beaker-puppet 0.9.0 → 0.10.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDI3OTNiODU1ZDBkMmY2MTk2NmMxZTE5YzNkZjQ5NjQwNjgwNjg4Nw==
+    ZTBjMzQ0ZjEzZTNkMDI3ODE1NGIwYWU2YzllZDA3NjFhNmU1YmM3ZQ==
   data.tar.gz: !binary |-
-    M2MzNzhiMDFmMDc4ZDBlYjAxNjg1OGNhMGM5YTNkNmUyNTg4NjBlZg==
+    MzY0ZWZiNTEzNDk0M2YwZTdlODcxNWQyM2E3MWRiYWE5YWNkNzE4YQ==
 SHA512:
   metadata.gz: !binary |-
-    M2QxNjAwNTI3MzI1ZDY4OWNmYjljNzhlYjRkNTBjNzQzZGQ3ZTQxOWQwNjcw
-    Yjc5ZWIxMjhjMWZkY2I2OGE2NjcyNzc0ZWUwNzRkZWFiNzBlMTNhMWEwMmYy
-    ZWI3MGZiOWFlMjBlOWQ3MGE1NDVjZGJjYzQzNzQ0ODQ5NzMwNTc=
+    YmRiOTAwYjU1NDU5ODBhZjdiMmFmNTIwODcxNGRhNDhhZWYzODA1YWJlYWZi
+    NTFlYzU5NjMwMTY3ZWZiODc4YjUxMjE0MGVkMmE0YzdkNTE2Njg0NDVhMmZm
+    MjEyMTliNTRhNGNmNmVhZGMxNjYzZGFhNWZhYjExOTk2MmNmZTU=
   data.tar.gz: !binary |-
-    NzRhYWU1YjczMjlhM2NhZDdlOTVlYzgwNThkZGRhNzJlMmMxZWZhNDUxYzYz
-    OTE4MjcyN2UyN2RkOTJlZGQyYzk3YjE4MjQxMDgyMmE3ZjcxNjZlOWU2ZTk0
-    ZWJlOTA0ZTA0YjA1ZDFjODA4OThjMWJkMzFmNjVlYzZiNjE4OTg=
+    ODczODMyZjcwZWNhNTgwMzg5YTljYTBiNTM4MWIzYmQ4MTkwNmVkYTE5ZGQ2
+    YWE0NGFhNDNiY2EwMGYwNWYyZDU0YmRhNmM2NzJjODYzNzc4MWM2OWZkMjg1
+    YjBlNDAxM2I0YWIwNzVhNjI1ZjNiN2MzMTBiNDFkODY2N2EyZTU=

data/lib/beaker-puppet/install_utils/puppet5.rb

@@ -24,10 +24,6 @@ module BeakerPuppet
         )
         file_hash = YAML.load_file( sha_yaml_file_local_path )
 
-        logger.debug("YAML HASH BELOW:")
-        logger.debug(file_hash)
-        logger.debug("PLATFORM_DATA BELOW:")
-        logger.debug(file_hash[:platform_data])
         return sha_yaml_folder_url, file_hash[:platform_data]
       end
 
@@ -85,36 +81,48 @@ module BeakerPuppet
       #
       # @return nil
       def install_artifact_on(host, artifact_url, project_name)
-        variant, _, _, _ = host[:platform].to_array
-        onhost_package_file = nil
-        if variant == 'eos'
-          host.get_remote_file( artifact_url )
-          onhost_package_file = File.basename( artifact_url )
-        elsif variant == 'solaris'
-          artifact_filename = File.basename( artifact_url )
-          artifact_folder = File.dirname( artifact_url )
-          fetch_http_file( artifact_folder, artifact_filename, '.' )
-          onhost_package_dir = host.tmpdir( 'puppet_installer' )
+        variant, version, _, _ = host[:platform].to_array
+        case variant
+        when 'eos'
+          host.get_remote_file(artifact_url)
+          onhost_package_file = File.basename(artifact_url)
+          # TODO Will be refactored into {Beaker::Host#install_local_package}
+          #   immediately following this work. The release timing makes it
+          #   necessary to have this here separately for a short while
+          host.install_from_file(onhost_package_file)
+        when 'solaris'
+          artifact_filename = File.basename(artifact_url)
+          artifact_folder = File.dirname(artifact_url)
+          fetch_http_file(artifact_folder, artifact_filename, '.')
+          onhost_package_dir = host.tmpdir('puppet_installer')
           scp_to host, artifact_filename, onhost_package_dir
