simp-beaker-helpers 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc117cc7ef7fe6cd0d4ad6fe888ce698a178fbe7
-  data.tar.gz: b3e0d8a3a7a7653be065d348e51bc989497461bb
+  metadata.gz: d4dc5e97b43efe34e806ff667363f93d9b550bb3
+  data.tar.gz: b37a65641c5255ba76ef3aae657fcf1da2c9130a
 SHA512:
-  metadata.gz: 86a0760188dea3c8216856fdc3850b57512d9715308ab6eebdbd62a91a71754b3c6df42ff0607d05f9d998201e47385a9a8a86417555319ba929ec7abcb10106
-  data.tar.gz: 253b1ea2a3278f8581737705800fa5763feb0c2a1fb9d4dbd9bb16b1542cfbee4d8becc16338fe15612b6fe2e1ef38cc9a1e47a7021f4b812d8ffc5cccff5267
+  metadata.gz: 3100502341f3d597b2bd2cd5f35d4dfeb6157592426c3d089006428bd72b93e14556097bb03709de7ce613faadc2c4ee9735fb342cc98313a07e3b1335b355e2
+  data.tar.gz: 1d140d0f353bf0373d8bfbfeb7baf8799b636ce62b4aa4abfa3b9db2d38547ef3a3b66b87575de502d85af482e75eff0f8920c9b5faf43fa11f4167c7a3e6a2b

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

data/lib/simp/beaker_helpers.rb

@@ -11,6 +11,13 @@ module Simp::BeakerHelpers
     facts.fetch(fact_name)
   end
 
+  # Returns the modulepath on the SUT, as an Array
+  def puppet_modulepath_on(sut, environment='production')
+    on(
+      sut, "puppet config print modulepath --environment #{environment}"
+    ).output.lines.last.strip.split(':')
+  end
+
   # Return the path to the 'spec/fixtures' directory
   def fixtures_path
     STDERR.puts '  ** fixtures_path' if ENV['BEAKER_helpers_verbose']
@@ -102,9 +109,7 @@ module Simp::BeakerHelpers
           # cannot rely on `copy_module_to()` to choose a sane default for
           # `target_module_path`.  This workaround queries each SUT's
           # `modulepath` and targets the first one.
-          target_module_path = on(
-            sut, 'puppet config print modulepath --environment production'
-          ).output.chomp.split(':').first
+          target_module_path = puppet_modulepath_on(sut).first
 
           mod_root = File.expand_path( "spec/fixtures/modules", File.dirname( fixtures_yml_path ))
 
@@ -416,7 +421,8 @@ done
   # This simulates the output of FakeCA's gencerts_nopass.sh to keydist/
   def copy_keydist_to( ca_sut = master, host_keydist_dir = nil  )
     if !host_keydist_dir
-      modulepath = on(ca_sut, 'puppet config print modulepath --environment production' ).output.chomp.split(':')
+      modulepath = puppet_modulepath_on(ca_sut)
+
       host_keydist_dir = "#{modulepath.first}/pki/files/keydist"
     end
     on ca_sut, "rm -rf #{host_keydist_dir}/*"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker