beaker 3.29.0 → 3.30.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWE2MmM4ZWMwNjg0M2ViZjUwNmJmMjFjOWIyNTdkN2M1MjNkMjEzNg==
+    ZjllZDM3MjczNGU1ODhiOGM2M2ZhZTIwMTVjNjQ1MzYzNWRlMTQ2YQ==
   data.tar.gz: !binary |-
-    ZThlOTg3YTg5ZWRhMjIwZWFiYzA0MmE3ZWZmMzc4OTBiYTJjYTYwZA==
+    ZmE2ZDVjMDYxNjBhYzYzMTE1OWNjNDJkMTM1ZGU2YjBhNzNkZDA4MA==
 SHA512:
   metadata.gz: !binary |-
-    NzQ1NmYyMmM3MzhmMTJlOTZiOWJkOGE2MzlhMzkxMzE5NzI2NzJhODY1Y2Q1
-    NDkxOTNmNDIwYzhlZjg1ZGRhNjg3MjEyODI4OGM0MjcyMjc3Mzc1Yzg4ZDEw
-    Njc1ZTBkNjg2ODA3ZDU1MDM1ODQ5NDVkNzQxZWY0ZjI5YjNjZTQ=
+    MTNiY2RiNDA4ZGJmMmExOGNlNzIyZGYzMDUzMTk3Yjc5NmFhZTM2NjNhZWRi
+    MDE3MWYxZDgxODlkN2VkOGIxNDA0N2Q0ZmY1MGNhNjdiZTRiZTQxYzIzYjNj
+    ODNhYjcyZmE0M2ZhMjNjZDZjODU1OWM3YjRiNzY5NWU4NDYzYWQ=
   data.tar.gz: !binary |-
-    ZTczYjM4ZmIyMWFiMGU2NmJiZjdjMzQ5NzI2NzZlZTY1YTU1MzA4ZjE5OGYw
-    NzIwMzJmMWRjNGU2MTljNzIxNzlhZTEzYzVmZjYwNDlmY2NlMDYwNTE0NWMw
-    MTJhZjU3OWVkNTMyZjcwODc1NjRkMzhlMTA0NTg2Zjc4MTYxNGQ=
+    YTQxOGZmNWNjOTJhOWY2ODQ4ZWNiMWRmMzg2MGE3ODI2M2U1M2JjNjU3MDBj
+    MmY3NTRkZjE1MWYzODIyOTc5OGNmMzNlZjVjYjQ5ZmNmZDdjZGM1NDM4Nzg0
+    MzllZDNjMzZmYmZkZWVkOGI3ODRjYWQzY2ExMjA0OTNlNjY1ZGY=

data/CHANGELOG.md

@@ -11,7 +11,21 @@ Tracking in this Changelog began for this project in version 3.25.0.
 If you're looking for changes from before this, refer to the project's
 git logs & PR history.
 
-# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.29.0...master)
+# [Unreleased](https://github.com/puppetlabs/beaker/compare/3.30.0...master)
+
+# [3.30.0](https://github.com/puppetlabs/beaker/compare/3.29.0...3.30.0) - 2018-01-10
+
+### Changed
+
+- Use `host.hostname` when combining options host_hash with host instance options
+
+### Removed
+
+- `amazon` as a platform value
+
+### Added
+
+- Load project options from .beaker.yml
 
 # [3.29.0](https://github.com/puppetlabs/beaker/compare/3.28.0...3.29.0) - 2017-11-16
 

data/acceptance/lib/beaker/acceptance/install_utils.rb

@@ -3,7 +3,7 @@ module Beaker
     module InstallUtils
 
       PLATFORM_PATTERNS = {
-        :redhat        => /fedora|el|centos|amazon/,
+        :redhat        => /fedora|el|centos/,
         :debian        => /debian|ubuntu/,
         :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
         :solaris_10    => /solaris-10/,

data/beaker.gemspec

@@ -55,6 +55,7 @@ Gem::Specification.new do |s|
   # Optional provisioner specific support
   s.add_runtime_dependency 'beaker-docker', '~> 0.1'
   s.add_runtime_dependency 'beaker-aws', '~> 0.1'
+  s.add_runtime_dependency 'beaker-abs', '~> 0.4'
   s.add_runtime_dependency 'beaker-vmpooler', '~> 1.0'
   s.add_runtime_dependency 'beaker-google', '~> 0.1'
   s.add_runtime_dependency 'beaker-vagrant', '~> 0.1'

data/lib/beaker/cli.rb

@@ -41,7 +41,6 @@ module Beaker
         return self
       end
 
-
       #add additional paths to the LOAD_PATH
       if not @options[:load_path].empty?
         @options[:load_path].each do |path|
@@ -257,7 +256,7 @@ module Beaker
         file_host_hash = h.merge(file_host_hash)
         @hosts.each do |host|
           if host_name.to_s == host.name.to_s
-            newly_keyed_hosts_entries[host.reachable_name] = file_host_hash.merge(host.host_hash)
+            newly_keyed_hosts_entries[host.hostname] = file_host_hash.merge(host.host_hash)
             break
           end
         end

data/lib/beaker/dsl/structure.rb

@@ -39,9 +39,10 @@ module Beaker
         logger.notify "\n* #{step_name}\n"
         set_current_step_name(step_name)
         if block_given?
-          logger.step_in()
           begin
-            yield
+            logger.with_indent do
+              yield
+            end
           rescue Exception => e
             if(@options.has_key?(:debug_errors) && @options[:debug_errors] == true)
               logger.info("Exception raised during step execution and debug-errors option is set, entering pry. Exception was: #{e.inspect}")
@@ -50,7 +51,6 @@ module Beaker
             end
             raise e
           end
-          logger.step_out()
         end
       end
 
@@ -120,9 +120,9 @@ module Beaker
         logger.notify "\n#{my_name}\n"
         set_current_test_name(my_name)
         if block_given?
-          logger.step_in()
-          yield
-          logger.step_out()
+          logger.with_indent do
+            yield
+          end
         end
       end
 

data/lib/beaker/host.rb

@@ -332,11 +332,11 @@ module Beaker
         # the options should come at the end of the method signature (rubyism)
         # and they shouldn't be ssh specific
 
-        @logger.step_in()
         seconds = Benchmark.realtime {
-          result = connection.execute(cmdline, options, output_callback)
+          @logger.with_indent do
+            result = connection.execute(cmdline, options, output_callback)
+          end
         }
-        @logger.step_out()
 
         if not options[:silent]
           @logger.debug "\n#{log_prefix} executed in %0.2f seconds" % seconds

data/lib/beaker/host/unix/exec.rb

@@ -168,7 +168,7 @@ module Unix::Exec
       exec(Beaker::Command.new("service ssh restart"))
     when /el-7|centos-7|redhat-7|oracle-7|scientific-7|eos-7|fedora-(1[4-9]|2[0-9])|archlinux-/
       exec(Beaker::Command.new("systemctl restart sshd.service"))
-    when /el-|centos|fedora|redhat|amazon|oracle|scientific|eos/
+    when /el-|centos|fedora|redhat|oracle|scientific|eos/
       exec(Beaker::Command.new("/sbin/service sshd restart"))
     when /sles/
       exec(Beaker::Command.new("rcsshd restart"))
@@ -196,7 +196,7 @@ module Unix::Exec
       directory = create_tmpdir_on(self)
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-    when /el-|centos|fedora|redhat|amazon|oracle|scientific|eos/
+    when /el-|centos|fedora|redhat|oracle|scientific|eos/
       directory = create_tmpdir_on(self)
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))

data/lib/beaker/host/unix/pkg.rb

@@ -39,7 +39,7 @@ module Unix::Pkg
       when /el-4/
         @logger.debug("Package query not supported on rhel4")
         return false
-      when /cisco|fedora|amazon|centos|eos|el-/
+      when /cisco|fedora|centos|eos|el-/
         result = execute("rpm -q #{name}", opts) { |result| result }
       when /ubuntu|debian|cumulus|huaweios/
         result = execute("dpkg -s #{name}", opts) { |result| result }
@@ -407,8 +407,8 @@ module Unix::Pkg
     when /^(solaris)$/
       release_path_end, release_file = solaris_puppet_agent_dev_package_info(
         puppet_collection, puppet_agent_version, opts )
-    when /^(sles|aix|el|centos|oracle|redhat|amazon|scientific)$/
-      variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|amazon|scientific)/)
+    when /^(sles|aix|el|centos|oracle|redhat|scientific)$/
+      variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
       arch = 'ppc' if variant == 'aix' && arch == 'power'
       version = '7.1' if variant == 'aix' && version == '7.2'
       release_path_end = "#{variant}/#{version}/#{puppet_collection}/#{arch}"

data/lib/beaker/host_prebuilt_steps.rb

@@ -444,7 +444,7 @@ module Beaker
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
         elsif host['platform'] =~ /arch|centos-7|el-7|redhat-7|fedora-(1[4-9]|2[0-9])/
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
-        elsif host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
+        elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
         elsif host['platform'] =~ /(free|open)bsd/
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
@@ -463,7 +463,7 @@ module Beaker
     def disable_se_linux host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
+        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
           @logger.debug("Disabling se_linux on #{host.name}")
           host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
         else
@@ -479,7 +479,7 @@ module Beaker
     def disable_iptables host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|amazon|fedora|eos/
+        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
           logger.debug("Disabling iptables on #{host.name}")
           host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
         else
@@ -502,7 +502,7 @@ module Beaker
         case host['platform']
           when /ubuntu/, /debian/, /cumulus/
             host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
-          when /^el-/, /centos/, /fedora/, /redhat/, /amazon/, /eos/
+          when /^el-/, /centos/, /fedora/, /redhat/, /eos/
             host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
         else
           logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
@@ -596,7 +596,7 @@ module Beaker
     #
     # @return [Boolean] if the host is el_based
     def el_based? host
-      ['centos','redhat','amazon','scientific','el','oracle'].include?(host['platform'].variant)
+      ['centos','redhat','scientific','el','oracle'].include?(host['platform'].variant)
     end
 
   end

data/lib/beaker/logger.rb

@@ -232,9 +232,19 @@ module Beaker
       end
     end
 
+    # Indent the step level for the duration of block.
+    def with_indent(&block)
+      old_line_prefix = self.line_prefix.dup
+      self.line_prefix << '  '
+      yield
+    ensure
+      self.line_prefix = old_line_prefix
+    end
+
     # Sets the step level appropriately for logging to be indented correctly
     #
     # @return nil
+    # @deprecated use {Logger#with_indent}
     def step_in
       self.line_prefix = self.line_prefix + '  '
     end
@@ -242,6 +252,7 @@ module Beaker
     # Sets the step level appropriately for logging to be indented correctly
     #
     # @return nil
+    # @deprecated use {Logger#with_indent}
     def step_out
       self.line_prefix = self.line_prefix.chop.chop
     end

data/lib/beaker/options/parser.rb

@@ -206,7 +206,8 @@ module Beaker
       #   4.  options file values
       #   5.  subcommand options, if executing beaker subcommands
       #   6.  subcommand options from $HOME/.beaker/subcommand_options.yaml
-      #   7.  default or preset values are given the lowest priority
+      #   7.  project values in .beaker.yml
+      #   8.  default or preset values are given the lowest priority
       #
       # @param [Array] args ARGV or a provided arguments array
       # @raise [ArgumentError] Raises error on bad input
@@ -217,18 +218,25 @@ module Beaker
         cmd_line_options[:command_line] = ([$0] + args).join(' ')
         @attribution = @attribution.merge(tag_sources(cmd_line_options, "flag"))
 
+        # Merge options in reverse precedence order. First project options,
+        # then global options from $HOME/.beaker/subcommand_options.yaml,
+        # then subcommand options in the project.
         subcommand_options_file = Beaker::Subcommands::SubcommandUtil::SUBCOMMAND_OPTIONS
-        options_files = {"homedir" => "#{ENV['HOME']}/#{subcommand_options_file}", "subcommand" => subcommand_options_file}
-
-        # Global subcommand options from $HOME/.beaker/subcommand_options.yaml are first to get merged into presets
-        # Subcommands are the second to get merged into presets
-        options_files.each do |src, path|
-          opts = Beaker::Options::SubcommandOptionsParser.parse_subcommand_options(args, path)
+        {
+          "project" => ".beaker.yml",
+          "homedir" => "#{ENV['HOME']}/#{subcommand_options_file}",
+          "subcommand" => subcommand_options_file,
+        }.each_pair do |src, path|
+          opts = if src == "project"
+                   Beaker::Options::SubcommandOptionsParser.parse_options_file(path)
+                 else
+                   Beaker::Options::SubcommandOptionsParser.parse_subcommand_options(args, path)
+                 end
           @attribution = @attribution.merge(tag_sources(opts, src))
           @options.merge!(opts)
         end
 
-        file_options                    = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
+        file_options                    = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file] || options[:options_file])
         @attribution = @attribution.merge(tag_sources(file_options, "options_file"))
 
         # merge together command line and file_options

data/lib/beaker/perf.rb

@@ -4,8 +4,8 @@ module Beaker
 
     PERF_PACKAGES = ['sysstat']
     # SLES does not treat sysstat as a service that can be started
-    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|amazon|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
-    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|amazon|centos|oracle|scientific|fedora|el|eos|cumulus/
+    PERF_SUPPORTED_PLATFORMS = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus|sles/
+    PERF_START_PLATFORMS     = /debian|ubuntu|redhat|centos|oracle|scientific|fedora|el|eos|cumulus/
 
     # Create the Perf instance and runs setup_perf_on_host on all hosts if --collect-perf-data
     # was used as an option on the Baker command line invocation. Instances of this class do not
@@ -50,7 +50,7 @@ module Beaker
         @logger.perf_output("Enabling aggressive sysstat polling")
         if host['platform'] =~ /debian|ubuntu/
           host.exec(Command.new('sed -i s/5-55\\\/10/*/ /etc/cron.d/sysstat'))
-        elsif host['platform'] =~ /centos|el|fedora|oracle|redhats|amazon|scientific/
+        elsif host['platform'] =~ /centos|el|fedora|oracle|redhats|scientific/
           host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
         end
       end

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|amazon|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
+    PLATFORMS = /^(huaweios|cisco_nexus|cisco_ios_xr|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|archlinux|el|eos|cumulus|f5|netscaler)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "stretch" => "9",

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.29.0'
+    STRING = '3.30.0'
   end
 end

data/spec/beaker/cli_spec.rb

@@ -47,6 +47,7 @@ module Beaker
 
     let(:cli)      {
       allow(File).to receive(:exists?).and_return(true)
+      allow(File).to receive(:exists?).with('.beaker.yml').and_return(false)
       Beaker::CLI.new.parse_options
     }
 
@@ -61,7 +62,7 @@ module Beaker
       end
     end
 
-    context '#combined_instance_and_options_hosts' do
+    describe '#combined_instance_and_options_hosts' do
       let (:options_host) { {'HOSTS' => {'ubuntu' => {:options_attribute => 'options'}} }}
       let (:instance_host ) {
         [Beaker::Host.create('ubuntu', {:platform => 'host'}, {} )]
@@ -78,6 +79,26 @@ module Beaker
         expect(merged_host['ubuntu'][:options_attribute]).to eq('options')
         expect(merged_host['ubuntu'][:platform]).to eq('host')
       end
+
+      context 'when hosts share IP addresses' do
+        let (:options_host) do
+          {'HOSTS' => {'host1' => {:options_attribute => 'options'},
+                       'host2' => {:options_attribute => 'options'}}}
+        end
+        let (:instance_host ) do
+          [Beaker::Host.create('host1',
+                               {:platform => 'host', :ip => '127.0.0.1'}, {} ),
+           Beaker::Host.create('host2',
+                               {:platform => 'host', :ip => '127.0.0.1'}, {} )]
+        end
+
+        it 'creates separate entries for each host' do
+          expected_hosts = instance_host.map(&:hostname)
+          merged_hosts = cli.combined_instance_and_options_hosts
+
+          expect(merged_hosts.keys).to eq(expected_hosts)
+        end
+      end
     end
 
     context 'execute!' do

data/spec/beaker/dsl/structure_spec.rb

@@ -28,10 +28,9 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'yields if a block is given' do
-      expect( subject ).to receive( :logger ).and_return( logger ).exactly(3).times
+      expect( subject ).to receive( :logger ).and_return( logger ).exactly(2).times
       allow(  subject ).to receive( :set_current_step_name )
-      expect( logger ).to receive( :step_in )
-      expect( logger ).to receive( :step_out )
+      allow( logger ).to receive(:with_indent) { |&block| block.call }
       expect( logger ).to receive( :notify )
       expect( subject ).to receive( :foo )
       subject.step 'blah' do
@@ -130,10 +129,9 @@ describe ClassMixedWithDSLStructure do
 
       it 'yields if a block is given' do
         subject.instance_variable_set(:@options, options)
-        expect( subject ).to receive( :logger ).and_return( logger ).exactly(3).times
+        expect( subject ).to receive( :logger ).and_return( logger ).exactly(2).times
         expect( logger ).to receive( :notify )
-        expect( logger ).to receive( :step_in )
-        expect( logger ).to receive( :step_out )
+        allow( logger ).to receive(:with_indent) { |&block| block.call }
         expect( subject ).to receive( :foo )
         subject.manual_test 'blah' do
           subject.foo
@@ -164,10 +162,9 @@ describe ClassMixedWithDSLStructure do
     end
 
     it 'yields if a block is given' do
-      expect( subject ).to receive( :logger ).and_return( logger ).exactly(3).times
+      expect( subject ).to receive( :logger ).and_return( logger ).exactly(2).times
       expect( logger ).to receive( :notify )
-      expect( logger ).to receive( :step_in )
-      expect( logger ).to receive( :step_out )
+      allow( logger ).to receive(:with_indent) { |&block| block.call }
       expect( subject ).to receive( :foo )
       subject.test_name 'blah' do
         subject.foo
@@ -383,4 +380,4 @@ describe ClassMixedWithDSLStructure do
     end
   end
 
-end
+end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -85,7 +85,7 @@ describe Beaker do
     ]
   end
 
