beaker 1.14.0 → 1.14.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTAxN2IzZDYzNjNjM2E0NjhjZDVjNmE1OWQ2YmZkNWY2MDE5MGNiMg==
+    OWJiMDQwNDIwYmU4MzZkYzYyYjg2M2JiMjg4OWVlOWZhYzYzNzk1Yw==
   data.tar.gz: !binary |-
-    OGRjYjFhOWYxNjI5MTc2NDc3NTNlZjEyNGFkMTZmYmUxZmRkZjVhZg==
+    ZTVlN2FlNzBkZmYzN2NiZjcwYTM0ZGYzYmE0ZWRmNTQ2ZDI3ZGEyNw==
 SHA512:
   metadata.gz: !binary |-
-    YWUwMDIzZTc4MDM5MjlhY2M4ZmVkZGE3ZjIzYWVjNzk2YmEyZjZjMjRiZjdm
-    YTQzMTU4Njg3ZDQzNDMxMDk1NDY3NDdjZWY1NTZjMjA4ZDA2OTk4ZWE5Yzk5
-    MjY0Y2JjNjcxMWZlNDZhZmZlNGVkM2FiMDBhMTIzYjY2OGZmOTE=
+    MmIxNGE0MGQyZGVjZmQ2YTJiODkyMThmMGI1ZGNjZTYxMTgzMTJlYThkNDYw
+    MzNlMmI2Yzk0NTkzZGYzZWRiODgzODIxZGM2YmYyZTdkNjE0ZmM5MTFkMTg2
+    OWQ4Nzg3MWY5MWI2N2QzOGU3ZTA0YjA3NDI1ZTk2MjZlMGM1NTU=
   data.tar.gz: !binary |-
-    NjA0MzQwMjE2YmZiZDQ1YTZhMTUwZWU5Yjk1MjFlMWNjN2EzMzg3MzJlZmQ2
-    OTZkMjBkYTEwM2E3MTFjMTRkMDJiMjUwMGU0ZTAxZWVhZTcwNWVjMDUwNDNh
-    MDE2YzNlNzQ2ZWIzMzJkMjY3MTVlYzczZWE0MjEzYTYzZjNlMTU=
+    NWQzZDJkZTk2MDI1NWM3NDljMjA3Y2RiNWEzODQyNDNlNWNmZWVmMTIwYzU1
+    MjI5MGU0NmQyMGJhNDU4ZDdlYTg4ZGI2OWY3Yzk2YzdkOTNkM2M1ZTVkYjBm
+    N2ZjNDJjMWMwMjk1NDUxZGEzZThhMWVhYjA0NGI4ODM4YWU2MGI=

data/lib/beaker/dsl/install_utils.rb

@@ -818,6 +818,8 @@ module Beaker
         _, protocol, hostname = options[:dev_builds_url].partition /.*:\/\//
         dev_builds_url = protocol + hostname
 
+        on host, "mkdir -p /root/#{package_name}"
+
         case variant
         when /^(fedora|el|centos)$/
           variant = (($1 == 'centos') ? 'el' : $1)
@@ -861,10 +863,10 @@ module Beaker
 
           config_dir = '/etc/yum.repos.d/'
           scp_to host, repo, config_dir
-          scp_to host, repo_dir, '/root'
+          scp_to host, repo_dir, "/root/#{package_name}"
 
           search = "baseurl\\s*=\\s*http:\\/\\/#{hostname}.*$"
-          replace = "baseurl=file:\\/\\/\\/root\\/#{arch}"
+          replace = "baseurl=file:\\/\\/\\/root\\/#{package_name}\\/#{arch}"
           sed_command = "sed -i 's/#{search}/#{replace}/'"
           find_and_sed = "find #{config_dir} -name \"*.repo\" -exec #{sed_command} {} \\;"
 
@@ -884,10 +886,10 @@ module Beaker
 
           config_dir = '/etc/apt/sources.list.d'
           scp_to host, list, config_dir
-          scp_to host, repo_dir, '/root'
+          scp_to host, repo_dir, "/root/#{package_name}"
 
           search = "'deb\\s\\+http:\\/\\/#{hostname}.*$"
-          replace = "'deb file:\\/\\/\\/root\\/#{codename} #{codename} main'"
+          replace = "'deb file:\\/\\/\\/root\\/#{package_name}\\/#{codename} #{codename} main'"
           sed_command = "sed -i 's/#{search}/#{replace}/'"
           find_and_sed = "find #{config_dir} -name \"*.list\" -exec #{sed_command} {} \\;"
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.14.0'
+    STRING = '1.14.1'
   end
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -572,6 +572,7 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it "scp's files to SUT then modifies them with find-and-sed 2-hit combo" do
+      expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
       expect(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
       expect(subject).to receive(:scp_to).with( host, repo_dir, /.*/ ).ordered
       expect(subject).to receive(:on).with( host, /^find .* sed .*/ ).ordered
@@ -593,6 +594,7 @@ describe ClassMixedWithDSLInstallUtils do
       let( :platform ) { Beaker::Platform.new('solaris-7-i386') }
 
       it "raises an exception." do
+        expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
         allow(subject).to receive(:options) { opts }
         expect{
           subject.install_puppetlabs_dev_repo host, package_name, package_version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.14.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest