beaker 1.17.1 → 1.17.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODE0YzQ4ODExNWQ2NjRhZDcwZmI0MmZjNWE1YTkyMDlkOTQzNDUyYw==
+    ZTBjNDZkNTNjYTM2YTcxMDYxNGVkODBlYzk4ZGY3ZjhiZWE0NGI4Yw==
   data.tar.gz: !binary |-
-    MzliNzczZTJjZGVlMjNlNjJhMjYyMTFkMGQ4YjlhMTIwNTFkMzBlNg==
+    YmU5OTVmYmI5MmU5ODZhZDE3Njg3MWVlOGYyNTM2NTg0ZGMxYzdlNg==
 SHA512:
   metadata.gz: !binary |-
-    MTdmODVkY2ZlYTI2YjRjNTJkNTlmNjEzYTk3NWYzYWI5NDhmMzNjYWE2N2E3
-    YmE1ODI4NDgxOWUzMWZkNzhlZDlhY2IyYTEzMGIxODA1Yzg1Mzg3ZTczYTcz
-    NTgyMzIzZGQ3YTRlZDI3ODhhNDYyOWIzMTYwNGE0MjM4YmRiOWU=
+    YjFhMDMxMTFmYjFjMDg1ZjIyOTc2NjQ1MDllNGZiYjVkMDM3YTQxZThkMjgw
+    ODk2ODc0MTE4OGE4ZTBlOWUwMTdlZjIyOTNmOTQ2N2FjOTliNTVlNDZlMTU5
+    NzVlZWY3MjBjODhhMzdiNWRmNmM3ZGRiNzIwZTg4ZjU2NWQxZDY=
   data.tar.gz: !binary |-
-    MzE3ZGQxMjc4Yjk0YjYwMmJlNWI0ODcwNGE4YjBmNzkzMmEwMjk5MjJjZjRl
-    MjVmMDY0YjEzYjgzODM0YmM2MDgyZjEwMDZlMjJlMjQ1MjlmYThiMDUxZjc3
-    ODM2NzhlZWU0MzJhMDUyZWYzMmM5ODRhYzk1ZDVhZjQxMDExYjc=
+    NzEzMTg0NzdmZDA3NTI0MjM0OTVhZWRhYWQ0MTgxMGRjMDcyOGRlNDMwODQ0
+    ZjE5MjY2Mjg2OGZjY2VmZmExMTEzNTRmNjkwZDNmYjY0NDUwNTI1NjA1MDBl
+    NGM3MjM4N2ZmMDE3YTY3ZGMyN2I5MWUwMjczZWJiZWU3NGY5MWI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 12 Aug, 2014 (0cb4134e)](#LATEST)
+* [LATEST - 15 Aug, 2014 (f6227484)](#LATEST)
+* [beaker1.17.1 - 12 Aug, 2014 (72e60299)](#beaker1.17.1)
 * [beaker1.17.0 - 12 Aug, 2014 (fb482b56)](#beaker1.17.0)
 * [beaker1.16.0 - 17 Jul, 2014 (c1267696)](#beaker1.16.0)
 * [beaker1.15.0 - 8 Jul, 2014 (82bb4ef9)](#beaker1.15.0)
@@ -53,9 +54,97 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 12 Aug, 2014 (0cb4134e)
+### <a name = "LATEST">LATEST - 15 Aug, 2014 (f6227484)
 
-* (HISTORY) update HISTORY.md for 1.17.1 gem (0cb4134e)
+* (GEM) update version number for 1.17.2 (f6227484)
+
+* Merge pull request #406 from anodelman/ec2 (5799458b)
+
+
+```
+Merge pull request #406 from anodelman/ec2
+
+(QENG-1090) beaker: exception when waiting for instance running in ec2
+```
+* Merge pull request #403 from anodelman/win-fix (956aa18c)
+
+
+```
+Merge pull request #403 from anodelman/win-fix
+
+(QENG-1081) Beaker Fails During Pre-suite in the "install_pe"...
+```
+* Merge pull request #405 from anodelman/utf-8-encoding (410490e4)
+
+
+```
+Merge pull request #405 from anodelman/utf-8-encoding
+
+(QENG-1087) beaker - failure in XML output
+```
+* Merge pull request #404 from anodelman/fix-default (cc38a7f4)
+
+
+```
+Merge pull request #404 from anodelman/fix-default
+
+(QENG-1086) The master-start-curl-retries is preset to...
+```
+* (QENG-1090) beaker: exception when waiting for instance running in ec2 (ae64c8e9)
+
+
+```
+(QENG-1090) beaker: exception when waiting for instance running in ec2
+
+- correctly capture AWS::EC2::Errors::InvalidInstanceID::NotFound when
+  checking status of newly created instance, deal with it as another
+  case that requires a retry
+```
+* (QENG-1087) beaker - failure in XML output (5a392c1a)
+
+
+```
+(QENG-1087) beaker - failure in XML output
+
+- caused by improperly stripping unsupported unicode characters from xml
+  output
+- add inclusion of 'jcode' for ruby 1.8 (included with Ruby and adds
+  lots of useful Unicode-oriented features to String and Regexp)
+- tested on 1.9 and 1.8 and correctly replaced invalid unicode with
+  escaped hex value
+```
+* (QENG-1086) The master-start-curl-retries is preset to... (77610212)
+
+
+```
+(QENG-1086) The master-start-curl-retries is preset to...
+
+...0, which causes default hosts not to retry verifying a bounced master.
+
+- host value being overwritten by default presets
+```
+* (QENG-1081) Beaker Fails During Pre-suite in the "install_pe"... (f08d67b1)
+
+
+```
+(QENG-1081) Beaker Fails During Pre-suite in the "install_pe"...
+
+... Function on Windows
+
+- when using an array of hosts the command object was overwritten and
+  thus the platform specific information was lost
+```
+### <a name = "beaker1.17.1">beaker1.17.1 - 12 Aug, 2014 (72e60299)
+
+* Merge pull request #399 from anodelman/make-gem (72e60299)
+
+
+```
+Merge pull request #399 from anodelman/make-gem
+
+create beaker 1.17.1 gem
+```
+* (HISTORY) update HISTORY.md for 1.17.1 gem (21480832)
 
 * (GEM) create beaker 1.17.1 gem (07b67f32)
 

data/lib/beaker.rb

@@ -33,6 +33,12 @@ module Beaker
   # Shared methods and helpers
   require 'beaker/shared'
 
+  # utf-8 support in ruby 1.8
+  if RUBY_VERSION.to_f < 1.9
+    require 'jcode'
+    $KCODE="u"
+  end
+
   # Add pry support when available
   begin
     require 'pry'

data/lib/beaker/dsl/helpers.rb

@@ -78,16 +78,16 @@ module Beaker
       # @raise  [FailTest] Raises an exception if *command* obviously fails.
       def on(host, command, opts = {}, &block)
         block_on host do | host |
+          cur_command = command
           if command.is_a? Command
-            command = command.cmd_line(host)
+            cur_command = command.cmd_line(host)
           end
           cmd_opts = {}
           #add any additional environment variables to the command
           if opts[:environment]
             cmd_opts['ENV'] = opts[:environment]
           end
-          command = Command.new(command.to_s, [], cmd_opts)
-          @result = host.exec(command, opts)
+          @result = host.exec(Command.new(cur_command.to_s, [], cmd_opts), opts)
 
           # Also, let additional checking be performed by the caller.
           if block_given?

data/lib/beaker/host/unix.rb

@@ -19,7 +19,6 @@ module Unix
       h.merge({
         'user'          => 'root',
         'group'         => 'pe-puppet',
-        'master-start-curl-retries' => 120,
         'jvm-puppet-confdir' => '/etc/puppetlabs/jvm-puppet/conf.d',
         'puppetservice'    => 'pe-httpd',
         'puppetpath'       => '/etc/puppetlabs/puppet',
@@ -40,7 +39,6 @@ module Unix
       h.merge({
         'user'              => 'root',
         'group'             => 'puppet',
-        'master-start-curl-retries' => 120,
         'jvm-puppet-confdir' => '/etc/jvm-puppet/conf.d',
         'puppetservice'     => 'puppetmaster',
         'puppetpath'        => '/etc/puppet',

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -223,12 +223,16 @@ module Beaker
         # exponential backoff for each poll.
         # TODO: should probably be a in a shared method somewhere
         for tries in 1..10
-          if instance.status == status
-            # Always sleep, so the next command won't cause a throttle
-            backoff_sleep(tries)
-            break
-          elsif tries == 10
-            raise "Instance never reached state #{status}"
+          begin
+            if instance.status == status
+              # Always sleep, so the next command won't cause a throttle
+              backoff_sleep(tries)
+              break
+            elsif tries == 10
+              raise "Instance never reached state #{status}"
+            end
+          rescue AWS::EC2::Errors::InvalidInstanceID::NotFound => e
+            @logger.debug("Instance #{name} not yet available (#{e})")
           end
           backoff_sleep(tries)
         end

data/lib/beaker/options/presets.rb

@@ -97,7 +97,7 @@ module Beaker
           :forge_host           => 'vulcan-acceptance.delivery.puppetlabs.net',
           :log_level            => 'verbose',
           :trace_limit          => 10,
-          :"master-start-curl-retries" => 0,
+          :"master-start-curl-retries" => 120,
           :options_file         => nil,
           :type                 => 'pe',
           :provision            => true,

data/lib/beaker/test_suite.rb

@@ -155,12 +155,33 @@ module Beaker
         text.gsub(/(\e|\^\[)\[(\d*;)*\d*m/, '')
       end
 
+      # Determine if the provided number falls in the range of accepted xml unicode values
+      # See http://www.w3.org/TR/xml/#charsets for valid for valid character specifications.
+      # @param [Integer] int The number to check against
+      # @return [Boolean] True, if the number corresponds to a valid xml unicode character, otherwise false
+      def is_valid_xml(int)
+        return ( int == 0x9 or
+                 int == 0xA or
+               ( int >= 0x0020 and int <= 0xD7FF ) or
+               ( int >= 0xE000 and int <= 0xFFFD ) or
+               ( int >= 0x100000 and int <= 0x10FFFF )
+        )
+      end
+
       # Escape invalid XML UTF-8 codes from provided string, see http://www.w3.org/TR/xml/#charsets for valid
       # character specification
       # @param [String] string The string to remove invalid codes from
       def escape_invalid_xml_chars string
-        re = /\u0009|\u000A|\u000D|[\u0020-\uD7FF]|[\uE000-\uFFFD]|[\u10000-\u10FFFF]/
-        return string.chars.map{|i| i =~ re ? i : "\\#{i.unpack("U*").join}"}.join
+        escaped_string = ""
+        string.chars.each do |i|
+          char_as_codestring = i.unpack("U*").join
+          if is_valid_xml(char_as_codestring.to_i)
+            escaped_string << i
+          else
+            escaped_string << "\\#{char_as_codestring}"
+          end
+        end
+        escaped_string
       end
 
       # Remove color codes and invalid XML characters from provided string

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.17.1'
+    STRING = '1.17.2'
   end
 end

metadata

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