-  ['centos','el-','redhat','fedora','amazon','eos'].each do | rhel_like |
+  ['centos','el-','redhat','fedora','eos'].each do | rhel_like |
     it_should_behave_like 'enables_root_login', rhel_like, [
       "sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\"",
       "sudo -E /sbin/service sshd reload"

data/spec/beaker/host_spec.rb

@@ -209,8 +209,7 @@ module Beaker
         logger = double(:logger)
         allow( logger ).to receive(:host_output)
         allow( logger ).to receive(:debug)
-        allow( logger ).to receive(:step_in)
-        allow( logger ).to receive(:step_out)
+        allow( logger ).to receive(:with_indent) { |&block| block.call }
         host.instance_variable_set :@logger, logger
         conn = double(:connection)
         allow( conn ).to receive(:execute).and_return(result)

data/spec/beaker/logger_spec.rb

@@ -47,11 +47,19 @@ module Beaker
     end
 
     context '#prefix_log_line' do
-      def prefix_log_line_test_compare_helper(in_test, out_answer, step_in_loop=1)
-        logger.line_prefix = ''
-        step_in_loop.times { logger.step_in() }
-        expect( logger.prefix_log_line(in_test) ).to be === out_answer
+      around :each do |example|
         logger.line_prefix = ''
+        begin
+          example.run
+        ensure
+          logger.line_prefix = ''
+        end
+      end
+
+      def prefix_log_line_test_compare_helper(in_test, out_answer)
+        logger.with_indent do
+          expect( logger.prefix_log_line(in_test) ).to be === out_answer
+        end
       end
 
       it 'can be successfully called with a arrays' do
@@ -81,68 +89,70 @@ module Beaker
       it 'can be nested' do
         line_arg = "\n\nwhy should this matter"
         answer = "      \n      \n      why should this matter"
-        prefix_log_line_test_compare_helper(line_arg, answer, 3)
+        logger.with_indent do
+          logger.with_indent do
+            logger.with_indent do
+              expect( logger.prefix_log_line(line_arg) ).to be === answer
+            end
+          end
+        end
       end
     end
 
-    context '#step_* methods' do
-      it 'steps in correctly (simple case)' do
-        logger.line_prefix = ''
-        logger.step_in()
-        expect( logger.line_prefix ).to be === '  '
+    context 'when indenting' do
+      around :each do |example|
         logger.line_prefix = ''
+        begin
+          example.run
+        ensure
+          logger.line_prefix = ''
+        end
       end
 
-      it 'sets length correctly in mixed scenario ' do
-        logger.line_prefix = ''
-        logger.step_in()
-        logger.step_in()
-        logger.step_out()
-        logger.step_in()
-        logger.step_in()
-        logger.step_out()
-        expect( logger.line_prefix ).to be === '    '
-        logger.line_prefix = ''
+      it 'steps in correctly (simple case)' do
+        logger.with_indent do
+          expect( logger.line_prefix ).to be === '  '
+        end
       end
 
-      it 'can be unevenly stepped out, will remain at base: 0' do
-        logger.line_prefix = ''
-        logger.step_in()
-        10.times { logger.step_out() }
-        expect( logger.line_prefix ).to be === ''
+      it 'sets length correctly in mixed scenario ' do
+        logger.with_indent do
+          logger.with_indent {}
+          logger.with_indent do
+            logger.with_indent {}
+            expect( logger.line_prefix ).to be === '    '
+          end
+        end
       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 = ''
+        logger.with_indent do
+          logger.with_indent do
+            expect( logger.line_prefix ).to be === 'Some string:    '
+          end
+        end
       end
 
-      it 'can handle stepping out with arbitrary strings' do
-        logger.line_prefix = ''
+      it 'can handle stepping in and out with arbitrary strings' do
         logger.line_prefix = 'Some string:'
-        10.times { logger.step_out() }
-        expect( logger.line_prefix ).to be === ''
-        logger.line_prefix = ''
+        10.times { logger.with_indent {} }
+        expect( logger.line_prefix ).to be === 'Some string:'
       end
 
-      it 'can handle stepping in and out with arbitrary strings' do
-        logger.line_prefix = ''
+      it 'restores the original prefix if an argument is raised' do
         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 = ''
+        expect do
+          logger.with_indent do
+            raise "whoops"
+          end
+        end.to raise_error(RuntimeError, 'whoops')
+        expect(logger.line_prefix).to eq('Some string:')
       end
     end
 

data/spec/beaker/options/parser_spec.rb

@@ -154,6 +154,12 @@ module Beaker
                   :auth_methods => 'auth_home_123'
               }
           }}
