cleanup and improve the code

the-teacher · Jan 29, 2023 · add85a8 · add85a8
1 parent 6b572c4
commit add85a8
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -46,8 +46,11 @@ gem "kaminari", "1.2.2"
 gem "whenever", "1.0.0", require: false
 
 group :development, :test do
-  # fake data for development and testing
+  # Fake data for development and testing
   gem "faker", "3.1.0"
+
+  # Code linting
+  gem "rubocop-rails", "2.17.4", require: false
 end
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -76,6 +76,7 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
     bindex (0.8.1)
     bootsnap (1.15.0)
       msgpack (~> 1.2)
@@ -177,6 +178,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    json (2.6.3)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -219,6 +221,9 @@ GEM
     nokogiri (1.13.10)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
+    parallel (1.22.1)
+    parser (3.2.0.0)
+      ast (~> 2.4.1)
     pg (1.4.5)
     public_suffix (5.0.1)
     puma (5.6.5)
@@ -253,13 +258,31 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.0.6)
     redis (5.0.5)
       redis-client (>= 0.9.0)
     redis-client (0.11.2)
       connection_pool
     regexp_parser (2.6.1)
     rexml (3.2.5)
+    rubocop (1.44.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-rails (2.17.4)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.33.0, < 2.0)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     sanitize (6.0.0)
@@ -291,8 +314,7 @@ GEM
       railties (>= 6.0.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
-      tzinfo (>= 1.0.0)
+    unicode-display_width (2.4.2)
     web-console (4.2.0)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
@@ -329,6 +351,7 @@ DEPENDENCIES
   puma (= 5.6.5)
   rails (= 7.0.4.2)
   redis (= 5.0.5)
+  rubocop-rails (= 2.17.4)
   sanitize (= 6.0.0)
   selenium-webdriver (= 4.7.1)
   sidekiq (= 7.0.2)

diff --git a/bin/setup b/bin/setup
@@ -40,7 +40,7 @@ FileUtils.chdir APP_ROOT do
   system('docker compose -f docker/docker-compose.yml up rails -d')
   wait('to launch Rails Container')
 
-  step_info "Installing Gems. Please Wait"
+  step_info "Installing Gems"
   rails_install_gems
 
   step_info "Create DB. Migrate DB. Create Seeds"
@@ -55,6 +55,9 @@ FileUtils.chdir APP_ROOT do
   step_info "Launching Sidekiq"
   sidekiq_start
 
+  step_info "Rubocop is Checking"
+  rubocop
+
   step_info "Visit Rails App: http://localhost:3000"
   step_info "Visit Mail Service: http://localhost:1080"
 

diff --git a/config/initializers/_SIDEKIQ.rb b/config/initializers/_SIDEKIQ.rb
@@ -9,7 +9,7 @@
 puts "Sidekiq service address: #{redis_url}"
 
 SQ_ERR_LOGGER = Logger.new(
-  Rails.root.join('/log/sidekiq.errors.log')
+  Rails.root.join('log/sidekiq.errors.log')
 )
 
 Sidekiq.configure_client do |config|

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -89,5 +89,3 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | b
 COPY Gemfile Gemfile
 COPY --chown=lucky:lucky Gemfile.lock Gemfile.lock
 RUN bundle
-
-RUN gem install rubocop-rails -v 2.17.4