Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development deps in Gemfile #546

Merged
merged 4 commits into from
Dec 4, 2016
Merged

Development deps in Gemfile #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ce7457
This PR moves the development dependencies to the Gemfile.
olleolleolle Dec 3, 2016
b6b5ad4
CHANGELOG.md - add back missing line
olleolleolle Dec 3, 2016
c33deca
Move line in CHANGELOG.md
olleolleolle Dec 3, 2016
3f03492
CHANGELOG.md danger warning
olleolleolle Dec 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: ruby

sudo: false
before_install:
- gem install bundler
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


matrix:
include:
Expand Down
3 changes: 1 addition & 2 deletions CHANGELOG.md
View file
Open in desktop
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).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please can you re-add it above your entry

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, of course.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, my fault, meant after


### 0.25.2 (November 30, 2016)

Expand Down
35 changes: 24 additions & 11 deletions Gemfile
View file
Open in desktop
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
View file
Open in desktop
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