Skip to content

Commit e9c6885

Browse files
committed
Fix: Ruby 2.1 build.
1 parent 044dad7 commit e9c6885

File tree

7 files changed

+115
-45
lines changed

7 files changed

+115
-45
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ gemfile:
2323
- gemfiles/rails_3.gemfile
2424
- gemfiles/rails_4.gemfile
2525
- gemfiles/rack_1.5.2.gemfile
26+
27+
bundler_args: --without development

Gemfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,30 @@
1+
# when changing this file, run appraisal install ; rubocop -a gemfiles/*
2+
13
source 'https://rubygems.org'
24

35
gemspec
46

57
group :development, :test do
8+
gem 'bundler'
9+
gem 'rake'
10+
gem 'rubocop', '0.35.1'
11+
end
12+
13+
group :development do
614
gem 'guard'
715
gem 'guard-rspec'
816
gem 'guard-rubocop'
17+
gem 'yard'
18+
gem 'appraisal'
19+
gem 'benchmark-ips'
20+
end
21+
22+
group :test do
23+
gem 'grape-entity', '0.5.0'
24+
gem 'maruku'
25+
gem 'rack-test'
26+
gem 'rspec', '~> 3.0'
27+
gem 'cookiejar'
28+
gem 'rack-contrib'
29+
gem 'mime-types', '< 3.0'
930
end

Rakefile

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,47 @@ RuboCop::RakeTask.new
2323

2424
task default: [:rubocop, :spec]
2525

26-
require 'yard'
27-
DOC_FILES = ['lib/**/*.rb', 'README.md']
26+
begin
27+
require 'yard'
28+
DOC_FILES = ['lib/**/*.rb', 'README.md']
2829

29-
YARD::Rake::YardocTask.new(:doc) do |t|
30-
t.files = DOC_FILES
31-
end
32-
33-
namespace :doc do
34-
YARD::Rake::YardocTask.new(:pages) do |t|
35-
t.files = DOC_FILES
36-
t.options = ['-o', '../grape.doc/docs']
30+
YARD::Rake::YardocTask.new(:doc) do |t|
31+
t.files = DOC_FILES
3732
end
3833

39-
namespace :pages do
40-
desc 'Check out gh-pages.'
41-
task :checkout do
42-
dir = File.dirname(__FILE__) + '/../grape.doc'
43-
unless Dir.exist?(dir)
44-
Dir.mkdir(dir)
45-
Dir.chdir(dir) do
46-
system('git init')
47-
system('git remote add origin [email protected]:ruby-grape/grape.git')
48-
system('git pull')
49-
system('git checkout gh-pages')
34+
namespace :doc do
35+
YARD::Rake::YardocTask.new(:pages) do |t|
36+
t.files = DOC_FILES
37+
t.options = ['-o', '../grape.doc/docs']
38+
end
39+
40+
namespace :pages do
41+
desc 'Check out gh-pages.'
42+
task :checkout do
43+
dir = File.dirname(__FILE__) + '/../grape.doc'
44+
unless Dir.exist?(dir)
45+
Dir.mkdir(dir)
46+
Dir.chdir(dir) do
47+
system('git init')
48+
system('git remote add origin [email protected]:ruby-grape/grape.git')
49+
system('git pull')
50+
system('git checkout gh-pages')
51+
end
5052
end
5153
end
52-
end
5354

54-
desc 'Generate and publish YARD docs to GitHub pages.'
55-
task publish: ['doc:pages:checkout', 'doc:pages'] do
56-
Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
57-
system('git checkout gh-pages')
58-
system('git add .')
59-
system('git add -u')
60-
system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
61-
system('git push origin gh-pages')
55+
desc 'Generate and publish YARD docs to GitHub pages.'
56+
task publish: ['doc:pages:checkout', 'doc:pages'] do
57+
Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
58+
system('git checkout gh-pages')
59+
system('git add .')
60+
system('git add -u')
61+
system("git commit -m 'Generating docs for version #{Grape::VERSION}.'")
62+
system('git push origin gh-pages')
63+
end
6264
end
6365
end
6466
end
67+
rescue LoadError # rubocop:disable Lint/HandleExceptions
68+
# ignore
6569
end

