Fixed Rubocop version in gemfile

ericproulx · ericproulx · commit 03788408696a · 2020-03-02T12:16:26.000+01:00
Ran appraisal clean
Ran appraisal generate

Re-ran rubocop

Put back rack1 and rack2 gemfile
I followed the naming convention of Appraisals

Added autogen appraisals file
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-01 23:02:40 +0100 using RuboCop version 0.80.1.
+# on 2020-03-02 11:38:28 +0100 using RuboCop version 0.80.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -112,13 +112,6 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Max: 14
 
-# Offense count: 1
-# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
-# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
-Naming/FileName:
-  Exclude:
-    - 'gemfiles/rack2-0.gemfile'
-
 # Offense count: 3
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ matrix:
     - rvm: 2.7.0
       gemfile: gemfiles/rack1.gemfile
     - rvm: 2.7.0
-      gemfile: gemfiles/rack2-0.gemfile
+      gemfile: gemfiles/rack2.gemfile
     - rvm: 2.7.0
       gemfile: gemfiles/rack_edge.gemfile
     - rvm: 2.7.0
diff --git a/Appraisals b/Appraisals
@@ -19,3 +19,11 @@ end
 appraise 'multi_xml' do
   gem 'multi_xml', require: 'multi_xml'
 end
+
+appraise 'rack1' do
+  gem 'rack', '~> 1.0'
+end
+
+appraise 'rack2' do
+  gem 'rack', '~> 2.0'
+end
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,7 @@
 #### Features
 
 * Your contribution here.
-* [#2003](https://github.com/ruby-grape/grape/pull/2003): Updated rubocop - [@ericproulx](https://github.com/ericproulx).
+* [#2003](https://github.com/ruby-grape/grape/pull/2003): Upgraded Rubocop to 0.80.1 - [@ericproulx](https://github.com/ericproulx).
 * [#2002](https://github.com/ruby-grape/grape/pull/2002): Objects allocation optimization (lazy_lookup) - [@ericproulx](https://github.com/ericproulx).
 
 #### Fixes
diff --git a/Gemfile b/Gemfile
@@ -10,8 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop'
-  gem 'rubocop-performance'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
diff --git a/gemfiles/multi_json.gemfile b/gemfiles/multi_json.gemfile
@@ -10,7 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.51.0'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
diff --git a/gemfiles/multi_xml.gemfile b/gemfiles/multi_xml.gemfile
@@ -10,7 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.51.0'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
diff --git a/gemfiles/rack1.gemfile b/gemfiles/rack1.gemfile
@@ -1,5 +1,38 @@
 # frozen_string_literal: true
 
-eval_gemfile('../Gemfile')
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
 
 gem 'rack', '~> 1.0'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
+end
+
+group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end
+
+group :test do
+  gem 'cookiejar'
+  gem 'coveralls_reborn'
+  gem 'danger-toc', '~> 0.1.2'
+  gem 'grape-entity', '~> 0.6'
+  gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'rack-test', '~> 1.1.0'
+  gem 'rspec', '~> 3.0'
+  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+end
+
+gemspec path: '../'
diff --git a/gemfiles/rack2-0.gemfile b/gemfiles/rack2-0.gemfile
diff --git a/gemfiles/rack2.gemfile b/gemfiles/rack2.gemfile
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rack', '~> 2.0'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
+end
+
+group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+end
+
+group :test do
+  gem 'cookiejar'
+  gem 'coveralls_reborn'
+  gem 'danger-toc', '~> 0.1.2'
+  gem 'grape-entity', '~> 0.6'
+  gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'rack-test', '~> 1.1.0'
+  gem 'rspec', '~> 3.0'
+  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+end
+
+gemspec path: '../'
diff --git a/gemfiles/rack_edge.gemfile b/gemfiles/rack_edge.gemfile
@@ -10,7 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.51.0'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
@@ -10,7 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.51.0'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -10,7 +10,8 @@ group :development, :test do
   gem 'bundler'
   gem 'hashie'
   gem 'rake'
-  gem 'rubocop', '0.51.0'
+  gem 'rubocop', '0.80.1'
+  gem 'rubocop-performance', require: false
 end
 
 group :development do
