Run against Rbx 2.5.8 and ignore failures.

dblock · dblock · commit 539133eb3994 · 2015-11-23T18:34:19.000-05:00
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-11-23 14:55:46 -0500 using RuboCop version 0.35.1.
+# 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
@@ -33,7 +33,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 751
+# Offense count: 750
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 215
diff --git a/.travis.yml b/.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
diff --git a/Appraisals b/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
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '0.35.1'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
diff --git a/Rakefile b/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 git@github.com: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 git@github.com: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
diff --git a/gemfiles/rack_1.5.2.gemfile b/gemfiles/rack_1.5.2.gemfile
@@ -5,7 +5,6 @@ source 'https://rubygems.org'
 gem 'rack', '1.5.2'
 
 group :development, :test do
-  gem 'rubocop', '0.35.1'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_3.gemfile
@@ -6,7 +6,6 @@ gem 'rails', '3.2.19'
 gem 'rack-cache', '<= 1.2'
 
 group :development, :test do
-  gem 'rubocop', '0.35.1'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile
@@ -5,7 +5,6 @@ source 'https://rubygems.org'
 gem 'rails', '4.1.6'
 
 group :development, :test do
-  gem 'rubocop', '0.35.1'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
diff --git a/grape.gemspec b/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")
