beaker 2.28.0 → 2.29.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWE3MmE2YzFiZGU2MDMwMDI1YTUyNTMxMDZhYmQ1OTY0NTRkMTk3Yg==
+    MzFmNmVhOTYzNjFkNjM3NjNmYTBjMDk3Njc1NGYwYmE2MGQ0NzM2ZA==
   data.tar.gz: !binary |-
-    MDkxZmJjOTA5OWU4NDMyMmM4NjMxM2U5OTc5ZmY4NzFmNzM2YzA2ZQ==
+    ZGIzM2M4YzE1MzZkYWNiNDNiMGYxMDc2ZmI0MTVkZmEzN2I4OThmOA==
 SHA512:
   metadata.gz: !binary |-
-    ODNhOTgzNmEyZjIyMTI4OTE3OWE1MGEwOWQwNmQ3ZjA4YzliOGI0YTQ0Yzdi
-    YmI1MjQ2Yzg0NDg5ZjYxYzZkYjMyZDYzNjNlZjgwNjdjMjAzNGQ3MWNhNWVh
-    MjAxMmQzNDA1YTc2YjU0M2VlZjNhZmQ0ZjZhMWI1ZWYxZjQxZGQ=
+    NTA5Yjk4YWNkOWRmMjE5OGNlMGQ1NGQ2OTgwNWVhZjYyZjI5YjA1OTgxZWYx
+    NjM1ZjMxYzU2Yzg0MDViOWZkZjQzNzJhYjA2NmY5ZjU1MjMxNmMyMWU1MDli
+    M2U0NmI3Njk4OGU1YzIwYTM4NjVmOThhNmZjYzU0ODE0NTkzZDg=
   data.tar.gz: !binary |-
-    Y2U5YmIxNDMzNmY2NjdjODg3NDgxNmY4MDFlYTcwOGU4NGE2ZDc4MGJhMmI1
-    NGVjMjM4OGE3MmM5ZjQ0NTBhZDFkMGQ1MzZmNmZlMWIzZjM2NDFjZDdjNmM1
-    NjExNjQ2OTA3MzJkMjU1MGE2NGVkYmFiNjgzMzMyYTBiZDNlY2M=
+    OTVlN2UzYjljMWQxNjU4ODE0ZTlkYmY0NDg0NmNlZTliOTUyOGE5ZWU2MTQ5
+    NGE5OTRlYWE5NjRkZWY2N2IzOTFmNTY4ZjVjMjk2MDRhZjU0ZjRiMWU4ZGNh
+    ZWJjNTEzY2ZjYTVmYTEzZTZiOWY2ZTc4MTc3YTk4OWMxMWI3ZjI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 4 Nov, 2015 (aadc0fcc)](#LATEST)
+* [LATEST - 18 Nov, 2015 (5ae7782f)](#LATEST)
+* [2.28.0 - 4 Nov, 2015 (89829551)](#2.28.0)
 * [2.27.0 - 21 Oct, 2015 (0378d13a)](#2.27.0)
 * [2.26.0 - 13 Oct, 2015 (427a512b)](#2.26.0)
 * [2.25.0 - 1 Oct, 2015 (51d4cb1a)](#2.25.0)
@@ -100,7 +101,105 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 4 Nov, 2015 (aadc0fcc)
+### <a name = "LATEST">LATEST - 18 Nov, 2015 (5ae7782f)
+
+* (GEM) update beaker version to 2.29.0 (5ae7782f)
+
+* Merge pull request #1011 from developerinlondon/feature/BKR-625-add-mounting-folder-option (4bc5750e)
+
+
+```
+Merge pull request #1011 from developerinlondon/feature/BKR-625-add-mounting-folder-option
+
+(BKR-625) Added ability to mount a folder.
+```
+* Merge pull request #1010 from dylanratcliffe/bkr-624/fix-line_prefix_length (e48e8752)
+
+
+```
+Merge pull request #1010 from dylanratcliffe/bkr-624/fix-line_prefix_length
+
+(BKR-624) Added a setter for line_prefix
+```
+* (BKR-624) Modified `step_in` and `step_out` methods so that you can set (e72689b5)
+
+
+```
+(BKR-624) Modified `step_in` and `step_out` methods so that you can set
+`line_prefix` explicitly and they will still work.
+```
+* BKR-625: Added ability to mount a folder. (e047bd84)
+
+
+```
+BKR-625: Added ability to mount a folder.
+
+Without this patch there is no way to mount a local folder inside the beaker nodes.
+
+With this patch folders can be mounted similar to below:
+
+
+    HOSTS:
+      ubuntu-1404-x64-master:
+        roles:
+          - master
+          - agent
+          - dashboard
+          - database
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+        mount_folders:
+          folder1:
+            from: ./
+            to: /vagrant/folder1
+          tmp:
+            from: /tmp
+            to: /vagrant/tmp
+        ip: 192.168.20.20
+      ubuntu-1404-x64-agent:
+        roles:
+          - agent
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+        ip: 192.168.21.21
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+
+
+
+In the above beaker will mount the folders ./ to /vagrant/folder1 and the folder /tmp to /vagrant/tmp
+
+This relates to the new feature ticket opened on puppetlab here: https://tickets.puppetlabs.com/browse/BKR-625
+```
+* Merge pull request #1007 from adrienthebo/bkr-517-print-exception-class-message (5780f563)
+
+
+```
+Merge pull request #1007 from adrienthebo/bkr-517-print-exception-class-message
+
+(BRK-617) Print exception message for test cases
+```
+* (BRK-617) Print exception message for test cases (788b9cda)
+
+
+```
+(BRK-617) Print exception message for test cases
+
+Some exceptions implement the `#inspect` method to only print the class
+name or otherwise change the output to not include the error message in
+question, which makes such exceptions very challenging to deubg. This
+commit changes the test case exception printing method to explicitly
+print the exception class and message so that there's always relevant
+context available when an exception is raised.
+```
+### <a name = "2.28.0">2.28.0 - 4 Nov, 2015 (89829551)
+
+* (HISTORY) update beaker history for gem release 2.28.0 (89829551)
 
 * (GEM) update beaker version to 2.28.0 (aadc0fcc)
 

data/docs/hypervisors/vagrant.md

@@ -0,0 +1,40 @@
+When using the Vagrant Hypervisor, beaker can mount specific local directories as synced_folders inside the vagrant box.
+This is done by using the 'mount_folders' option in the nodeset file.
+
+Example hosts file:
+
+    HOSTS:
+      ubuntu-1404-x64-master:
+        roles:
+          - master
+          - agent
+          - dashboard
+          - database
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+        mount_folders:
+          folder1:
+            from: ./
+            to: /vagrant/folder1
+          tmp:
+            from: /tmp
+            to: /vagrant/tmp
+        ip: 192.168.20.20
+      ubuntu-1404-x64-agent:
+        roles:
+          - agent
+        platform: ubuntu-1404-x86_64
+        hypervisor: vagrant
+        box: puppetlabs/ubuntu-14.04-64-nocm
+        box_url: https://vagrantcloud.com/puppetlabs/boxes/ubuntu-14.04-64-nocm
+        ip: 192.168.21.21
+    CONFIG:
+      nfs_server: none
+      consoleport: 443
+
+In the above beaker will mount the folders ./ to /vagrant/folder1 and the folder /tmp to /vagrant/tmp
+
+## Supported Virtualization Providers ##
+* [Vagrant](Vagrant-Support.md)

data/lib/beaker/hypervisor/vagrant.rb

@@ -35,6 +35,12 @@ module Beaker
         v_file << "    v.vm.synced_folder '.', '/vagrant', disabled: true\n" if host['synced_folder'] == 'disabled'
         v_file << "    v.vm.network :private_network, ip: \"#{host['ip'].to_s}\", :netmask => \"#{host['netmask'] ||= "255.255.0.0"}\", :mac => \"#{randmac}\"\n"
 
+        unless host['mount_folders'].nil? 
+          host['mount_folders'].each do |name, folder|
+            v_file << "    v.vm.synced_folder '#{folder[:from]}', '#{folder[:to]}', create: true\n"
+          end
+        end
+
         if /windows/i.match(host['platform'])
           v_file << "    v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
           v_file << "    v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"

data/lib/beaker/logger.rb

@@ -78,7 +78,6 @@ module Beaker
       end
 
       @last_result = nil
-      @line_prefix_length = 0
       @line_prefix = ''
 
       @destinations = []
@@ -118,7 +117,6 @@ module Beaker
       dests.each {|dest| add_destination(dest)}
     end
 
-
     # Turn on/off STDOUT logging
     # @param [Boolean] off If true, disable STDOUT logging, if false enable STDOUT logging
     def quiet(off = true)
@@ -238,17 +236,14 @@ module Beaker
     #
     # @return nil
     def step_in
-      @line_prefix_length += 2
-      @line_prefix = ' ' * @line_prefix_length
+      self.line_prefix = self.line_prefix + '  '
     end
 
     # Sets the step level appropriately for logging to be indented correctly
     #
     # @return nil
     def step_out
-      @line_prefix_length -= 2
-      @line_prefix_length = 0 if @line_prefix_length < 0
-      @line_prefix = ' ' * @line_prefix_length
+      self.line_prefix = self.line_prefix.chop.chop
     end
 
     # Custom reporting for messages generated by host SUTs.

data/lib/beaker/test_case.rb

@@ -160,7 +160,7 @@ module Beaker
         #
         # @param exception [Exception] exception to fail with
         def log_and_fail_test(exception)
-          logger.error(exception.inspect)
+          logger.error("#{exception.class}: #{exception.message}")
           bt = exception.backtrace
           logger.pretty_backtrace(bt).each_line do |line|
             logger.error(line)

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.28.0'
+    STRING = '2.29.0'
   end
 end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -14,7 +14,12 @@ module Beaker
     let( :vagrant ) { Beaker::Vagrant.new( @hosts, options ) }
 
     before :each do
-      @hosts = make_hosts()
+      @hosts = make_hosts({
+        :mount_folders => {
+          :test_temp => {:from => './', :to => '/temp'},
+          :test_tmp => {:from => '../', :to => '/tmp'}
+        }
+      })
     end
 
     it "stores the vagrant file in $WORKINGDIR/.vagrant/beaker_vagrant_files/sample.cfg" do
@@ -41,6 +46,8 @@ Vagrant.configure("2") do |c|
     v.vm.box_url = 'http://address.for.my.box.vm1'
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm1", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.synced_folder './', '/temp', create: true
+    v.vm.synced_folder '../', '/tmp', create: true
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end
@@ -51,6 +58,8 @@ Vagrant.configure("2") do |c|
     v.vm.box_url = 'http://address.for.my.box.vm2'
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm2", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.synced_folder './', '/temp', create: true
+    v.vm.synced_folder '../', '/tmp', create: true
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end
@@ -61,6 +70,8 @@ Vagrant.configure("2") do |c|
     v.vm.box_url = 'http://address.for.my.box.vm3'
     v.vm.box_check_update = 'true'
     v.vm.network :private_network, ip: "ip.address.for.vm3", :netmask => "255.255.0.0", :mac => "0123456789"
+    v.vm.synced_folder './', '/temp', create: true
+    v.vm.synced_folder '../', '/tmp', create: true
     v.vm.provider :virtualbox do |vb|
       vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
     end

data/spec/beaker/logger_spec.rb

@@ -47,10 +47,10 @@ module Beaker
 
     context '#prefix_log_line' do
       def prefix_log_line_test_compare_helper(in_test, out_answer, step_in_loop=1)
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
         step_in_loop.times { logger.step_in() }
         expect( logger.prefix_log_line(in_test) ).to be === out_answer
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
       end
 
       it 'can be successfully called with a arrays' do
@@ -86,33 +86,63 @@ module Beaker
 
     context '#step_* methods' do
       it 'steps in correctly (simple case)' do
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
         logger.step_in()
-        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 2
         expect( logger.line_prefix ).to be === '  '
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
       end
 
       it 'sets length correctly in mixed scenario ' do
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
         logger.step_in()
         logger.step_in()
         logger.step_out()
         logger.step_in()
         logger.step_in()
         logger.step_out()
-        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 4
         expect( logger.line_prefix ).to be === '    '
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
       end
 
       it 'can be unevenly stepped out, will remain at base: 0' do
-        logger.instance_variable_set( :@line_prefix_length, 0 )
+        logger.line_prefix = ''
         logger.step_in()
         10.times { logger.step_out() }
-        expect( logger.instance_variable_get( :@line_prefix_length ) ).to be === 0
         expect( logger.line_prefix ).to be === ''
       end
+
+      it 'can handle arbitrary strings as prefixes' do
+        logger.line_prefix = ''
+        logger.line_prefix = 'Some string:'
+        expect( logger.line_prefix ).to be === 'Some string:'
+        logger.line_prefix = ''
+      end
+
+      it 'can handle stepping in with arbitrary strings' do
+        logger.line_prefix = ''
+        logger.line_prefix = 'Some string:'
+        logger.step_in()
+        logger.step_in()
+        expect( logger.line_prefix ).to be === 'Some string:    '
+        logger.line_prefix = ''
+      end
+
+      it 'can handle stepping out with arbitrary strings' do
+        logger.line_prefix = ''
+        logger.line_prefix = 'Some string:'
+        10.times { logger.step_out() }
+        expect( logger.line_prefix ).to be === ''
+        logger.line_prefix = ''
+      end
+
+      it 'can handle stepping in and out with arbitrary strings' do
+        logger.line_prefix = ''
+        logger.line_prefix = 'Some string:'
+        10.times { logger.step_in() }
+        10.times { logger.step_out() }
+        expect( logger.line_prefix ).to be === 'Some string:'
+        logger.line_prefix = ''
+      end
     end
 
     context 'new' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.28.0
+  version: 2.29.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -546,6 +546,7 @@ files:
 - docs/hosts/eos.md
 - docs/hypervisors/README.md
 - docs/hypervisors/aws.md
+- docs/hypervisors/vagrant.md
 - docs/vSphere-Support.md
 - ext/completion/beaker-completion.bash
 - lib/beaker.rb