beaker-puppet_install_helper 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11815b324733036dc08183bfbbf1adeedcb26087
-  data.tar.gz: 4ffdbaeeb350522e4b5a553d5543970779205ca9
+  metadata.gz: e3ab1391c840c72e0a1e79bf939dcbfbdf58869a
+  data.tar.gz: f4c3d416e7647511608663e7e3fe84540eee0ab8
 SHA512:
-  metadata.gz: 5f1501d591403ec224579a049bf95244b2905f0a6a688d34bd839980ebe673a4893e39533a21a2bff630faf4e9840d976333db534c185a0ebe101756fc69c30b
-  data.tar.gz: 2d561aa93e32f028c296065f60e32c242b67b5274bf16017d760207f2903cd30a2e617b16607031f29ecbdb364bdcf24b2dc90571dcbf28c1b0e478ddacfd05c
+  metadata.gz: 21987dff0ba3291aa3a1e81cc5a94e076ba08c62c387ba0ac5c4fea2cc5484719d7489c3ae3b881a4d519cf1f1758b3847fba5df0c6d8f5c8e839b93cda02000
+  data.tar.gz: 8b6c6cd2b7c4d31e6853a8f0454990bb3d56166e6261297e28b76a79d745f5d05b0098e4014b2f72f3b99f5c77c3dc3c3a312429d1e00c06367021a6ea0c624e

data/.travis.yml

@@ -3,5 +3,5 @@ script: "bundle exec rspec spec"
 notifications:
   email: false
 rvm:
-  - 2.1.6
-  - 1.9.3
+  - 2.3.1
+  - 2.2.5

data/CHANGELOG.md

