From 2ec8c2dfaf77a41327318e9f9474debe0a52df8b Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Tue, 9 Oct 2018 04:23:09 +0300 Subject: [PATCH 1/4] [gem] actual armitage-rubocop version --- qonfig.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qonfig.gemspec b/qonfig.gemspec index 427c45b7..8d4eeabc 100644 --- a/qonfig.gemspec +++ b/qonfig.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'simplecov', '~> 0.14' spec.add_development_dependency 'simplecov-json', '~> 0.2' spec.add_development_dependency 'rspec', '~> 3.8' - spec.add_development_dependency 'armitage-rubocop', '~> 0.6' + spec.add_development_dependency 'armitage-rubocop', '~> 0.9' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake' From de9d88248206c07f469efacf5eef2462fa5b1407 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 13 Oct 2018 11:40:48 +0300 Subject: [PATCH 2/4] [gem] actualized dependencies --- qonfig.gemspec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qonfig.gemspec b/qonfig.gemspec index 8d4eeabc..be747b82 100644 --- a/qonfig.gemspec +++ b/qonfig.gemspec @@ -29,10 +29,9 @@ Gem::Specification.new do |spec| end spec.add_development_dependency 'coveralls', '~> 0.8' - spec.add_development_dependency 'simplecov', '~> 0.14' - spec.add_development_dependency 'simplecov-json', '~> 0.2' + spec.add_development_dependency 'simplecov', '~> 0.16' spec.add_development_dependency 'rspec', '~> 3.8' - spec.add_development_dependency 'armitage-rubocop', '~> 0.9' + spec.add_development_dependency 'armitage-rubocop', '~> 0.10' spec.add_development_dependency 'bundler' spec.add_development_dependency 'rake' From 6e86b84b551d2b87ec9e79885c7bc842ae933303 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 13 Oct 2018 11:42:58 +0300 Subject: [PATCH 3/4] [gem] improved rake tasks --- Rakefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 82bb534a..a1819e14 100644 --- a/Rakefile +++ b/Rakefile @@ -2,7 +2,17 @@ require 'bundler/gem_tasks' require 'rspec/core/rake_task' +require 'rubocop' +require 'rubocop-rspec' +require 'rubocop/rake_task' -RSpec::Core::RakeTask.new(:spec) +RuboCop::RakeTask.new(:rubocop) do |t| + config_path = File.expand_path(File.join('.rubocop.yml'), __dir__) -task default: :spec + t.options = ['--config', config_path] + t.requires << 'rubocop-rspec' +end + +RSpec::Core::RakeTask.new(:rspec) + +task default: :rspec From dc7752e1283000b1bb2dcd58b64faea97895ad46 Mon Sep 17 00:00:00 2001 From: Rustam Ibragimov Date: Sat, 13 Oct 2018 11:43:15 +0300 Subject: [PATCH 4/4] [ci] removed useless simplecov-json --- spec/spec_helper.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b73a1dbf..2f0537a8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,12 +1,10 @@ # frozen_string_literal: true require 'simplecov' -require 'simplecov-json' require 'coveralls' SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([ SimpleCov::Formatter::HTMLFormatter, - SimpleCov::Formatter::JSONFormatter, Coveralls::SimpleCov::Formatter ])