beaker 1.10.0 → 1.11.0

data/lib/beaker/test_case.rb

@@ -108,7 +108,7 @@ module Beaker
       @logger = logger
       @options = options
       @path    = path
-      @usr_home = ENV['HOME']
+      @usr_home = options[:home]
       @test_status = :pass
       @exception = nil
       @runtime = nil
@@ -182,18 +182,5 @@ module Beaker
       hash
     end
 
-    # This method retrieves the forge hostname from either:
-    # * The environment variable 'forge_host'
-    # * The parameter 'forge_host' from the CONFIG hash in a node definition
-    #
-    # If none of these are available, it falls back to the static
-    # 'vulcan-acceptance.delivery.puppetlabs.net' hostname
-    #
-    # @return [String] hostname of test forge
-    def forge
-      ENV['forge_host'] ||
-        @options['forge_host'] ||
-        'vulcan-acceptance.delivery.puppetlabs.net'
-    end
   end
 end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.10.0'
+    STRING = '1.11.0'
   end
 end

data/spec/beaker/answers_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module Beaker
   describe Answers do
     let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
+    let( :options )     { Beaker::Options::Presets.env_vars }
     let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                           basic_hosts[1]['platform'] = 'windows'
                           basic_hosts }
@@ -16,42 +17,43 @@ module Beaker
 
     it 'generates 3.2 answers for 3.2 hosts' do
       @ver = '3.2'
-      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, {}).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      Beaker::Answers::Version32.should_receive( :answers ).with( hosts, master_certname, options ).once
+      subject.answers( @ver, hosts, master_certname, options )
     end
 
     it 'generates 3.0 answers for 3.1 hosts' do
       @ver = '3.1'
-      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, {} ).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, options ).once
+      subject.answers( @ver, hosts, master_certname, options )
     end
 
     it 'generates 3.0 answers for 3.0 hosts' do
       @ver = '3.0'
-      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, {} ).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      Beaker::Answers::Version30.should_receive( :answers ).with( hosts, master_certname, options ).once
+      subject.answers( @ver, hosts, master_certname, options )
     end
 
     it 'generates 2.8 answers for 2.8 hosts' do
       @ver = '2.8'
-      Beaker::Answers::Version28.should_receive( :answers ).with( hosts, master_certname, {} ).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      Beaker::Answers::Version28.should_receive( :answers ).with( hosts, master_certname, options ).once
+      subject.answers( @ver, hosts, master_certname, options )
     end
 
     it 'generates 2.0 answers for 2.0 hosts' do
       @ver = '2.0'
-      Beaker::Answers::Version20.should_receive( :answers ).with( hosts, master_certname, {} ).once
-      subject.answers( @ver, hosts, master_certname, {} )
+      Beaker::Answers::Version20.should_receive( :answers ).with( hosts, master_certname, options ).once
+      subject.answers( @ver, hosts, master_certname, options )
     end
 
     it 'raises an error for an unknown version' do
       @ver = 'x.x'
-      expect{ subject.answers( @ver, hosts, master_certname, {} ) }.to raise_error( NotImplementedError )
+      expect{ subject.answers( @ver, hosts, master_certname, options ) }.to raise_error( NotImplementedError )
     end
   end
 
   module Answers
     describe Version32 do
+      let( :options )     { Beaker::Options::Presets.env_vars }
       let( :basic_hosts ) { make_hosts( {'pe_ver' => @ver } ) }
       let( :hosts ) { basic_hosts[0]['roles'] = ['master', 'agent']
                       basic_hosts[1]['roles'] = ['dashboard', 'agent']
@@ -63,17 +65,17 @@ module Beaker
       # master certname to the dashboard answers
       it 'should add q_puppetmaster_certname to the dashboard answers' do
         @ver = '3.2'
-        expect( subject.answers( hosts, master_certname, {} )['vm2']).to include :q_puppetmaster_certname
+        expect( subject.answers( hosts, master_certname, options )['vm2']).to include :q_puppetmaster_certname
       end
 
       it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
         @ver = '3.2'
-        expect( subject.answers( hosts, master_certname, {:type => :upgrade} )['vm2']).to include :q_upgrade_with_unknown_disk_space
+        expect( subject.answers( hosts, master_certname, options.merge( {:type => :upgrade} ) )['vm2']).to include :q_upgrade_with_unknown_disk_space
       end
 
       it 'should add answers to the host objects' do
         @ver = '3.2'
-        answers = subject.answers( hosts, master_certname, {})
+        answers = subject.answers( hosts, master_certname, options )
         hosts.each do |host|
           expect( host[:answers] ).to be === answers[host.name]
         end
@@ -81,6 +83,7 @@ module Beaker
     end
 
     describe Version30 do
+      let( :options )     { Beaker::Options::Presets.env_vars }
       let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
       let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                             basic_hosts[1]['platform'] = 'windows'
@@ -89,24 +92,26 @@ module Beaker
 
       it 'uses simple answers for upgrade from 3.0.x to 3.0.x' do
         @ver = '3.0'
-        expect( subject.answers( hosts, master_certname, { :type => :upgrade } )).to be === { "vm2"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm1"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm3"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" } }
+        expect( subject.answers( hosts, master_certname, options.merge({ :type => :upgrade }) )).to be === { "vm2"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm1"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" }, "vm3"=>{ :q_install=>"y", :q_install_vendor_packages=>"y" } }
       end
 
       it 'sets correct answers for an agent' do
-        expect( subject.answers( hosts, master_certname,{} )['vm3'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"n", :q_all_in_one_install=>"n", :q_puppet_enterpriseconsole_install=>"n", :q_puppetdb_install=>"n", :q_database_install=>"n" }
+        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"n", :q_all_in_one_install=>"n", :q_puppet_enterpriseconsole_install=>"n", :q_puppetdb_install=>"n", :q_database_install=>"n" }
       end
 
       it 'sets correct answers for a master' do
-        expect( subject.answers( hosts, master_certname, {} )['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0], :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>"master_certname", :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0], :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
+        @ver = '3.0'
+        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_verify_packages=>"y", :q_puppet_symlinks_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>master_certname, :q_puppetmaster_install=>"y", :q_all_in_one_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetdb_install=>"y", :q_database_install=>"y", :q_puppetdb_hostname=>hosts[0], :q_puppetdb_port=>8081, :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_certname=>"master_certname", :q_puppetdb_database_name=>"pe-puppetdb", :q_puppetdb_database_user=>"mYpdBu3r", :q_puppetdb_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_database_host=>hosts[0], :q_database_port=>5432, :q_pe_database=>"y", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_database_root_password=>"'=ZYdjiP3jCwV5eo9s1MBd'", :q_database_root_user=>"pe-postgres" }
       end
 
       it 'generates nil answers for a windows host' do
-        expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
+        @ver = '3.0'
+        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
       end
 
       it 'should add answers to the host objects' do
         @ver = '3.0'
-        answers = subject.answers( hosts, master_certname, {})
+        answers = subject.answers( hosts, master_certname, options )
         hosts.each do |host|
           expect( host[:answers] ).to be === answers[host.name]
         end
@@ -114,6 +119,7 @@ module Beaker
     end
 
     describe Version28 do
+      let( :options )     { Beaker::Options::Presets.env_vars }
       let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
       let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                             basic_hosts[1]['platform'] = 'windows'
@@ -121,20 +127,23 @@ module Beaker
       let( :master_certname ) { 'master_certname' }
 
       it 'sets correct answers for an agent' do
-        expect( subject.answers( hosts, master_certname,{} )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
+        @ver = '2.8'
+        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
       end
 
       it 'sets correct answers for a master' do
-        expect( subject.answers( hosts, master_certname, {} )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
+        @ver = '2.8'
+        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
       end
 
       it 'generates nil answers for a windows host' do
-        expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
+        @ver = '2.8'
+        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
       end
 
       it 'should add answers to the host objects' do
         @ver = '2.8'
-        answers = subject.answers( hosts, master_certname, {})
+        answers = subject.answers( hosts, master_certname, options )
         hosts.each do |host|
           expect( host[:answers] ).to be === answers[host.name]
         end
@@ -142,6 +151,7 @@ module Beaker
 
     end
     describe Version20 do
+      let( :options )     { Beaker::Options::Presets.env_vars }
       let( :basic_hosts ) { make_hosts( { 'pe_ver' => @ver } ) }
       let( :hosts )       { basic_hosts[0]['roles'] = ['master', 'database', 'dashboard']
                             basic_hosts[1]['platform'] = 'windows'
@@ -149,20 +159,23 @@ module Beaker
       let( :master_certname ) { 'master_certname' }
 
       it 'sets correct answers for an agent' do
-        expect( subject.answers( hosts, master_certname,{} )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
+        @ver = '2.0'
+        expect( subject.answers( hosts, master_certname, options )['vm3'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[2], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"n", :q_puppet_enterpriseconsole_install=>"n" }
       end
 
       it 'sets correct answers for a master' do
-        expect( subject.answers( hosts, master_certname, {} )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_root_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
+        @ver = '2.0'
+        expect( subject.answers( hosts, master_certname, options )['vm1'] ).to be === { :q_install=>"y", :q_puppetagent_install=>"y", :q_puppet_cloud_install=>"y", :q_puppet_symlinks_install=>"y", :q_vendor_packages_install=>"y", :q_puppetagent_certname=>hosts[0], :q_puppetagent_server=>hosts[0], :q_puppetmaster_install=>"y", :q_puppet_enterpriseconsole_install=>"y", :q_puppetmaster_certname=>"master_certname", :q_puppetmaster_dnsaltnames=>"master_certname,puppet,#{hosts[0][:ip]}", :q_puppetmaster_enterpriseconsole_hostname=>hosts[0], :q_puppetmaster_enterpriseconsole_port=>443, :q_puppetmaster_forward_facts=>"y", :q_puppet_enterpriseconsole_database_install=>"y", :q_puppet_enterpriseconsole_auth_database_name=>"console_auth", :q_puppet_enterpriseconsole_auth_database_user=>"mYu7hu3r", :q_puppet_enterpriseconsole_auth_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_name=>"console", :q_puppet_enterpriseconsole_database_user=>"mYc0nS03u3r", :q_puppet_enterpriseconsole_database_root_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_database_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_inventory_hostname=>hosts[0], :q_puppet_enterpriseconsole_inventory_certname=>hosts[0], :q_puppet_enterpriseconsole_inventory_dnsaltnames=>hosts[0], :q_puppet_enterpriseconsole_inventory_port=>8140, :q_puppet_enterpriseconsole_master_hostname=>hosts[0], :q_puppet_enterpriseconsole_auth_user_email=>"'admin@example.com'", :q_puppet_enterpriseconsole_auth_password=>"'~!@\#$%^*-/ aZ'", :q_puppet_enterpriseconsole_httpd_port=>443, :q_puppet_enterpriseconsole_smtp_host=>"'vm1'", :q_puppet_enterpriseconsole_smtp_use_tls=>"'n'", :q_puppet_enterpriseconsole_smtp_port=>"'25'", :q_puppet_enterpriseconsole_auth_user=>"'admin@example.com'" }
       end
 
       it 'generates nil answers for a windows host' do
-        expect( subject.answers( hosts, master_certname, {} )['vm2'] ).to be === nil
+        @ver = '2.0'
+        expect( subject.answers( hosts, master_certname, options )['vm2'] ).to be === nil
       end
 
       it 'should add answers to the host objects' do
         @ver = '2.0'
-        answers = subject.answers( hosts, master_certname, {})
+        answers = subject.answers( hosts, master_certname, options )
         hosts.each do |host|
           expect( host[:answers] ).to be === answers[host.name]
         end

data/spec/beaker/dsl/helpers_spec.rb

@@ -11,6 +11,7 @@ class ClassMixedWithDSLHelpers
 end
 
 describe ClassMixedWithDSLHelpers do
+  let( :opts )     { Beaker::Options::Presets.env_vars }
   let( :command )  { 'ls' }
   let( :host ) { double.as_null_object }
   let( :result ) { Beaker::Result.new( host, command ) }
@@ -127,26 +128,26 @@ describe ClassMixedWithDSLHelpers do
       end
 
       it 'yields self' do
-        subject.on host, command do 
+        subject.on host, command do
           expect( subject ).
             to be_an_instance_of( ClassMixedWithDSLHelpers )
         end
       end
 
       it 'provides access to stdout' do
-        subject.on host, command do 
+        subject.on host, command do
           expect( subject.stdout ).to be == 'stdout'
         end
       end
 
       it 'provides access to stderr' do
-        subject.on host, command do 
+        subject.on host, command do
           expect( subject.stderr ).to be == 'stderr'
         end
       end
 
       it 'provides access to exit_code' do
-        subject.on host, command do 
+        subject.on host, command do
           expect( subject.exit_code ).to be == 0
         end
       end
@@ -513,7 +514,7 @@ describe ClassMixedWithDSLHelpers do
 
   describe '#stub_forge_on' do
     it 'stubs forge.puppetlabs.com with the value of `forge`' do
-      subject.should_receive( :forge ).and_return( 'my_forge.example.com' )
+      subject.stub( :options ).and_return( {} )
       Resolv.should_receive( :getaddress ).
         with( 'my_forge.example.com' ).and_return( '127.0.0.1' )
       subject.should_receive( :stub_hosts_on ).
@@ -521,15 +522,16 @@ describe ClassMixedWithDSLHelpers do
       subject.should_receive( :stub_hosts_on ).
         with( 'my_host', 'forgeapi.puppetlabs.com' => '127.0.0.1' )
 
-      subject.stub_forge_on( 'my_host' )
+      subject.stub_forge_on( 'my_host', 'my_forge.example.com' )
     end
   end
 
   describe "#stub_forge" do
     it "delegates to #stub_forge_on with the default host" do
+      subject.stub( :options ).and_return( {} )
       subject.stub( :hosts ).and_return( hosts )
 
-      subject.should_receive( :stub_forge_on ).with( master ).once
+      subject.should_receive( :stub_forge_on ).with( master, nil ).once
 
       subject.stub_forge( )
 
@@ -878,4 +880,109 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
+
+  describe 'copy_root_module_to' do
+    def source_to_scp (source, target, items)
+      subject.stub(:parse_for_moduleroot).and_return('/totalfake/testmodule')
+      Dir.stub(:getpwd).and_return('/totalfake/testmodule')
+
+      items = [items] unless items.kind_of?(Array)
+      File.stub(:exists?).with(any_args()).and_return(false)
+      File.stub(:directory?).with(any_args()).and_return(false)
+      items.each do |item|
+        source_item = File.join(source,item)
+        File.stub(:exists?).with(source_item).and_return(true)
+        options = {}
+        if ['manifests','lib','templates','files'].include? item
+          File.stub(:directory?).with(source_item).and_return(true)
+          options = {:mkdir => true}
+        end
+        master.should_receive(:do_scp_to).with(source_item,target,options).ordered
+      end
+    end
+    it 'should call scp with the correct info, with only providing host' do
+      files = ['manifests','lib','templates','metadata.json','Modulefile','files']
+      source_to_scp '/totalfake/testmodule',"#{master['puppetpath']}/modules/testmodule",files
+      subject.stub(:parse_for_modulename).with(any_args()).and_return("testmodule")
+      subject.copy_root_module_to(master)
+    end
+    it 'should call scp with the correct info, when specifying the modulename' do
+      files = ['manifests','lib','metadata.json','Modulefile']
+      source_to_scp '/totalfake/testmodule',"#{master['puppetpath']}/modules/bogusmodule",files
+      subject.stub(:parse_for_modulename).and_return('testmodule')
+      subject.copy_root_module_to(master,{:module_name =>"bogusmodule"})
+    end
+    it 'should call scp with the correct info, when specifying the target to a different path' do
+      files = ['manifests','lib','templates','metadata.json','Modulefile','files']
+      target = "/opt/shared/puppet/modules"
+      source_to_scp '/totalfake/testmodule',"#{target}/testmodule",files
+      subject.stub(:parse_for_modulename).and_return('testmodule')
+      subject.copy_root_module_to(master,{:target_module_path => target})
+    end
+  end
+
+  describe 'split_author_modulename' do
+    it 'should return a correct modulename' do
+      result =  subject.split_author_modulename('myname-test_43_module')
+      expect(result[:author]).to eq('myname')
+      expect(result[:module]).to eq('test_43_module')
+    end
+  end
+
+  describe 'get_module_name' do
+    it 'should return a has of author and modulename' do
+      expect(subject.get_module_name('myname-test_43_module')).to eq('test_43_module')
+    end
+    it 'should return nil for invalid names' do
+      expect(subject.get_module_name('myname-')).to eq(nil)
+    end
+  end
+
+  describe 'parse_for_modulename' do
+    directory = '/testfilepath/myname-testmodule'
+    it 'should return name from metadata.json' do
+      File.stub(:exists?).with("#{directory}/metadata.json").and_return(true)
+      File.stub(:read).with("#{directory}/metadata.json").and_return(" {\"name\":\"myname-testmodule\"} ")
+      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from metadata.json")
+      subject.logger.should_not_receive(:debug).with('Unable to determine name, returning null')
+      subject.parse_for_modulename(directory).should eq('testmodule')
+    end
+    it 'should return name from Modulefile' do
+      File.stub(:exists?).with("#{directory}/metadata.json").and_return(false)
+      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
+      File.stub(:read).with("#{directory}/Modulefile").and_return("name    'myname-testmodule'  \nauthor   'myname'")
+      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from Modulefile")
+      subject.logger.should_not_receive(:debug).with("Unable to determine name, returning null")
+      expect(subject.parse_for_modulename(directory)).to eq('testmodule')
+    end
+  end
+
+  describe 'parse_for_module_root' do
+    directory = '/testfilepath/myname-testmodule'
+    it 'should recersively go up the directory to find the module files' do
+      File.stub(:exists?).with("#{directory}/acceptance/Modulefile").and_return(false)
+      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
+      subject.logger.should_not_receive(:debug).with("At root, can't parse for another directory")
+      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}/acceptance, moving up")
+      expect(subject.parse_for_moduleroot("#{directory}/acceptance")).to eq(directory)
+    end
+    it 'should recersively go up the directory to find the module files' do
+      File.stub(:exists?).and_return(false)
+      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}, moving up")
+      subject.logger.should_receive(:error).with("At root, can't parse for another directory")
+      expect(subject.parse_for_moduleroot(directory)).to eq(nil)
+    end
+
+  end
+end
+
+module FakeFS
+  class File < StringIO
+    def self.absolute_path(filepath)
+      RealFile.absolute_path(filepath)
+    end
+    def self.expand_path(filepath)
+      RealFile.expand_path(filepath)
+    end
+  end
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -7,19 +7,20 @@ class ClassMixedWithDSLInstallUtils
 end
 
 describe ClassMixedWithDSLInstallUtils do
-   let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
-                                        :platform => 'linux',
-                                        :roles => [ 'agent' ] } ) }
-   let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
-                          basic_hosts[1][:platform] = 'windows'
-                          basic_hosts  }
-   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
+  let(:opts)          { Beaker::Options::Presets.env_vars }
+  let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
+                                       :platform => 'linux',
+                                       :roles => [ 'agent' ] } ) }
+  let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
+                         basic_hosts[1][:platform] = 'windows'
+                         basic_hosts  }
+  let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
+                                                :pe_ver => '3.0',
+                                                :working_dir => '/tmp' } ) }
+  let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
                                                  :pe_ver => '3.0',
-                                                 :working_dir => '/tmp' } ) }
-   let(:unixhost)      { make_host( 'unixhost', { :platform => 'linux',
-                                                  :pe_ver => '3.0',
-                                                  :working_dir => '/tmp',
-                                                  :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
+                                                 :working_dir => '/tmp',
+                                                 :dist => 'puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386' } ) }
 
 
   context 'extract_repo_info_from' do
@@ -257,7 +258,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.should_receive( :wait_for_host_in_dashboard ).with( hosts[2] ).once
       #run puppet agent now that installation is complete
       subject.should_receive( :on ).with( hosts, /puppet agent/, :acceptable_exit_codes => [0,2] ).once
-      subject.do_install( hosts )
+      subject.do_install( hosts, opts )
     end
   end
 
@@ -326,9 +327,10 @@ describe ClassMixedWithDSLInstallUtils do
   describe 'install_pe' do
 
     it 'calls do_install with sorted hosts' do
+      subject.stub( :options ).and_return( {} )
       subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2] ] )
       subject.stub( :do_install ).and_return( true )
-      subject.should_receive( :do_install ).with( hosts )
+      subject.should_receive( :do_install ).with( hosts, {} )
       subject.install_pe
     end
 
@@ -340,7 +342,7 @@ describe ClassMixedWithDSLInstallUtils do
       subject.stub( :hosts ).and_return( [ hosts[1], hosts[0], hosts[2] ] )
       subject.stub( :options ).and_return( {} )
       subject.stub( :do_install ).and_return( true )
-      subject.should_receive( :do_install ).with( hosts )
+      subject.should_receive( :do_install ).with( hosts, {} )
       subject.install_pe
       hosts.each do |h|
         expect( h['pe_ver'] ).to be === '2.8'