-          onhost_package_file = "#{ onhost_package_dir }/#{ artifact_filename }"
-        elsif variant == 'osx'
-          on host, "curl -O #{ artifact_url }"
-          onhost_package_file = "#{ project_name }*"
-        end
+          onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
+          host.install_local_package(onhost_package_file, '.')
+        when 'osx'
+          on host, "curl -O #{artifact_url}"
+          onhost_package_file = "#{project_name}*"
+          host.install_local_package(onhost_package_file)
+        when 'windows'
+          install_msi_on(host, artifact_url)
+        when 'aix'
+          artifact_filename = File.basename(artifact_url)
+          artifact_folder = File.dirname(artifact_url)
+          fetch_http_file(artifact_folder, artifact_filename, '.')
+          onhost_package_dir = host.tmpdir('puppet_installer')
+          scp_to host, artifact_filename, onhost_package_dir
+          onhost_package_file = "#{onhost_package_dir}/#{artifact_filename}"
 
-        if variant == 'eos'
           # TODO Will be refactored into {Beaker::Host#install_local_package}
           #   immediately following this work. The release timing makes it
-          #   necessary to have this here separately for a short while
-          host.install_from_file( onhost_package_file )
-        elsif onhost_package_file
-          if onhost_package_dir
-            host.install_local_package( onhost_package_file, '.' )
-          else
-            host.install_local_package( onhost_package_file )
+          #   necessary to have this here seperately for a short while
+          # NOTE: the AIX 7.1 package will only install on 7.2 with
+          # --ignoreos. This is a bug in package building on AIX 7.1's RPM
+          if version == "7.2"
+            aix_72_ignoreos_hack = "--ignoreos"
           end
+          on host, "rpm -ivh #{aix_72_ignoreos_hack} #{onhost_package_file}"
         else
-          host.install_package( artifact_url )
+          host.install_package(artifact_url)
         end
       end
 

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

data/spec/beaker-puppet/install_utils/puppet5_spec.rb

@@ -139,9 +139,10 @@ describe ClassMixedWithDSLInstallUtils do
 
     let( :artifact_url ) { 'url://in/the/jungle/lies/the/prize.pnc' }
     let( :platform ) { @platform || 'linux' }
+    let( :version ) { @version || '' }
     let( :mock_platform ) {
       mock_platform = Object.new
-      allow( mock_platform ).to receive( :to_array ) { [platform, '', '', ''] }
+      allow( mock_platform ).to receive( :to_array ) { [platform, version, '', ''] }
       mock_platform
     }
     let( :host ) {
@@ -159,6 +160,23 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_artifact_on( host, artifact_url, 'project_name' )
     end
 
+    it 'installs from a file on EOS' do
+      @platform = 'eos'
+
+      expect(host).to receive(:get_remote_file).with(artifact_url)
+      expect(host).to receive(:install_from_file).with(File.basename(artifact_url))
+
+      subject.install_artifact_on(host, artifact_url, 'project_name')
+    end
+
+    it 'install an MSI from a URL on Windows' do
+      @platform = 'windows'
+
+      expect(subject).to receive(:install_msi_on).with(host, artifact_url)
+
+      subject.install_artifact_on(host, artifact_url, 'project_name')
+    end
+
     context 'local install cases' do
 
       def run_shared_test_steps
@@ -182,6 +200,33 @@ describe ClassMixedWithDSLInstallUtils do
         run_shared_test_steps()
       end
 
+      it 'AIX: fetches the file & runs local install' do
+        @platform = 'aix'
+        @version = '7.2'
+
+        expect( subject ).to receive( :fetch_http_file ).once
+        expect( subject ).to receive( :scp_to ).once
+        expect( subject ).to receive( :on ).with( host, /^rpm -ivh --ignoreos .*#{File.basename(artifact_url)}$/ ).once
+
+        expect( host ).to receive( :install_local_package ).never
+        expect( host ).to receive( :install_package ).never
+        subject.install_artifact_on( host, artifact_url, 'project_name' )
+      end
+
+      it 'AIX 6.1: fetches the file & runs local install' do
+        @platform = 'aix'
+        @version = '6.1'
+
+        expect( subject ).to receive( :fetch_http_file ).once
+        expect( subject ).to receive( :scp_to ).once
+        expect( subject ).to receive( :on ).with( host, /^rpm -ivh .*#{File.basename(artifact_url)}$/ ).once
+        expect( subject ).not_to receive( :on ).with( host, /^rpm -ivh --ignoreos .*#{File.basename(artifact_url)}$/ )
+
+        expect( host ).to receive( :install_local_package ).never
+        expect( host ).to receive( :install_package ).never
+        subject.install_artifact_on( host, artifact_url, 'project_name' )
+      end
+
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec