beaker 1.14.1 → 1.15.0

data/lib/beaker/dsl/helpers.rb

@@ -689,10 +689,8 @@ module Beaker
 
       # @!visibility private
       def bounce_service host, service, curl_retries = 120
-        # Any reason to not
-        # host.exec puppet_resource( 'service', service, 'ensure=stopped' )
-        # host.exec puppet_resource( 'service', service, 'ensure=running' )
-        host.exec( Command.new( "#{host['service-prefix']}#{service} restart" ) )
+        host.exec puppet_resource( 'service', service, 'ensure=stopped' )
+        host.exec puppet_resource( 'service', service, 'ensure=running' )
         curl_with_retries(" #{service} ", host, "https://localhost:8140", [35, 60], curl_retries)
       end
 

data/lib/beaker/dsl/install_utils.rb

@@ -603,7 +603,7 @@ module Beaker
           host.install_package('lsb-release')
         end
 
-        if ! host.check_for_package 'curl'
+        if ! host.check_for_command 'curl'
           on host, 'apt-get install -y curl'
         end
 
@@ -688,7 +688,7 @@ module Beaker
       # @raise [StandardError] if gem does not exist on target host
       # @api private
       def install_puppet_from_gem( host, opts )
-        if host.check_for_package( 'gem' )
+        if host.check_for_command( 'gem' )
           if opts[:facter_version]
             on host, "gem install facter -v#{opts[:facter_version]}"
           end

data/lib/beaker/host/unix.rb

@@ -19,7 +19,6 @@ module Unix
       h.merge({
         'user'          => 'root',
         'group'         => 'pe-puppet',
-        'service-prefix'=> '/etc/init.d/',
         'master-start-curl-retries' => 120,
         'puppetservice' => 'pe-httpd',
         'puppetpath'    => '/etc/puppetlabs/puppet',

data/lib/beaker/logger.rb

@@ -143,8 +143,9 @@ module Beaker
       else
         if string.respond_to?( :encode )
           # We're running in >= 1.9 and we'll need to convert
-          # Remove invalide and undefined UTF-8 character encodings
-          string.encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
+          # Remove invalid and undefined UTF-8 character encodings
+          encoding = Encoding ? Encoding.default_external : "UTF-8"
+          return string.encode(encoding, string.encoding, :invalid => :replace, :undef => :replace, :replace => '')
         else
           # We're running 1.8, do nothing
           string

data/lib/beaker/platform.rb

@@ -1,10 +1,11 @@
 module Beaker
-  #This class create a Platform object inheriting from String.  It supports all String methods while adding
-  #several platform-specific use cases.
+  # This class create a Platform object inheriting from String.  It supports
+  # all String methods while adding several platform-specific use cases.
   class Platform < String
-    #Supported platforms
+    # Supported platforms
     PLATFORMS = /^(osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
-    #Platform version numbers vs. codenames conversion hash
+
+    # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "wheezy"  => "7",
                      "squeeze" => "6",
@@ -14,21 +15,26 @@ module Beaker
                      "raring"  => "1304",
                      "quantal" => "1210",
                      "precise" => "1204",
+                     "lucid"   => "1004",
                    },
       }
 
     # A string with the name of the platform.
     attr_reader :variant
+
     # A string with the version number of the platform.
     attr_reader :version
+
     # A string with the codename of the platform+version, nil on platforms
     # without codenames.
     attr_reader :codename
+
     # A string with the cpu architecture of the platform.
     attr_reader :arch
 
-    #Creates the Platform object.  Checks to ensure that the platform String provided meets the platform
-    #formatting rules.  Platforms name must be of the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
+    # Creates the Platform object.  Checks to ensure that the platform String
+    # provided meets the platform formatting rules.  Platforms name must be of
+    # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
     # * osx
     # * centos
     # * fedora

data/lib/beaker/result.rb

@@ -33,8 +33,9 @@ module Beaker
     def convert string
       if string.respond_to?( :encode )
         # We're running in >= 1.9 and we'll need to convert
-        # Remove invalide and undefined UTF-8 character encodings
-        return string.encode('UTF-8', 'binary', :invalid => :replace, :undef => :replace, :replace => '')
+        # Remove invalid and undefined UTF-8 character encodings
+        encoding = Encoding ? Encoding.default_external : "UTF-8"
+        return string.encode(encoding, string.encoding, :invalid => :replace, :undef => :replace, :replace => '')
       else
         # We're running in < 1.9 and Ruby doesn't care
         return string

data/lib/beaker/version.rb

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

data/spec/beaker/dsl/helpers_spec.rb

@@ -761,7 +761,7 @@ describe ClassMixedWithDSLHelpers do
     let(:test_case_path) { 'testcase/path' }
     let(:tmpdir_path) { '/tmp/tmpdir' }
     let(:puppet_path) { '/puppet/path' }
-    let(:puppetservice) { @ps || nil }
+    let(:puppetservice) { nil }
     let(:is_pe) { false }
     let(:host) do
       FakeHost.new(:pe => is_pe,
@@ -805,7 +805,8 @@ describe ClassMixedWithDSLHelpers do
         it 'bounces puppet twice' do
           subject.stub(:curl_with_retries)
           subject.with_puppet_running_on(host, {})
-          expect(host).to execute_commands_matching(/#{@ps} restart/).exactly(2).times
+          expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=stopped/).exactly(2).times
+          expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=running/).exactly(2).times
         end
 
         it 'yield to a block after bouncing service' do
@@ -813,11 +814,13 @@ describe ClassMixedWithDSLHelpers do
           subject.stub(:curl_with_retries)
           expect do
             subject.with_puppet_running_on(host, {}) do
-              expect(host).to execute_commands_matching(/#{@ps} restart/).once
+              expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=stopped/).once
+              expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=running/).once
               execution += 1
             end
           end.to change { execution }.by(1)
-          expect(host).to execute_commands_matching(/#{@ps} restart/).exactly(2).times
+          expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=stopped/).exactly(2).times
+          expect(host).to execute_commands_matching(/puppet resource service #{puppetservice} ensure=running/).exactly(2).times
         end
       end
 

data/spec/beaker/platform_spec.rb

@@ -74,6 +74,11 @@ module Beaker
         expect( platform.with_version_codename ).to be === 'ubuntu-quantal-xxx'
       end
 
+      it "can convert ubuntu-10.04-xxx to ubuntu-lucid-xxx" do
+        @name = 'ubuntu-10.04-xxx'
+        expect( platform.with_version_codename ).to be === 'ubuntu-lucid-xxx'
+      end
+
       it "leaves centos-7-xxx alone" do
         @name = 'centos-7-xxx'
         expect( platform.with_version_codename ).to be === 'centos-7-xxx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -332,6 +332,7 @@ files:
 - .travis.yml
 - DOCUMENTING.md
 - Gemfile
+- HISTORY.md
 - LICENSE
 - README.md
 - Rakefile