beaker 2.16.0 → 2.17.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFkMzY5NTRmMTYyNWI3NzhhZTBkNDUyZDQwNDE4ZGQ4ZTYzOWE0MA==
+    YjMwMzYyMmMwOThkODRiYzdjZjgwNTVkYjA0NmMzNGY0NWIyZDc1Yg==
   data.tar.gz: !binary |-
-    MmYyODFjZTYzNGM1NmRhYzRiZjNiZDIzMDEzOTdkMmI3ZDI5Y2JiZg==
+    MDZlZmUxYzc2ZDhkMWY2MDY2NjU0ODUyYzJkYjhiZWJiZWU2OGI2Mw==
 SHA512:
   metadata.gz: !binary |-
-    YjAyZTMxYjQ5YTZhOWQwZjM4N2NlYTVjYmEzMDg4MGZjNzgyYTYzNGUwNDk2
-    MDliNmY1NjYzMGY0MDE5YjE1NTc2YjdjZTRkNjk1ZmYyNWJmMzQ0ZDkxNTJh
-    NWMyMjBjYWMzY2I1MzVhYzYyNDQ1ZmI2MDFkOTI0YTEyYTFiNGM=
+    MWVhZmE0MjA1MWRhZThhNzAxZGVjMmM3YTUwMjRjYzhjN2NhOTg3N2IwODU1
+    NTU2ODc4Y2U3NmMyNTRkMjhlMWUyMDUzZWZkMTYzOGM3ZTRiNWM3NjA2Mzg2
+    MmY4ZGI1MDU1ZmUyZTBjYTM0NDE5NzY1MGEwNjM4NWYzNDhmNTA=
   data.tar.gz: !binary |-
-    Yzc2NWU5OTQ3OWZlNGU2MzhlYTNhM2I0NThmOGU0NWRkZTgwM2EzMTQxYmMz
-    ODQwOTEwYWFiYWEzYzQ5MWJiY2NjZTk2NDRlZjk3YTg1MzFjMDQ0OTViM2Ey
-    YTY0YTdkMTYwMDhhYzFlNjkyM2VlOWRiMzBhOTlmODRhZjVkNWY=
+    NzE0OWNkMTBmNGRiYmQ0YmVjMDZjMTViYmNjNzBjMTY4OTMwNDViZWUwOThm
+    NzI5MjhmZTA1M2QwMzJjYmQwMDcyM2IwZmU0NjEzMjg5MmY5NjliMGE2ZDky
+    MWE0YTI2MDQ4MWY1ZTY3OGMzOTNmNjc3YjI1ZTVjOThlNzM3MWI=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 6 Jul, 2015 (6b0a9ca2)](#LATEST)
+* [LATEST - 10 Jul, 2015 (745d9116)](#LATEST)
+* [2.16.0 - 6 Jul, 2015 (b3e76227)](#2.16.0)
 * [2.15.1 - 1 Jul, 2015 (cd6f0bab)](#2.15.1)
 * [2.15.0 - 1 Jul, 2015 (07c416fb)](#2.15.0)
 * [2.14.1 - 5 Jun, 2015 (35026603)](#2.14.1)
@@ -85,7 +86,109 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 6 Jul, 2015 (6b0a9ca2)
+### <a name = "LATEST">LATEST - 10 Jul, 2015 (745d9116)
+
+* (GEM) update beaker version to 2.17.0 (745d9116)
+
+* Merge pull request #884 from justinstoller/maint/master/moar-puppet-agent (7ba09f8f)
+
+
+```
+Merge pull request #884 from justinstoller/maint/master/moar-puppet-agent
+
+(maint) Allow PE puppet-agent installs on custom roles
+```
+* (maint) Allow PE puppet-agent installs on custom roles (cfe9c834)
+
+
+```
+(maint) Allow PE puppet-agent installs on custom roles
+
+Previously we installed puppet-agent on a host if there was the agent
+role and no other role assigned to it. This prevents assigning a
+puppet-agent node the "default" role to be used as the default test
+target, or allow any other custom roles.
+
+To allow assigning the "default" or custom roles to a puppet-agent node
+we list the non-puppet-agnet roles we know how to generate installation answers
+for and use that list to determine what nodes are puppet-agent or not.
+```
+* Merge pull request #883 from anodelman/puppetservice (2822e415)
+
+
+```
+Merge pull request #883 from anodelman/puppetservice
+
+(BKR-390) Scooter pipeline is using pe-httpd instead of pe-puppetserver
+```
+* Merge pull request #882 from anodelman/osx (b64ee262)
+
+
+```
+Merge pull request #882 from anodelman/osx
+
+(BKR-388) Beaker::Host::Mac#touch returns non-existent path
+```
+* Merge pull request #879 from anodelman/maint (df169767)
+
+
+```
+Merge pull request #879 from anodelman/maint
+
+(BKR-386) beaker does not work with host_preserved.yaml file anymore
+```
+* (BKR-390) Scooter pipeline is using pe-httpd instead of pe-puppetserver (3a7830cc)
+
+
+```
+(BKR-390) Scooter pipeline is using pe-httpd instead of pe-puppetserver
+
+- only use aio defaults on agents that are not master, database or
+  dashboard (was previously using aio defaults/paths on all hosts
+  identified as being >= 4.0)
+```
+* (BKR-388) Beaker::Host::Mac#touch returns non-existent path (21e885e0)
+
+
+```
+(BKR-388) Beaker::Host::Mac#touch returns non-existent path
+
+- ensure that the mac host.touch method returns a correct, absolute
+  path to the touch command
+```
+* Merge pull request #859 from vindir/feature/instancestores (a3429c39)
+
+
+```
+Merge pull request #859 from vindir/feature/instancestores
+
+(BKR-348) AWS: Adding instance storage support
+```
+* (BKR-386) beaker does not work with host_preserved.yaml file anymore (c1b471fc)
+
+
+```
+(BKR-386) beaker does not work with host_preserved.yaml file anymore
+
+- puppet-agent installation was causing a 'version' argument to be added
+  to the preserved host file, causing beaker to output --version
+  information upon re-use of that file
+- fix is just renaming --version to use beaker_version instead of
+  version as a flag
+```
+* (BKR-348) instance storage now supported (e607b2d5)
+
+
+```
+(BKR-348) instance storage now supported
+
+AMIs using the instance storage root device type are now supported
+allowing users who don't want/need EBS backed AMIs to add nodesets
+more easily.
+```
+### <a name = "2.16.0">2.16.0 - 6 Jul, 2015 (b3e76227)
+
+* (HISTORY) update beaker history for gem release 2.16.0 (b3e76227)
 
 * (GEM) update beaker version to 2.16.0 (6b0a9ca2)
 

data/lib/beaker/cli.rb

@@ -16,6 +16,8 @@ module Beaker
       @logger = Beaker::Logger.new(@options)
       @options[:logger] = @logger
       @options[:timestamp] = @timestamp
+      @options[:beaker_version] = Beaker::Version::STRING
+      beaker_version_string = VERSION_STRING % @options[:beaker_version]
       @execute = true
 
       if @options[:help]
@@ -23,11 +25,13 @@ module Beaker
         @execute = false
         return
       end
-      if @options[:version]
-        @logger.notify(VERSION_STRING % Beaker::Version::STRING)
+      if @options[:beaker_version_print]
+        @logger.notify(beaker_version_string)
         @execute = false
         return
       end
+      @logger.info("Beaker!")
+      @logger.info(beaker_version_string)
       @logger.info(@options.dump)
       if @options[:parse_only]
         @execute = false

data/lib/beaker/dsl/install_utils/foss_utils.rb

@@ -35,8 +35,9 @@ module Beaker
         #                            or a role (String or Symbol) that identifies one or more hosts.
         def configure_foss_defaults_on( hosts )
           block_on hosts do |host|
-            if (host[:version] && (not version_is_less(host[:version], '4.0'))) or host['type'] && host['type'] =~ /aio/
-              # add foss defaults to host
+            if (not_controller(host) && host[:version] && (not version_is_less(host[:version], '4.0'))) \
+              or (host['type'] && host['type'] =~ /aio/)
+              # add aio defaults to host
               add_aio_defaults_on(host)
             else
               add_foss_defaults_on(host)

data/lib/beaker/dsl/install_utils/pe_utils.rb

@@ -26,7 +26,8 @@ module Beaker
         #                            or a role (String or Symbol) that identifies one or more hosts.
         def configure_pe_defaults_on( hosts )
           block_on hosts do |host|
-            if (host[:pe_ver] && (not version_is_less(host[:pe_ver], '4.0'))) or (host['type'] && host['type'] =~ /aio/)
+            if (not_controller(host) && host[:pe_ver] && (not version_is_less(host[:pe_ver], '4.0'))) \
+              or (host['type'] && host['type'] =~ /aio/)
               # add pe defaults to host
               add_aio_defaults_on(host)
             else
@@ -508,8 +509,9 @@ module Beaker
         def create_agent_specified_arrays(hosts)
           hosts_agent_only = []
           hosts_not_agent_only = []
+          non_agent_only_roles = %w(master database dashboard console frictionless)
           hosts.each do |host|
-            if host['roles'] && host['roles'].length == 1 && host['roles'][0] == 'agent'
+            if host['roles'].none? {|role| non_agent_only_roles.include?(role) }
               hosts_agent_only << host
             else
               hosts_not_agent_only << host

data/lib/beaker/dsl/roles.rb

@@ -89,6 +89,35 @@ module Beaker
         find_host_with_role :default
       end
 
+      # Determine if host is not a controller, does not have roles 'master',
+      # 'dashboard' or 'database'.
+      #
+      # @return [Boolean]      True if agent-only, false otherwise
+      #
+      # @example Basic usage
+      #     if not_controller(host)
+      #       puts "this host isn't in charge!"
+      #     end
+      #
+      def not_controller(host)
+        controllers = ['dashboard', 'database', 'master', 'console']
+        matched_roles = host['roles'].select { |v| controllers.include?(v) }
+        matched_roles.length == 0
+      end
+
+      # Determine if this host is exclusively an agent (only has a single role 'agent')
+      #
+      #
+      # @return [Boolean]      True if agent-only, false otherwise
+      #
+      # @example Basic usage
+      #     if agent_only(host)
+      #       puts "this host is ONLY an agent!"
+      #     end
+      def agent_only(host)
+        host['roles'].length == 1 && host['roles'].include?('agent')
+      end
+
       #Create a new role method for a given arbitrary role name.  Makes it possible to be able to run
       #commands without having to refer to role by String or Symbol.  Will not add a new method 
       #definition if the name is already in use.

data/lib/beaker/host/mac.rb

@@ -5,10 +5,11 @@ end
 module Mac
     class Host < Unix::Host
 
-    [ 'user', 'group', 'pkg' ].each do |lib|
+    [ 'exec', 'user', 'group', 'pkg' ].each do |lib|
       require "beaker/host/mac/#{lib}"
     end
 
+    include Mac::Exec
     include Mac::User
     include Mac::Group
     include Mac::Pkg

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

@@ -0,0 +1,8 @@
+module Mac::Exec
+  include Beaker::CommandFactory
+
+  def touch(file, abs=true)
+    (abs ? '/usr/bin/touch' : 'touch') + " #{file}"
+  end
+
+end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -268,23 +268,27 @@ module Beaker
         raise RuntimeError, "Image not found: #{image_id}"
       end
 
+      @logger.notify("Image Storage Type: #{image.root_device_type}")
+
       # Transform the images block_device_mappings output into a format
       # ready for a create.
-      orig_bdm = image.block_device_mappings()
-      @logger.notify("aws-sdk: Image block_device_mappings: #{orig_bdm.to_hash}")
       block_device_mappings = []
-      orig_bdm.each do |device_name, rest|
-        block_device_mappings << {
-          :device_name => device_name,
-          :ebs => {
-            # Change the default size of the root volume.
-            :volume_size => host['volume_size'] || rest[:volume_size],
-            # This is required to override the images default for
-            # delete_on_termination, forcing all volumes to be deleted once the
-            # instance is terminated.
-            :delete_on_termination => true,
+      if image.root_device_type == :ebs
+        orig_bdm = image.block_device_mappings()
+        @logger.notify("aws-sdk: Image block_device_mappings: #{orig_bdm.to_hash}")
+        orig_bdm.each do |device_name, rest|
+          block_device_mappings << {
+            :device_name => device_name,
+            :ebs => {
+              # Change the default size of the root volume.
+              :volume_size => host['volume_size'] || rest[:volume_size],
+              # This is required to override the images default for
+              # delete_on_termination, forcing all volumes to be deleted once the
+              # instance is terminated.
+              :delete_on_termination => true,
+            }
           }
-        }
+        end
       end
 
       security_group = ensure_group(vpc || region, Beaker::EC2Helper.amiports(host))
@@ -304,9 +308,9 @@ module Beaker
         :instance_type => amisize,
         :disable_api_termination => false,
         :instance_initiated_shutdown_behavior => "terminate",
-        :block_device_mappings => block_device_mappings,
         :subnet => subnet_id,
       }
+      config[:block_device_mappings] = block_device_mappings if image.root_device_type == :ebs
       region.instances.create(config)
     end
 

data/lib/beaker/options/command_line_parser.rb

@@ -191,7 +191,7 @@ module Beaker
           end
 
           opts.on('--version', 'Report currently running version of beaker' ) do
-            @cmd_options[:version] = true
+            @cmd_options[:beaker_version_print] = true
           end
 
           opts.on('--parse-only', 'Display beaker parsed options and exit' ) do

data/lib/beaker/options/parser.rb

@@ -190,7 +190,7 @@ module Beaker
         #   overwrite defaults with command line and file options
         @options = @options.merge(cmd_line_and_file_options)
 
-        if not @options[:help] and not @options[:version]
+        if not @options[:help] and not @options[:beaker_version_print]
           #read the hosts file that contains the node configuration and hypervisor info
           hosts_options = Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.16.0'
+    STRING = '2.17.0'
   end
 end

data/spec/beaker/dsl/install_utils/foss_utils_spec.rb

@@ -75,11 +75,19 @@ describe ClassMixedWithDSLInstallUtils do
       subject.configure_foss_defaults_on( hosts )
     end
 
-    it 'uses aio paths for hosts of version >= 4.0' do
+    it 'uses aio paths for hosts of version >= 4.0, except for master/database/dashboard' do
+      agents = []
+      not_agents = []
       hosts.each do |host|
         host[:version] = '4.0'
+        if subject.agent_only(host)
+          agents << host
+        else
+          not_agents << host
+        end
       end
-      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).exactly(agents.length).times
+      expect(subject).to receive(:add_foss_defaults_on).exactly(not_agents.length).times
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
       subject.configure_foss_defaults_on( hosts )

data/spec/beaker/dsl/install_utils/pe_utils_spec.rb

@@ -52,7 +52,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.configure_pe_defaults_on( hosts )
     end
 
-    it 'uses foss paths for hosts of type pe' do
+    it 'uses pe paths for hosts of type pe' do
       hosts.each do |host|
         host[:type] = 'pe'
       end
@@ -69,11 +69,19 @@ describe ClassMixedWithDSLInstallUtils do
       subject.configure_pe_defaults_on( hosts )
     end
 
-    it 'uses aio paths for hosts of version >= 4.0' do
+    it 'uses aio paths for hosts of version >= 4.0, except for master/dashboard/database' do
+      agents = []
+      not_agents = []
       hosts.each do |host|
         host[:pe_ver] = '4.0'
+        if subject.agent_only(host)
+          agents << host
+        else
+          not_agents << host
+        end
       end
-      expect(subject).to receive(:add_aio_defaults_on).exactly(hosts.length).times
+      expect(subject).to receive(:add_aio_defaults_on).exactly(agents.length).times
+      expect(subject).to receive(:add_pe_defaults_on).exactly(not_agents.length).times
       expect(subject).to receive(:add_puppet_paths_on).exactly(hosts.length).times
 
       subject.configure_pe_defaults_on( hosts )
@@ -458,7 +466,11 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :install_puppet_agent_pe_promoted_repo_on ).with( hosts[2],
                                                                                      {:puppet_agent_version=>nil, :puppet_agent_sha=>nil, :pe_ver=>nil, :puppet_collection=>nil} ).once
       hosts.each do |host|
-        expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
+        if subject.agent_only(host)
+          expect( subject ).to receive( :add_aio_defaults_on ).with( host ).once
+        else
+          expect( subject ).to receive( :add_pe_defaults_on ).with( host ).once
+        end
         expect( subject ).to receive( :sign_certificate_for ).with( host ).once
         expect( subject ).to receive( :stop_agent_on ).with( host ).once
         expect( subject ).to receive( :on ).with( host, /puppet agent -t/, :acceptable_exit_codes => [0,2] ).once
@@ -651,4 +663,87 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe 'create_agent_specified_arrays' do
+    let(:master)        { make_host( 'master',       { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['master', 'agent']})}
+    let(:db)            { make_host( 'db',           { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['database', 'agent']})}
+    let(:console)       { make_host( 'console',      { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['dashboard', 'agent']})}
+    let(:monolith)      { make_host( 'monolith',     { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => %w(master dashboard database)})}
+    let(:frictionless)  { make_host( 'frictionless', { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent', 'frictionless']})}
+    let(:agent1)        { make_host( 'agent1',       { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent']})}
+    let(:agent2)        { make_host( 'agent2',       { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent']})}
+    let(:default_agent) { make_host( 'default',      { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['default', 'agent']})}
+    let(:masterless)    { make_host( 'masterless',   { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent', 'masterless']})}
+    let(:compiler)      { make_host( 'compiler',     { :platform => 'linux',
+                                                       :pe_ver   => '4.0',
+                                                       :roles => ['agent', 'compile_master']})}
+
+    it 'sorts hosts with common PE roles' do
+      these_hosts = [master, db, console, agent1, frictionless]
+      agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
+      expect(agent_only.length).to be 1
+      expect(agent_only).to include(agent1)
+      expect(non_agent.length).to be 4
+      expect(non_agent).to include(master)
+      expect(non_agent).to include(db)
+      expect(non_agent).to include(console)
+      expect(non_agent).to include(frictionless)
+    end
+
+    # Possibly needed for NetDev and Scale testing
+    it 'defaults to classifying custom roles as "agent only"' do
+      these_hosts = [monolith, compiler, agent1, agent2]
+      agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
+      expect(agent_only.length).to be 3
+      expect(agent_only).to include(agent1)
+      expect(agent_only).to include(agent2)
+      expect(agent_only).to include(compiler)
+      expect(non_agent.length).to be 1
+      expect(non_agent).to include(monolith)
+    end
+
+    # Most common form of module testing
+    it 'allows a puppet-agent host to be the default test target' do
+      these_hosts = [monolith, default_agent]
+      agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
+      expect(agent_only.length).to be 1
+      expect(agent_only).to include(default_agent)
+      expect(non_agent.length).to be 1
+      expect(non_agent).to include(monolith)
+    end
+
+    # Preferred module on commit scenario
+    it 'handles masterless scenarios' do
+      these_hosts = [masterless]
+      agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
+      expect(agent_only.length).to be 1
+      expect(non_agent).to be_empty
+    end
+
+    # IIRC, this is the basic PE integration smoke test
+    it 'handles agent-only-less scenarios' do
+      these_hosts = [monolith, frictionless]
+      agent_only, non_agent = subject.create_agent_specified_arrays(these_hosts)
+      expect(agent_only).to be_empty
+      expect(non_agent.length).to be 2
+    end
+  end
+
 end

data/spec/beaker/dsl/roles_spec.rb

@@ -96,6 +96,25 @@ describe ClassMixedWithDSLRoles do
       expect( subject.database ).to be_nil
     end
   end
+  describe '#not_controller' do
+    it 'returns true when a host does not have the roles master/database/dashboard' do
+      expect( subject.not_controller(agent1) ).to be == true
+    end
+    it 'returns false when a host has one of the roles master/database/dashboard' do
+      expect( subject.not_controller(a_and_dash) ).to be == false
+    end
+  end
+  describe '#agent_only' do
+    it 'returns true when a host has the single role agent' do
+      expect( subject.agent_only(agent1) ).to be == true
+    end
+    it 'returns false when a host has more than a single role' do
+      expect( subject.agent_only(a_and_dash) ).to be == false
+    end
+    it 'returns false when a host has the role master' do
+      expect( subject.agent_only(master) ).to be == false
+    end
+  end
   describe '#default' do
     it 'returns the default host when one is specified' do
       @hosts = [ db, agent1, agent2, default, master]

data/spec/beaker/host_spec.rb

@@ -364,6 +364,24 @@ module Beaker
 
       end
 
+    end
+
+    describe "#touch" do
+
+      it "generates the right absolute command for a windows host" do
+        @platform = 'windows'
+        expect( host.touch('touched_file') ).to be == "c:\\\\windows\\\\system32\\\\cmd.exe /c echo. 2> touched_file"
+      end
+
+      it "generates the right absolute command for a unix host" do
+        @platform = 'centos'
+        expect( host.touch('touched_file') ).to be == "/bin/touch touched_file"
+      end
+
+      it "generates the right absolute command for an osx host" do
+        @platform = 'osx'
+        expect( host.touch('touched_file') ).to be == "/usr/bin/touch touched_file"
+      end
 
     end
 

data/spec/beaker/options/command_line_parser_spec.rb

@@ -7,7 +7,7 @@ module Beaker
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
       let(:full_opts_in)  {["--hosts", "host.cfg",           "--options", "opts_file", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "always",   "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath",     "-m", "module",         "-q",    "--dry-run",       "--no-ntp",    "--repo-proxy",    "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast",  "--no-color",    "--version", "--log-level", "info", "--package-proxy", "http://192.168.100.1:3128",    "--collect-perf-data",    "--parse-only",    "--validate", "--timeout", "40", "--log-prefix", "pants",      "--configure",         "--tag", "1,2,3", "--exclude-tag", "4,5,6",        "--xml-time-order"]}
-      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :version=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
+      let(:full_opts_out) {{:hosts_file=>"anotherfile.cfg",:options_file=>"opts_file",  :helper => "path_to_helper",  :load_path => "load_path",  :tests => "test1.rb,test2.rb,test3.rb",  :pre_suite => "pre_suite.rb",  :post_suite => "post_suite.rb", :provision=>false, :preserve_hosts => "always", :root_keys=>true, :keyfile => "../.ssh/id_rsa",  :install => "gitrepopath", :modules=>"module", :quiet=>true, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true,                                 :fail_mode => "fast", :color=>false, :beaker_version_print=>true,  :log_level => "info",  :package_proxy => "http://192.168.100.1:3128", :collect_perf_data=>true, :parse_only=>true, :validate=>true,  :timeout => "40",  :log_prefix => "pants", :configure => true, :tag_includes => "1,2,3", :tag_excludes => "4,5,6", :xml_time_enabled => true}}
       let(:validate_true)  {["--validate"]}
       let(:validate_false) {["--no-validate"]}
       let(:configure_true)  {['--configure']}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.17.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -448,6 +448,7 @@ files:
 - lib/beaker/host/freebsd.rb
 - lib/beaker/host/freebsd/exec.rb
 - lib/beaker/host/mac.rb
+- lib/beaker/host/mac/exec.rb
 - lib/beaker/host/mac/group.rb
 - lib/beaker/host/mac/pkg.rb
 - lib/beaker/host/mac/user.rb