beaker 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODViOGJiN2ZhMDlmNjQ4NmQxNTNkMjZiNjhlYTc5MjI0NzIyNmEzMA==
+    ZGEyOTZiYzFiN2YzMzJhYjYwNjg5NWE5Yjc5ZTg5NGYxMjVmODMzZA==
   data.tar.gz: !binary |-
-    N2U1MDk2NWUwZjNmNGE2Zjc0MDQ2Y2ZhMzk3M2ZjYTJkMWNhMmJhYw==
+    YzkyNjNlMDdlZDE0ZDlhNWQzMjFjMTBkOGNjNDEyNzA1NjMyYmFjYg==
 SHA512:
   metadata.gz: !binary |-
-    Yjg1OTYzNGNmZTBiOTU2YWMwZjA5NjUyOTc5M2JhZjY2NTMwOTQxNzk2NTNk
-    OWYzNGU4NzgxNjA0NGIxYmMyNWQzNzYxM2Q4Y2U1MWY4MTE3MDg5M2I1Y2Ey
-    NGUwYWI5OTIyZGRlNTU4MjYzYmMwMTkxZTUxMTkwYWFmMDk5NDE=
+    MDVjOGE4ZWJlYjgxYmJkYzY2ODQ5ZjExNDQyOWZjY2ZjMjEyY2YxZjZlM2I4
+    NTc5Njg0YTk2NGNiMzFkYWNmY2YyNDNiNjFmOWU1OTlkOTU0YWJjZTBmYTIy
+    MGM5ZDZlOTFlMWU4OWVjMGY1YjVlZjEyMzcxMjgwOTZjMzM2YWI=
   data.tar.gz: !binary |-
-    ZWZjY2FlNzE2MzNmZDE4MDJlMjFiMzEyMjNlOWFiZDZmNDExMjU5Y2U1YWQw
-    MDUyODBlMzIwM2VmNDNhMmVjOWZjOWRlMGQxODYzZTFmNzQ2OWVhOWI4MDU0
-    Njk1YWEzMDk3M2JlMDlhZjZmMDkxNDNiNjAwZWE5ZWUxODQyZGM=
+    MjRkZTgxNjM5MDhlODExMWI0ZTIwYzE5YzM3NmI0Yzg5ZDkwOGNlYWNlZTM4
+    YzAzOGE4YWQyNTljNjUyZDM1NTE3MjVmZGU4OWE5MjI3ZWM3NjNkNWY1N2Nk
+    MDc2OGNlNWE2NjRiMDBhMjU5NzMxMmMyMDlhNzQwMjFkZTMwMjI=

data/lib/beaker/answers/version32.rb

@@ -13,6 +13,14 @@ module Beaker
           the_answers[dashboard.name][:q_puppetmaster_certname] = master_certname
         end
 
+        if options[:type] == :upgrade && dashboard != database
+          # In a split configuration, there is no way for the upgrader
+          # to know how much disk space is available for the database
+          # migration. We tell it to continue on, because we're
+          # awesome.
+          the_answers[dashboard.name][:q_upgrade_with_unknown_disk_space] = 'y'
+        end
+
         return the_answers
       end
     end

data/lib/beaker/dsl/helpers.rb

@@ -724,7 +724,7 @@ module Beaker
           args << { :environment => opts[:environment]}
         end
 
-        file_path = "/tmp/apply_manifest.#{rand(1000000000).to_s}.pp"
+        file_path = host.tmpfile('apply_manifest.pp')
         create_remote_file(host, file_path, manifest + "\n")
         args << file_path
         on host, puppet( 'apply', *args), on_options, &block
@@ -819,10 +819,14 @@ module Beaker
       # This wraps the method `stub_hosts_on` and makes the stub specific to
       # the forge alias.
       #
+      # forge api v1 canonical source is forge.puppetlabs.com
+      # forge api v3 canonical source is forgeapi.puppetlabs.com
+      #
       # @param machine [String] the host to perform the stub on
       def stub_forge_on(machine)
         @forge_ip ||= Resolv.getaddress(forge)
         stub_hosts_on(machine, 'forge.puppetlabs.com' => @forge_ip)
+        stub_hosts_on(machine, 'forgeapi.puppetlabs.com' => @forge_ip)
       end
 
       # This wraps the method `stub_hosts` and makes the stub specific to

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.5.0'
+    STRING = '1.6.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -300,26 +300,26 @@ describe ClassMixedWithDSLHelpers do
     it 'calls puppet' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
-        with( 'my_host', 'puppet_command',
+        with( agent, 'puppet_command',
               :acceptable_exit_codes => [0] )
 
-      subject.apply_manifest_on( 'my_host', 'class { "boo": }')
+      subject.apply_manifest_on( agent, 'class { "boo": }')
     end
     it 'adds acceptable exit codes with :catch_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
-        with( 'my_host', 'puppet_command',
+        with( agent, 'puppet_command',
               :acceptable_exit_codes => [0,2] )
 
-      subject.apply_manifest_on( 'my_host',
+      subject.apply_manifest_on( agent,
                                 'class { "boo": }',
                                 :trace => true,
                                 :catch_failures => true )
@@ -327,14 +327,14 @@ describe ClassMixedWithDSLHelpers do
     it 'allows acceptable exit codes through :catch_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).
-        with( 'my_host', 'puppet_command',
+        with( agent, 'puppet_command',
               :acceptable_exit_codes => [4,0,2] )
 
-      subject.apply_manifest_on( 'my_host',
+      subject.apply_manifest_on( agent,
                                 'class { "boo": }',
                                 :acceptable_exit_codes => [4],
                                 :trace => true,
@@ -343,17 +343,17 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces a 0 exit code through :catch_changes' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
-        'my_host',
+        agent,
         'puppet_command',
         :acceptable_exit_codes => [0]
       )
 
       subject.apply_manifest_on(
-        'my_host',
+        agent,
         'class { "boo": }',
         :trace         => true,
         :catch_changes => true
@@ -362,17 +362,17 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces a 2 exit code through :expect_changes' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
-        'my_host',
+        agent,
         'puppet_command',
         :acceptable_exit_codes => [2]
       )
 
       subject.apply_manifest_on(
-        'my_host',
+        agent,
         'class { "boo": }',
         :trace         => true,
         :expect_changes => true
@@ -381,17 +381,17 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces exit codes through :expect_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
-        'my_host',
+        agent,
         'puppet_command',
         :acceptable_exit_codes => [1,4,6]
       )
 
       subject.apply_manifest_on(
-        'my_host',
+        agent,
         'class { "boo": }',
         :trace           => true,
         :expect_failures => true
@@ -400,7 +400,7 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces exit codes through :expect_failures' do
       expect {
         subject.apply_manifest_on(
-          'my_host',
+          agent,
           'class { "boo": }',
           :trace           => true,
           :expect_failures => true,
@@ -411,17 +411,17 @@ describe ClassMixedWithDSLHelpers do
     it 'enforces added exit codes through :expect_failures' do
       subject.should_receive( :create_remote_file ).and_return( true )
       subject.should_receive( :puppet ).
-        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', /apply_manifest.\d+.pp/ ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
         and_return( 'puppet_command' )
 
       subject.should_receive( :on ).with(
-        'my_host',
+        agent,
         'puppet_command',
         :acceptable_exit_codes => [1,2,3,4,5,6]
       )
 
       subject.apply_manifest_on(
-        'my_host',
+        agent,
         'class { "boo": }',
         :acceptable_exit_codes => (1..5),
         :trace                 => true,
@@ -479,6 +479,8 @@ describe ClassMixedWithDSLHelpers do
         with( 'my_forge.example.com' ).and_return( '127.0.0.1' )
       subject.should_receive( :stub_hosts_on ).
         with( 'my_host', 'forge.puppetlabs.com' => '127.0.0.1' )
+      subject.should_receive( :stub_hosts_on ).
+        with( 'my_host', 'forgeapi.puppetlabs.com' => '127.0.0.1' )
 
       subject.stub_forge_on( 'my_host' )
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec