diff --git a/.travis.yml b/.travis.yml index f93bca740..0ec2a830c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,3 +23,5 @@ gemfile: - gemfiles/rails_3.gemfile - gemfiles/rails_4.gemfile - gemfiles/rack_1.5.2.gemfile + +bundler_args: --without development diff --git a/Gemfile b/Gemfile index 6a46bf87c..533afd993 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,30 @@ +# when changing this file, run appraisal install ; rubocop -a gemfiles/* + source 'https://rubygems.org' gemspec group :development, :test do + gem 'bundler' + gem 'rake' + gem 'rubocop', '0.35.1' +end + +group :development do gem 'guard' gem 'guard-rspec' gem 'guard-rubocop' + gem 'yard' + gem 'appraisal' + gem 'benchmark-ips' +end + +group :test do + gem 'grape-entity', '0.5.0' + gem 'maruku' + gem 'rack-test' + gem 'rspec', '~> 3.0' + gem 'cookiejar' + gem 'rack-contrib' + gem 'mime-types', '< 3.0' end diff --git a/Rakefile b/Rakefile index 242685393..0aa5e5709 100644 --- a/Rakefile +++ b/Rakefile @@ -23,43 +23,47 @@ RuboCop::RakeTask.new task default: [:rubocop, :spec] -require 'yard' -DOC_FILES = ['lib/**/*.rb', 'README.md'] +begin + require 'yard' + DOC_FILES = ['lib/**/*.rb', 'README.md'] -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'] + YARD::Rake::YardocTask.new(:doc) do |t| + t.files = DOC_FILES 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') + 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 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') + 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 end +rescue LoadError # rubocop:disable Lint/HandleExceptions + # ignore end diff --git a/gemfiles/rack_1.5.2.gemfile b/gemfiles/rack_1.5.2.gemfile index 3ba7ea3a7..ea96ee147 100644 --- a/gemfiles/rack_1.5.2.gemfile +++ b/gemfiles/rack_1.5.2.gemfile @@ -5,9 +5,28 @@ source 'https://rubygems.org' gem 'rack', '1.5.2' group :development, :test do + gem 'bundler' + gem 'rake' + gem 'rubocop', '0.35.1' +end + +group :development do gem 'guard' gem 'guard-rspec' gem 'guard-rubocop' + gem 'yard' + gem 'appraisal' + gem 'benchmark-ips' +end + +group :test do + gem 'grape-entity', '0.5.0' + gem 'maruku' + gem 'rack-test' + gem 'rspec', '~> 3.0' + gem 'cookiejar' + gem 'rack-contrib' + gem 'mime-types', '< 3.0' end gemspec path: '../' diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_3.gemfile index 55a7d5747..cd4dfbc0f 100644 --- a/gemfiles/rails_3.gemfile +++ b/gemfiles/rails_3.gemfile @@ -2,13 +2,32 @@ source 'https://rubygems.org' -gem 'rails', '3.2.22' +gem 'rails', '3.2.19' gem 'rack-cache', '<= 1.2' group :development, :test do + gem 'bundler' + gem 'rake' + gem 'rubocop', '0.35.1' +end + +group :development do gem 'guard' gem 'guard-rspec' gem 'guard-rubocop' + gem 'yard' + gem 'appraisal' + gem 'benchmark-ips' +end + +group :test do + gem 'grape-entity', '0.5.0' + gem 'maruku' + gem 'rack-test' + gem 'rspec', '~> 3.0' + gem 'cookiejar' + gem 'rack-contrib' + gem 'mime-types', '< 3.0' end gemspec path: '../' diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile index 8c386c724..136ec2b81 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.gemfile @@ -5,9 +5,28 @@ source 'https://rubygems.org' gem 'rails', '4.1.6' group :development, :test do + gem 'bundler' + gem 'rake' + gem 'rubocop', '0.35.1' +end + +group :development do gem 'guard' gem 'guard-rspec' gem 'guard-rubocop' + gem 'yard' + gem 'appraisal' + gem 'benchmark-ips' +end + +group :test do + gem 'grape-entity', '0.5.0' + gem 'maruku' + gem 'rack-test' + gem 'rspec', '~> 3.0' + gem 'cookiejar' + gem 'rack-contrib' + gem 'mime-types', '< 3.0' end gemspec path: '../' diff --git a/grape.gemspec b/grape.gemspec index c6529951c..328781b18 100644 --- a/grape.gemspec +++ b/grape.gemspec @@ -22,20 +22,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'virtus', '>= 1.0.0' s.add_runtime_dependency 'builder' - s.add_development_dependency 'grape-entity', '0.5.0' - s.add_development_dependency 'rake', '~> 10' - s.add_development_dependency 'maruku' - s.add_development_dependency 'yard' - s.add_development_dependency 'rack-test' - s.add_development_dependency 'rspec', '~> 3.0' - s.add_development_dependency 'bundler' - s.add_development_dependency 'cookiejar' - s.add_development_dependency 'rack-contrib' - 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 = Dir['**/*'].keep_if { |file| File.file?(file) } s.test_files = Dir['spec/**/*'] s.require_paths = ['lib']