Merge pull request #1209 from dblock/rubocop-0.35.1

Rubocop 0.35.1, RBX 2.5.8

Author: dblock

.rubocop.yml

@@ -2,6 +2,5 @@ AllCops:
   Exclude:
     - vendor/**/*
     - bin/**/*
-    - gemfiles/**/*
 
 inherit_from: .rubocop_todo.yml

.rubocop_todo.yml

@@ -1,11 +1,16 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-19 13:28:59 -0400 using RuboCop version 0.33.0.
+# on 2015-11-23 18:15:01 -0500 using RuboCop version 0.35.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
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 1
+Lint/DuplicatedKey:
+  Exclude:
+    - 'spec/grape/validations_spec.rb'
+
 # Offense count: 1
 Lint/NestedMethodDefinition:
   Exclude:
@@ -22,18 +27,18 @@ Metrics/BlockNesting:
 # Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 300
+  Max: 277
 
-# Offense count: 23
+# Offense count: 22
 Metrics/CyclomaticComplexity:
-  Max: 16
+  Max: 14
 
-# Offense count: 717
+# Offense count: 750
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 215
 
-# Offense count: 42
+# Offense count: 44
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 36
@@ -43,17 +48,22 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Max: 272
 
-# Offense count: 17
+# Offense count: 15
 Metrics/PerceivedComplexity:
-  Max: 18
+  Max: 16
 
-# Offense count: 30
+# Offense count: 44
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 Style/BlockDelimiters:
-  Enabled: false
+  Exclude:
+    - 'spec/grape/api_spec.rb'
+    - 'spec/grape/exceptions/validation_errors_spec.rb'
+    - 'spec/grape/middleware/versioner/header_spec.rb'
+    - 'spec/grape/request_spec.rb'
 
-# Offense count: 167
+# Offense count: 105
+# Configuration parameters: Exclude.
 Style/Documentation:
   Enabled: false
 
@@ -65,13 +75,6 @@ Style/DoubleNegation:
     - 'lib/grape/middleware/versioner/header.rb'
     - 'lib/grape/path.rb'
 
-# Offense count: 3
-Style/EachWithObject:
-  Exclude:
-    - 'lib/grape/dsl/inside_route.rb'
-    - 'lib/grape/exceptions/base.rb'
-    - 'lib/grape/formatter/serializable_hash.rb'
-
 # Offense count: 14
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/RaiseArgs:

.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 2.2
   - 2.1
   - 2.0.0
-  - rbx-2.2.10
+  - rbx-2.5.8
   - jruby-19mode
   - ruby-head
   - jruby-head
@@ -15,6 +15,7 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2.5.8
 
 gemfile:
   - Gemfile

Appraisals

@@ -1,12 +1,12 @@
-appraise "rails-3" do
-  gem "rails", "3.2.19"
-  gem "rack-cache", "<= 1.2"  # Pin as next rack-cache version (1.3) removes Ruby1.9 support
+appraise 'rails-3' do
+  gem 'rails', '3.2.19'
+  gem 'rack-cache', '<= 1.2'  # Pin as next rack-cache version (1.3) removes Ruby1.9 support
 end
 
-appraise "rails-4" do
-  gem "rails", "4.1.6"
+appraise 'rails-4' do
+  gem 'rails', '4.1.6'
 end
 
-appraise "rack-1.5.2" do
-  gem "rack", "1.5.2"
+appraise 'rack-1.5.2' do
+  gem 'rack', '1.5.2'
 end

Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '0.33.0'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'

Rakefile

@@ -17,52 +17,49 @@ end
 task :spec
 
 require 'rainbow/ext/string' unless String.respond_to?(:color)
+
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
 task default: [:rubocop, :spec]
 
-begin
-  require 'yard'
-  DOC_FILES = ['lib/**/*.rb', 'README.md']
+require 'yard'
+DOC_FILES = ['lib/**/*.rb', 'README.md']
 
-  YARD::Rake::YardocTask.new(:doc) do |t|
-    t.files = DOC_FILES
-  end
+YARD::Rake::YardocTask.new(:doc) do |t|
+  t.files = DOC_FILES
+end
 
-  namespace :doc do
-    YARD::Rake::YardocTask.new(:pages) do |t|
-      t.files   = DOC_FILES
-      t.options = ['-o', '../grape.doc/docs']
-    end
+namespace :doc do
+  YARD::Rake::YardocTask.new(:pages) do |t|
+    t.files   = DOC_FILES
+    t.options = ['-o', '../grape.doc/docs']
+  end
 
-    namespace :pages do
-      desc 'Check out gh-pages.'
-      task :checkout do
-        dir = File.dirname(__FILE__) + '/../grape.doc'
-        unless Dir.exist?(dir)
-          Dir.mkdir(dir)
-          Dir.chdir(dir) do
-            system('git init')
-            system('git remote add origin [email protected]:ruby-grape/grape.git')
-            system('git pull')
-            system('git checkout gh-pages')
-          end
+  namespace :pages do
+    desc 'Check out gh-pages.'
+    task :checkout do
+      dir = File.dirname(__FILE__) + '/../grape.doc'
+      unless Dir.exist?(dir)
+        Dir.mkdir(dir)
+        Dir.chdir(dir) do
+          system('git init')
+          system('git remote add origin [email protected]:ruby-grape/grape.git')
+          system('git pull')
+          system('git checkout gh-pages')
         end
       end
+    end
 
-      desc 'Generate and publish YARD docs to GitHub pages.'
-      task publish: ['doc:pages:checkout', 'doc:pages'] do
-        Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
-          system('git checkout gh-pages')
-          system('git add .')
-          system('git add -u')
-          system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
-          system('git push origin gh-pages')
-        end
+    desc 'Generate and publish YARD docs to GitHub pages.'
+    task publish: ['doc:pages:checkout', 'doc:pages'] do
+      Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
+        system('git checkout gh-pages')
+        system('git add .')
+        system('git add -u')
+        system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
+        system('git push origin gh-pages')
       end
     end
   end
-rescue LoadError
-  puts 'You need to install YARD.'
 end

gemfiles/rack_1.5.2.gemfile

@@ -1,14 +1,13 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rack", "1.5.2"
+gem 'rack', '1.5.2'
 
 group :development, :test do
-  gem "rubocop", "0.33.0"
-  gem "guard"
-  gem "guard-rspec"
-  gem "guard-rubocop"
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
 end
 
-gemspec :path => "../"
+gemspec path: '../'

gemfiles/rails_3.gemfile

@@ -1,15 +1,14 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rails", "3.2.19"
-gem "rack-cache", "<= 1.2"
+gem 'rails', '3.2.19'
+gem 'rack-cache', '<= 1.2'
 
 group :development, :test do
-  gem "rubocop", "0.33.0"
-  gem "guard"
-  gem "guard-rspec"
-  gem "guard-rubocop"
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
 end
 
-gemspec :path => "../"
+gemspec path: '../'

gemfiles/rails_4.gemfile

@@ -1,14 +1,13 @@
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "rails", "4.1.6"
+gem 'rails', '4.1.6'
 
 group :development, :test do
-  gem "rubocop", "0.33.0"
-  gem "guard"
-  gem "guard-rspec"
-  gem "guard-rubocop"
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
 end
 
-gemspec :path => "../"
+gemspec path: '../'

grape.gemspec

@@ -31,9 +31,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'cookiejar'
   s.add_development_dependency 'rack-contrib'
-  s.add_development_dependency 'mime-types'
+  s.add_development_dependency 'mime-types', '< 3.0'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'benchmark-ips'
+  s.add_development_dependency 'rubocop', '0.35.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")