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.

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

merged 4 commits into from
Dec 4, 2016

Conversation

olleolleolle
Copy link
Contributor

@olleolleolle olleolleolle commented Dec 3, 2016

This PR moves the development dependencies to the Gemfile.

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

@grape-bot
Copy link

grape-bot commented Dec 3, 2016

<tr>
  <td>:book:</td>
  <td data-sticky="false">We really appreciate pull requests that demonstrate issues, even without a fix. That said, the next step is to try and fix the failing tests!</td>
</tr>
1 Message

Generated by 🚫 danger

- 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
@kzaitsev
Copy link
Contributor

kzaitsev commented Dec 3, 2016

Hello, thanks, any reasons why we need this?

@olleolleolle
Copy link
Contributor Author

@Bugagazavr Oh, you're welcome.

The good part is that this uses the Bundler DSL to match and select versions and platforms (which it already does, partially).

Now, by adding the ruby RUBY_VERSION annotation, the if conditional for finding a version matching exactly the rvm-selected Ruby under test is no longer needed. The ruby version annotation in the gemfile assists Bundler's quest for the right list of gems to lock on for the current Ruby version.

Conditionals like this:

if RUBY_VERSION < '2.2.2' 

Copy link
Member

@LeFnord LeFnord left a comment

Choose a reason for hiding this comment

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

thanks @olleolleolle for the improvement

@Bugagazavr … I'm fine with it

@@ -6,8 +6,7 @@

#### Fixes

* Your contribution here.
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

@@ -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.

👍

@LeFnord
Copy link
Member

LeFnord commented Dec 3, 2016

@olleolleolle sorry … let it us it was in your first commit, I will have an eye on

@olleolleolle
Copy link
Contributor Author

@LeFnord If it pleases you, I can squash the commits to a single one.

@LeFnord
Copy link
Member

LeFnord commented Dec 3, 2016

Thanks again, will do it later, when I am on my machine

@LeFnord LeFnord merged commit 23d0211 into ruby-grape:master Dec 4, 2016
@olleolleolle olleolleolle deleted the fix/gemspec-holds-no-development-deps branch December 4, 2016 06:11
LeFnord pushed a commit to LeFnord/grape-swagger that referenced this pull request Dec 18, 2016
* 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
LeFnord pushed a commit to LeFnord/grape-swagger that referenced this pull request Feb 9, 2019
* 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants