Run Rubocop in Jenkins

Also fix the rubocop issues that slipped in the meantime.

.rubocop.yml

@@ -26,6 +26,10 @@ Lint/RescueException:
 Metrics/ClassLength:
   Exclude:
     - 'test/**/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - 'test/**/*'
 
 Naming/AccessorMethodName:
   Enabled: false

Gemfile

@@ -13,7 +13,6 @@ group :test do
   if RUBY_VERSION < '2.1'
     gem 'public_suffix', '< 3'
     gem 'rainbow', '< 3'
-    gem 'rubocop', '< 0.51.0'
   else
     gem 'public_suffix'
     gem 'rubocop', '~> 0.52.1'

Rakefile

@@ -1,5 +1,6 @@
 require 'rake'
 require 'rake/testtask'
+require 'rubocop/rake_task' if RUBY_VERSION >= '2.1'
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -26,14 +27,14 @@ end
 
 desc 'Test Dynflow plugin.'
 task :test do
+  Rake::Task['rubocop'].invoke if defined? RuboCop
   Rake::Task['test:core'].invoke
   Rake::Task['test:api'].invoke
 end
 
-require 'rubocop/rake_task'
-
-desc 'Run RuboCop on the lib directory'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.patterns = ['lib/**/*.rb', 'test/**/*.rb']
-  task.fail_on_error = false
+if defined? RuboCop
+  desc 'Run RuboCop on the lib directory'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.fail_on_error = true
+  end
 end

lib/smart_proxy_dynflow_core/log.rb

@@ -55,7 +55,7 @@ def roll_log
 
     class ProxyStructuredFormater < ::Dynflow::LoggerAdapters::Formatters::Abstract
       def call(_severity, _datetime, _prog_name, message)
-        if ::Exception === message
+        if message.is_a?(::Exception)
           subject = "#{message.message} (#{message.class})"
           if @base.respond_to?(:exception)
             @base.exception("Error details", message)
@@ -74,7 +74,7 @@ def format(message)
     end
 
     class ProxyAdapter < ::Dynflow::LoggerAdapters::Simple
-      def initialize(logger, level = Logger::DEBUG, formatters = [])
+      def initialize(logger, level = Logger::DEBUG, _formatters = [])
         @logger           = logger
         @logger.level     = level
         @logger.formatter = ProxyStructuredFormater.new(@logger)

lib/smart_proxy_dynflow_core/task_launcher_registry.rb

@@ -1,7 +1,6 @@
 module SmartProxyDynflowCore
   class TaskLauncherRegistry
     class << self
-
       def register(name, launcher)
         registry[name] = launcher
       end

smart_proxy_dynflow_core.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('mocha', '~> 1')
   gem.add_development_dependency('rack-test', '~> 0')
   gem.add_development_dependency "rake", "~> 10.0"
-  gem.add_development_dependency('rubocop', '~> 0.52.1')
   gem.add_development_dependency('webmock', '~> 1')
 
   gem.add_runtime_dependency('dynflow', "~> 1.1")

test/core_test/api_test.rb

@@ -115,13 +115,13 @@ def wait_until(iterations = 10, interval = 0.2)
 
     describe 'POST /tasks/launch' do
       it 'triggers a task by operation' do
-        klass = mock()
-        instance = mock()
+        klass = mock
+        instance = mock
         klass.expects(:new).returns(instance)
         instance.expects(:launch!).with({})
         instance.expects(:results).returns({})
         TaskLauncherRegistry.stubs(:registry).returns('something' => klass)
-        post '/tasks/launch', { :operation => 'something', :input => { } }.to_json, request_headers
+        post '/tasks/launch', { :operation => 'something', :input => {} }.to_json, request_headers
       end
 
       it 'fail 404 when operation is missing' do
@@ -133,13 +133,13 @@ def wait_until(iterations = 10, interval = 0.2)
     describe 'GET /tasks/operations' do
       it 'gets the list of operations' do
         get '/tasks/operations', request_headers
-        response = JSON.load(last_response.body)
+        response = JSON.parse(last_response.body)
         response.must_equal []
 
-        TaskLauncherRegistry.stubs(:registry).returns({'foo' => 'foo-v', 'bar' => 'bar-v', 'baz' => 'baz-v'})
+        TaskLauncherRegistry.stubs(:registry).returns({ 'foo' => 'foo-v', 'bar' => 'bar-v', 'baz' => 'baz-v' })
         get '/tasks/operations', request_headers
-        response = JSON.load(last_response.body)
-        response.must_equal %w(foo bar baz)
+        response = JSON.parse(last_response.body)
+        response.must_equal %w[foo bar baz]
       end
     end
   end

test/core_test/task_launcher_registry_test.rb

@@ -27,14 +27,14 @@ class TaskLauncherRegistryTest < MiniTest::Spec
         end
 
         it 'fetches the value' do
-          registry.expects(:registry).returns({'my_operation' => Integer})
+          registry.expects(:registry).returns({ 'my_operation' => Integer })
           registry.fetch('my_operation').must_equal Integer
         end
       end
 
       describe '#key' do
         it 'checks presence of a key' do
-          registry.expects(:registry).returns({'my_operation' => Integer}).twice
+          registry.expects(:registry).returns({ 'my_operation' => Integer }).twice
           assert registry.key?('my_operation')
           refute registry.key?('missing')
         end
@@ -45,7 +45,7 @@ class TaskLauncherRegistryTest < MiniTest::Spec
           registry.register('foo', nil)
           registry.register('bar', nil)
           registry.register('baz', nil)
-          registry.operations.must_equal %w(foo bar baz)
+          registry.operations.must_equal %w[foo bar baz]
         end
       end
     end