beaker-puppet_install_helper 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjA3MTZjYjdiZThlMTFjNjJiMzBhOTlmY2ViZTM5MzAxOTg2NzAzMA==
+    YmQxZWM4ODRkZTcwMjQxMDYxZWFkODhjYjlmNTA4MmU3MGU0MTllNA==
   data.tar.gz: !binary |-
-    MDU4MWNjYjMwNTM1MTliYjMwNjA4NGE4OGMzZjFkNDkxYTM2MDJmMA==
+    NjdkNWM2ZGQ5YzRiYzE0NTlmY2ExYmNlZDNmZjM4YmRkMmZhNzM1ZA==
 SHA512:
   metadata.gz: !binary |-
-    MDhiYzZlYTlmYjBhZTgyNTk0ZmQyNTkwNDM2YzczMmIxZmRhODk5NGJmYzA3
-    MzNmZDAyNzJiNmQ0MGFlOGVkZDcxODJlMjYzMWM1ZGEwMjk3YmE3Mzc5YmRk
-    ODZhNzVlNGUzODlkY2E4ZTA2NjE0MDIxNTFiZDVkZTY5ZGQ5NTE=
+    NDNhY2MzZjQ1YWU3ODU4YjM5MTNjMjg5MGVjNDM0N2VhOTE2NmVkNzgwMjBi
+    ZDgzZWM2MjQ4MGIzNGRjNGFhMzQ1NWJhZGNlMDE0NTY3YzI3ZGQzNWU0ZTcy
+    MjcxZTc0OGQ2NzRmMzNjMTE3ODU4ZTBiMGM3ZTg5YTY2NzRhY2U=
   data.tar.gz: !binary |-
-    Mzc5YWY3ZjdhNmJkZTY1MTIyMjE2ZWY2YjQ2MGQzNTI1MmQ2OTY0ZTdhNzhm
-    MmNlNTVhYWI2NmY5ZDhhZWU3N2FkMjEzMDAwODE5OTQ3NjFjYTU5NDVjNzZi
-    OTUzMGNiMjE1MzlkNDI1YWUyNTljY2FkNzZmZWJjMTQ3NjBiNjE=
+    ZTMzYmM1N2I2MjBkOGRmYWU1ZDkxZWI1Y2U3OTJmODA1NTZhMGI2ZGYwZjc0
+    ODI2YWFhMjBjNTE3MzI0OTE4YTc1NWQ3YmUxNDdhN2ViYTdjOTBlZGIxYjMw
+    ZGI3YTFmMmJiNTU1MGY2YjA0ZDU1MDk1OWQyMDE1OGExMGFlMGM=

data/README.md

@@ -0,0 +1,17 @@
+## beaker-puppet\_install\_helper
+
+This gem is simply an abstraction for the various ways that we install puppet from the `spec/spec_helper_acceptance.rb` files across the modules.
+
+The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `PUPPET_VERSION` and/or `PUPPET_INSTALL_TYPE` in the following combinations to have puppet installed on the desired hosts:
+
+- `PUPPET_INSTALL_TYPE` is unset: it will look at the default node's type (ie, `default.is_pe?` and choose either foss or pe methods below.
+- `PUPPET_INSTALL_TYPE=pe` will read `PUPPET_VERSION` and attempt to install that version of the PE tarball. If no version is set, then it uses the latest stable build.
+- `PUPPET_INSTALL_TYPE=foss` will read `PUPPET_VERSION` and:
+  - if `PUPPET_VERSION` is less than 4 will attempt to install that version of the system package if available, or else the ruby gem of that version.
+  - if `PUPPET_VERSION` is 4 or more it will attempt to install the corresponding puppet-agent package, or gem version otherwise.
+- `PUPPET_INSTALL_TYPE=agent` will read `PUPPET_VERSION` and install that version of puppet-agent (eg, `PUPPET_INSTALL_TYPE=agent PUPPET_VERSION=1.0.0`)
+
+The best way is explicitly set `PUPPET_INSTALL_TYPE` and `PUPPET_VERSION` to what you want. It'll probably do what you expect.
+
+### TODO
+- Add support for ci-ready builds

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.authors     = ["Puppetlabs"]
   s.email       = ["hunter@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker-puppet_install_helper"

data/lib/beaker/puppet_install_helper.rb

@@ -26,12 +26,12 @@ module Beaker::PuppetInstallHelper
     case type
     when "pe"
       # This will skip hosts that are not supported
-      install_pe_on(Array(hosts),{"pe_ver" => version})
+      install_pe_on(Array(hosts),options.merge({"pe_ver" => version}))
     when "foss"
-      opts = {
+      opts = options.merge({
         :version        => version,
         :default_action => "gem_install",
-      }
+      })
 
       install_puppet_on(hosts, opts)
       # XXX install_puppet_on() will only add_aio_defaults_on when the nodeset
@@ -56,7 +56,7 @@ module Beaker::PuppetInstallHelper
       end
     when "agent"
       # This will fail on hosts that are not supported; use foss and specify a 4.x version instead
-      install_puppet_agent_on(hosts, {:version => version})
+      install_puppet_agent_on(hosts,options.merge({:version => version}))
       # XXX install_puppet_agent_on() will only add_aio_defaults_on when the
       # nodeset type == 'aio', but we don't want to depend on that.
       add_aio_defaults_on(hosts)

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -14,6 +14,7 @@ describe 'beaker::puppet_install_helper' do
     [foss_host, pe_host]
   end
   before :each do
+    allow(subject).to receive(:options).and_return({})
     allow(subject).to receive(:on)
     allow(subject).to receive(:fact_on)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -48,6 +48,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- README.md
 - beaker-puppet_install_helper.gemspec
 - lib/beaker/puppet_install_helper.rb
 - spec/spec_helper.rb