Page MenuHomeSoftware Heritage
Files F9697180

No OneTemporary
Actions

View Options

diff --git a/.travis.yml b/.travis.yml
index e313d879..4e549bf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,38 @@
#This file is generated by ModuleSync, do not edit.
---
sudo: false
language: ruby
cache: bundler
script: "bundle exec rake validate lint spec"
matrix:
fast_finish: true
include:
- - rvm: 2.1.6
+ - rvm: 2.3.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
script: bundle exec rake beaker
services: docker
sudo: required
- - rvm: 2.1.6
+ - rvm: 2.3.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
script: bundle exec rake beaker
services: docker
sudo: required
- rvm: 2.3.1
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0"
- rvm: 2.1.9
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 4.0"
- rvm: 2.1.5
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.5
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 3.0"
notifications:
email: false
diff --git a/Gemfile b/Gemfile
index ff291189..c97275bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,46 +1,48 @@
#This file is generated by ModuleSync, do not edit.
source ENV['GEM_SOURCE'] || "https://rubygems.org"
-def location_for(place, version = nil)
- if place =~ /^(git[:@][^#]*)#(.*)/
- [version, { :git => $1, :branch => $2, :require => false }].compact
- elsif place =~ /^file:\/\/(.*)/
- ['>= 0', { :path => File.expand_path($1), :require => false }]
+def location_from_env(env, default_location = [])
+ if location = ENV[env]
+ if location =~ /^((?:git|https?)[:@][^#]*)#(.*)/
+ [{ :git => $1, :branch => $2, :require => false }]
+ elsif location =~ /^file:\/\/(.*)/
+ ['>= 0', { :path => File.expand_path($1), :require => false }]
+ else
+ [location, { :require => false }]
+ end
else
- [place, version, { :require => false }].compact
+ default_location
end
end
group :development, :unit_tests do
- gem 'metadata-json-lint', :require => false
- gem 'puppet_facts', :require => false
- gem 'puppet-blacksmith', '>= 3.4.0', :require => false
- gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
- gem 'rspec-puppet', '>= 2.3.2', :require => false
- gem 'rspec-puppet-facts', :require => false
- gem 'simplecov', :require => false
- gem 'parallel_tests', :require => false
+ gem 'metadata-json-lint'
+ gem 'puppet_facts'
+ gem 'puppet-blacksmith', '>= 3.4.0'
+ gem 'puppetlabs_spec_helper', '>= 1.2.1'
+ gem 'rspec-puppet', '>= 2.3.2'
+ gem 'rspec-puppet-facts'
+ gem 'simplecov'
+ gem 'parallel_tests'
+ gem 'rubocop', '0.41.2' if RUBY_VERSION < '2.0.0'
+ gem 'rubocop' if RUBY_VERSION >= '2.0.0'
+ gem 'rubocop-rspec', '~> 1.6' if RUBY_VERSION >= '2.3.0'
+ gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
end
group :system_tests do
- gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')
- gem 'beaker', *location_for(ENV['BEAKER_VERSION'])
- gem 'serverspec', :require => false
- gem 'beaker-puppet_install_helper', :require => false
- gem 'master_manipulator', :require => false
- gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
+ gem 'beaker', *location_from_env('BEAKER_VERSION', []) if RUBY_VERSION >= '2.3.0'
+ gem 'beaker', *location_from_env('BEAKER_VERSION', ['< 3']) if RUBY_VERSION < '2.3.0'
+ gem 'beaker-rspec', *location_from_env('BEAKER_RSPEC_VERSION', ['>= 3.4'])
+ gem 'serverspec'
+ gem 'beaker-puppet_install_helper'
+ gem 'master_manipulator'
+ gem 'beaker-hostgenerator', *location_from_env('BEAKER_HOSTGENERATOR_VERSION', [])
end
-# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
-# if using ruby 1.x
-gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
-# rubocop 0.42.0 requires ruby >=2
-gem 'rubocop', '0.41.2', :require => false if RUBY_VERSION =~ /^1\./
-gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0'
-
-gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
-gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
+gem 'facter', *location_from_env('FACTER_GEM_VERSION')
+gem 'puppet', *location_from_env('PUPPET_GEM_VERSION')
if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)
end
diff --git a/Gemfile.lock.bak b/Gemfile.lock.bak
new file mode 100644
index 00000000..a070814e
--- /dev/null
+++ b/Gemfile.lock.bak
@@ -0,0 +1,362 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ CFPropertyList (2.2.8)
+ addressable (2.4.0)
+ ast (2.3.0)
+ aws-sdk-v1 (1.66.0)
+ json (~> 1.4)
+ nokogiri (>= 1.4.4)
+ beaker (2.50.0)
+ aws-sdk-v1 (~> 1.57)
+ beaker-answers (~> 0.0)
+ beaker-hiera (~> 0.0)
+ beaker-hostgenerator
+ beaker-pe (~> 0.0)
+ docker-api
+ fission (~> 0.4)
+ fog (~> 1.25, < 1.35.0)
+ fog-google (~> 0.0.9)
+ google-api-client (~> 0.8, < 0.9.5)
+ hocon (~> 1.0)
+ in-parallel (~> 0.1)
+ inifile (~> 2.0)
+ json (~> 1.8)
+ mime-types (~> 2.99)
+ minitest (~> 5.4)
+ net-scp (~> 1.2)
+ net-ssh (~> 2.9)
+ open_uri_redirections (~> 0.2.1)
+ rbvmomi (~> 1.8, < 1.9.0)
+ rsync (~> 1.0.9)
+ stringify-hash (~> 0.0)
+ unf (~> 0.1)
+ beaker-answers (0.11.0)
+ hocon (~> 1.0)
+ require_all (~> 1.3.2)
+ stringify-hash (~> 0.0.0)
+ beaker-hiera (0.1.1)
+ stringify-hash (~> 0.0.0)
+ beaker-hostgenerator (0.7.3)
+ deep_merge (~> 1.0)
+ stringify-hash (~> 0.0.0)
+ beaker-pe (0.9.0)
+ stringify-hash (~> 0.0.0)
+ beaker-puppet_install_helper (0.4.4)
+ beaker (~> 2.0)
+ beaker-rspec (5.6.0)
+ beaker (~> 2.0)
+ rspec
+ serverspec (~> 2)
+ specinfra (~> 2)
+ builder (3.2.2)
+ deep_merge (1.1.1)
+ diff-lcs (1.2.5)
+ docile (1.1.5)
+ docker-api (1.31.0)
+ excon (>= 0.38.0)
+ json
+ domain_name (0.5.20160615)
+ unf (>= 0.0.5, < 1.0.0)
+ excon (0.52.0)
+ facter (2.4.6)
+ CFPropertyList (~> 2.2.6)
+ facterdb (0.3.6)
+ facter
+ jgrep
+ faraday (0.9.2)
+ multipart-post (>= 1.2, < 3)
+ fission (0.5.0)
+ CFPropertyList (~> 2.2)
+ fog (1.34.0)
+ fog-atmos
+ fog-aws (>= 0.6.0)
+ fog-brightbox (~> 0.4)
+ fog-core (~> 1.32)
+ fog-dynect (~> 0.0.2)
+ fog-ecloud (~> 0.1)
+ fog-google (>= 0.0.2)
+ fog-json
+ fog-local
+ fog-powerdns (>= 0.1.1)
+ fog-profitbricks
+ fog-radosgw (>= 0.0.2)
+ fog-riakcs
+ fog-sakuracloud (>= 0.0.4)
+ fog-serverlove
+ fog-softlayer
+ fog-storm_on_demand
+ fog-terremark
+ fog-vmfusion
+ fog-voxel
+ fog-xml (~> 0.1.1)
+ ipaddress (~> 0.5)
+ nokogiri (~> 1.5, >= 1.5.11)
+ fog-atmos (0.1.0)
+ fog-core
+ fog-xml
+ fog-aws (0.11.0)
+ fog-core (~> 1.38)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
+ ipaddress (~> 0.8)
+ fog-brightbox (0.11.0)
+ fog-core (~> 1.22)
+ fog-json
+ inflecto (~> 0.0.2)
+ fog-core (1.42.0)
+ builder
+ excon (~> 0.49)
+ formatador (~> 0.2)
+ fog-dynect (0.0.3)
+ fog-core
+ fog-json
+ fog-xml
+ fog-ecloud (0.3.0)
+ fog-core
+ fog-xml
+ fog-google (0.0.9)
+ fog-core
+ fog-json
+ fog-xml
+ fog-json (1.0.2)
+ fog-core (~> 1.0)
+ multi_json (~> 1.10)
+ fog-local (0.3.0)
+ fog-core (~> 1.27)
+ fog-powerdns (0.1.1)
+ fog-core (~> 1.27)
+ fog-json (~> 1.0)
+ fog-xml (~> 0.1)
+ fog-profitbricks (0.0.5)
+ fog-core
+ fog-xml
+ nokogiri
+ fog-radosgw (0.0.5)
+ fog-core (>= 1.21.0)
+ fog-json
+ fog-xml (>= 0.0.1)
+ fog-riakcs (0.1.0)
+ fog-core
+ fog-json
+ fog-xml
+ fog-sakuracloud (1.7.5)
+ fog-core
+ fog-json
+ fog-serverlove (0.1.2)
+ fog-core
+ fog-json
+ fog-softlayer (1.1.3)
+ fog-core
+ fog-json
+ fog-storm_on_demand (0.1.1)
+ fog-core
+ fog-json
+ fog-terremark (0.1.0)
+ fog-core
+ fog-xml
+ fog-vmfusion (0.1.0)
+ fission
+ fog-core
+ fog-voxel (0.1.0)
+ fog-core
+ fog-xml
+ fog-xml (0.1.2)
+ fog-core
+ nokogiri (~> 1.5, >= 1.5.11)
+ formatador (0.2.5)
+ google-api-client (0.9.4)
+ addressable (~> 2.3)
+ googleauth (~> 0.5)
+ httpclient (~> 2.7)
+ hurley (~> 0.1)
+ memoist (~> 0.11)
+ mime-types (>= 1.6)
+ representable (~> 2.3.0)
+ retriable (~> 2.0)
+ thor (~> 0.19)
+ googleauth (0.5.1)
+ faraday (~> 0.9)
+ jwt (~> 1.4)
+ logging (~> 2.0)
+ memoist (~> 0.12)
+ multi_json (~> 1.11)
+ os (~> 0.9)
+ signet (~> 0.7)
+ hiera (3.2.1)
+ hocon (1.1.2)
+ http-cookie (1.0.2)
+ domain_name (~> 0.5)
+ httpclient (2.8.2.2)
+ hurley (0.2)
+ in-parallel (0.1.15)
+ inflecto (0.0.2)
+ inifile (2.0.2)
+ ipaddress (0.8.3)
+ jgrep (1.4.1)
+ json
+ json (1.8.3)
+ json_pure (2.0.2)
+ jwt (1.5.4)
+ little-plugger (1.1.4)
+ logging (2.1.0)
+ little-plugger (~> 1.1)
+ multi_json (~> 1.10)
+ master_manipulator (1.2.3)
+ beaker (~> 2.7, >= 2.7.0)
+ multi_json
+ mcollective-client (2.9.0)
+ json
+ stomp
+ systemu
+ memoist (0.15.0)
+ metaclass (0.0.4)
+ metadata-json-lint (0.0.11)
+ json
+ spdx-licenses (~> 1.0)
+ mime-types (2.99.2)
+ mini_portile2 (2.1.0)
+ minitest (5.9.0)
+ mocha (1.1.0)
+ metaclass (~> 0.0.1)
+ multi_json (1.12.1)
+ multipart-post (2.0.0)
+ net-scp (1.2.1)
+ net-ssh (>= 2.6.5)
+ net-ssh (2.9.4)
+ net-telnet (0.1.1)
+ netrc (0.11.0)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ open_uri_redirections (0.2.1)
+ os (0.9.6)
+ parallel (1.9.0)
+ parallel_tests (2.7.1)
+ parallel
+ parser (2.3.1.2)
+ ast (~> 2.2)
+ pkg-config (1.1.7)
+ powerpack (0.1.1)
+ puppet (4.5.3)
+ CFPropertyList (~> 2.2.6)
+ facter (> 2.0, < 4)
+ hiera (>= 2.0, < 4)
+ json_pure
+ puppet-blacksmith (3.4.0)
+ puppet (>= 2.7.16)
+ rest-client (~> 1.8.0)
+ puppet-lint (2.0.2)
+ puppet-syntax (2.1.0)
+ rake
+ puppet_facts (0.2.1)
+ puppetlabs_spec_helper (1.2.1)
+ mocha (~> 1.0)
+ puppet-lint (~> 2.0)
+ puppet-syntax (~> 2.0)
+ rspec-puppet (~> 2.0)
+ rainbow (2.1.0)
+ rake (11.2.2)
+ rbvmomi (1.8.2)
+ builder
+ nokogiri (>= 1.4.1)
+ trollop
+ representable (2.3.0)
+ uber (~> 0.0.7)
+ require_all (1.3.3)
+ rest-client (1.8.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 3.0)
+ netrc (~> 0.7)
+ retriable (2.1.0)
+ rspec (3.5.0)
+ rspec-core (~> 3.5.0)
+ rspec-expectations (~> 3.5.0)
+ rspec-mocks (~> 3.5.0)
+ rspec-core (3.5.2)
+ rspec-support (~> 3.5.0)
+ rspec-expectations (3.5.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.5.0)
+ rspec-its (1.2.0)
+ rspec-core (>= 3.0.0)
+ rspec-expectations (>= 3.0.0)
+ rspec-mocks (3.5.0)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.5.0)
+ rspec-puppet (2.4.0)
+ rspec
+ rspec-puppet-facts (1.6.1)
+ facter
+ facterdb (>= 0.3.0)
+ json
+ mcollective-client
+ puppet
+ rspec-support (3.5.0)
+ rsync (1.0.9)
+ rubocop (0.42.0)
+ parser (>= 2.3.1.1, < 3.0)
+ powerpack (~> 0.1)
+ rainbow (>= 1.99.1, < 3.0)
+ ruby-progressbar (~> 1.7)
+ unicode-display_width (~> 1.0, >= 1.0.1)
+ rubocop-rspec (1.6.0)
+ rubocop (>= 0.42.0)
+ ruby-progressbar (1.8.1)
+ serverspec (2.36.0)
+ multi_json
+ rspec (~> 3.0)
+ rspec-its
+ specinfra (~> 2.53)
+ sfl (2.2)
+ signet (0.7.3)
+ addressable (~> 2.3)
+ faraday (~> 0.9)
+ jwt (~> 1.5)
+ multi_json (~> 1.10)
+ simplecov (0.12.0)
+ docile (~> 1.1.0)
+ json (>= 1.8, < 3)
+ simplecov-html (~> 0.10.0)
+ simplecov-html (0.10.0)
+ spdx-licenses (1.1.0)
+ specinfra (2.61.1)
+ net-scp
+ net-ssh (>= 2.7, < 4.0)
+ net-telnet
+ sfl
+ stomp (1.4.3)
+ stringify-hash (0.0.2)
+ systemu (2.6.5)
+ thor (0.19.1)
+ trollop (2.1.2)
+ uber (0.0.15)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.7.2)
+ unicode-display_width (1.1.0)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ beaker
+ beaker-hostgenerator
+ beaker-puppet_install_helper
+ beaker-rspec (>= 3.4)
+ facter
+ master_manipulator
+ metadata-json-lint
+ parallel_tests
+ puppet
+ puppet-blacksmith (>= 3.4.0)
+ puppet_facts
+ puppetlabs_spec_helper (>= 1.2.1)
+ rspec-puppet (>= 2.3.2)
+ rspec-puppet-facts
+ rubocop-rspec (~> 1.6)
+ serverspec
+ simplecov
+
+BUNDLED WITH
+ 1.12.5

File Metadata

Mime Type
text/x-diff
Expires
Mon, Aug 18, 11:03 PM (6 d, 13 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3261118

Event Timeline

About · Developer information · Legal