@@ -0,0 +1,41 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.6.0]
+### Changed
+- Change the default `PUPPET_INSTALL_TYPE` to `agent`
+
+## [0.5.0]
+### Changed
+- Bump the beaker dependency range up to allow for beaker 3.
+
+## [0.4.4]
+### Fixed
+- Always add certs on windows
+
+## [0.4.3]
+### Fixed
+- Use pe\_ver for the host variable of version to install
+
+## [0.4.2]
+### Fixed
+- Re-add CA certs on windows and solaris for PE 3.
+
+## [0.4.1]
+### Fixed
+- Don't copy certs on solaris, as they are no longer needed
+
+## [0.4.0]
+### Changed
+- Add solaris for installing CA certs as well.
+
+[0.6.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.5.0...0.6.0
+[0.5.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.4...0.5.0
+[0.4.4]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.3...0.4.4
+[0.4.3]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.2...0.4.3
+[0.4.2]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.1...0.4.2
+[0.4.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.4.0...0.4.1
+[0.4.2]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.3.1...0.4.0

data/Gemfile

@@ -1,8 +1,20 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
 
-if File.exists? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
+group :test do
+  gem 'beaker', '= 2.52.0' if RUBY_VERSION <= '2.1.6'
+  gem 'beaker' if RUBY_VERSION > '2.1.6'
+  gem 'bundler', '~> 1.9'
+  gem 'rake', '~> 10.0'
+  gem 'rspec', '~> 3'
+  gem 'rubocop', require: false
+  gem 'rubocop-rspec', require: false
 end
 
+group :development do
+  gem 'pry'
+  gem 'pry-byebug'
+end
+
+eval(File.read("#{__FILE__}.local"), binding) if File.exist? "#{__FILE__}.local"

data/MAINTAINERS

@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "file_format": "This MAINTAINERS file format is described at http://pup.pt/maintainers",
+  "issues": "https://github.com/puppetlabs/beaker-puppet_install_helper/issues",
+  "people": [
+    {
+      "github": "hunner",
+      "name": "Hunter Haugen"
+    },
+    {
+      "github": "DavidS",
+      "name": "David Schmitt"
+    }
+  ]
+}

data/README.md

@@ -6,15 +6,22 @@ This gem is simply an abstraction for the various ways that we install puppet fr
 
 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` is unset: if `type: pe` is set for the default node in the nodeset, it will us the PE install method. Otherwise it will only install an agent.
 - `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=agent` will read `PUPPET_INSTALL_VERSION` and install that version of puppet-agent (eg, `PUPPET_INSTALL_TYPE=agent PUPPET_INSTALL_VERSION=1.0.0`)
 - `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_INSTALL_VERSION` to what you want. It'll probably do what you expect.
 
+#### Installing a puppet-agent package from a development repository
+
+In order to use a custom, or unreleased, puppet-agent package set the following environment variables"
+- `PUPPET_INSTALL_TYPE=agent`
+- `PUPPET_AGENT_SHA` is the longform commit SHA used when building the puppet-agent package, for example `PUPPET_AGENT_SHA=18d31fd5ed41abb276398201f84a4347e0fc7092`.  This is required to be set in order to use a development puppet-agent package
+- `PUPPET_AGENT_SUITE_VERSION` is the version of the puppet-agent package, for example `PUPPET_AGENT_SUITE_VERSION="1.8.2.350.g18d31fd`.  This is optional, and will default to `PUPPET_AGENT_SHA` if not set
+
 ### `install_ca_certs`
 
 Install Certificate Authority Certs on Windows and OSX for Geotrust, User Trust Network, and Equifax

data/Rakefile

@@ -0,0 +1,15 @@
+require 'bundler/gem_tasks'
+task default: [:lint, :spec]
+
+require 'rubocop/rake_task'
+desc 'Run rubocop'
+RuboCop::RakeTask.new(:lint) do |t|
+  t.requires << 'rubocop-rspec'
+end
+
+require 'rspec/core/rake_task'
+desc 'Run spec tests using rspec'
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ['--color']
+  t.pattern = 'spec'
+end

data/beaker-puppet_install_helper.gemspec

@@ -1,18 +1,17 @@
 Gem::Specification.new do |s|
-  s.name        = "beaker-puppet_install_helper"
-  s.version     = '0.5.0'
-  s.authors     = ["Puppetlabs"]
-  s.email       = ["hunter@puppetlabs.com"]
-  s.homepage    = "https://github.com/puppetlabs/beaker-puppet_install_helper"
-  s.summary     = %q{Puppet install helper for Beaker}
-  s.description = %q{Puppet install helper for Beaker, see https://github.com/puppetlabs/beaker}
+  s.name        = 'beaker-puppet_install_helper'
+  s.version     = '0.6.0'
+  s.authors     = ['Puppetlabs']
+  s.email       = ['hunter@puppet.com']
+  s.homepage    = 'https://github.com/puppetlabs/beaker-puppet_install_helper'
+  s.summary     = 'Puppet install helper for Beaker'
+  s.description = 'Provides a unified external interface to choosing which version of puppet to install on the systems under test. For details on Beaker, see https://github.com/puppetlabs/beaker'
   s.license     = 'Apache-2'
 
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   ## Testing dependencies
   s.add_development_dependency 'rspec'

data/lib/beaker/ca_cert_helper.rb

@@ -10,7 +10,6 @@ module Beaker::CaCertHelper
     install_ca_certs_on(hosts)
   end
 
-
   ##
   # Install certs on Windows and OSX Hosts
   #
@@ -23,7 +22,7 @@ module Beaker::CaCertHelper
         if host['platform'] =~ /windows/i
           create_cert_on_host(host, cert_name, ca)
           add_windows_cert host, cert_name
-        elsif host['platform'] =~ /solaris/i and host['pe_ver'] and version_is_less(host['pe_ver'], '4.0.0')
+        elsif host['platform'] =~ /solaris/i && host['pe_ver'] && version_is_less(host['pe_ver'], '4.0.0')
           create_cert_on_host(host, cert_name, ca)
           add_solaris_cert host, cert_name
         end
@@ -136,8 +135,6 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
 
     certs
   end
-
-
 end
 
 include Beaker::CaCertHelper

data/lib/beaker/puppet_install_helper.rb

@@ -2,22 +2,21 @@ require 'beaker'
 require 'beaker/ca_cert_helper'
 
 module Beaker::PuppetInstallHelper
-  def run_puppet_install_helper(type_arg=find_install_type,version=find_install_version)
-    run_puppet_install_helper_on(hosts,type_arg,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=find_install_version)
-
+  def run_puppet_install_helper_on(hosts, type_arg = find_install_type, version = find_install_version)
     type = type_arg || find_install_type
 
     # Short circuit based on rspec-system and beaker variables
-    if ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
+    if (ENV['RS_PROVISION'] == 'no') || (ENV['BEAKER_provision'] == 'no')
       Array(hosts).each do |host|
         case type
-        when "pe"
+        when 'pe'
           configure_pe_defaults_on(host)
         when /foss|agent/
           configure_foss_defaults_on(host)
@@ -35,48 +34,56 @@ module Beaker::PuppetInstallHelper
     # PUPPET_INSTALL_TYPE=foss
     # PUPPET_INSTALL_TYPE=agent
 
+    # For PUPPET_INSTALL_TYPE=agent and using a development version of Puppet Agent
+    # PUPPET_AGENT_SHA=18d31fd5ed41abb276398201f84a4347e0fc7092   <-- Required.  Long form commit SHA used to build the Puppet Agent
+    # PUPPET_AGENT_SUITE_VERSION=1.8.2.350.g18d31fd               <-- Optiona. Version string for the Puppet Agent
+
     # Ensure windows 2003 is always set to 32 bit
     Array(hosts).each do |host|
-      if host["platform"] =~ /windows-2003/i
-        host["install_32"] = true
-      end
+      host['install_32'] = true if host['platform'] =~ /windows-2003/i
     end
 
     case type
-    when "pe"
+    when 'pe'
       # These will skip hosts that are not supported
-      install_pe_on(Array(hosts),options.merge({"pe_ver" => version}))
+      install_pe_on(Array(hosts), options.merge('pe_ver' => version))
       install_ca_certs_on(Array(hosts))
-    when "foss"
-      opts = options.merge({
-        :version        => version,
-        :default_action => "gem_install",
-      })
+    when 'foss'
+      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
       # type == 'aio', but we don't want to depend on that.
-      if opts[:version] and not version_is_less(opts[:version], '4.0.0')
+      if opts[:version] && !version_is_less(opts[:version], '4.0.0')
         add_aio_defaults_on(hosts)
         add_puppet_paths_on(hosts)
       end
       Array(hosts).each do |host|
-        if fact_on(host,"osfamily") != "windows"
-          on host, "mkdir -p #{host["distmoduledir"]}"
+        if fact_on(host, 'osfamily') != 'windows'
+          on host, "mkdir -p #{host['distmoduledir']}"
           # XXX Maybe this can just be removed? What PE/puppet version needs
           # it?
-          on host, "touch #{host.puppet["hiera_config"]}"
+          on host, "touch #{host.puppet['hiera_config']}"
         end
-        if fact_on(host, "operatingsystem") == "Debian"
+        if fact_on(host, 'operatingsystem') == 'Debian'
           on host, "echo 'export PATH=/var/lib/gems/1.8/bin/:${PATH}' >> ~/.bashrc"
         end
-        if fact_on(host, "operatingsystem") == "Solaris"
+        if fact_on(host, 'operatingsystem') == 'Solaris'
           on host, "echo 'export PATH=/opt/puppet/bin:/var/ruby/1.8/gem_home/bin:${PATH}' >> ~/.bashrc"
         end
       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,options.merge({:version => version}))
+    when 'agent'
+      if ENV['PUPPET_AGENT_SHA'].nil?
+        # This will fail on hosts that are not supported; use foss and specify a 4.x version instead
+        install_puppet_agent_on(hosts, options.merge(version: version))
+      else
+        opts = options.merge(puppet_collection: 'PC1',
+                             puppet_agent_sha: ENV['PUPPET_AGENT_SHA'],
+                             puppet_agent_version: ENV['PUPPET_AGENT_SUITE_VERSION'] || ENV['PUPPET_AGENT_SHA'])
+        install_puppet_agent_dev_repo_on(hosts, opts)
+      end
+
       # 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)
@@ -87,23 +94,15 @@ module Beaker::PuppetInstallHelper
   end
 
   def find_install_type
-    if type = ENV["PUPPET_INSTALL_TYPE"]
-      type
-    elsif default.is_pe?
-      "pe"
-    else
-      "foss"
-    end
+    ENV['PUPPET_INSTALL_TYPE'] || if default.is_pe?
+                                    'pe'
+                                  else
+                                    'agent'
+                                  end
   end
 
   def find_install_version
-    if type = ENV["PUPPET_INSTALL_VERSION"]
-      type
-    elsif type = ENV["PUPPET_VERSION"]
-      type
-    else
-      nil
-    end
+    ENV['PUPPET_INSTALL_VERSION'] || ENV['PUPPET_VERSION']
   end
 end
 

data/spec/unit/beaker/ca_cert_helper_spec.rb

@@ -8,16 +8,16 @@ describe 'beaker::ca_cert_helper' do
     end
   end
 
-
   describe 'install_ca_certs_on' do
     before :each do
       allow(subject).to receive(:get_cert_hash).and_return(
-                            {'geotrustglobal.pem' => 'my cert string',
-                             'usertrust-network.pem' => 'my user trust cert'})
+        'geotrustglobal.pem' => 'my cert string',
+        'usertrust-network.pem' => 'my user trust cert'
+      )
     end
 
-    it "windows 2003 node" do
-      w2k3 = {"pe_ver" => "3.8.3", "platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+    it 'windows 2003 node' do
+      w2k3 = { 'pe_ver' => '3.8.3', 'platform' => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
 
       expect(subject).to receive(:add_windows_cert).with(w2k3, 'geotrustglobal.pem')
       expect(subject).to receive(:create_cert_on_host).with(w2k3, 'geotrustglobal.pem', 'my cert string')
@@ -26,8 +26,8 @@ describe 'beaker::ca_cert_helper' do
       subject.install_ca_certs_on w2k3
     end
 
-    it "solaris 11 node" do
-      sol = {"pe_ver" => "3.8.3", "platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+    it 'solaris 11 node' do
+      sol = { 'pe_ver' => '3.8.3', 'platform' => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
 
       expect(subject).to receive(:add_solaris_cert).with(sol, 'geotrustglobal.pem')
       expect(subject).to receive(:create_cert_on_host).with(sol, 'geotrustglobal.pem', 'my cert string')
@@ -38,24 +38,24 @@ describe 'beaker::ca_cert_helper' do
   end
 
   describe 'add_windows_cert' do
-    it {
-      host = {"platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+    it do
+      host = { 'platform' => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
       expect(subject).to receive(:on).with(host, 'cmd /c certutil -v -addstore Root `cygpath -w geotrustglobal.pem`')
       subject.add_windows_cert host, 'geotrustglobal.pem'
-    }
+    end
   end
 
   describe 'add_solaris_cert' do
-    it {
-      host = {"platform" => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne'}
+    it do
+      host = { 'platform' => 'solaris-11-x86_64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
       expect(subject).to receive(:on).with(host, 'echo \'# geotrustglobal.pem\' >> /opt/puppet/ssl/cert.pem')
       expect(subject).to receive(:on).with(host, 'cat geotrustglobal.pem >> /opt/puppet/ssl/cert.pem')
       subject.add_solaris_cert host, 'geotrustglobal.pem'
-    }
+    end
   end
 
   describe 'get_cert_hash' do
-    it 'should contain 3 certs' do
+    it 'contains 3 certs' do
       cert_hash = subject.get_cert_hash
       expect(cert_hash.length).to equal(3)
       expect(cert_hash.class).to eq(Hash)

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-describe 'beaker::puppet_install_helper' do
+describe 'Beaker::PuppetInstallHelper' do
   let :subject do
     Class.new { include Beaker::PuppetInstallHelper }
   end
   let :hosts do
-    foss_host = double(:is_pe? => false)
-    pe_host = double(:is_pe? => true)
-    allow(foss_host).to receive(:[]).with("distmoduledir").and_return("/dne")
-    allow(foss_host).to receive(:[]).with("platform").and_return("Debian")
-    allow(foss_host).to receive(:[]).with("pe_ver").and_return(nil)
-    allow(foss_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
-    allow(pe_host).to receive(:[]).with("pe_ver").and_return("3.8.3")
-    allow(pe_host).to receive(:[]).with("distmoduledir").and_return("/dne")
-    allow(pe_host).to receive(:[]).with("platform").and_return("Debian")
-    allow(pe_host).to receive(:puppet).and_return({"hiera_config" => "/dne"})
+    foss_host = double(is_pe?: false)
+    pe_host = double(is_pe?: true)
+    allow(foss_host).to receive(:[]).with('distmoduledir').and_return('/dne')
+    allow(foss_host).to receive(:[]).with('platform').and_return('Debian')
+    allow(foss_host).to receive(:[]).with('pe_ver').and_return(nil)
+    allow(foss_host).to receive(:puppet).and_return('hiera_config' => '/dne')
+    allow(pe_host).to receive(:[]).with('pe_ver').and_return('3.8.3')
+    allow(pe_host).to receive(:[]).with('distmoduledir').and_return('/dne')
+    allow(pe_host).to receive(:[]).with('platform').and_return('Debian')
+    allow(pe_host).to receive(:puppet).and_return('hiera_config' => '/dne')
     [foss_host, pe_host]
   end
   before :each do
@@ -23,9 +23,11 @@ describe 'beaker::puppet_install_helper' do
     allow(subject).to receive(:fact_on)
   end
   after :each do
-    ENV.delete("PUPPET_VERSION")
-    ENV.delete("PUPPET_INSTALL_VERSION")
-    ENV.delete("PUPPET_INSTALL_TYPE")
+    ENV.delete('PUPPET_VERSION')
+    ENV.delete('PUPPET_INSTALL_VERSION')
+    ENV.delete('PUPPET_INSTALL_TYPE')
+    ENV.delete('PUPPET_AGENT_SHA')
+    ENV.delete('PUPPET_AGENT_SUITE_VERSION')
   end
   describe '#run_puppet_install_helper' do
     before :each do
@@ -33,97 +35,118 @@ describe 'beaker::puppet_install_helper' do
       allow(subject).to receive(:default).and_return(hosts[0])
     end
     it 'calls run_puppet_install_helper_on on each host' do
-      expect(subject).to receive(:run_puppet_install_helper_on).with(hosts,"foss",nil)
+      expect(subject).to receive(:run_puppet_install_helper_on).with(hosts, 'agent', nil)
       subject.run_puppet_install_helper
     end
-    ["PUPPET_VERSION","PUPPET_INSTALL_VERSION"].each do |version_var| 
+    %w(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")
+        ENV[version_var] = '4.1.0'
+        expect(subject).to receive(:run_puppet_install_helper_on).with(hosts, 'agent', '4.1.0')
         subject.run_puppet_install_helper
       end
     end
   end
   describe '#run_puppet_install_helper_on' do
-    context "for default" do
-      it "uses foss by default for non-pe nodes" do
+    context 'for default' do
+      it 'uses agent by default for non-pe nodes' do
         expect(subject).to receive(:default).and_return(hosts[0])
-        expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
+        expect(subject).to receive(:add_aio_defaults_on).with(hosts)
+        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
+        expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
         subject.run_puppet_install_helper_on(hosts)
       end
-      it "windows 2003 node" do
-        w2k3 = {"platform" => 'windows-2003r2-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
-        win_hosts = [ w2k3 ]
-        expect(subject).to receive(:default).and_return(double(:is_pe? => true))
-        expect(subject).to receive(:install_pe_on).with([w2k3.merge({'install_32' => true})], {"pe_ver" => nil})
+      it 'windows 2003 node' do
+        w2k3 = { 'platform' => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
+        win_hosts = [w2k3]
+        expect(subject).to receive(:default).and_return(double(is_pe?: true))
+        expect(subject).to receive(:install_pe_on).with([w2k3.merge('install_32' => true)], 'pe_ver' => nil)
         expect(subject).to receive(:create_cert_on_host).exactly(3).times
         expect(subject).to receive(:add_windows_cert).exactly(3).times
         subject.run_puppet_install_helper_on(win_hosts)
       end
-      it "uses PE by default for PE nodes" do
+      it 'uses PE by default for PE nodes' do
         expect(subject).to receive(:default).and_return(hosts[1])
-        expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
         subject.run_puppet_install_helper_on(hosts)
       end
     end
-    context "for foss" do
-      it "uses foss explicitly" do
-        ENV["PUPPET_INSTALL_TYPE"] = "foss"
-        expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
+    context 'for foss' do
+      it 'uses foss explicitly' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'foss'
+        expect(subject).to receive(:install_puppet_on).with(hosts, version: nil, default_action: 'gem_install')
         subject.run_puppet_install_helper_on(hosts)
       end
-      ["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"})
+      %w(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"})
+        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
-      it "uses PE explicitly" do
-        ENV["PUPPET_INSTALL_TYPE"] = "pe"
-        expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})
+    context 'for PE' do
+      it 'uses PE explicitly' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'pe'
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
         subject.run_puppet_install_helper_on(hosts)
       end
-      it "uses PE with a version" do
-        ENV["PUPPET_INSTALL_TYPE"] = "pe"
-        ENV["PUPPET_INSTALL_VERSION"] = "3.8.1"
-        expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
+      it 'uses PE with a version' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'pe'
+        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
-      it "installs certs on PE 3 solaris" do
-        sol = {"pe_ver" => "3.8.3", "platform" => 'solaris-11-64', 'distmoduledir' => '/dne','hieraconf' => '/dne'}
-        hosts = [ sol ]
-        ENV["PUPPET_INSTALL_TYPE"] = "pe"
-        ENV["PUPPET_INSTALL_VERSION"] = "3.8.1"
-        expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
+      it 'installs certs on PE 3 solaris' do
+        sol = { 'pe_ver' => '3.8.3', 'platform' => 'solaris-11-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
+        hosts = [sol]
+        ENV['PUPPET_INSTALL_TYPE'] = 'pe'
+        ENV['PUPPET_INSTALL_VERSION'] = '3.8.1'
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1')
         expect(subject).to receive(:create_cert_on_host).exactly(3).times
         expect(subject).to receive(:add_solaris_cert).exactly(3).times
         subject.run_puppet_install_helper_on(hosts)
       end
     end
-    context "for puppet-agent" do
-      it "uses agent explicitly" do
-        ENV["PUPPET_INSTALL_TYPE"] = "agent"
-        expect(subject).to receive(:install_puppet_agent_on).with(hosts,{:version => nil})
+    context 'for puppet-agent' do
+      it 'uses agent explicitly' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+        expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
+        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
+      it 'uses foss with a version' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+        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)
+        subject.run_puppet_install_helper_on(hosts)
+      end
+    end
+    context 'for puppet-agent development repo' do
+      before :each do
+        ENV['PUPPET_INSTALL_TYPE'] = 'agent'
+        ENV['PUPPET_AGENT_SHA'] = 'abc123'
+      end
+      it 'uses a development repo' do
+        expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_collection: 'PC1', puppet_agent_sha: 'abc123', puppet_agent_version: 'abc123')
         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
-      it "uses foss with a version" do
-        ENV["PUPPET_INSTALL_TYPE"] = "agent"
-        ENV["PUPPET_INSTALL_VERSION"] = "1.1.0"
-        expect(subject).to receive(:install_puppet_agent_on).with(hosts,{:version => "1.1.0"})
+      it 'uses a development repo with suite version' do
+        ENV['PUPPET_AGENT_SUITE_VERSION'] = '1.0.0.0.gabc123'
+        expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_collection: 'PC1', puppet_agent_sha: 'abc123', puppet_agent_version: '1.0.0.0.gabc123')
         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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,19 +38,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
-description: Puppet install helper for Beaker, see https://github.com/puppetlabs/beaker
+description: Provides a unified external interface to choosing which version of puppet
+  to install on the systems under test. For details on Beaker, see https://github.com/puppetlabs/beaker
 email:
-- hunter@puppetlabs.com
+- hunter@puppet.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
+- MAINTAINERS
 - README.md
+- Rakefile
 - beaker-puppet_install_helper.gemspec
 - lib/beaker/ca_cert_helper.rb
 - lib/beaker/puppet_install_helper.rb