+          let(:project_file) {@project_file || {
+              :level => 'seventh',
+              :ssh => {
+                  :auth_methods => 'auth_project_123'
+              }
+          }}
           let(:presets) { {
               :level => 'lowest',
               :ssh => {
@@ -183,11 +189,13 @@ module Beaker
             allow(OptionsFileParser).to receive(:parse_options_file).and_return(opt_file)
             allow(parser).to receive(:parse_hosts_options).and_return(host_file)
 
-            allow(SubcommandOptionsParser).to receive(:parse_subcommand_options).and_return(homedir_file, subcommand_file)
+            allow(SubcommandOptionsParser).to receive(:parse_options_file).with(".beaker.yml").and_return(project_file)
+            allow(SubcommandOptionsParser).to receive(:parse_subcommand_options).with(anything, "#{ENV['HOME']}/.beaker/subcommand_options.yaml").and_return(homedir_file)
+            allow(SubcommandOptionsParser).to receive(:parse_subcommand_options).with(anything, Pathname(".beaker/subcommand_options.yaml")).and_return(subcommand_file)
           end
 
           it 'presets have the lowest priority' do
-            @env = @argv = @host_file = @opt_file = @subcommand_file = @homedir_file = {}
+            @env = @argv = @host_file = @opt_file = @subcommand_file = @homedir_file = @project_file = {}
             mock_out_parsing
 
             opts = parser.parse_args([])
@@ -196,6 +204,18 @@ module Beaker
             expect(attribution[:level]).to be == 'preset'
           end
 
+          it 'project options should have seventh priority' do
+            @env = @argv = @host_file = @opt_file = @subcommand_file = @homedir_file = {}
+            mock_out_parsing
+
+            opts = parser.parse_args([])
+            attribution = parser.attribution
+            expect(opts[:ssh][:auth_methods]).to be == 'auth_project_123'
+            expect(attribution[:ssh][:auth_methods]).to be == 'project'
+            expect(opts[:level]).to be == 'seventh'
+            expect(attribution[:level]).to be == 'project'
+          end
+
           it 'home directory options should have sixth priority' do
             @env = @argv = @host_file = @opt_file = @subcommand_file = {}
             mock_out_parsing
@@ -266,6 +286,28 @@ module Beaker
             expect(attribution[:level]).to be == 'env'
           end
 
+          it "loads the options file from a project file" do
+            mock_out_parsing
+
+            project_file[:options_file] = 'my_options_file.rb'
+            allow(OptionsFileParser).to receive(:parse_options_file).with('my_options_file.rb').and_return(ssh: {config: true})
+
+            output = parser.parse_args([])
+            attribution = parser.attribution
+            expect(output[:ssh][:config]).to be true
+            expect(attribution[:ssh][:config]).to eq('options_file')
+          end
+
+          it "loads project file options with the init subcommand" do
+            @env = @argv = @host_file = @opt_file = @subcommand_file = @homedir_file = {}
+            mock_out_parsing
+
+            output = parser.parse_args(%w[init --hosts redhat7-64ma])
+            attribution = parser.attribution
+            expect(output[:level]).to eq('seventh')
+            expect(attribution[:level]).to eq('project')
+          end
+
         end
 
         it "can correctly combine arguments from different sources" do
@@ -293,7 +335,6 @@ module Beaker
           args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "nope"]
           expect { parser.parse_args(args) }.to raise_error(ArgumentError)
         end
-
       end
 
       describe '#parse_hosts_options' do

data/spec/helpers.rb

@@ -146,7 +146,6 @@ module PlatformHelpers
                       'fedora',
                       'redhat',
                       'oracle',
-                      'amazon',
                       'scientific',
                       'eos'].concat(FEDORASYSTEMV)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.29.0
+  version: 3.30.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -346,6 +346,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: beaker-abs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: beaker-vmpooler
   requirement: !ruby/object:Gem::Requirement