Skip to content

Commit

Permalink
Development deps in Gemfile (ruby-grape#546)
Browse files Browse the repository at this point in the history
* This PR moves the development dependencies to the Gemfile.

- move development dependencies to Gemfile (where there's platforms annotation support and ruby version identification)
- update the Bundler version to latest, in Travis build step before_install, so that the smarts keep working
- made Gemfile Rubocop-compliant

* CHANGELOG.md - add back missing line

* Move line in CHANGELOG.md

* CHANGELOG.md danger warning
  • Loading branch information
olleolleolle authored and LeFnord committed Dec 18, 2016
1 parent cf27664 commit f475045
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: ruby

sudo: false
before_install:
- gem install bundler

matrix:
include:
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@

#### Fixes

* Your contribution here.

* [#546](https://github.com/ruby-grape/grape-swagger/pull/546): Move development dependencies to Gemfile - [@olleolleolle](https://github.com/olleolleolle).

### 0.25.2 (November 30, 2016)

Expand Down
35 changes: 24 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
source 'http://rubygems.org'

ruby RUBY_VERSION

gemspec

case version = ENV['GRAPE_VERSION'] || '~> 0.18'
when 'HEAD'
gem 'grape', github: 'ruby-grape/grape'
else
gem 'grape', version
end
gem 'grape', case version = ENV['GRAPE_VERSION'] || '~> 0.18'
when 'HEAD'
{ github: 'ruby-grape/grape' }
else
version
end

gem ENV['MODEL_PARSER'] if ENV.key?('MODEL_PARSER')

if RUBY_VERSION < '2.2.2'
gem 'rack', '<2.0.0'
gem 'activesupport', '<5.0.0'
group :development, :test do
gem 'bundler'
gem 'kramdown'
gem 'pry', platforms: [:mri]
gem 'pry-byebug', platforms: [:mri]
gem 'rack'
gem 'rack-cors'
gem 'rack-test'
gem 'rake'
gem 'rdoc'
gem 'redcarpet', platforms: [:mri]
gem 'rouge', platforms: [:mri]
gem 'rspec', '~> 3.0'
gem 'rubocop', '~> 0.40'
gem 'shoulda'
end

group :test do
gem 'ruby-grape-danger', '~> 0.1.0', require: false
gem 'grape-entity'
gem 'grape-swagger-entity'
gem 'ruby-grape-danger', '~> 0.1.0', require: false
end
14 changes: 0 additions & 14 deletions grape-swagger.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,6 @@ Gem::Specification.new do |s|

s.add_runtime_dependency 'grape', '>= 0.12.0'

s.add_development_dependency 'rake'
s.add_development_dependency 'shoulda'
s.add_development_dependency 'rdoc'
s.add_development_dependency 'rspec', '~> 3.0'
s.add_development_dependency 'bundler'
s.add_development_dependency 'rack-test'
s.add_development_dependency 'rack-cors'
s.add_development_dependency 'rubocop', '~> 0.40'
s.add_development_dependency 'kramdown'
s.add_development_dependency 'redcarpet' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
s.add_development_dependency 'rouge' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
s.add_development_dependency 'pry' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')
s.add_development_dependency 'pry-byebug' unless RUBY_PLATFORM.eql?('java') || RUBY_ENGINE.eql?('rbx')

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec}/*`.split("\n")
s.require_paths = ['lib']
Expand Down

0 comments on commit f475045

Please sign in to comment.