beaker 1.12.0 → 1.12.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWYzNDNkZGNiOTY2ZTlkYTFmNWMwM2ZmYTU2ZTVkYTc4Nzg2MmM0ZA==
+    YzhiZGU5NjI3OTViZmFmOTIyZTdiMzA0ZmY4Y2UyZTAyZGZhZWRhMQ==
   data.tar.gz: !binary |-
-    NTg2ODk5ZjczMzM0ZWQzZTk4YzM2ZGZmODYyOGJmOTE4YmRiNmEzZg==
+    ZTMxOWNlZjQ5MzRlNWQxZjc0OTA1MTM4MmMzZGZmODgxN2QwOGUzNA==
 SHA512:
   metadata.gz: !binary |-
-    ZDU3MDhmZTdjZDYxMGQ5MmIyZDdmMWQ5ZDc2MWE5OGJlNmNkODEwM2NkM2Q1
-    NWJlNjg4NDM3MzMwZGI4OTQ4MmZlZjBlM2M1MjE3NjAyMjA4ZDM0OTM5MTMy
-    ZTQ5OGZjNmU2YTdiMzI2OTlmMmNiMGY4NWI4YmM2NGQ2ZWQ2YWU=
+    ZjJhOTc2YzQ0NTZmMWRmN2ZmODU2NWJmNGNjMWNlZDE1Yjg3MDIzMDIzMGVk
+    MmYyMWM2YmQ5ZjA2OTU4NDUyNDg3YmFiNzZkOTgxM2QyOWNjOGU4NDk3ZWVj
+    NDVmNjNiZDI3Nzg3NGFjOWE1NzBkOTFmMTk5NGExMjgzZGIyNDU=
   data.tar.gz: !binary |-
-    NWViYmEzMmE5OGQxZGNkZGMzODllOWRjN2ZmNGJmMjcwOTZiOThhYTVkNDE4
-    NTI4NzUxZGRhZmUzOGQ2MDYwMDQ4NWI0OTg0Y2EyZDY2YTUyYmYzMTk4MWYy
-    MGY1MTBhOWFmY2QwMDVkM2QyMTdmZTRmODU5N2MxNjA3MmFhYmM=
+    YmM5ZjEyNjVjZDhjZGYwZjY0NGZmY2ZmYTg4NmFiMmI1NWZlY2MxY2VhN2U2
+    YTE4ZGUyMTFiOGIzNjc1MDJmNjg0Y2MyMGVlNTgwMjE2ZTc1ZTE0YTg1NWEw
+    ZTIwYWQwMzNjOTdlNTFlN2I2ZWNlMTU3NjA0ZDgzNjU1ZjYzNWY=

data/lib/beaker/dsl/helpers.rb

@@ -303,6 +303,25 @@ module Beaker
         run_script_on(default, script, opts, &block)
       end
 
+      # Copy a puppet module from a given source to all hosts under test.
+      # Assumes each host under test has an associated 'distmoduledir' (set in the
+      # host configuration YAML file).
+      #
+      # @param opts [Hash]
+      # @option opts [String] :source The location on the test runners box where the files are found
+      # @option opts [String] :module_name The name of the module to be copied over
+      def puppet_module_install_on(host, opts = {})
+        Array(host).each do |host|
+          scp_to host, opts[:source], File.join(host['distmoduledir'], opts[:module_name])
+        end
+      end
+
+      # Copy a puppet module from a given source to all hosts under test.
+      # @see #puppet_module_install_on
+      def puppet_module_install opts = {}
+        puppet_module_install_on(hosts, opts)
+      end
+
       # Limit the hosts a test case is run against
       # @note This will modify the {Beaker::TestCase#hosts} member
       #   in place unless an array of hosts is passed into it and

data/lib/beaker/dsl/install_utils.rb

@@ -577,6 +577,7 @@ module Beaker
         end
         #send in the global options hash
         do_install(sorted_hosts, options.merge({:type => :upgrade}))
+        options['upgrade'] = true
       end
     end
   end

data/lib/beaker/host/unix/file.rb

@@ -6,7 +6,7 @@ module Unix::File
   end
 
   def tmpdir(name)
-    execute("mktemp -td #{name}.XXXXXX")
+    execute("mktemp -dt #{name}.XXXXXX")
   end
 
   def path_split(paths)

data/lib/beaker/hypervisor/docker.rb

@@ -89,6 +89,10 @@ module Beaker
     end
 
     def dockerfile_for(host)
+
+      # Warn if image is not define, empty or nil
+      @logger.error("Docker image undefined!") if (host['image']||= nil).to_s.empty?
+
       # specify base image
       dockerfile = <<-EOF
         FROM #{host['image']}

data/lib/beaker/options/options_hash.rb

@@ -109,7 +109,7 @@ module Beaker
         base
       end
 
-      # Recursively merge self with an OptionsHash or Hash
+      # Create new OptionsHash from recursively merged self with an OptionsHash or Hash
       #
       # @param [OptionsHash, Hash] hash The hash to merge from
       #
@@ -124,6 +124,26 @@ module Beaker
       #
       # @return [OptionsHash] The combined hash
       def merge hash
+        #make a deep copy into an empty hash object
+        merged_hash = rmerge(OptionsHash.new, self)
+        rmerge(merged_hash, hash)
+      end
+
+      # Recursively merge self with an OptionsHash or Hash
+      #
+      # @param [OptionsHash, Hash] hash The hash to merge from
+      #
+      # @example
+      #   base = { :key => { :subkey1 => 'subval', :subkey2 => 'subval' } }
+      #   hash = { :key => { :subkey1 => 'newval'} }
+      #
+      #   base.merge!(hash)
+      #   #=> {:key =>
+      #         {:subkey1 => 'newval',
+      #          :subkey2 => 'subval' }
+      #
+      # @return [OptionsHash] The combined hash
+      def merge! hash
         rmerge(self, hash)
       end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.12.0'
+    STRING = '1.12.1'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -228,6 +228,25 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+  describe '#puppet_module_install_on' do
+    it 'scps the module to the module dir' do
+      subject.stub( :hosts ).and_return( hosts )
+
+      subject.should_receive( :scp_to ).with( master, '/module', '/etc/puppet/modules/test' ).once
+      subject.puppet_module_install_on( master, {:source => '/module', :module_name => 'test'} )
+    end
+  end
+
+  describe '#puppet_module_install' do
+    it 'delegates to #puppet_module_install_on with the hosts list' do
+      subject.stub( :hosts ).and_return( hosts )
+
+      subject.should_receive( :puppet_module_install_on ).with( hosts, {:source => '/module', :module_name => 'test'}).once
+
+      subject.puppet_module_install( {:source => '/module', :module_name => 'test'} )
+    end
+  end
+
   describe 'confine' do
     let(:logger) { double.as_null_object }
     before do

data/spec/beaker/options/options_hash_spec.rb

@@ -36,8 +36,13 @@ module Beaker
       end
 
       it "when merged with a hash that contains a hash, the sub-hash becomes an OptionsHash" do
+        newhash = options.merge({'key' => {'subkey' => 'subvalue'}})
+        expect(newhash[:key].is_a?(OptionsHash)) === true and expect(newhash[:key][:subkey]) === 'subvalue'
+      end
+
+      it "does not alter the original hash when doing a merge" do
         options.merge({'key' => {'subkey' => 'subvalue'}})
-        expect(options[:key].is_a?(OptionsHash)) === true and expect(options[:key][:subkey]) === 'subvalue'
+        expect(options[:key]).to be === nil
       end
 
       context 'pretty prints itself' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest