beaker 3.1.0 → 3.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZiYTYwMjI3N2RiZDBkMzc4NzhjODAzYzg1YjU3ZjJmMjZjMzVjMg==
+    MjE0N2NkNzU1MGYxNjdiNDYwOWI1YjQ0YjA4Mzc2ODg1N2Q4MDliNg==
   data.tar.gz: !binary |-
-    MTA1OTM1YTM3NTUyNGZiZTNiNDJkMTQ1MzRkYTAyMmYxZTUwZGJiMw==
+    M2FlZTM0YmJmNGUxMDViYTEzNjVmNDZiZjA5YjkxNTE1ZWUzYjdmMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGUxODBmZjhhMzQ3YzVkNDViYjU1MWYyMjk3NTdmNmQzMzdiOWZmNTIxMThl
-    NjliMDRiNmU0ZDQwN2Q2MjJlZjdlZjJjMzQ3OTY3MzI4NTlkZGY0YzRhYWI5
-    ZjQ1ZDAwZDBlNGI0NmY0MTRkYTJiODBiMjI4NWQ2MGZmOWY1MjA=
+    MTg2MDM3Yzg5ZmZhY2RjMGU3MTlmM2ZlNzU2MTA3MzY5MGVhMjQwMzdkZWRi
+    ZWE0M2JiYmU3ZWM3MWZlZDExYzMxOGZmMDI0MmM5N2UxYzUwMzRkMjNkNjA2
+    NGJkMzg1NWU2MWM4Y2QxZTM1NTgyNjczN2MxNDVlNzg2ODZlNDg=
   data.tar.gz: !binary |-
-    MDZkZjY4ZmMyZTdmNTkzNTFmZjI3YTU0ZWZlZDBlZmJlNzY0MmI2YTRjZmJi
-    MGVmY2I3NGU2MjllYTUxMDNhZTI3MzljMTNkMWUyM2E3YWUyODZlMDU2MDZl
-    YzYwMDFkZGRiZGVjMTkxYmRkYmZkYzBlYTg3NzM2ZDA0ZDE3NDQ=
+    NTMzZGE4MDZjZjJjNjU2NTM3NDVkNTg5NTE3YWNjZWMwMWYwZDU5MTlhZjg3
+    ZjdlOTcyZDQyOTVmODNlYTYwODA2ODk3ZTQzN2ViYjRlYjYzODVmY2IwZDYw
+    NjBiMjYyYjVmM2UzZjM5YjdjNzgxOTQzMzY2YzhjODUwNmZhODQ=

data/acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb

@@ -0,0 +1,94 @@
+require 'hocon/config_value_factory'
+
+test_name 'Hocon Helpers Test' do
+
+  hocon_filename = 'hocon.conf'
+  step 'setup : create hocon file to play with' do
+    hocon_content = <<-END
+      {
+        setting1 : "value1",
+        setting2 : 2,
+        setting3 : False
+      }
+    END
+    create_remote_file(hosts, hocon_filename, hocon_content)
+  end
+
+  step '#hocon_file_read : reads doc' do
+    doc = hocon_file_read_on(hosts[0], hocon_filename)
+    assert(doc.has_value?('setting2'))
+  end
+
+  step '#hocon_file_edit_on : set_value and verify it exists' do
+    hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+      doc2 = doc.set_value('c', '[4, 5]')
+
+      assert(doc2.has_value?('c'), 'Should have inserted "c" value!')
+    end
+  end
+
+  step '#hocon_file_edit_on : testing failure modes' do
+    def test_filename_failure(filename)
+      begin
+        hocon_file_edit_on(hosts, filename) do |_, _|
+          fail('block should not run in failure mode')
+        end
+        fail('execution should not continue in failure mode')
+      rescue ArgumentError => e
+        assert(e.to_s =~ /requires a filename/)
+      else
+        fail('No exception raised in failure mode')
+      end
+    end
+
+    step 'filename is nil' do
+      test_filename_failure(nil)
+    end
+
+    step 'filename is empty string' do
+      test_filename_failure('')
+    end
+
+    step 'no block given' do
+      begin
+        hocon_file_edit_on(hosts, hocon_filename)
+        fail('execution should not continue in failure mode')
+      rescue ArgumentError => e
+        assert(e.to_s =~ /No block was provided/)
+      else
+        fail('No exception raised in failure mode')
+      end
+    end
+  end
+
+  step '#hocon_file_edit_on : verify saving workflow' do
+    step '#hocon_file_edit_on : set_value and save' do
+      hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+        doc2 = doc.set_value('a.b', '[1, 2, 3, 4, 5]')
+        create_remote_file(host, hocon_filename, doc2.render)
+      end
+    end
+
+    step '#hocon_file_edit_on : independently read value to verify save' do
+      hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+        msg_fail = 'Should have saved "a.b" value inserted in previous step'
+        assert(doc.has_value?('a.b'), msg_fail)
+      end
+    end
+  end
+
+  step '#hocon_file_edit_in_place_on : verify auto-saving workflow' do
+    step '#hocon_file_edit_in_place_on : set_value and save' do
+      hocon_file_edit_in_place_on(hosts, hocon_filename) do |host, doc|
+        doc.set_value('c.d', '[6, 2, 73, 4, 45]')
+      end
+    end
+
+    step '#hocon_file_edit_in_place_on : verify save' do
+      hocon_file_edit_on(hosts, hocon_filename) do |host, doc|
+        msg_fail = 'Should have saved "c.d" value inserted in previous step'
+        assert(doc.has_value?('c.d'), msg_fail)
+      end
+    end
+  end
+end

data/bin/beaker

@@ -4,6 +4,6 @@ require 'rubygems' unless defined?(Gem)
 require 'beaker'
 
 Beaker::CLI.new.execute!
-
 puts "Beaker completed successfully, thanks."
+
 exit 0

data/docs/how_to/use_hocon_helpers.md

