beaker-puppet 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c098df759909b2d7139e23776333e7f7da342c
-  data.tar.gz: ba69889bd92bbe1d47b7a5e0fe16b844aa7ad7b1
+  metadata.gz: 400c5005acf587cae1d5e1fe8afbcc14d9d88d8f
+  data.tar.gz: 9392fc5d8c862d5c83bdebdd46504102dbfb2ef4
 SHA512:
-  metadata.gz: 49299bd7b7715c3e50d0aaf79397c5add2a29dca58b76284266e5f2b8d4447532784abe943ca4013b77bd5533316385ee323ec3680fa2e0c1f257209986bd49e
-  data.tar.gz: 50e8a96e4e5ebf3951aaf823436999374e18229b6359900a000c7fd1b4881234a1e3a4c9af8c8d1abbbc9bb2968e59d637597aacf050afea8f87d4b1f1c140f2
+  metadata.gz: 8e8db28e64c428caf4b4a253e70ad0ce9dfb9c3dcda51622d32cd9f1b5768ac1023d10797f6e4366bf88aeebc0057f7a94983cdc2c96f8ad2c9b7d30e745f45c
+  data.tar.gz: 41d0fd41083c3a4e8ea4e57f9d25524c5a3ab94bb578d2336187078314fdf43f783878ac9b520f77c4805989a5f0a6d000a87b994696f1cca023ab4eab521f68

data/lib/beaker-puppet.rb

@@ -13,7 +13,7 @@ end
 [ 'windows', 'foss', 'puppet', 'ezbake', 'module' ].each do |lib|
   require "beaker-puppet/install_utils/#{lib}_utils"
 end
-[ 'tk', 'facter', 'puppet' ].each do |lib|
+[ 'tk', 'facter', 'puppet', 'host' ].each do |lib|
   require "beaker-puppet/helpers/#{lib}_helpers"
 end
 
@@ -35,6 +35,7 @@ module BeakerPuppet
   include Beaker::DSL::Helpers::TKHelpers
   include Beaker::DSL::Helpers::FacterHelpers
   include Beaker::DSL::Helpers::PuppetHelpers
+  include Beaker::DSL::Helpers::HostHelpers
 
   include Beaker::DSL::Wrappers
 end

data/lib/beaker-puppet/helpers/facter_helpers.rb

@@ -37,11 +37,17 @@ module Beaker
         # @return String The value of the fact 'name' on the provided host
         # @raise  [FailTest] Raises an exception if call to facter fails
         def fact_on(host, name, opts = {})
+          if opts.kind_of?(Hash)
+            opts.merge!({json: nil})
+          else
+            opts << ' --json'
+          end
+
           result = on host, facter(name, opts)
           if result.kind_of?(Array)
-            result.map { |res| res.stdout.chomp }
+            result.map { |res| JSON.parse(res.stdout)[name] }
           else
-            result.stdout.chomp
+            JSON.parse(result.stdout)[name]
           end
         end
 

data/lib/beaker-puppet/helpers/host_helpers.rb

@@ -0,0 +1,36 @@
+module Beaker
+  module DSL
+    module Helpers
+      # Methods that help you interact with your facter installation, facter must be installed
+      # for these methods to execute correctly
+      #
+      module HostHelpers
+
+        def ruby_command(host)
+          "env PATH=\"#{host['privatebindir']}:${PATH}\" ruby"
+        end
+
+        # Returns an array containing the owner, group and mode of
+        # the file specified by path. The returned mode is an integer
+        # value containing only the file mode, excluding the type, e.g
+        # S_IFDIR 0040000
+        def stat(host, path)
+          ruby = ruby_command(host)
+          owner = on(host, "#{ruby} -e 'require \"etc\"; puts (Etc.getpwuid(File.stat(\"#{path}\").uid).name)'").stdout.chomp
+          group = on(host, "#{ruby} -e 'require \"etc\"; puts (Etc.getgrgid(File.stat(\"#{path}\").gid).name)'").stdout.chomp
+          mode  = on(host, "#{ruby} -e 'puts (File.stat(\"#{path}\").mode & 0777).to_s(8)'").stdout.chomp.to_i
+
+          [owner, group, mode]
+        end
+
+        def assert_ownership_permissions(host, location, expected_user, expected_group, expected_permissions)
+          permissions = stat(host, location)
+          assert_equal(expected_user, permissions[0], "Owner #{permissions[0]} does not match expected #{expected_user}")
+          assert_equal(expected_group, permissions[1], "Group #{permissions[1]} does not match expected #{expected_group}")
+          assert_equal(expected_permissions, permissions[2], "Permissions  #{permissions[2]} does not match expected #{expected_permissions}")
+        end
+      end
+    end
+  end
+end
+

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

