beaker-puppet_install_helper 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17e6a51cd929ad47b6650028e546f4e0e5708111
-  data.tar.gz: b782f88f97d51b289c7198683e0ed3c7829e96a2
+  metadata.gz: bfd5c439c7716c6e608e803b8b233c871a6added
+  data.tar.gz: 51ad611cb0b5d67beb392d51914e221ab6c4ca1f
 SHA512:
-  metadata.gz: 8d1fccdeb2a26047783bb3d6be89788195aefe060520edaeca7bddfd8b32e19e1bfed1f5664a676267a1d8e5d504aa30661f370a50fc4a8b2498aa8efcb25210
-  data.tar.gz: e357f54eca20d2e932d7c8664db898b0a0897eeecfbde0eab44fbb9897c4d7b556de8194a02915d0eef54b7dedbffc276028f3bbe517427ef778b83420fb4cea
+  metadata.gz: 57d559f50199430bffa0fa7565a161cfd62395e24f335935d8c192b46c3a08cab4abd4c8b20cbd6d80c4e936ad99d17dee193a27cb6c1f1d9b86acff5153fcc5
+  data.tar.gz: 981118b529218403ab27707c1e0fc2e6d1c5a176a9face7c9f0e15ad440f77b435a125b17231ee394e90d2c7f173d6d9e8d42d403199346667707e2a6503db79

data/README.md

@@ -4,16 +4,16 @@ This gem is simply an abstraction for the various ways that we install puppet fr
 
 ### `run_puppet_install_helper`
 
-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:
+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_INSTALL_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`)
+- `PUPPET_INSTALL_TYPE=pe` will read `PUPPET_INSTALL_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_INSTALL_VERSION` and:
+  - if `PUPPET_INSTALL_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_INSTALL_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_INSTALL_VERSION` and install that version of puppet-agent (eg, `PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_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.
+The best way is explicitly set `PUPPET_INSTALL_TYPE` and `PUPPET_INSTALL_VERSION` to what you want. It'll probably do what you expect.
 
 ### `install_ca_certs`
 

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.3.0'
+  s.version     = '0.3.1'
   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

@@ -2,14 +2,14 @@ require 'beaker'
 require 'beaker/ca_cert_helper'
 
 module Beaker::PuppetInstallHelper
-  def run_puppet_install_helper(type_arg=find_install_type,version=ENV["PUPPET_VERSION"])
+  def run_puppet_install_helper(type_arg=find_install_type,version=find_install_version)
     run_puppet_install_helper_on(hosts,type_arg,version)
   end
 
   # Takes a host(s) object, install type string, and install version string.
   # - Type defaults to PE for PE nodes, and foss otherwise.
   # - Version will default to the latest 3x foss/pe package, depending on type
-  def run_puppet_install_helper_on(hosts,type_arg=find_install_type,version=ENV["PUPPET_VERSION"])
+  def run_puppet_install_helper_on(hosts,type_arg=find_install_type,version=find_install_version)
 
     type = type_arg || find_install_type
 
@@ -27,9 +27,9 @@ module Beaker::PuppetInstallHelper
     end
 
     # Example environment variables to be read:
-    # PUPPET_VERSION=3.8.1 <-- for foss/pe/gem
-    # PUPPET_VERSION=4.1.0 <-- for agent/gem
-    # PUPPET_VERSION=1.0.1 <-- for agent
+    # PUPPET_INSTALL_VERSION=3.8.1 <-- for foss/pe/gem
+    # PUPPET_INSTALL_VERSION=4.1.0 <-- for agent/gem
+    # PUPPET_INSTALL_VERSION=1.0.1 <-- for agent
     #
     # PUPPET_INSTALL_TYPE=pe
     # PUPPET_INSTALL_TYPE=foss
@@ -94,6 +94,16 @@ module Beaker::PuppetInstallHelper
       "foss"
     end
   end
+
+  def find_install_version
+    if type = ENV["PUPPET_INSTALL_VERSION"]
+      type
+    elsif type = ENV["PUPPET_VERSION"]
+      type
+    else
+      nil
+    end
+  end
 end
 
 include Beaker::PuppetInstallHelper

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -22,6 +22,7 @@ describe 'beaker::puppet_install_helper' do
   end
   after :each do
     ENV.delete("PUPPET_VERSION")
