Merge pull request #66 from ashmaroli/bump-rubocop

Use Rubocop w/ config inherited from Jekyll-3.8.0
jekyll · Apr 23, 2018 · 1cce1d0 · 1cce1d0
2 parents 45fb7fd + b21b016
commit 1cce1d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -2,7 +2,7 @@ inherit_gem:
   jekyll: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.1
   Include:
     - lib/**/*.rb
 
@@ -22,7 +22,7 @@ Lint/HandleExceptions:
   Exclude:
     - lib/jekyll/watcher.rb
 
-Lint/RescueWithoutErrorClass:
+Style/RescueStandardError:
   Exclude:
     - lib/jekyll/watcher.rb
 

diff --git a/jekyll-watch.gemspec b/jekyll-watch.gemspec
@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "jekyll", "~> 3.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "rubocop", "0.51"
+  spec.add_development_dependency "rubocop", "~> 0.55.0"
 end
diff --git a/lib/jekyll/watcher.rb b/lib/jekyll/watcher.rb
@@ -30,7 +30,7 @@ def watch(options, site = nil)
       unless options["serving"]
         trap("INT") do
           listener.stop
-          puts "     Halting auto-regeneration."
+          Jekyll.logger.info "", "Halting auto-regeneration."
           exit 0
         end
 
@@ -128,7 +128,7 @@ def process(site, time)
         Jekyll.logger.warn "Error:", e.message
         Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
       end
-      puts ""
+      Jekyll.logger.info ""
     end
   end
 end