@@ -0,0 +1,37 @@
+# How-to Use Hocon Helpers
+
+Beaker provides a few convenience methods to help you use the
+[HOCON](https://github.com/typesafehub/config/blob/master/HOCON.md)
+configuration file format in your testing. This doc will give you an overview of
+what each method does, but if you'd like more in-depth information, please
+checkout our
+[Hocon Helpers Rubydocs](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HoconHelpers).
+
+# #hocon_file_read_on
+
+If you'd just like to read the contents of a HOCON file from a System Under Test
+(SUT), this is the method for you. Note that you will get back a
+[ConfigValueFactory object](https://github.com/puppetlabs/ruby-hocon#basic-usage)
+like in the other helper methods here.
+
+# #hocon_file_edit_in_place_on
+
+This method is specifically for editing a file on a SUT and saving it in-place,
+meaning it'll save your changes in the place of the original file you read from.
+
+The special thing to take note of here is that the Proc you pass to this method
+will need to return the doc that you'd like saved in order for saving to work as
+specified.
+
+# #hocon_file_edit_on
+
+This method is our generic open-ended method for editing a file from a SUT. This
+is the most flexible method, doing nothing but providing you with the contents
+of the file to edit yourself.
+
+This does not save the file edited. Our recommendation is to use the
+[`create_remote_file` method](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HostHelpers#create_remote_file-instance_method),
+as shown in the
+[Rubydocs example](http://www.rubydoc.info/github/puppetlabs/beaker/Beaker/DSL/Helpers/HoconHelpers#hocon_file_edit_on-instance_method)
+if you'd like to save. This allows us to have more flexibility to do things such
+as moving the edited file to back up or version your changes.

data/docs/tutorials/installation.md

@@ -4,7 +4,7 @@ In most cases, beaker is running on a system separate from the SUT; we will comm
 
 ## Beaker Requirements
 
-* Ruby 1.9+, 2.0.0p481, or 2.1.1
+* Ruby >= 2.2.5
 * libxml2, libxslt (needed for the [Nokogiri](http://nokogiri.org/tutorials/installing_nokogiri.html) gem)
 * g++ (needed for the [unf_ext](http://rubydoc.info/gems/unf_ext/) gem)
 * curl (needed for some DSL functions to be able to execute successfully)

data/lib/beaker/cli.rb

@@ -31,9 +31,15 @@ module Beaker
         @execute = false
         return
       end
-      @logger.info("Beaker!")
-      @logger.info(beaker_version_string)
-      @logger.info(@options.dump)
+
+      if Beaker::Shared::SubcommandsUtil::write_config?
+        @options.dump_to_file(Beaker::Shared::SubcommandsUtil::CONFIG_PATH)
+      else
+        @logger.info("Beaker!")
+        @logger.info(beaker_version_string)
+        @logger.info(@options.dump)
+      end
+
       if @options[:parse_only]
         @execute = false
         return

data/lib/beaker/dsl/helpers.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-[ 'facter', 'host', 'puppet', 'test', 'tk', 'web' ].each do |lib|
+[ 'facter', 'host', 'puppet', 'test', 'tk', 'web', 'hocon' ].each do |lib|
       require "beaker/dsl/helpers/#{lib}_helpers"
 end
 
@@ -29,6 +29,7 @@ module Beaker
       include Beaker::DSL::Helpers::TestHelpers
       include Beaker::DSL::Helpers::TKHelpers
       include Beaker::DSL::Helpers::WebHelpers
+      include Beaker::DSL::Helpers::HoconHelpers
       include Beaker::DSL::Helpers::Hiera
     end
   end

data/lib/beaker/dsl/helpers/hocon_helpers.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+require 'hocon/parser/config_document_factory'
+require 'hocon/config_value_factory'
+
+module Beaker
+  module DSL
+    module Helpers
+      # Convenience methods for modifying and reading Hocon configs
+      #
+      # @note For usage guides for these methods, check these sources:
+      #   - {https://github.com/puppetlabs/beaker/tree/master/docs/how_to/use_hocon_helpers.md Beaker docs}.
+      #   - Beaker acceptance tests in +acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb+
+      module HoconHelpers
+
+        # Reads the given hocon file from a SUT
+        #
+        # @param [Host] host Host to get hocon file from.
+        # @param [String] filename Name of the hocon file to get
+        #
+        # @raise ArgumentError if arguments are missing or incorrect
+        # @return [Hocon::ConfigValueFactory] parsed hocon file
+        def hocon_file_read_on(host, filename)
+          if filename.nil? || filename.empty?
+            raise ArgumentError, '#hocon_file_edit_on requires a filename'
+          end
+          file_contents = on(host, "cat #{filename}").stdout
+          Hocon::Parser::ConfigDocumentFactory.parse_string(file_contents)
+        end
+
+        # Grabs the given hocon file from a SUT, allowing you to edit the file
+        # just like you would a local one in the passed block.
+        #
+        # @note This method does not save the hocon file after editing. Our
+        #   recommended workflow for that is included in our example. If you'd
+        #   rather just save a file in-place on a SUT, then
+        #   {#hocon_file_edit_in_place_on} is a better method to use.
+        #
+        # @example Editing a value & saving as a new file
+        #   hocon_file_edit_on(hosts, 'hocon.conf') do |host, doc|
+        #     doc2 = doc.set_value('a.b', '[1, 2, 3, 4, 5]')
+        #     create_remote_file(host, 'hocon_latest.conf', doc2.render)
+        #   end
+        #
+        # @param [Host,Array<Host>] hosts Host (or an array of hosts) to
+        #   edit the hocon file on.
+        # @param [String] filename Name of the file to edit.
+        # @param [Proc] block Code to edit the hocon file.
+        #
+        # @yield [Host] Currently executing host.
+        # @yield [Hocon::ConfigValueFactory] Doc to edit. Refer to
+        #   {https://github.com/puppetlabs/ruby-hocon#basic-usage Hocon's basic usage doc}
+        #   for info on how to use this object.
+        #
+        # @raise ArgumentError if arguments are missing or incorrect.
+        # @return nil
+        def hocon_file_edit_on(hosts, filename, &block)
+          if not block_given?
+            msg = 'DSL method `hocon_file_edit_on` provides a given block'
+            msg << ' a hocon file to edit. No block was provided.'
+            raise ArgumentError, msg
+          end
+          block_on hosts, {} do | host |
+            doc = hocon_file_read_on(host, filename)
+            yield host, doc
+          end
+        end
+
+        # Grabs the given hocon file from a SUT, allowing you to edit the file
+        # and have those edits saved in-place of the file on the SUT.
+        #
+        # @note that a the crucial difference between this & {#hocon_file_edit_on}
+        #   is that your Proc will need to return the
+        #   {#hocon_file_edit_on Hocon::ConfigValueFactory doc}
+        #   you want saved for the in-place save to work correctly.
+        #
+        # @note for info about parameters, please checkout {#hocon_file_edit_on}.
+        #
+        # @example setting an attribute & saving
+        #   hocon_file_edit_in_place_on(hosts, hocon_filename) do |host, doc|
+        #     doc.set_value('c.d', '[6, 2, 73, 4, 45]')
+        #   end
+        #
+        def hocon_file_edit_in_place_on(hosts, filename, &block)
+          hocon_file_edit_on(hosts, filename) do |host, doc|
+            content_doc = yield host, doc
+            create_remote_file(host, filename, content_doc.render)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,13 +1,37 @@
 module FreeBSD::Pkg
   include Beaker::CommandFactory
 
-  def install_package(name, cmdline_args = nil, opts = {})
-    cmdline_args ||= '-y'
-    execute("pkg install #{cmdline_args} #{name}", opts) { |result| result }
+  def pkg_info_pattern(package)
+    # This seemingly restrictive pattern prevents false positives...
+    "^#{package}-[0-9][0-9a-zA-Z_\\.,]*$"
   end
 
-  def check_for_package(name, opts = {})
-    execute("pkg info #{name}", opts) { |result| result }
+  def check_pkgng_sh
+    'TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexist ' \
+    'pkg info -x "pkg(-devel)?\\$" > /dev/null 2>&1'
   end
 
+  def pkgng_active?(opts = {})
+    opts = {:accept_all_exit_codes => true}.merge(opts)
+    execute("/bin/sh -c '#{check_pkgng_sh}'", opts) { |r| r }.exit_code == 0
+  end
+
+  def install_package(package, cmdline_args = nil, opts = {})
+    cmd = if pkgng_active?
+            "pkg install #{cmdline_args || '-y'} #{package}"
+          else
+            "pkg_add #{cmdline_args || '-r'} #{package}"
+          end
+    execute(cmd, opts) { |result| result }
+  end
+
+  def check_for_package(package, opts = {})
+    opts = {:accept_all_exit_codes => true}.merge(opts)
+    cmd = if pkgng_active?
+            "pkg info #{package}"
+          else
+            "pkg_info -Ix '#{pkg_info_pattern(package)}'"
+          end
+    execute(cmd, opts) { |result| result }.exit_code == 0
+  end
 end

data/lib/beaker/host_prebuilt_steps.rb

@@ -13,7 +13,7 @@ module Beaker
     SLEEPWAIT = 5
     TRIES = 5
     UNIX_PACKAGES = ['curl', 'ntpdate']
-    FREEBSD_PACKAGES = ['curl', 'perl5']
+    FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
     WINDOWS_PACKAGES = ['curl']
     PSWINDOWS_PACKAGES = []
@@ -127,11 +127,27 @@ module Beaker
     # @param [Host] host Host to act on
     # @param [Array<String>] package_list List of package names to install
     def check_and_install_packages_if_needed host, package_list
-      package_list.each do |pkg|
-        if not host.check_for_package pkg
-          host.install_package pkg
+      package_list.each do |string|
+        alternatives = string.split('|')
+        next if alternatives.any? { |pkg| host.check_for_package pkg }
+        install_one_of_packages host, alternatives
+      end
+    end
+
+    # Installs one of alternative packages (first available)
+    #
+    # @param [Host] host Host to act on
+    # @param [Array<String>] packages List of package names (alternatives).
+    def install_one_of_packages host, packages
+      error = nil
+      packages.each do |pkg|
+        begin
+          return host.install_package pkg
+        rescue Beaker::Host::CommandFailure => e
+          error = e
         end
       end
+      raise error
     end
 
     #Install a set of authorized keys using {HostPrebuiltSteps::ROOT_KEYS_SCRIPT}.  This is a

data/lib/beaker/hypervisor/vmpooler.rb

@@ -81,13 +81,14 @@ module Beaker
     # @return [Hash] Tag hash
     def add_tags(host)
       host[:host_tags].merge(
-          {
-              'beaker_version'    => Beaker::Version::STRING,
-              'jenkins_build_url' => @options[:jenkins_build_url],
-              'department'        => @options[:department],
-              'project'           => @options[:project],
-              'created_by'        => @options[:created_by]
-          })
+        'beaker_version'    => Beaker::Version::STRING,
+        'jenkins_build_url' => @options[:jenkins_build_url],
+        'department'        => @options[:department],
+        'project'           => @options[:project],
+        'created_by'        => @options[:created_by],
+        'name'              => host.name,
+        'roles'             => host.host_hash[:roles].join(', ')
+      )
     end
 
     # Get host info hash from parsed json response

data/lib/beaker/options/options_hash.rb

@@ -38,6 +38,14 @@ module Beaker
         end
       end
 
+      def dump_to_file(output_file)
+        dirname = File.dirname(output_file)
+        unless File.directory?(dirname)
+          FileUtils.mkdir_p(dirname)
+        end
+        File.open(output_file, 'w+') { |f| f.write(dump)  }
+      end
+
     end
   end
 end

data/lib/beaker/options/parser.rb

@@ -224,7 +224,7 @@ module Beaker
       # @raise [ArgumentError] if a hosts file is generated, but it can't
       #   be read by the HostsFileParser
       def parse_hosts_options
-        if File.exists?(@options[:hosts_file])
+        if @options[:hosts_file].nil? || File.exists?(@options[:hosts_file])
           #read the hosts file that contains the node configuration and hypervisor info
           return Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
         end

data/lib/beaker/shared.rb

@@ -1,4 +1,4 @@
-[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar', 'options_resolver' ].each do |lib|
+[ 'repetition', 'error_handler', 'host_manager', 'timed', 'semvar', 'options_resolver', 'subcommands_util' ].each do |lib|
   require "beaker/shared/#{lib}"
 end
 module Beaker
@@ -9,6 +9,7 @@ module Beaker
     include Beaker::Shared::Timed
     include Beaker::Shared::Semvar
     include Beaker::Shared::OptionsResolver
+    include Beaker::Shared::SubcommandsUtil
   end
 end
 include Beaker::Shared

data/lib/beaker/shared/subcommands_util.rb

@@ -0,0 +1,37 @@
+module Beaker
+  module Shared
+    # Methods used in execution of Subcommands
+    # - should we write the config?
+    # - reset ARGV 
+    # - execute Beaker
+    module SubcommandsUtil
+      CONFIG_PATH = ".beaker/config"
+    
+      @@write_config = false
+
+      def self.write_config=( val )
+        @@write_config = val
+      end
+      
+      def self.write_config?
+        @@write_config
+      end
+      
+      # Reset ARGV to contain the arguments determined by a specific subcommand
+      # @param [Array<String>] args the arguments determined by a specific subcommand
+      def reset_argv(args)
+        ARGV.clear
+        args.each do |arg|
+          ARGV << arg
+        end
+      end
+
+      # Update ARGV and call Beaker
+      # @param [Array<String>] args the arguments determined by a specific subcommand
+      def execute_beaker(*args)
+        reset_argv(args)
+        Beaker::CLI.new.execute! 
+      end
+    end
+  end
+end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.1.0'
+    STRING = '3.2.0'
   end
 end

data/spec/beaker/host/freebsd/pkg_spec.rb

@@ -27,25 +27,71 @@ module Beaker
     let (:opts)     { @opts || {} }
     let (:logger)   { double( 'logger' ).as_null_object }
     let (:instance) { FreeBSDPkgTest.new(opts, logger) }
+    let(:cond) do
+      'TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexist pkg info -x "pkg(-devel)?\\$" > /dev/null 2>&1'
+    end
 
-    context "install_package" do
-
-      it "runs the correct install command" do
-        expect( Beaker::Command ).to receive(:new).with('pkg install -y rsync', [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
-        instance.install_package('rsync')
+    context "pkg_info_patten" do
+      it "returns correct patterns" do
+        expect( instance.pkg_info_pattern('rsync') ).to eq '^rsync-[0-9][0-9a-zA-Z_\\.,]*$'
       end
+    end
 
+    context "check_pkgng_sh" do
+      it { expect( instance.check_pkgng_sh ).to eq cond }
     end
 
-    context "check_for_package" do
+    context "pkgng_active?" do
+      it "returns true if pkgng is available" do
+        expect( instance ).to receive(:check_pkgng_sh).once.and_return("do you have pkgng?")
+        expect( Beaker::Command ).to receive(:new).with("/bin/sh -c 'do you have pkgng?'", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( instance ).to receive(:exec).with('',{:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
+        expect( instance.pkgng_active? ).to be true
+      end
+      it "returns false if pkgng is unavailable" do
+        expect( instance ).to receive(:check_pkgng_sh).once.and_return("do you have pkgng?")
+        expect( Beaker::Command ).to receive(:new).with("/bin/sh -c 'do you have pkgng?'", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+        expect( instance ).to receive(:exec).with('',{:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 127}))
+        expect( instance.pkgng_active? ).to be false
+      end
+    end
 
-      it "runs the correct checking command" do
-        expect( Beaker::Command ).to receive(:new).with('pkg info rsync', [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
-        expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
-        instance.check_for_package('rsync')
+    context "install_package" do
+      context "without pkgng" do
+        it "runs the correct install command" do
+          expect( instance ).to receive(:pkgng_active?).once.and_return(false)
+          expect( Beaker::Command ).to receive(:new).with("pkg_add -r rsync", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          instance.install_package('rsync')
+        end
       end
+      context "with pkgng" do
+        it "runs the correct install command" do
+          expect( instance ).to receive(:pkgng_active?).once.and_return(true)
+          expect( Beaker::Command ).to receive(:new).with("pkg install -y rsync", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {}).and_return(generate_result("hello", {:exit_code => 0}))
+          instance.install_package('rsync')
+        end
+      end
+    end
 
+    context "check_for_package" do
+      context "without pkgng" do
+        it "runs the correct checking command" do
+          expect( instance ).to receive(:pkgng_active?).once.and_return(false)
+          expect( Beaker::Command ).to receive(:new).with("pkg_info -Ix '^rsync-[0-9][0-9a-zA-Z_\\.,]*$'", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
+          instance.check_for_package('rsync')
+        end
+      end
+      context "with pkgng" do
+        it "runs the correct checking command" do
+          expect( instance ).to receive(:pkgng_active?).once.and_return(true)
+          expect( Beaker::Command ).to receive(:new).with("pkg info rsync", [], {:prepend_cmds=>nil, :cmdexe=>false}).and_return('')
+          expect( instance ).to receive(:exec).with('', {:accept_all_exit_codes => true}).and_return(generate_result("hello", {:exit_code => 0}))
+          instance.check_for_package('rsync')
+        end
+      end
     end
 
   end

data/spec/beaker/options/parser_spec.rb

@@ -246,7 +246,9 @@ module Beaker
           end
 
           it 'calls beaker-hostgenerator to get hosts information' do
-            parser.instance_variable_set( :@options, {} )
+            parser.instance_variable_set( :@options, {
+              :hosts_file => 'notafile.yml'
+            } )
             allow( Beaker::Options::HostsFileParser ).to receive(
               :parse_hosts_file
             ).and_raise( Errno::ENOENT )
@@ -266,7 +268,9 @@ module Beaker
           end
 
           it 'sets the :hosts_file_generated flag to signal others when needed' do
-            options_test = {}
+            options_test = {
+              :hosts_file => 'not_a_file.yml'
+            }
             parser.instance_variable_set( :@options, options_test )
             allow( Beaker::Options::HostsFileParser ).to receive(
               :parse_hosts_file
@@ -284,7 +288,9 @@ module Beaker
           end
 
           it 'beaker-hostgenerator failures trigger nice prints & a rethrow' do
-            options_test = {}
+            options_test = {
+              :hosts_file => 'not_a_file.yml'
+            }
             parser.instance_variable_set( :@options, options_test )
             allow( Beaker::Options::HostsFileParser ).to receive(
               :parse_hosts_file
@@ -309,6 +315,14 @@ module Beaker
               parser.parse_hosts_options
             }.to raise_error( BeakerHostGenerator::Exceptions::InvalidNodeSpecError )
           end
+
+          it 'can be passed a nil hosts file and get the default hash back' do
+            parser.instance_variable_set( :@options, {} )
+
+            host_options = parser.parse_hosts_options
+            expect(host_options[:HOSTS]).to be === {}
+
+          end
         end
 
       end

data/spec/beaker/shared/subcommands_util_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Beaker
+  module Shared
+    describe SubcommandsUtil do
+
+      let(:cli) {
+        double("cli")
+      }
+
+      describe 'reset_argv' do
+        it "resets argv" do
+          args = ["test1", "test2"]
+          expect(ARGV).to receive(:clear).exactly(1).times
+          subject.reset_argv(args)
+          expect(ARGV[0]).to eq(args[0])
+          expect(ARGV[1]).to eq(args[1])
+        end
+      end
+
+      describe 'execute_beaker' do
+        it "executes beaker with arguments" do
+          allow(cli).to receive(:execute!).and_return(true)
+          allow(Beaker::CLI).to receive(:new).and_return(cli)
+          expect(subject).to receive(:reset_argv).exactly(1).times
+          expect(cli).to receive(:execute!).exactly(1).times
+          subject.execute_beaker(['args'])
+        end
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -460,6 +460,7 @@ files:
 - acceptance/pre_suite/puppet_pkg/install.rb
 - acceptance/tests/base/README.md
 - acceptance/tests/base/dsl/helpers/configuration_test.rb
+- acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/add_system32_hosts_entry_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb
 - acceptance/tests/base/dsl/helpers/host_helpers/backup_the_file_test.rb
@@ -539,6 +540,7 @@ files:
 - docs/how_to/test_arbitrary_beaker_versions.md
 - docs/how_to/the_beaker_dsl.md
 - docs/how_to/upgrade_from_2_to_3.md
+- docs/how_to/use_hocon_helpers.md
 - docs/how_to/use_user_password_authentication.md
 - docs/how_to/write_a_beaker_test_for_a_module.md
 - docs/tutorials/README.md
@@ -559,6 +561,7 @@ files:
 - lib/beaker/dsl/assertions.rb
 - lib/beaker/dsl/helpers.rb
 - lib/beaker/dsl/helpers/facter_helpers.rb
+- lib/beaker/dsl/helpers/hocon_helpers.rb
 - lib/beaker/dsl/helpers/host_helpers.rb
 - lib/beaker/dsl/helpers/puppet_helpers.rb
 - lib/beaker/dsl/helpers/test_helpers.rb
@@ -654,6 +657,7 @@ files:
 - lib/beaker/shared/options_resolver.rb
 - lib/beaker/shared/repetition.rb
 - lib/beaker/shared/semvar.rb
+- lib/beaker/shared/subcommands_util.rb
 - lib/beaker/shared/timed.rb
 - lib/beaker/ssh_connection.rb
 - lib/beaker/tasks/quick_start.rb
@@ -742,6 +746,7 @@ files:
 - spec/beaker/shared/options_resolver_spec.rb
 - spec/beaker/shared/repetition_spec.rb
 - spec/beaker/shared/semvar_spec.rb
+- spec/beaker/shared/subcommands_util_spec.rb
 - spec/beaker/ssh_connection_spec.rb
 - spec/beaker/test_case_spec.rb
 - spec/beaker/test_suite_spec.rb