Address todos generated by rubocop for gemfiles and gemspec files (#295)

This partially addresses #293. Since rubocop generated quite a few todos, the commits addressing them are split up into a few different PRs that cover different files.
thoughtbot · Sep 28, 2018 · 879b47f · 879b47f
1 parent 124c89b
commit 879b47f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 73 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,6 +4,7 @@ inherit_from:
 AllCops:
   Exclude:
     - "tmp/**/*"
+    - "gemfiles/*"
 
 Style/EmptyMethod:
   EnforcedStyle: expanded
@@ -17,26 +18,6 @@ Style/EmptyMethod:
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 18
-# Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-    - 'gemfiles/rails4.2.gemfile'
-    - 'gemfiles/rails5.0.gemfile'
-    - 'gemfiles/rails5.1.gemfile'
-    - 'gemfiles/rails5.2.gemfile'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'factory_bot_rails.gemspec'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
@@ -70,33 +51,13 @@ Style/Documentation:
     - 'test/**/*'
     - 'lib/generators/factory_bot/model/model_generator.rb'
 
-# Offense count: 29
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-Style/HashSyntax:
-  Exclude:
-    - 'gemfiles/rails4.2.gemfile'
-    - 'gemfiles/rails5.0.gemfile'
-    - 'gemfiles/rails5.1.gemfile'
-    - 'gemfiles/rails5.2.gemfile'
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'factory_bot_rails.gemspec'
-
 # Offense count: 84
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   EnforcedStyle: "double_quotes"
   Exclude:
-    - 'Gemfile'
-    - 'factory_bot_rails.gemspec'
     - 'lib/generators/factory_bot.rb'
     - 'lib/generators/factory_bot/model/model_generator.rb'
 
@@ -117,12 +78,6 @@ Style/TrailingCommaInArguments:
     - 'spec/factory_bot_rails/definition_file_paths_spec.rb'
     - 'lib/generators/factory_bot/model/model_generator.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Exclude:
-    - 'factory_bot_rails.gemspec'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: WordRegex.

diff --git a/Gemfile b/Gemfile
@@ -1,22 +1,22 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gemspec name: 'factory_bot_rails'
+gemspec name: "factory_bot_rails"
 
-gem 'appraisal'
-gem 'aruba'
-gem 'coffee-rails'
-gem 'cucumber', '1.3.19'
-gem 'jquery-rails'
-gem 'rake'
-gem 'rspec-rails'
-gem 'uglifier'
-gem 'test-unit'
+gem "appraisal"
+gem "aruba"
+gem "coffee-rails"
+gem "cucumber", "1.3.19"
+gem "jquery-rails"
+gem "rake"
+gem "rspec-rails"
+gem "test-unit"
+gem "uglifier"
 
-gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-gem 'jdbc-sqlite3', platforms: :jruby
-gem 'therubyrhino', platforms: :jruby
-gem 'jruby-openssl', platforms: :jruby
+gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+gem "jdbc-sqlite3", platforms: :jruby
+gem "jruby-openssl", platforms: :jruby
+gem "therubyrhino", platforms: :jruby
 
-gem 'sqlite3', platforms: :ruby
+gem "sqlite3", platforms: :ruby
 
 gem "rubocop", "0.54", require: false
diff --git a/factory_bot_rails.gemspec b/factory_bot_rails.gemspec
@@ -1,20 +1,20 @@
 Gem::Specification.new do |s|
-  s.name        = %q{factory_bot_rails}
-  s.version     = '4.11.1'
+  s.name        = "factory_bot_rails"
+  s.version     = "4.11.1"
   s.authors     = ["Joe Ferris"]
-  s.email       = %q{jferris@thoughtbot.com}
+  s.email       = "jferris@thoughtbot.com"
   s.homepage    = "https://github.com/thoughtbot/factory_bot_rails"
-  s.summary     = %q{factory_bot_rails provides integration between
-    factory_bot and rails 3 or newer}
-  s.description = %q{factory_bot_rails provides integration between
-    factory_bot and rails 3 or newer (currently just automatic factory definition
-    loading)}
+  s.summary     = "factory_bot_rails provides integration between "\
+                  "factory_bot and rails 3 or newer"
+  s.description = "factory_bot_rails provides integration between "\
+                  "factory_bot and rails 3 or newer (currently just automatic "\
+                  "factory definition loading)"
 
-  s.files         = Dir['lib/**/*'] + %w[CONTRIBUTING.md LICENSE NEWS README.md]
+  s.files         = Dir["lib/**/*"] + %w[CONTRIBUTING.md LICENSE NEWS README.md]
   s.require_paths = ["lib"]
   s.executables   = []
   s.license       = "MIT"
 
-  s.add_runtime_dependency('railties', '>= 3.0.0')
-  s.add_runtime_dependency('factory_bot', '~> 4.11.1')
+  s.add_runtime_dependency("factory_bot", "~> 4.11.1")
+  s.add_runtime_dependency("railties", ">= 3.0.0")
 end