Skip to content

Commit 6efccaa

Browse files
committed
moves dev dependencies into gemspec
1 parent 3ebb409 commit 6efccaa

File tree

4 files changed

+37
-48
lines changed

4 files changed

+37
-48
lines changed

.travis.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,24 @@ sudo: false
33
language: ruby
44

55
cache: bundler
6-
7-
bundler_args: --without development
8-
9-
rvm:
10-
- 2.3.1
11-
- 2.3.0
12-
- 2.2
13-
- 2.1
14-
- 2.0.0
15-
- ruby-head
16-
- jruby-head
17-
- rbx-2
6+
bundler_args: --without test
187

198
matrix:
209
include:
2110
- rvm: 2.3.1
2211
script:
2312
- bundle exec danger
13+
- rvm: 2.3.1
14+
- rvm: 2.3.0
15+
- rvm: 2.2
16+
- rvm: 2.1
17+
- rvm: ruby-head
18+
- rvm: jruby-9.1.2.0
19+
- rvm: jruby-head
20+
- rvm: rbx-2
21+
2422
allow_failures:
2523
- rvm: ruby-head
24+
- rvm: jruby-9.1.2.0
2625
- rvm: jruby-head
2726
- rvm: rbx-2

Gemfile

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,34 +2,22 @@ source 'http://rubygems.org'
22

33
gemspec
44

5-
current_ruby_version = Gem::Version.new(RUBY_VERSION)
6-
7-
if Gem::Requirement.new('>= 2.2.2').satisfied_by? current_ruby_version
8-
gem 'activesupport', '~> 5.0'
9-
gem 'rack', '~> 2.0', group: [:development, :test]
10-
else
11-
gem 'activesupport', '~> 4.0'
12-
gem 'rack', '< 2', group: [:development, :test]
5+
if RUBY_VERSION < '2.2.2'
6+
gem 'rack', '<2.0.0'
7+
gem 'activesupport', '<5.0.0'
138
end
149

1510
gem 'json', '< 2', group: [:development, :test]
1611

17-
group :development do
18-
gem 'pry'
19-
gem 'guard'
20-
gem 'guard-rspec'
21-
gem 'guard-bundler'
22-
gem 'rb-fsevent'
23-
gem 'growl'
24-
end
25-
2612
group :development, :test do
27-
gem 'rake'
28-
gem 'rspec'
29-
gem 'rack-test', '~> 0.6.2', require: 'rack/test'
3013
gem 'rubocop', '0.31.0'
14+
gem 'ruby-grape-danger', '~> 0.1.0', require: false
3115
end
3216

3317
group :test do
34-
gem 'ruby-grape-danger', '~> 0.1.0', require: false
18+
gem 'guard'
19+
gem 'guard-rspec'
20+
gem 'guard-bundler'
21+
gem 'rb-fsevent'
22+
gem 'growl'
3523
end

Rakefile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1+
# encoding: utf-8
2+
13
require 'rubygems'
24
require 'bundler'
3-
Bundler.setup :default, :test, :development
5+
6+
Bundler.setup(:default, :development)
7+
8+
require 'rake'
49

510
Bundler::GemHelper.install_tasks
611

12+
require 'rspec/core'
713
require 'rspec/core/rake_task'
8-
RSpec::Core::RakeTask.new(:spec) do |spec|
9-
spec.pattern = 'spec/**/*_spec.rb'
10-
end
1114

12-
RSpec::Core::RakeTask.new(:rcov) do |spec|
13-
spec.pattern = 'spec/**/*_spec.rb'
14-
spec.rcov = true
15-
end
15+
RSpec::Core::RakeTask.new(:spec)
1616

17-
task :spec
18-
require 'rainbow/ext/string' unless String.respond_to?(:color)
1917
require 'rubocop/rake_task'
2018
RuboCop::RakeTask.new(:rubocop)
2119

22-
task default: [:spec, :rubocop]
20+
task default: [:rubocop, :spec]

grape-entity.gemspec

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ Gem::Specification.new do |s|
1515
s.rubyforge_project = 'grape-entity'
1616

1717
s.add_runtime_dependency 'multi_json', '>= 1.3.2'
18+
s.add_runtime_dependency 'activesupport'
1819

20+
s.add_development_dependency 'bundler'
21+
s.add_development_dependency 'rake'
22+
s.add_development_dependency 'rspec', '~> 3.0'
23+
s.add_development_dependency 'rack-test'
1924
s.add_development_dependency 'maruku'
2025
s.add_development_dependency 'yard'
21-
s.add_development_dependency 'rspec', '~> 2.9'
22-
s.add_development_dependency 'bundler'
26+
s.add_development_dependency 'pry' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
27+
s.add_development_dependency 'pry-byebug' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
2328

2429
s.files = `git ls-files`.split("\n")
25-
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
26-
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
30+
s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
2731
s.require_paths = ['lib']
2832
end

0 commit comments

Comments
 (0)