summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2015-05-06 14:10:46 -0700
committerMorgan Haskel <morgan@puppetlabs.com>2015-05-06 14:10:46 -0700
commit3b804b898506660701753bef664cfabd034904cb (patch)
treea3ea6ca34c9edb75df4410a7ad070cb730596d40
parentb02a409d141e70b93fe39df84ec3217cbb60ec0f (diff)
sync via modulesync
-rw-r--r--.travis.yml6
-rw-r--r--Gemfile21
2 files changed, 1 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 0fc75e3..291ceb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,19 +6,13 @@ script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
fast_finish: true
include:
- - rvm: 1.9.3
- env: PUPPET_GEM_VERSION="~> 3.4.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- - rvm: 1.9.3
- env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
- env: PUPPET_GEM_VERSION="~> 3.4.0"
- - rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
diff --git a/Gemfile b/Gemfile
index fcd27d5..cc77f38 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,5 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
-def location_for(place, fake_version = nil)
- if place =~ /^(git:[^#]*)#(.*)/
- [fake_version, { :git => $1, :branch => $2, :require => false }].compact
- elsif place =~ /^file:\/\/(.*)/
- ['>= 0', { :path => File.expand_path($1), :require => false }]
- else
- [place, { :require => false }]
- end
-end
-
group :development, :unit_tests do
gem 'rspec-core', '3.1.7', :require => false
gem 'puppetlabs_spec_helper', :require => false
@@ -18,17 +8,8 @@ group :development, :unit_tests do
gem 'json', :require => false
end
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
group :system_tests do
- 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
+ gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end