From f0b8745872932cc0bcdc783045c440a010bac5d8 Mon Sep 17 00:00:00 2001 From: Jasdeep Gosal Date: Mon, 26 Aug 2019 10:09:51 -0400 Subject: [PATCH 1/4] Upgrade to ruby 2.6.3 [#166913897] --- .ruby-version | 2 +- default.yml | 2 +- spec/private_attribute_accessors_spec.rb | 2 +- spec/unless_with_multiple_conditions_spec.rb | 2 +- spec/update_not_update_attributes_spec.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ruby-version b/.ruby-version index 0bee604..ec1cf33 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.3.3 +2.6.3 diff --git a/default.yml b/default.yml index 54bbe8b..53247e3 100644 --- a/default.yml +++ b/default.yml @@ -6,7 +6,7 @@ require: - ./lib/update_not_update_attributes AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 2.6 Exclude: - '*.gemspec' diff --git a/spec/private_attribute_accessors_spec.rb b/spec/private_attribute_accessors_spec.rb index 07ba16e..f9d80cf 100644 --- a/spec/private_attribute_accessors_spec.rb +++ b/spec/private_attribute_accessors_spec.rb @@ -25,7 +25,7 @@ def parse_source(source, file = nil) file = file.path end - RuboCop::ProcessedSource.new(source, 2.3, file) + RuboCop::ProcessedSource.new(source, 2.6, file) end def _investigate(cop, processed_source) diff --git a/spec/unless_with_multiple_conditions_spec.rb b/spec/unless_with_multiple_conditions_spec.rb index 31857f9..becc37f 100644 --- a/spec/unless_with_multiple_conditions_spec.rb +++ b/spec/unless_with_multiple_conditions_spec.rb @@ -23,7 +23,7 @@ def parse_source(source, file = nil) file = file.path end - RuboCop::ProcessedSource.new(source, 2.3, file) + RuboCop::ProcessedSource.new(source, 2.6, file) end def _investigate(cop, processed_source) diff --git a/spec/update_not_update_attributes_spec.rb b/spec/update_not_update_attributes_spec.rb index f4a1f82..85a9753 100644 --- a/spec/update_not_update_attributes_spec.rb +++ b/spec/update_not_update_attributes_spec.rb @@ -23,7 +23,7 @@ def parse_source(source, file = nil) file = file.path end - RuboCop::ProcessedSource.new(source, 2.3, file) + RuboCop::ProcessedSource.new(source, 2.6, file) end def _investigate(cop, processed_source) From 2b6876db5e573d5f5cb427c3fdb4a34c17ce033a Mon Sep 17 00:00:00 2001 From: Jasdeep Gosal Date: Mon, 26 Aug 2019 10:10:48 -0400 Subject: [PATCH 2/4] Add rubocop-rails It was extracted out: https://github.com/rubocop-hq/rubocop/issues/5976 [#166913897] --- cw-style.gemspec | 3 ++- default.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cw-style.gemspec b/cw-style.gemspec index df45fef..f9db3a4 100644 --- a/cw-style.gemspec +++ b/cw-style.gemspec @@ -28,10 +28,11 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency "rubocop", ">= 0.53.0" + spec.add_dependency "rubocop", ">= 0.74.0" spec.add_dependency "rubocop-rspec-focused", "= 0.0.3" spec.add_dependency "rubocop-thread_safety" spec.add_development_dependency "bundler", "~> 1.15" + spec.add_dependency "rubocop-rails" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" spec.add_development_dependency "debugger-ruby_core_source" diff --git a/default.yml b/default.yml index 53247e3..07d45d1 100644 --- a/default.yml +++ b/default.yml @@ -1,6 +1,7 @@ require: - rubocop/rspec/focused - rubocop-thread_safety + - rubocop-rails - ./lib/unless_with_multiple_conditions - ./lib/private_attribute_accessors - ./lib/update_not_update_attributes From 152d04cf6604250b18b3ac59a2352752167a800d Mon Sep 17 00:00:00 2001 From: Jasdeep Gosal Date: Mon, 26 Aug 2019 10:11:02 -0400 Subject: [PATCH 3/4] Update bundler version [#166913897] --- cw-style.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cw-style.gemspec b/cw-style.gemspec index f9db3a4..fe4c788 100644 --- a/cw-style.gemspec +++ b/cw-style.gemspec @@ -31,8 +31,8 @@ Gem::Specification.new do |spec| spec.add_dependency "rubocop", ">= 0.74.0" spec.add_dependency "rubocop-rspec-focused", "= 0.0.3" spec.add_dependency "rubocop-thread_safety" - spec.add_development_dependency "bundler", "~> 1.15" spec.add_dependency "rubocop-rails" + spec.add_development_dependency "bundler", "~> 2.0.2" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec" spec.add_development_dependency "debugger-ruby_core_source" From 35ed63809713af85e04b0ee7dc7d8356b906f880 Mon Sep 17 00:00:00 2001 From: Jasdeep Gosal Date: Mon, 26 Aug 2019 10:11:15 -0400 Subject: [PATCH 4/4] Bump version [#166913897] --- lib/charity_water/style/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/charity_water/style/version.rb b/lib/charity_water/style/version.rb index 299a270..3db180c 100644 --- a/lib/charity_water/style/version.rb +++ b/lib/charity_water/style/version.rb @@ -1,5 +1,5 @@ module CharityWater module Style - VERSION = '2.2.0'.freeze + VERSION = '3.0.0'.freeze end end