+    ENV.delete("PUPPET_INSTALL_VERSION")
     ENV.delete("PUPPET_INSTALL_TYPE")
   end
   describe '#run_puppet_install_helper' do
@@ -33,10 +34,12 @@ describe 'beaker::puppet_install_helper' do
       expect(subject).to receive(:run_puppet_install_helper_on).with(hosts,"foss",nil)
       subject.run_puppet_install_helper
     end
-    it 'calls run_puppet_install_helper_on on each host with a version ' do
-      ENV["PUPPET_VERSION"] = "4.1.0"
-      expect(subject).to receive(:run_puppet_install_helper_on).with(hosts,"foss","4.1.0")
-      subject.run_puppet_install_helper
+    ["PUPPET_VERSION","PUPPET_INSTALL_VERSION"].each do |version_var| 
+      it 'calls run_puppet_install_helper_on on each host with a version ' do
+        ENV[version_var] = "4.1.0"
+        expect(subject).to receive(:run_puppet_install_helper_on).with(hosts,"foss","4.1.0")
+        subject.run_puppet_install_helper
+      end
     end
   end
   describe '#run_puppet_install_helper_on' do
@@ -65,19 +68,21 @@ describe 'beaker::puppet_install_helper' do
         expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
         subject.run_puppet_install_helper_on(hosts)
       end
-      it "uses foss with a version" do
-        ENV["PUPPET_INSTALL_TYPE"] = "foss"
-        ENV["PUPPET_VERSION"] = "3.8.1"
-        expect(subject).to receive(:install_puppet_on).with(hosts,{:version => "3.8.1",:default_action => "gem_install"})
-        subject.run_puppet_install_helper_on(hosts)
-      end
-      it "uses foss with a >4 version detects AIO" do
-        ENV["PUPPET_INSTALL_TYPE"] = "foss"
-        ENV["PUPPET_VERSION"] = "4.1.0"
-        expect(subject).to receive(:install_puppet_on).with(hosts,{:version => "4.1.0",:default_action => "gem_install"})
-        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
-        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
-        subject.run_puppet_install_helper_on(hosts)
+      ["PUPPET_VERSION","PUPPET_INSTALL_VERSION"].each do |version_var| 
+        it "uses foss with a version" do
+          ENV["PUPPET_INSTALL_TYPE"] = "foss"
+          ENV[version_var] = "3.8.1"
+          expect(subject).to receive(:install_puppet_on).with(hosts,{:version => "3.8.1",:default_action => "gem_install"})
+          subject.run_puppet_install_helper_on(hosts)
+        end
+        it "uses foss with a >4 version detects AIO" do
+          ENV["PUPPET_INSTALL_TYPE"] = "foss"
+          ENV[version_var] = "4.1.0"
+          expect(subject).to receive(:install_puppet_on).with(hosts,{:version => "4.1.0",:default_action => "gem_install"})
+          expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+          expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+          subject.run_puppet_install_helper_on(hosts)
+        end
       end
     end
     context "for PE" do
@@ -88,7 +93,7 @@ describe 'beaker::puppet_install_helper' do
       end
       it "uses PE with a version" do
         ENV["PUPPET_INSTALL_TYPE"] = "pe"
-        ENV["PUPPET_VERSION"] = "3.8.1"
+        ENV["PUPPET_INSTALL_VERSION"] = "3.8.1"
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
         subject.run_puppet_install_helper_on(hosts)
       end
@@ -103,7 +108,7 @@ describe 'beaker::puppet_install_helper' do
       end
       it "uses foss with a version" do
         ENV["PUPPET_INSTALL_TYPE"] = "agent"
-        ENV["PUPPET_VERSION"] = "1.1.0"
+        ENV["PUPPET_INSTALL_VERSION"] = "1.1.0"
         expect(subject).to receive(:install_puppet_agent_on).with(hosts,{:version => "1.1.0"})
         expect(subject).to receive(:add_aio_defaults_on).with(hosts)
         expect(subject).to receive(:add_puppet_paths_on).with(hosts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec