beaker 1.6.2 → 1.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2IxZWQ2ODlhMWE0MTg5MGE5OWZiOGU2YWNjZjRhM2MxMThkMGFkZA==
+    YjhhNzM3MzA5MGZmZTdjMDg5MGI1YmVlMDY1ZGI2NWFmMTUyZGE5YQ==
   data.tar.gz: !binary |-
-    ZGY4NWZkMzc0ZGI5MmQwODNiMmI1ZGNmY2Y0ZTNhOGFhNWY3YTA4YQ==
+    MTgxNDk2NTBkMWY0NzA2MDc0NGIwMjQzM2IxZjBlY2M0NGE3NWYxMA==
 SHA512:
   metadata.gz: !binary |-
-    OWZhY2Q3ZTExMzI1OTI5NmRjYzVhOGNiNWI5YzhhYjEyNzFlYjM4YTJhMmI5
-    YTAzZWM2YWVkNDU1N2EwNjIyZGNjODk1NjZjODI5OTkwMzI3ZDExY2RkMTAy
-    ZjU5NDA3NzA1YWZhN2Y2YTI2YjJiZThkMzNhODA2ZDcxYWVlYTg=
+    YWQ0ZGI3Yzk2NmQ5NDdlZDUzMmJkMzFiOGUyNjk0MzFkNmEwNjBlN2FhYTZj
+    N2I3NjM3Zjk1NDM5MjhjMWEwZWFjNTQxZWFjNTljMDllZjA3NjAzZmUyMzg4
+    ZThiMzBmM2U1ZjYxN2I0ZDUxYWIwNThhNzAxYTQxZjAyZWE0MGY=
   data.tar.gz: !binary |-
-    ZWJiYzg2MGY5MWU1OTVmMzUxYTNkYzVkODJjNTBkOWYzMzgxMTkzMTFkODll
-    YzY2ZDBmNjhlZTMzMWY3ZGFhYWU1ODQ4NWUwMGE2MzIzMWJlODg5OTBlODZj
-    OTk3YzM1ZWZkMmRjNTg0NjMzMmExYjMwNzM1YTJmY2U1OTk2YjI=
+    ZWQwYmYxMGIxZjliYjA4NTNkZmZlNjI0MWEzNjcxNDI1ZGNlMDk0NDcyODg4
+    ZDI0MDdiMmZhNzE4NDY4ZGE3MDQwMTZlOTRjNjQ4M2ZiMmQzZmE4NDlhNTY0
+    ZWQzYTgyMThmYzNlYTkwZWYzNTliM2RmZjJlMzlmOGZkYTA3NDg=

data/.gitignore

@@ -12,6 +12,13 @@ coverage
 .bundle
 .vendor
 _vendor
-!tmp/README
-tmp/*
+tmp/
 doc
+# JetBrains IDEA
+*.iml
+.idea/
+# rbenv file
+.ruby-version
+# Vagrant folder
+.vagrant/
+.vagrant_files/

data/lib/beaker/cli.rb

@@ -15,16 +15,23 @@ module Beaker
       @options = @options_parser.parse_args
       @logger = Beaker::Logger.new(@options)
       @options[:logger] = @logger
+      @execute = true
 
       if @options[:help]
         @logger.notify(@options_parser.usage)
-        exit
+        @execute = false
+        return
       end
       if @options[:version]
         @logger.notify(VERSION_STRING % Beaker::Version::STRING)
-        exit
+        @execute = false
+        return
       end
       @logger.info(@options.dump)
+      if @options[:parse_only]
+        @execute = false
+        return
+      end
 
       #add additional paths to the LOAD_PATH
       if not @options[:load_path].empty?
@@ -81,6 +88,9 @@ module Beaker
 
     def execute!
 
+      if !@execute
+        return
+      end
       begin
         trap(:INT) do
           @logger.warn "Interrupt received; exiting..."

data/lib/beaker/dsl/helpers.rb

@@ -675,14 +675,14 @@ module Beaker
       #
       def apply_manifest_on(host, manifest, opts = {}, &block)
         if host.is_a?(Array)
-          host.each do |h|
+          return host.map do |h|
             apply_manifest_on(h, manifest, opts, &block)
           end
-          return
         end
 
         on_options = {}
-        on_options[:acceptable_exit_codes] = Array(opts.delete(:acceptable_exit_codes))
+        on_options[:acceptable_exit_codes] = Array(opts[:acceptable_exit_codes])
+
         args = ["--verbose"]
         args << "--parseonly" if opts[:parseonly]
         args << "--trace" if opts[:trace]

data/lib/beaker/dsl/install_utils.rb

@@ -131,8 +131,8 @@ module Beaker
 
       #Create the PE install command string based upon the host and options settings
       # @param [Host] host The host that PE is to be installed on
+      #                    For UNIX machines using the full PE installer, the host object must have the 'pe_installer' field set correctly.
       # @param [Hash{Symbol=>String}] options The options
-      # @option options [String] :installer The name of the installer to use for upgrading/installing
       # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                          (Othersie uses individual Windows hosts pe_ver)
       # @option options [String  :pe_ver Default PE version to install or upgrade to
@@ -150,7 +150,7 @@ module Beaker
         elsif host['roles'].include? 'frictionless' and ! version_is_less(version, '3.2.0')
           "cd #{host['working_dir']} && curl -kO https://#{master}:8140/packages/#{version}/install.bash && bash install.bash"
         else
-          "cd #{host['working_dir']}/#{host['dist']} && ./#{options[:installer]} -a #{host['working_dir']}/answers"
+          "cd #{host['working_dir']}/#{host['dist']} && ./#{host['pe_installer']} -a #{host['working_dir']}/answers"
         end
       end
 
@@ -258,7 +258,6 @@ module Beaker
       #                  (Otherwise uses individual hosts pe_ver)
       # @option options [String] :pe_ver_win Default PE version to install or upgrade to on Windows hosts
       #                  (Otherwise uses individual Windows hosts pe_ver)
-      # @option options [String] :installer ('puppet-enterprise-installer') The name of the installer to use for upgrading/installing
       # @option options [Symbol] :type (:install) One of :upgrade or :install
       #
       #                      
@@ -268,7 +267,6 @@ module Beaker
       # @api private
       #
       def do_install hosts, options = {}
-        options[:installer] = options[:installer] || 'puppet-enterprise-installer' 
         options[:type] = options[:type] || :install 
         hostcert='uname | grep -i sunos > /dev/null && hostname || hostname -s'
         master_certname = on(master, hostcert).stdout.strip
@@ -278,6 +276,7 @@ module Beaker
         # Set PE distribution for all the hosts, create working dir
         use_all_tar = ENV['PE_USE_ALL_TAR'] == 'true'
         hosts.each do |host|
+          host['pe_installer'] ||= 'puppet-enterprise-installer'
           if host['platform'] !~ /windows/
             platform = use_all_tar ? 'all' : host['platform']
             version = options[:pe_ver] || host['pe_ver']
@@ -452,12 +451,13 @@ module Beaker
       def install_pe 
         #process the version files if necessary
         hosts.each do |host|
+          host['pe_dir'] ||= options[:pe_dir]
           if host['platform'] =~ /windows/
             host['pe_ver'] = host['pe_ver'] || 
-              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || options[:pe_dir], options[:pe_version_file_win])
+              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file_win])
           else
             host['pe_ver'] = host['pe_ver'] || 
-              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir] || options[:pe_dir], options[:pe_version_file])
+              Beaker::Options::PEVersionScraper.load_pe_version(host[:pe_dir], options[:pe_version_file])
           end
         end
         do_install sorted_hosts
@@ -466,31 +466,28 @@ module Beaker
       #Upgrade PE based upon host configuration and options
       # @param [String] path A path (either local directory or a URL to a listing of PE builds). 
       #                      Will contain a LATEST file indicating the latest build to install.
+      #                      This is ignored if a pe_upgrade_ver and pe_upgrade_dir are specified
+      #                      in the host configuration file.
       # @example 
       #  upgrade_pe("http://neptune.puppetlabs.lan/3.0/ci-ready/")
       #
       # @note Install file names are assumed to be of the format puppet-enterprise-VERSION-PLATFORM.(tar)|(tar.gz)
       #       for Unix like systems and puppet-enterprise-VERSION.msi for Windows systems.
       # @api dsl
-      def upgrade_pe path 
-        version = Options::PEVersionScraper.load_pe_version(path, options[:pe_version_file])
-        version_win = Options::PEVersionScraper.load_pe_version(path, options[:pe_version_file_win])
-        pre_30 = version_is_less(version, '3.0')
-        if pre_30
-          do_install(sorted_hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win => version_win, :installer => 'puppet-enterprise-upgrader'})
-        else
-          do_install(sorted_hosts, {:type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win =>  version_win})
-        end
-        #at this point we've completed a successful upgrade, update the host pe_ver to reflect that
+      def upgrade_pe path=nil
         hosts.each do |host|
+          host['pe_dir'] = host['pe_upgrade_dir'] || path
           if host['platform'] =~ /windows/
-            host['pe_ver'] = version_win
+            host['pe_ver'] = host['pe_upgrade_ver'] || Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file_win])
           else
-            host['pe_ver'] = version
+            host['pe_ver'] = host['pe_upgrade_ver'] || Options::PEVersionScraper.load_pe_version(host['pe_dir'], options[:pe_version_file])
+          end
+          if version_is_less(host['pe_ver'], '3.0')
+            host['pe_installer'] ||= 'puppet-enterprise-upgrader'
           end
         end
+        do_install(sorted_hosts, {:type => :upgrade})
       end
-
     end
   end
 end

data/lib/beaker/host.rb

@@ -158,7 +158,7 @@ module Beaker
       if options[:silent]
         output_callback = nil
       else
-        @logger.debug "\n#{log_prefix} $ #{cmdline}"
+        @logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{cmdline}"
         output_callback = logger.method(:host_output)
       end
 

data/lib/beaker/hypervisor/vagrant.rb

@@ -18,7 +18,7 @@ module Beaker
       "10.255.#{rand_chunk}.#{rand_chunk}"
     end
 
-    def make_vfile hosts
+    def make_vfile hosts, options = {}
       #HACK HACK HACK - add checks here to ensure that we have box + box_url
       #generate the VagrantFile
       v_file = "Vagrant.configure(\"2\") do |c|\n"
@@ -34,7 +34,7 @@ module Beaker
         @logger.debug "created Vagrantfile for VagrantHost #{host.name}"
       end
       v_file << "  c.vm.provider :virtualbox do |vb|\n"
-      v_file << "    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n"
+      v_file << "    vb.customize [\"modifyvm\", :id, \"--memory\", \"#{options['vagrant_memsize'] ||= '1024'}\"]\n"
       v_file << "  end\n"
       v_file << "end\n"
       File.open(@vagrant_file, 'w') do |f|
@@ -65,11 +65,11 @@ module Beaker
     def set_ssh_config host, user
         f = Tempfile.new("#{host.name}")
         ssh_config = Dir.chdir(@vagrant_path) do
-          stdin, stdout, stderr, wait_thr = Open3.popen3('vagrant', 'ssh-config', host.name)
-          if not wait_thr.value.success?
-            raise "Failed to 'vagrant ssh-config' for #{host.name}"
+          result = `vagrant ssh-config #{host.name}`
+          if $?.to_i != 0
+            raise "Failed to vagrant ssh-config for #{host.name}"
           end
-          stdout.read
+          result
         end
         #replace hostname with ip
         ssh_config = ssh_config.gsub(/#{host.name}/, host['ip']) unless not host['ip']
@@ -117,7 +117,7 @@ module Beaker
         #make sure that any old boxes are dead dead dead
         vagrant_cmd("destroy --force") if File.file?(@vagrant_file)
 
-        make_vfile @vagrant_hosts
+        make_vfile @vagrant_hosts, @options
 
         vagrant_cmd("up")
       else #set host ip of already up boxes
@@ -155,18 +155,12 @@ module Beaker
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        exit_status = 1
-        Open3.popen3("vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
-          while line = stdout.gets
-            @logger.debug(line)
-          end
-          if not wait_thr.value.success?
-            raise "Failed to exec 'vagrant #{args}'"
-          end
-          exit_status = wait_thr.value 
-        }
-        if exit_status != 0
-          raise "Failed to execute vagrant_cmd ( #{args} )"
+        result = `vagrant #{args} 2>&1`
+        result.each_line do |line|
+          @logger.debug(line)
+        end
+        if $?.to_i != 0
+          raise "Failed to exec 'vagrant #{args}'"
         end
       end
     end

data/lib/beaker/logger.rb

@@ -51,18 +51,18 @@ module Beaker
       options = args.last.is_a?(Hash) ? args.pop : {}
       @color = options[:color]
       case options[:log_level]
-      when /debug/i
+      when /debug/i, :debug
         @log_level = :debug
-      when   /verbose/i
+      when /verbose/i, :verbose
         @log_level = :verbose
-      when /info/i
+      when /info/i, :info
         @log_level = :info
-      when /notify/i
+      when /notify/i, :notify
         @log_level = :notify
-      when /warn/i
+      when /warn/i, :warn
         @log_level = :warn
       else
-        @log_level = :info
+        @log_level = :verbose
       end
       @destinations = []
 
@@ -129,11 +129,11 @@ module Beaker
     end
 
     # Custom reporting for messages generated by host SUTs.  
-    # Will not print unless we are at {LOG_LEVELS} 'debug' or higher.  
+    # Will not print unless we are at {LOG_LEVELS} 'verbose' or higher.  
     # Strips any color codes already in the provided messages, then adds logger color codes before reporting
     # @param args[Array<String>] Strings to be reported
     def host_output *args
-      return unless is_debug?
+      return unless is_verbose?
       strings = strip_colors_from args
       string = strings.join
       optionally_color GREY, string, false

data/lib/beaker/options/command_line_parser.rb

@@ -135,11 +135,6 @@ module Beaker
             @cmd_options[:log_level] = val
           end
 
-          opts.on '--[no-]debug',
-                  'DEPRECATED, use --log-level' do |bool|
-            @cmd_options[:log_level] =  bool ? 'debug' : 'info'
-          end
-
           opts.on  '-d', '--[no-]dry-run',
                    'Report what would happen on targets',
                    '(default: false)' do |bool|
@@ -179,14 +174,24 @@ module Beaker
             @cmd_options[:version] = true
           end
 
-          opts.on '-c', '--config FILE',
-                  'DEPRECATED use --hosts' do |file|
-            @cmd_options[:hosts_file] = file
+          opts.on('--parse-only', 'Display beaker parsed options and exit' ) do 
+            @cmd_options[:parse_only] = true
           end
 
           opts.on('--help', 'Display this screen' ) do 
             @cmd_options[:help] = true
           end
+
+          opts.on '-c', '--config FILE',
+                  'DEPRECATED, use --hosts' do |file|
+            @cmd_options[:hosts_file] = file
+          end
+
+          opts.on '--[no-]debug',
+                  'DEPRECATED, use --log-level' do |bool|
+            @cmd_options[:log_level] =  bool ? 'debug' : 'info'
+          end
+
         end
 
       end

data/lib/beaker/options/presets.rb

@@ -29,7 +29,7 @@ module Beaker
       def self.presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
-          :log_level => 'info',
+          :log_level => 'verbose',
           :hosts_file => 'sample.cfg',
           :options_file => nil,
           :type => 'pe',

data/lib/beaker/shared/host_handler.rb

@@ -22,7 +22,7 @@ module Beaker
       end
 
       def get_ip(host)
-        host.exec(Command.new("ip a|awk '/g/{print$2}' | cut -d/ -f1 | head -1")).stdout.chomp
+        host.exec(Command.new("ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1")).stdout.chomp
       end
 
       def set_etc_hosts(host, etc_hosts)

data/lib/beaker/test_suite.rb

@@ -247,7 +247,7 @@ module Beaker
     end
 
     def log_path(name)
-      @@log_dir ||= File.join("log", @start_time.strftime("%F_%T"))
+      @@log_dir ||= File.join("log", @start_time.strftime("%F_%H_%M_%S"))
       unless File.directory?(@@log_dir) then
         FileUtils.mkdir_p(@@log_dir)
 

data/lib/beaker/utils/setup_helper.rb

@@ -23,7 +23,7 @@ module Beaker
         if master['platform'].include? 'solaris'
           stdout = master.exec(Command.new("ifconfig -a inet| awk '/broadcast/ {print $2}' | cut -d/ -f1 | head -1")).stdout
         else
-          stdout = master.exec(Command.new("ip a|awk '/g/{print$2}' | cut -d/ -f1 | head -1")).stdout
+          stdout = master.exec(Command.new("ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1")).stdout
         end
         ip=stdout.chomp
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.6.2'
+    STRING = '1.7.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -310,7 +310,7 @@ describe ClassMixedWithDSLHelpers do
       subject.apply_manifest_on( agent, 'class { "boo": }')
     end
 
-    it 'accepts an array of hosts' do
+    it 'operates on an array of hosts' do
       the_hosts = [master, agent]
 
       subject.should_receive( :create_remote_file ).twice.and_return( true )
@@ -321,10 +321,11 @@ describe ClassMixedWithDSLHelpers do
 
         subject.should_receive( :on ).
           with( host, 'puppet_command',
-                :acceptable_exit_codes => [0] ).ordered
+                :acceptable_exit_codes => [0, 1] ).ordered
       end
 
-      subject.apply_manifest_on( the_hosts, 'include foobar')
+      result = subject.apply_manifest_on( the_hosts, 'include foobar', :acceptable_exit_codes => [0,1] )
+      result.should(be_an(Array))
     end
 
     it 'adds acceptable exit codes with :catch_failures' do

data/spec/beaker/dsl/install_utils_spec.rb

@@ -130,7 +130,9 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'generates a unix PE install command for a unix host' do
-      expect( subject.installer_cmd( unixhost, { :installer => 'puppet-enterprise-installer' } ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -a /tmp/answers"
+      the_host = unixhost.dup
+      the_host['pe_installer'] = 'puppet-enterprise-installer'
+      expect( subject.installer_cmd( the_host, {} ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -a /tmp/answers"
     end
   end
 
@@ -350,35 +352,44 @@ describe ClassMixedWithDSLInstallUtils do
     it 'calls puppet-enterprise-upgrader for pre 3.0 upgrades' do
       Beaker::Options::PEVersionScraper.stub( :load_pe_version ).and_return( '2.8' )
       Beaker::Options::PEVersionScraper.stub( :load_pe_version_win ).and_return( '2.8' )
-      subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2] ] )
+      the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
+      subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
       version = version_win = '2.8'
       path = "/path/to/upgradepkg"
-      subject.should_receive( :do_install ).with( hosts, { :type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win => version_win, :installer => 'puppet-enterprise-upgrader' } )
+      subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )
       subject.upgrade_pe( path )
+      the_hosts.each do |h|
+        expect( h['pe_installer'] ).to be === 'puppet-enterprise-upgrader'
+      end
     end
 
     it 'uses standard upgrader for post 3.0 upgrades' do
       Beaker::Options::PEVersionScraper.stub( :load_pe_version ).and_return( '3.1' )
       Beaker::Options::PEVersionScraper.stub( :load_pe_version_win ).and_return( '3.1' )
-      subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2] ]  )
+      the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
+      subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
       version = version_win = '3.1'
       path = "/path/to/upgradepkg"
-      subject.should_receive( :do_install ).with( hosts, { :type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win => version_win } )
+      subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )
       subject.upgrade_pe( path )
+      the_hosts.each do |h|
+        expect( h['pe_installer'] ).to be nil
+      end
     end
 
     it 'updates pe_ver post upgrade' do
       Beaker::Options::PEVersionScraper.stub( :load_pe_version ).and_return( '2.8' )
       Beaker::Options::PEVersionScraper.stub( :load_pe_version_win ).and_return( '2.8' )
-      subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2] ] )
+      the_hosts = [ hosts[0].dup, hosts[1].dup, hosts[2].dup ]
+      subject.stub( :hosts ).and_return( the_hosts )
       subject.stub( :options ).and_return( {} )
       version = version_win = '2.8'
       path = "/path/to/upgradepkg"
-      subject.should_receive( :do_install ).with( hosts, { :type => :upgrade, :pe_dir => path, :pe_ver => version, :pe_ver_win => version_win, :installer => 'puppet-enterprise-upgrader' } )
+      subject.should_receive( :do_install ).with( the_hosts, { :type => :upgrade } )
       subject.upgrade_pe( path )
-      hosts.each do |h|
+      the_hosts.each do |h|
         expect( h['pe_ver'] ).to be === '2.8'
       end
     end

data/spec/beaker/host_spec.rb

@@ -115,7 +115,7 @@ module Beaker
       it 'logs the amount of time spent executing the command' do
         result.exit_code = 0
 
-        expect(host.logger).to receive(:debug).with(/host executed in \d\.\d{2} seconds/)
+        expect(host.logger).to receive(:debug).with(/executed in \d\.\d{2} seconds/)
 
         host.exec(command,{})
       end

data/spec/beaker/hypervisor/vagrant_spec.rb

@@ -28,6 +28,21 @@ module Beaker
       expect( File.read( File.expand_path( File.join( path, "Vagrantfile") ) ) ).to be === "Vagrant.configure(\"2\") do |c|\n  c.vm.define 'vm1' do |v|\n    v.vm.hostname = 'vm1'\n    v.vm.box = 'vm1_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm1'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm1\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm2' do |v|\n    v.vm.hostname = 'vm2'\n    v.vm.box = 'vm2_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm2'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm2\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.define 'vm3' do |v|\n    v.vm.hostname = 'vm3'\n    v.vm.box = 'vm3_of_my_box'\n    v.vm.box_url = 'http://address.for.my.box.vm3'\n    v.vm.base_mac = '0123456789'\n    v.vm.network :private_network, ip: \"ip.address.for.vm3\", :netmask => \"255.255.0.0\"\n  end\n  c.vm.provider :virtualbox do |vb|\n    vb.customize [\"modifyvm\", :id, \"--memory\", \"1024\"]\n  end\nend\n"
     end
 
+    it "uses the memsize defined per vagrant host" do
+      FakeFS.activate!
+      path = vagrant.instance_variable_get( :@vagrant_path )
+      vagrant.stub( :randmac ).and_return( "0123456789" )
+
+      vagrant.make_vfile( @hosts, {'vagrant_memsize' => 'hello!'} )
+
+      generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
+
+      match = generated_file.match(/vb.customize \["modifyvm", :id, "--memory", "hello!"]/)
+
+      expect( match ).to_not be nil
+
+    end
+
     it "can generate a new /etc/hosts file referencing each host" do
 
       @hosts.each do |host|
@@ -66,8 +81,7 @@ module Beaker
       name = host.name
       Dir.stub( :chdir ).and_yield()
 
-      out = double( 'stdout' )
-      out.stub( :read ).and_return("Host #{host.name}
+      vagrant.should_receive(:`).and_return("Host #{host.name}
     HostName 127.0.0.1
     User vagrant
     Port 2222
@@ -76,12 +90,6 @@ module Beaker
     PasswordAuthentication no
     IdentityFile /home/root/.vagrant.d/insecure_private_key
     IdentitiesOnly yes")
-      wait_thr = OpenStruct.new
-      state = mock( 'state' )
-      state.stub( :success? ).and_return( true )
-      wait_thr.value = state
-
-      Open3.stub( :popen3 ).with( 'vagrant', 'ssh-config', host.name ).and_return( [ "", out, "", wait_thr ])
 
       file = double( 'file' )
       file.stub( :path ).and_return( '/path/sshconfig' )
@@ -139,14 +147,15 @@ module Beaker
       end
 
       it "can provision a set of hosts" do
-        vagrant.should_receive( :make_vfile ).with( @hosts ).once
+        options = vagrant.instance_variable_get( :@options )
+        vagrant.should_receive( :make_vfile ).with( @hosts, options ).once
         vagrant.should_receive( :vagrant_cmd ).with( "destroy --force" ).never
         vagrant.provision
       end
 
       it "destroys an existing set of hosts before provisioning" do
-        vagrant.make_vfile(@hosts)
-        vagrant.should_receive(:vagrant_cmd).with("destroy --force").once
+        vagrant.make_vfile( @hosts )
+        vagrant.should_receive( :vagrant_cmd ).with( "destroy --force" ).once
         vagrant.provision
       end
 

data/spec/beaker/logger_spec.rb

@@ -16,7 +16,7 @@ module Beaker
       context 'default for' do
         its(:destinations)  { should include(STDOUT)  }
         its(:color)         { should be_nil           }
-        its(:log_level)     { should be :info       }
+        its(:log_level)     { should be :verbose      }
       end
     end
 
@@ -54,6 +54,30 @@ module Beaker
         colorized_logger.optionally_color "\e[00;30m", 'my string'
       end
 
+      context 'at verbose log_level' do
+        subject( :verbose_logger )  { Logger.new( my_io,
+                                              :log_level => 'verbose',
+                                              :quiet => true,
+                                              :color => true )
+                                  }
+
+        its( :is_debug? ) { should be_false }
+        its( :is_verbose? ) { should be_true }
+        its( :is_warn? )  { should be_true }
+
+        context 'but print' do
+          before do
+            my_io.stub :puts
+            my_io.should_receive( :print ).at_least :twice
+          end
+
+          it( 'warnings' )    { verbose_logger.warn 'IMA WARNING!'    }
+          it( 'successes' )   { verbose_logger.success 'SUCCESS!'     }
+          it( 'errors' )      { verbose_logger.error 'ERROR!'         }
+          it( 'host_output' ) { verbose_logger.host_output 'ERROR!'   }
+          it( 'debugs' )      { verbose_logger.debug 'NOT DEBUGGING!' }
+        end
+      end
 
       context 'at debug log_level' do
         subject( :debug_logger )  { Logger.new( my_io,
@@ -65,7 +89,6 @@ module Beaker
         its( :is_debug? ) { should be_true }
         its( :is_warn? )  { should be_true }
 
-
         context 'successfully print' do
           before do
             my_io.stub :puts
@@ -82,8 +105,9 @@ module Beaker
 
       context 'at info log_level' do
         subject( :info_logger ) { Logger.new( my_io,
-                                              :quiet => true,
-                                              :color => true )
+                                              :log_level => :info,
+                                              :quiet     => true,
+                                              :color     => true )
                                   }
 
         its( :is_debug? ) { should be_false }

data/spec/beaker/shared/host_handler_spec.rb

@@ -36,7 +36,7 @@ module Beaker
         it "can exec the get_ip command" do
           host = make_host('name', { :stdout => "192.168.2.130\n" } )
 
-          Command.should_receive( :new ).with( "ip a|awk '/g/{print$2}' | cut -d/ -f1 | head -1" ).once
+          Command.should_receive( :new ).with( "ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1" ).once
 
           expect( host_handler.get_ip( host ) ).to be === "192.168.2.130"
 

data/spec/beaker/utils/setup_helper_spec.rb

@@ -20,7 +20,7 @@ module Beaker
           path = Beaker::Utils::SetupHelper::ETC_HOSTS_PATH
           master = setup_helper.only_host_with_role(hosts, :master)
 
-          Command.should_receive( :new ).with( "ip a|awk '/g/{print$2}' | cut -d/ -f1 | head -1" ).once
+          Command.should_receive( :new ).with( "ip a|awk '/global/{print$2}' | cut -d/ -f1 | head -1" ).once
           Command.should_receive( :new ).with( "cp %s %s.old" % [path, path] ).once
           Command.should_receive( :new ).with( "cp %s %s.new" % [path, path] ).once
           Command.should_receive( :new ).with( "grep -v '#{ip} #{master}' %s > %s.new" % [path, path] ).once

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec