beaker-puppet_install_helper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTE3YjkzOTlhZjAwYjAyYzI5NmJmY2U4ZjNhYzBjNmRmODA1NThlNA==
+    OGMwYzBjYWE3ZWY0Zjk4MDBmODMzMzNjZDJlZmVhZmZiOTEwNTJkNQ==
   data.tar.gz: !binary |-
-    MTdlYjcxZTJkZTc4YTg4YzlkYzAwYjBiNGUyYTZiZDljMmU2NDA1ZQ==
+    OGVmMzlkMWRjNzdhOTUxMDlhMmYxY2ExZTM1NDhjNzlhY2QyYmI0MA==
 SHA512:
   metadata.gz: !binary |-
-    ZjYxZTAyNmM5ZjViMjQ4MTRmMDQxMjBhYjYxZWEyOWM3YjhmMzgyODYwMzU5
-    NzBkZWQxMTY4YjMxY2VjYzMzNmIyMGIyZjc3OTYxOTNiOGFiMzk2ZjdhMjRi
-    YmVkYTczNDJmYmRhZmMzOTJiMzU4MDY5Nzc2YTkwMjdhNWJmMGM=
+    Y2U4N2IzMDk4NDU2NTAxMmE5NDY0YTZhYjJhZDhhMTcyNTUzYjg5M2E4NTVk
+    YTRjNjM5MDY0NDEwZTI4ODNhYmU4ZTA1ZGI4ZjNlY2NhY2Q0MGM5ZjA0NDM0
+    ZjE2MjA0NTNkZjYwNTFiYzMyMWE3MmExNzAxOTM3ZGQ4ZGVmY2Y=
   data.tar.gz: !binary |-
-    NmU3MDRiZWYwZDFhYTliYmUxY2FmZDA0MTUyOGRjYTA2MDg4OWI0YjY5ZGY3
-    MTUwMGZlZTNlMTYwZjUwYWU4YTIyMGUxNWE1OWM0OGQ1ZDIxZWMwMzAyNjVm
-    NDY0Y2Q1NjkyOTZiY2IwMzE4ZmRmZTJkYzU1NzVkM2ZlOWQyMGM=
+    MWEyYjYwNWE4M2VmYzgwY2JjOTI2ZDEzNTg2NmI5NTNmYTRmZmYwYjMyZDkz
+    NDZiYmYxOTUxMDJjNjcyOTM0MzMwNjFiNGU0YjBiODc2NGI1OTU4Nzg3NDUx
+    ZDNhNTZjN2MwMDNhNWFlZGY0N2RiMGJjODk0ZWRmZDk1NzljZGY=

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+script: "bundle exec rspec spec"
+notifications:
+  email: false
+rvm:
+  - 2.1.6
+  - 1.9.3

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.0'
+  s.version     = '0.1.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

@@ -27,13 +27,21 @@ module Beaker::PuppetInstallHelper
     when "pe"
       # This will skip hosts that are not supported
       install_pe_on(hosts,{"pe_ver" => version})
+      add_pe_defaults_on(hosts)
+      add_puppet_paths_on(hosts)
     when "foss"
-      foss_opts = {
+      opts = {
         :version        => version,
         :default_action => "gem_install",
       }
 
-      install_puppet_on(hosts, foss_opts)
+      install_puppet_on(hosts, opts)
+      if opts[:version] and not version_is_less(opts[:version], '4.0.0')
+        add_aio_defaults_on(hosts)
+      else
+        add_foss_defaults_on(hosts)
+      end
+      add_puppet_paths_on(hosts)
       Array(hosts).each do |host|
         if fact_on(host,"osfamily") != "windows"
           on host, "mkdir -p #{host["distmoduledir"]}"
@@ -49,6 +57,8 @@ module Beaker::PuppetInstallHelper
     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})
+      add_aio_defaults_on(hosts)
+      add_puppet_paths_on(hosts)
     else
       raise ArgumentError, "Type must be pe, foss, or agent; got #{type.inspect}"
     end

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -18,8 +18,8 @@ describe 'beaker::puppet_install_helper' do
   end
   describe '#run_puppet_install_helper' do
     before :each do
-      expect(subject).to receive(:default).and_return(double(:is_pe? => false))
-      expect(subject).to receive(:hosts).and_return(hosts)
+      allow(subject).to receive(:default).and_return(double(:is_pe? => false))
+      allow(subject).to receive(:hosts).and_return(hosts)
     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)
@@ -36,11 +36,15 @@ describe 'beaker::puppet_install_helper' do
       it "uses foss by default for non-pe nodes" do
         expect(subject).to receive(:default).and_return(double(:is_pe? => false))
         expect(subject).to receive(:install_puppet_on).with(hosts,{:version => nil,:default_action => "gem_install"})
+        expect(subject).to receive(:add_foss_defaults_on).with(hosts)
+        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
         subject.run_puppet_install_helper_on(hosts)
       end
       it "uses PE by default for PE nodes" do
         expect(subject).to receive(:default).and_return(double(:is_pe? => true))
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})
+        expect(subject).to receive(:add_pe_defaults_on).with(hosts)
+        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
         subject.run_puppet_install_helper_on(hosts)
       end
     end
@@ -48,12 +52,24 @@ describe 'beaker::puppet_install_helper' 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"})
+        expect(subject).to receive(:add_foss_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"] = "foss"
         ENV["PUPPET_VERSION"] = "3.8.1"
         expect(subject).to receive(:install_puppet_on).with(hosts,{:version => "3.8.1",:default_action => "gem_install"})
+        expect(subject).to receive(:add_foss_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 >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)
       end
     end
@@ -61,12 +77,16 @@ describe 'beaker::puppet_install_helper' do
       it "uses PE explicitly" do
         ENV["PUPPET_INSTALL_TYPE"] = "pe"
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => nil})
+        expect(subject).to receive(:add_pe_defaults_on).with(hosts)
+        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
         subject.run_puppet_install_helper_on(hosts)
       end
       it "uses PE with a version" do
         ENV["PUPPET_INSTALL_TYPE"] = "pe"
         ENV["PUPPET_VERSION"] = "3.8.1"
         expect(subject).to receive(:install_pe_on).with(hosts,{"pe_ver" => "3.8.1"})
+        expect(subject).to receive(:add_pe_defaults_on).with(hosts)
+        expect(subject).to receive(:add_puppet_paths_on).with(hosts)
         subject.run_puppet_install_helper_on(hosts)
       end
     end
@@ -74,12 +94,16 @@ describe 'beaker::puppet_install_helper' 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_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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - beaker-puppet_install_helper.gemspec
 - lib/beaker/puppet_install_helper.rb