gemfiles/rack_1.5.2.gemfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,28 @@ source 'https://rubygems.org'
55
gem 'rack', '1.5.2'
66

77
group :development, :test do
8+
gem 'bundler'
9+
gem 'rake'
10+
gem 'rubocop', '0.35.1'
11+
end
12+
13+
group :development do
814
gem 'guard'
915
gem 'guard-rspec'
1016
gem 'guard-rubocop'
17+
gem 'yard'
18+
gem 'appraisal'
19+
gem 'benchmark-ips'
20+
end
21+
22+
group :test do
23+
gem 'grape-entity', '0.5.0'
24+
gem 'maruku'
25+
gem 'rack-test'
26+
gem 'rspec', '~> 3.0'
27+
gem 'cookiejar'
28+
gem 'rack-contrib'
29+
gem 'mime-types', '< 3.0'
1130
end
1231

1332
gemspec path: '../'

gemfiles/rails_3.gemfile

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,32 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'rails', '3.2.22'
5+
gem 'rails', '3.2.19'
66
gem 'rack-cache', '<= 1.2'
77

88
group :development, :test do
9+
gem 'bundler'
10+
gem 'rake'
11+
gem 'rubocop', '0.35.1'
12+
end
13+
14+
group :development do
915
gem 'guard'
1016
gem 'guard-rspec'
1117
gem 'guard-rubocop'
18+
gem 'yard'
19+
gem 'appraisal'
20+
gem 'benchmark-ips'
21+
end
22+
23+
group :test do
24+
gem 'grape-entity', '0.5.0'
25+
gem 'maruku'
26+
gem 'rack-test'
27+
gem 'rspec', '~> 3.0'
28+
gem 'cookiejar'
29+
gem 'rack-contrib'
30+
gem 'mime-types', '< 3.0'
1231
end
1332

1433
gemspec path: '../'

gemfiles/rails_4.gemfile

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,28 @@ source 'https://rubygems.org'
55
gem 'rails', '4.1.6'
66

77
group :development, :test do
8+
gem 'bundler'
9+
gem 'rake'
10+
gem 'rubocop', '0.35.1'
11+
end
12+
13+
group :development do
814
gem 'guard'
915
gem 'guard-rspec'
1016
gem 'guard-rubocop'
17+
gem 'yard'
18+
gem 'appraisal'
19+
gem 'benchmark-ips'
20+
end
21+
22+
group :test do
23+
gem 'grape-entity', '0.5.0'
24+
gem 'maruku'
25+
gem 'rack-test'
26+
gem 'rspec', '~> 3.0'
27+
gem 'cookiejar'
28+
gem 'rack-contrib'
29+
gem 'mime-types', '< 3.0'
1130
end
1231

1332
gemspec path: '../'

grape.gemspec

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@ Gem::Specification.new do |s|
2222
s.add_runtime_dependency 'virtus', '>= 1.0.0'
2323
s.add_runtime_dependency 'builder'
2424

25-
s.add_development_dependency 'grape-entity', '0.5.0'
26-
s.add_development_dependency 'rake', '~> 10'
27-
s.add_development_dependency 'maruku'
28-
s.add_development_dependency 'yard'
29-
s.add_development_dependency 'rack-test'
30-
s.add_development_dependency 'rspec', '~> 3.0'
31-
s.add_development_dependency 'bundler'
32-
s.add_development_dependency 'cookiejar'
33-
s.add_development_dependency 'rack-contrib'
34-
s.add_development_dependency 'mime-types', '< 3.0'
35-
s.add_development_dependency 'appraisal'
36-
s.add_development_dependency 'benchmark-ips'
37-
s.add_development_dependency 'rubocop', '0.35.1'
38-
3925
s.files = Dir['**/*'].keep_if { |file| File.file?(file) }
4026
s.test_files = Dir['spec/**/*']
4127
s.require_paths = ['lib']

0 commit comments

Comments
 (0)