beaker 1.17.3 → 1.17.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDBiYjkxMWM4Mzg3ODE1ZTI1Njk1YWVjY2JiN2MwMjhhZTU4ZDljOQ==
+    NWRiY2Y3ZGRkNGNhY2YyNDQxOWQxYmI0MTRkZDQ0MmUyZTllM2E1ZQ==
   data.tar.gz: !binary |-
-    YWQwNmUyODFlNDdkZWQ0N2UzZmQ1ZGFiMDY0MDAyMTc2NjcyYTIxZQ==
+    ZTRmNzY0ZjI2NDRlOWNiOTJmZDM4ZDFmYmRkYWJiNmE4MWFkZDQyMQ==
 SHA512:
   metadata.gz: !binary |-
-    OWNjYjVjYmE3MWUwY2FlODJhOTI0NGVlY2ZkMzBlZDg2ZDEwOWQwYmUzYWVi
-    ODQxYTY1MDU0ODEwYWZkZDIxOTcyNWM3YTVmYzRhNGZjYjJjOWQ2MzUxODk0
-    M2I0N2QzMTc4MWM4MTViZmY4NTc1YTdjMDczMzhmOTM3OTViNDY=
+    YmJmNDJlMWU3ZWI0YzVhZjY1M2I0MGU0ODg4Y2EwMjVhZDY3ZTYzOGM1OTYx
+    ZDEyNjYzMTE0MWI2NzI4YTQyNjAxZGI1YTYzM2UwYzEwYzU1YTA2NGZmNDQ1
+    NjE1YThkNDMyNTlmMGM4ZjI5YWIyNDQyYmVjMzJkMGRkMzhkNzg=
   data.tar.gz: !binary |-
