Skip to content

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... #49

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

Merged
merged 1 commit into from
Apr 6, 2015
Merged

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ gem "puppet", *location_for(ENV['PUPPET_LOCATION'] || '~> 3.4.0')
gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')

beaker_version = ENV['BEAKER_VERSION']
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] || '~> 4.0'
group :development, :test do
gem 'rspec'
Expand All @@ -23,7 +24,14 @@ group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'beaker-rspec', *location_for(beaker_rspec_version)
if beaker_version
gem 'beaker', *location_for(beaker_version)
end
if beaker_rspec_version
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
end
Copy link
Contributor

Choose a reason for hiding this comment

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

Does beaker-rspec work on Windows? If no, this will need further shielding guarding.

Copy link
Member

Choose a reason for hiding this comment

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

This PR doesn't change the exposure of Windows to beaker-rspec. ie it was installed before, and installation will still be attempted after this PR, it will just use more of Bundler's options when installing it. If the Gemfile didn't work before, it still won't work, if it worked before, it should continue to work.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, @justinstoller is correct. This doesn't alter the functionality/defaults of the Gemfile - just adds support for BEAKER_VERSION/BEAKER_RSPEC_VERSION.

Copy link
Contributor

Choose a reason for hiding this comment

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

Let's keep it broken is not really a good statement folks. It's too easy to add :system_tests around this - it will make it consistent with other modules as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Would you prefer to simply remove the beaker/beaker-rspec gem dependency until such time as there are acceptance level tests? If so, I'm cool with that. I was just folding the Gemfile under the new standard without really being concerned with the actual contents of that file.

Copy link
Contributor

Choose a reason for hiding this comment

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

Actually, we can take this as is - let's just file something or followup with a fix.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not sure what the new standard is, I just saw that other gemfiles use :system_tests and thought that would be part of this change.

end

# see http://projects.puppetlabs.com/issues/21698
Expand Down