@@ -15,22 +15,28 @@ module Beaker
             'distmoduledir'         => '/etc/puppetlabs/code/modules',
             'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
           },
-          'windows' => { #windows
+          # sitemoduledir not included on Windows (check PUP-4049 for more info).
+          #
+          # Paths to the puppet's vendored ruby installation on Windows were
+          # updated in Puppet 6 to more closely match those of *nix agents.
+          # These path values include both the older (puppet <= 5) paths (which
+          # include sys/ruby) and the newer versions, which have no custom ruby
+          # directory
+          'windows' => { # windows with cygwin
             'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
-            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
             'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
-            # sitemoduledir not included (check PUP-4049 for more info)
           },
-          'pwindows' => { #pure windows
+          'pswindows' => { # pure windows
             'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
-            'privatebindir'     => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\sys\\ruby\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin"',
+            'privatebindir'     => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\sys\\ruby\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin"',
             'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
           }
         }
 
         # Add the appropriate aio defaults to the host object so that they can be accessed using host[option], set host[:type] = aio
         # @param [Host] host    A single host to act upon
-        # @param [String] platform The platform type of this host, one of windows or unix
+        # @param [String] platform The platform type of this host, one of 'windows', 'pswindows', or 'unix'
         def add_platform_aio_defaults(host, platform)
           AIO_DEFAULTS[platform].each_pair do |key, val|
             host[key] = val
@@ -49,7 +55,7 @@ module Beaker
         def add_aio_defaults_on(hosts)
           block_on hosts do | host |
             if host.is_powershell?
-              platform = 'pwindows'
+              platform = 'pswindows'
             elsif host['platform'] =~ /windows/
               platform = 'windows'
             else

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/beaker-puppet/helpers/facter_helpers_spec.rb

@@ -33,22 +33,39 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#fact_on' do
     it 'retrieves a fact on a single host' do
-      result.stdout = "family\n"
-      expect( subject ).to receive(:facter).with('osfamily',{}).once
+      result.stdout = "{\"osfamily\": \"family\"}\n"
+      expect( subject ).to receive(:facter).with('osfamily',{json: nil}).once
       expect( subject ).to receive(:on).and_return(result)
 
-      expect( subject.fact_on('host','osfamily') ).to be === result.stdout.chomp
+      expect( subject.fact_on('host','osfamily') ).to be === JSON.parse(result.stdout)['osfamily']
     end
 
-    it 'chomps correctly when it receives an array of results from #on' do
-      result.stdout = "family\n"
+    it 'converts each element to a structured fact when it receives an array of results from #on' do
+      result.stdout = "{\"os\": {\"name\":\"name\", \"family\": \"family\"}}\n"
       times = hosts.length
       results_array = [result] * times
-      chomped_array = [result.stdout.chomp] * times
+      parsed_array = [JSON.parse(result.stdout)['os']] * times
       allow( subject ).to receive( :on ).and_return( results_array )
 
-      expect( subject.fact_on(hosts,'osfamily') ).to be === chomped_array
+      expect( subject.fact_on(hosts,'os') ).to be === parsed_array
+    end
+
+    it 'returns a single result for single host' do
+      result.stdout = "{\"osfamily\": \"family\"}\n"
+      parsed_result = JSON.parse(result.stdout)['osfamily']
+      allow( subject ).to receive( :on ).and_return( result )
+
+      expect( subject.fact_on('host','osfamily') ).to be === parsed_result
+    end
+
+    it 'preserves data types' do
+      result.stdout = "{\"identity\": { \"uid\": 0, \"user\": \"root\", \"privileged\": true }}"
+      allow( subject ).to receive( :on ).and_return( result )
+      structured_fact = subject.fact_on('host','identity')
 
+      expect(structured_fact['uid'].class).to be Fixnum
+      expect(structured_fact['user'].class).to be String
+      expect(structured_fact['privileged'].class).to be (TrueClass or FalseClass)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -233,6 +233,7 @@ files:
 - bin/beaker-puppet
 - lib/beaker-puppet.rb
 - lib/beaker-puppet/helpers/facter_helpers.rb
+- lib/beaker-puppet/helpers/host_helpers.rb
 - lib/beaker-puppet/helpers/puppet_helpers.rb
 - lib/beaker-puppet/helpers/rake_helpers.rb
 - lib/beaker-puppet/helpers/tk_helpers.rb