-    ZWU2MGU5YWMzOGFmZDMwMDdjMDQwMGIxMWQ3NzM2NDFkYzE2OWY5OTc3YjA1
-    MTgxNTI1YjE0NmZiY2I5MTc5MjE2YzRjZTlmODM4ZDRmMTgzNGI0ZTg1ZTU1
-    YzdjNDIyMjI0Mzg0YjFkNzAwMWM1NjMwMjI0YWRjMjcyNjRkY2U=
+    NWVmMjg1YTc4MzA3MDhiNTM4NWM0MDk4NmM2NTMzZTBmNjgxMTRjMWRmMmQw
+    YzBhYWM0M2IzZWU2OGNkZDE2ZTMyZDc2Yzc3MTk5ZTdjMDdkY2VkNjMxYWQ4
+    MGFjZTc1OWQ1NWM1MmI5MzRiNzQ3NGFlMWRhMzc5YjM0MTMyMzU=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 20 Aug, 2014 (92584d1e)](#LATEST)
+* [LATEST - 20 Aug, 2014 (1e6a4a8f)](#LATEST)
+* [beaker1.17.3 - 20 Aug, 2014 (f8a536c1)](#beaker1.17.3)
 * [beaker1.17.2 - 15 Aug, 2014 (c6f1f64a)](#beaker1.17.2)
 * [beaker1.17.1 - 12 Aug, 2014 (72e60299)](#beaker1.17.1)
 * [beaker1.17.0 - 12 Aug, 2014 (fb482b56)](#beaker1.17.0)
@@ -55,7 +56,47 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 20 Aug, 2014 (92584d1e)
+### <a name = "LATEST">LATEST - 20 Aug, 2014 (1e6a4a8f)
+
+* (GEM) version bump for 1.17.4 (1e6a4a8f)
+
+* Merge pull request #411 from anodelman/ec2 (2b4c9049)
+
+
+```
+Merge pull request #411 from anodelman/ec2
+
+(MAINT) kill zombies after provided number of hours
+```
+* Merge pull request #409 from cyberious/ScpCopyIgnoreFix (e59632eb)
+
+
+```
+Merge pull request #409 from cyberious/ScpCopyIgnoreFix
+
+QENG-1080 do_scp_to now checks for source path of absolute and prunes accordingly
+```
+* (MAINT) kill zombies after provided number of hours (3f3c3b27)
+
+
+```
+(MAINT) kill zombies after provided number of hours
+
+- was always using the default 3 hours
+```
+* QENG-1080 Fixed issue where we appended the source path to the target path, we now check for absolute path prior (cdd9c7b8)
+
+### <a name = "beaker1.17.3">beaker1.17.3 - 20 Aug, 2014 (f8a536c1)
+
+* Merge pull request #410 from anodelman/make-gem (f8a536c1)
+
+
+```
+Merge pull request #410 from anodelman/make-gem
+
+create beaker 1.17.3 gem
+```
+* (HISTORY) update history for 1.17.3 gem (0d6006c4)
 
 * (GEM) version bump for 1.17.3 gem (92584d1e)
 

data/lib/beaker/host.rb

@@ -291,13 +291,25 @@ module Beaker
 
         # create necessary directory structure on host
         required_dirs = (dir_source.map{ | dir | File.dirname(dir) }).uniq
+        require 'pathname'
+        source_path = Pathname.new(source)
         required_dirs.each do |dir|
-          mkdir_p( File.join(target, dir) )
+          dir_path = Pathname.new(dir)
+          if dir_path.absolute?
+            mkdir_p(File.join(target,dir_path.relative_path_from(source_path)))
+          else
+            mkdir_p( File.join(target, dir) )
+          end
         end
 
         # copy each file to the host
         dir_source.each do |s|
-          file_path = File.join(target, s)
+          s_path = Pathname.new(s)
+          if s_path.absolute?
+            file_path = File.join(target,s_path.relative_path_from(source_path))
+          else
+            file_path = File.join(target, s)
+          end
           result = connection.scp_to(s, file_path, options, $dry_run)
         end
       end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -101,15 +101,15 @@ module Beaker
         @logger.debug "Reviewing: #{region.name}"
         @ec2.regions[region.name].instances.each do |instance|
           if (instance.key_name =~ /#{key}/)
-            @logger.debug "Examining #{instance.id} (keyname: #{key}, launch time: #{instance.launch_time}, status: #{instance.status})"
-          end
-          if (instance.key_name =~ /#{key}/) and ((time_now - instance.launch_time) >  ZOMBIE*60*60) and instance.status.to_s !~ /terminated/
-            @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
-            begin
-              instance.terminate()
-              kill_count += 1
-            rescue AWS::EC2::Errors => e
-              @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
+            @logger.debug "Examining #{instance.id} (keyname: #{instance.key_name}, launch time: #{instance.launch_time}, status: #{instance.status})"
+            if ((time_now - instance.launch_time) >  max_age*60*60) and instance.status.to_s !~ /terminated/
+              @logger.debug "Kill! #{instance.id}: #{instance.key_name} (Current status: #{instance.status})"
+              begin
+                instance.terminate()
+                kill_count += 1
+              rescue AWS::EC2::Errors => e
+                @logger.debug "Failed to remove instance: #{instance.id}, #{e}"
+              end
             end
           end
         end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.17.3'
+    STRING = '1.17.4'
   end
 end

data/spec/beaker/host_spec.rb

@@ -246,6 +246,66 @@ module Beaker
         host.do_scp_to *args
       end
 
+      context "using an ignore array with an absolute source path" do
+        source_path = '/repos/puppetlabs-inifile'
+        target_path = '/etc/puppetlabs/modules/inifile'
+        before :each do
+          test_dir = "#{source_path}/tests"
+          other_test_dir = "#{source_path}/tests2"
+
+          files = [
+              '00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb',
+              '01_TestSetup.rb', '03_PuppetMasterSanity.rb',
+              '06_InstallModules.rb','02_PuppetUserAndGroup.rb',
+              '04_ValidateSignCert.rb', '07_InstallCACerts.rb'              ]
+
+          @fileset1 = files.shuffle.map {|file| test_dir + '/' + file }
+          @fileset2 = files.shuffle.map {|file| other_test_dir + '/' + file }
+
+          create_files( @fileset1 )
+          create_files( @fileset2 )
+        end
+        it 'can take an ignore list that excludes all files and not call scp_to', :use_fakefs => true do
+          logger = host[:logger]
+          conn = double(:connection)
+          @options = { :logger => logger }
+          host.instance_variable_set :@connection, conn
+          args = [ source_path, target_path, {:ignore => ['tests', 'tests2']} ]
+
+          logger.should_receive(:debug)
+          host.should_receive( :mkdir_p ).exactly(0).times
+          conn.should_receive(:scp_to).exactly(0).times
+
+          host.do_scp_to *args
+        end
+        it 'can take an ignore list that excludes a single file and scp the rest', :use_fakefs => true do
+          exclude_file = '07_InstallCACerts.rb'
+          logger = host[:logger]
+          conn = double(:connection)
+          @options = { :logger => logger }
+          host.instance_variable_set :@connection, conn
+          args = [ source_path, target_path, {:ignore => [exclude_file]} ]
+
+          Dir.stub( :glob ).and_return( @fileset1 + @fileset2 )
+
+          logger.should_receive(:debug)
+          host.should_receive( :mkdir_p ).with("#{target_path}/tests")
+          host.should_receive( :mkdir_p ).with("#{target_path}/tests2")
+          (@fileset1 + @fileset2).each do |file|
+            if file !~ /#{exclude_file}/
+              file_args = [ file, File.join(target_path, file.gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              conn_args = file_args + [ nil ]
+              conn.should_receive(:scp_to).with( *conn_args ).and_return(Beaker::Result.new(host, 'output!'))
+            else
+              file_args = [ file, File.join(target_path, file.gsub(source_path,'')), {:ignore => [exclude_file]} ]
+              conn_args = file_args + [ nil ]
+              conn.should_not_receive(:scp_to).with( *conn_args )
+            end
+          end
+
+          host.do_scp_to *args
+        end
+      end
       context "using an ignore array" do
 
         before :each do

metadata

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