beaker 2.8.0 → 2.9.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjYxOGQ2OTU1ODFmMGMyYzU5YTE3ZTg2ZTNhYjUzYzVkMTE4ZmZhNg==
+    NTRiYTFlN2E4ZTQyNWUxMWJlZGRmNzNmNTNmN2NhYzk3OTFjODYzYg==
   data.tar.gz: !binary |-
-    NGU4Y2UxNGI0YmMxZjRiZTRkNmY2ZjljNDlmZTY2YjUzZDg0ZDdkNw==
+    YjNkMGZkODlhYmM3Y2Q2ZDA5OGE1OTM2ODQ2MWIxNzkxYmViMDY3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OTYwZTkxZDE1ZjIxZjdjNjcwZWM2OTg2MGM0YWIyZDUyMTEyY2U3OGExY2Jh
-    ZGNlNGMyYjA5YjJhOGIyZWE2MmI1NDlhMWM3NzI4YzZlNzkzNjg1MTY4ZWQ2
-    MWJmOTFiYjYzYTg1NTFkZDIxZTkxMmJlMzJkNmM3YTJkODE1YzQ=
+    ZDkyODM0NzY1ZGY0MzdiNzViMzEyZTZhMmRiNTAyNTAzMDQzMmU3Y2IwNTM3
+    YmQ5OWViYzYzNDUzYWE5OTlmNGNkZjljNzgwMmE4MmQwODZhNTE3ZTQ4MjZl
+    ODE3Mzg1MmMxOTFjMmRhMWM5ZmFmNGRjOWExNWU1MGFhYjQ5MjM=
   data.tar.gz: !binary |-
-    MWYzNWYxNzcwZDI2YTc1ZWFmOGE4M2ZjNjNmMGY5NjRiMDVhMmZhNzE1ODJl
-    NjAxN2U5ZmQ4Yjc1NDZkYTkwYzkzZDIxOTY0NDNjZjYyMjdlYTk2NTdjOGRh
-    NWI2YmU3YjgyODM0ZDQ3ZjNhMGQyZmMyMDBmZjkyZDU0OTNiNDA=
+    MDEzZjUxNmZmMmI1MjdiZjcwZjFjNDY3ODA2MDdlYmY3MTQwNGMxZWNjNjcy
+    MmM4NzZhMjcxMDljNWE4NDU4MGE3MmQ2MGQxYWFhOWNjMzYzZTk2M2Y2MmU5
+    MThkNWE5MTQzYjRmNDg3MWU3MzQyZjA4MjVlYzZhZDZhZDFkZWE=

data/.simplecov

@@ -1,15 +1,15 @@
 SimpleCov.configure do
   add_filter 'spec/'
+  add_filter 'vendor/'
   add_filter do |file|
     file.lines_of_code < 10
   end
-  add_group 'DSL', '/dsl'
-  add_group 'Host', '/host'
-  add_group 'Utils' do |file|
-    files = %w(cli.rb logger.rb options_parsing.rb test_config.rb utils/)
-    files.any? {|f| file.filename =~ Regexp.new( Regexp.quote(f) ) }
-  end
-  add_group 'Hypervisors', '/hypervisor'
+  add_group 'Answers', '/answers/'
+  add_group 'DSL', '/dsl/'
+  add_group 'Host', '/host/'
+  add_group 'Hypervisors', '/hypervisor/'
+  add_group 'Options', '/options/'
+  add_group 'Shared', '/shared/'
 end
 
-SimpleCov.start if ENV['COVERAGE']
+SimpleCov.start if ENV['BEAKER_COVERAGE']

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 26 Mar, 2015 (f320c276)](#LATEST)
+* [LATEST - 9 Apr, 2015 (901c4a94)](#LATEST)
+* [beaker2.8.0 - 26 Mar, 2015 (2d25d06d)](#beaker2.8.0)
 * [beaker2.7.1 - 19 Mar, 2015 (45b2bf10)](#beaker2.7.1)
 * [beaker2.7.0 - 19 Mar, 2015 (38b14ef8)](#beaker2.7.0)
 * [beaker2.6.0 - 12 Mar, 2015 (d4e731ab)](#beaker2.6.0)
@@ -76,7 +77,245 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 26 Mar, 2015 (f320c276)
+### <a name = "LATEST">LATEST - 9 Apr, 2015 (901c4a94)
+
+* (GEM) update beaker version to 2.9.0 (901c4a94)
+
+* Merge pull request #783 from anodelman/maint (62b5ac60)
+
+
+```
+Merge pull request #783 from anodelman/maint
+
+(BKR-70) Make SshConnection.close more robust...
+```
+* (BKR-70) Make SshConnection.close more robust... (3bb4f7ca)
+
+
+```
+(BKR-70) Make SshConnection.close more robust...
+
+...(so that on(host, "reboot") works correctly)
+
+- catch IOErrors
+- added additional execution option ':expect_connection_failure' for
+  operations that you believe should result in the connection to the
+  host being dropped or broken
+- tested with rebooting centos7 box, successfully rebuilds connection
+  and continues test execution
+```
+* Merge pull request #781 from anodelman/zombie (959952a7)
+
+
+```
+Merge pull request #781 from anodelman/zombie
+
+(BKR-192) can't run beaker without a host file specified
+```
+* (BKR-192) can't run beaker without a host file specified (5cf28b4c)
+
+
+```
+(BKR-192) can't run beaker without a host file specified
+
+- the hosts file was being defaulted to to provide a log name prefix -
+  it needs a default value for when there is no user provided value plus
+  no hosts file
+```
+* Merge pull request #778 from anodelman/maint (e2d23066)
+
+
+```
+Merge pull request #778 from anodelman/maint
+
+(BKR-188) have beaker support a 'test' raketask.
+```
+* Merge pull request #780 from anodelman/spec-tests (a64a3a10)
+
+
+```
+Merge pull request #780 from anodelman/spec-tests
+
+(BKR-183) simplecov busted in beaker
+```
+* (BKR-183) simplecov busted in beaker (3ae9cd7f)
+
+
+```
+(BKR-183) simplecov busted in beaker
+
+- accidentally busted when we dropped ruby 1.8 support
+- updated to look nice with the current beaker directory structure
+- updated env var to meet beaker standards
+```
+* (BKR-188) have beaker support a 'test' raketask. (93faeffa)
+
+
+```
+(BKR-188) have beaker support a 'test' raketask.
+
+- meets our gem standards
+```
+* Merge pull request #767 from petems/BKR-113-freebsd_pkg_commands (a18ff029)
+
+
+```
+Merge pull request #767 from petems/BKR-113-freebsd_pkg_commands
+
+(BKR-113) Add pkg commands for FreeBSD
+```
+* Merge pull request #764 from petems/BKR-113-add_freebsd_host_class (cc6b606e)
+
+
+```
+Merge pull request #764 from petems/BKR-113-add_freebsd_host_class
+
+(BKR-113) Add FreeBSD host class
+```
+* Merge pull request #768 from anodelman/maint (5a8d8b0c)
+
+
+```
+Merge pull request #768 from anodelman/maint
+
+(QENG-2083) share out beaker's history file generation tool
+```
+* Merge pull request #770 from madAndroid/BKR-165-hack_etc_hosts_docker (bfd12ca9)
+
+
+```
+Merge pull request #770 from madAndroid/BKR-165-hack_etc_hosts_docker
+
+(BKR-165) hack_etc_hosts method doesn't work for Docker provider
+```
+* Merge pull request #773 from liamjbennett/install_windows_cert (3aa42917)
+
+
+```
+Merge pull request #773 from liamjbennett/install_windows_cert
+
+(gh-691) Add function to install certs on windows agents
+```
+* Merge pull request #771 from justinstoller/maint/master/pc1 (8909e35a)
+
+
+```
+Merge pull request #771 from justinstoller/maint/master/pc1
+
+(QENG-2096) Update dev repo for new AIO repo name
+```
+* Merge pull request #762 from sschneid/bkr-161_tagging (084ee947)
+
+
+```
+Merge pull request #762 from sschneid/bkr-161_tagging
+
+(BKR-161) Beaker tagging improvements
+```
+* (gh-691) Add function to install certs on windows agents (ccf0bb7e)
+
+
+```
+(gh-691) Add function to install certs on windows agents
+
+This fixes the issue raised in PUP-2365
+```
+* BKR-165 - Add spec test to check for presence of /etc/hosts for docker provider (d5da2ee2)
+
+* BKR-165 - Amend hack_etc_hosts to set host file entry to host['vm_ip'], if present; add comments to that affect (9c8874b8)
+
+* BKR-165 - add hack_etc_hosts method to beaker hypervisor, and set host['vm_ip'] to correct container IP (b324abe7)
+
+* (QENG-2096) Update dev repo for new AIO repo name (06e3da46)
+
+
+```
+(QENG-2096) Update dev repo for new AIO repo name
+
+Soon AIO builds will only be published to the repo "PC1" (not
+products/devel or main as previously). This allows Beaker to install
+from both new AIO repos or legacy repos.
+```
+* (QENG-2083) share out beaker's history file generation tool (afe0d24c)
+
+
+```
+(QENG-2083) share out beaker's history file generation tool
+
+- remove the history file generator used exclusively by beaker in favor of the
+  new, general use tool
+```
+* Merge pull request #763 from mullr/fix-ezbake-package-version (3e2e1e6d)
+
+
+```
+Merge pull request #763 from mullr/fix-ezbake-package-version
+
+Fix ezbake version string extraction
+```
+* Merge pull request #753 from petems/MAINT-fix_copy_module_to_on_non_cygwin (30a9ee04)
+
+
+```
+Merge pull request #753 from petems/MAINT-fix_copy_module_to_on_non_cygwin
+
+(MAINT) Fix copy module to on non-cygwin
+```
+* Merge pull request #761 from petems/MAINT-show_error_from_docker (a6198bb4)
+
+
+```
+Merge pull request #761 from petems/MAINT-show_error_from_docker
+
+(MAINT) Show error from docker
+```
+* (BKR-113) Add pkg commands for FreeBSD (efb39f8e)
+
+* (BKR-113) Add FreeBSD host class (e288f713)
+
+
+```
+(BKR-113) Add FreeBSD host class
+
+* Also add to supported platforms
+* Main change is location of Puppet data under `/usr/local/etc` rather than `/etc/`
+```
+* (BKR-162) Fix ezbake version string extraction (3b1bf59b)
+
+
+```
+(BKR-162) Fix ezbake version string extraction
+
+This previously used 'echo -n', which is not a universally available
+feature of echo. When running with an OS X host, this caused the string
+to look like "-n PACKAGE-1.2.3\n", which caused cascading failures in
+the code that uses this data. printf is a more portable replacement.
+```
+* (BKR-161) Beaker tagging improvements (da9fe1ed)
+
+
+```
+(BKR-161) Beaker tagging improvements
+
+- Use JOB_NAME for 'project' tag default if it exists
+- Set 'beaker_version' tag in vmpooler hypervisor
+```
+* (MAINT) Updates spec to detect error string (58d7a031)
+
+* (MAINT) Changes error message to help debugging (2d9bc305)
+
+
+```
+(MAINT) Changes error message to help debugging
+
+* Changes the wording to say it was not connectable rather than found
+* Adds error string to help debugging the issue
+```
+* (MAINT) Adds non-cygwin block for copy_module_to (8e5cdd0c)
+
+### <a name = "beaker2.8.0">beaker2.8.0 - 26 Mar, 2015 (2d25d06d)
+
+* (HISTORY) update beaker history for gem release 2.8.0 (2d25d06d)
 
 * (GEM) update beaker version to 2.8.0 (f320c276)
 

data/Rakefile

@@ -2,6 +2,10 @@ require 'open3'
 
 task :default => [ 'test:spec' ]
 
+task :test do
+  Rake::Task['test:spec'].invoke
+end
+
 task :spec do
   Rake::Task['test:spec'].invoke
 end

data/beaker.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown'
   s.add_development_dependency 'thin'
-  s.add_development_dependency 'gitlab-grit'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'

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

@@ -169,7 +169,7 @@ module Beaker
 
             load 'ezbake.rb'
             ezbake = EZBake::Config
-            ezbake[:package_version] = `echo -n $(rake pl:print_build_param[ref] | tail -n 1)`
+            ezbake[:package_version] = `printf $(rake pl:print_build_param[ref] | tail -n 1)`
             EZBakeUtils.config = ezbake
           end
         end

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

@@ -13,7 +13,7 @@ module Beaker
       # * the module {Beaker::DSL::Wrappers} the provides convenience methods for {Beaker::DSL::Command} creation
       module ModuleUtils
 
-        # The directories in the module directory that will not be scp-ed to the test system when using 
+        # The directories in the module directory that will not be scp-ed to the test system when using
         # `copy_module_to`
         PUPPET_MODULE_INSTALL_IGNORE = ['.bundle', '.git', '.idea', '.vagrant', '.vendor', 'vendor', 'acceptance',
                                         'bundle', 'spec', 'tests', 'log']
@@ -123,22 +123,24 @@ module Beaker
 
             opts[:protocol] ||= 'scp'
             case opts[:protocol]
-              when 'scp'
-                #move to the host
-                scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
-                #rename to the selected module name, if not correct
-                cur_path = File.join(target_module_dir, source_name)
-                cur_path = File.join(target_module_dir, source_name)
-                new_path = File.join(target_module_dir, module_name)
-                if cur_path != new_path
-                  # NOTE: this will need to be updated to handle powershell only windows SUTs
+            when 'scp'
+              #move to the host
+              scp_to host, source_path, target_module_dir, {:ignore => ignore_list}
+              #rename to the selected module name, if not correct
+              cur_path = File.join(target_module_dir, source_name)
+              new_path = File.join(target_module_dir, module_name)
+              if (cur_path != new_path)
+                if host.is_cygwin?
                   on host, "mv #{cur_path} #{new_path}"
+                else
+                  on host, "move /y #{cur_path} #{new_path}"
                 end
-              when 'rsync'
-                rsync_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
-              else
-                logger.debug "Unsupported transfer protocol, returning nil"
-                nil
+              end
+            when 'rsync'
+              rsync_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+            else
+              logger.debug "Unsupported transfer protocol, returning nil"
+              nil
             end
           end
         end

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

@@ -551,7 +551,7 @@ module Beaker
           platform_configs_dir = File.join(repo_configs_dir, variant)
 
           # some of the uses of dev_builds_url below can't include protocol info,
-          # pluse this opens up possibility of switching the behavior on provided
+          # plus this opens up possibility of switching the behavior on provided
           # url type
           _, protocol, hostname = options[:dev_builds_url].partition /.*:\/\//
           dev_builds_url = protocol + hostname
@@ -583,10 +583,16 @@ module Beaker
                           repo_filename,
                           platform_configs_dir)
 
-            link = "%s/%s/%s/repos/%s/%s%s/products/%s/" %
+            link = "%s/%s/%s/repos/%s/%s%s/PC1/%s/" %
               [ dev_builds_url, package_name, build_version, variant,
                 fedora_prefix, version, arch ]
 
+            if not link_exists?( link )
+              link = "%s/%s/%s/repos/%s/%s%s/products/%s/" %
+                [ dev_builds_url, package_name, build_version, variant,
+                  fedora_prefix, version, arch ]
+            end
+
             if not link_exists?( link )
               link = "%s/%s/%s/repos/%s/%s%s/devel/%s/" %
                 [ dev_builds_url, package_name, build_version, variant,
@@ -626,8 +632,13 @@ module Beaker
             scp_to host, list, config_dir
             scp_to host, repo_dir, "/root/#{package_name}"
 
+            pc1_check = on( host,
+                           "[[ -d /root/#{package_name}/#{codename}/PC1 ]]",
+                            :acceptable_exit_codes => [0,1] )
+
+            repo_name = pc1_check.exit_code == 0 ? 'PC1' : 'main'
             search = "deb\\s\\+http:\\/\\/#{hostname}.*$"
-            replace = "deb file:\\/\\/\\/root\\/#{package_name}\\/#{codename} #{codename} main"
+            replace = "deb file:\\/\\/\\/root\\/#{package_name}\\/#{codename} #{codename} #{repo_name}"
             sed_command = "sed -i 's/#{search}/#{replace}/'"
             find_and_sed = "find #{config_dir} -name \"*.list\" -exec #{sed_command} {} \\;"
 
@@ -716,6 +727,16 @@ module Beaker
           end
         end
 
+        # This method will install a pem file certifcate on a windows host
+        # 
+        # @param [Host] host                 A host object
+        # @param [String] cert_name          The name of the pem file
+        # @param [String] cert               The contents of the certificate
+        #                  
+        def install_cert_on_windows(host, cert_name, cert)
+          create_remote_file(host, "C:\\Windows\\Temp\\#{cert_name}.pem", cert)
+          on host, "certutil -v -addstore Root C:\\Windows\\Temp\\#{cert_name}.pem"
+        end
       end
     end
   end

data/lib/beaker/host.rb

@@ -39,6 +39,8 @@ module Beaker
         Aix::Host.new name, options
       when /osx/
         Mac::Host.new name, options
+      when /freebsd/
+        FreeBSD::Host.new name, options
       else
         Unix::Host.new name, options
       end
@@ -394,10 +396,19 @@ module Beaker
         unless options[:silent]
           # What?
           result.log(@logger)
+          if !options[:expect_connection_failure] && !result.exit_code
+            # no exit code was collected, so the stream failed
+            raise CommandFailure, "Host '#{self}' connection failure running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
+
+          end
+          if options[:expect_connection_failure] && result.exit_code
+            # should have had a connection failure, but didn't
+            raise CommandFailure, "Host '#{self}' should have resulted in a connection failure running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
+          end
           # No, TestCase has the knowledge about whether its failed, checking acceptable
           # exit codes at the host level and then raising...
           # is it necessary to break execution??
-          if !options[:accept_all_exit_codes] && !result.exit_code_in?(Array(options[:acceptable_exit_codes] || 0))
+          if !options[:accept_all_exit_codes] && !result.exit_code_in?(Array(options[:acceptable_exit_codes] || [0, nil]))
             raise CommandFailure, "Host '#{self}' exited with #{result.exit_code} running:\n #{cmdline}\nLast #{@options[:trace_limit]} lines of output were:\n#{result.formatted_output(@options[:trace_limit])}"
           end
         end
@@ -595,7 +606,14 @@ module Beaker
 
   end
 
-  [ 'windows', 'pswindows', 'unix', 'aix', 'mac' ].each do |lib|
+  [
+    'windows',
+    'pswindows',
+     'unix',
+     'aix',
+     'mac',
+     'freebsd',
+  ].each do |lib|
     require "beaker/host/#{lib}"
   end
 end

data/lib/beaker/host/freebsd.rb

@@ -0,0 +1,31 @@
+[ 'host', 'command_factory' ].each do |lib|
+  require "beaker/#{lib}"
+end
+
+module FreeBSD
+  class Host < Unix::Host
+
+    def self.foss_defaults
+      h = Beaker::Options::OptionsHash.new
+      h.merge({
+        'user'              => 'root',
+        'group'             => 'puppet',
+        'puppetserver-confdir' => '/etc/puppetserver/conf.d',
+        'puppetservice'     => 'puppetmaster',
+        'puppetpath'        => '/usr/local/etc/puppet/modules',
+        'puppetvardir'      => '/var/lib/puppet',
+        'puppetbin'         => '/usr/bin/puppet',
+        'puppetbindir'      => '/usr/bin',
+        'hieralibdir'       => '/opt/puppet-git-repos/hiera/lib',
+        'hierapuppetlibdir' => '/opt/puppet-git-repos/hiera-puppet/lib',
+        'hierabindir'       => '/opt/puppet-git-repos/hiera/bin',
+        'hieradatadir'      => '/usr/local/etc/puppet/modules/hieradata',
+        'hieraconf'         => '/usr/local/etc/puppet/modules/hiera.yaml',
+        'distmoduledir'     => '/usr/local/etc/puppet/modules',
+        'sitemoduledir'     => '/usr/share/puppet/modules',
+        'pathseparator'     => ':',
+        })
+    end
+  end
+
+end

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

@@ -32,6 +32,10 @@ module Unix::Pkg
         result = exec(Beaker::Command.new("pkg info #{name}"), :acceptable_exit_codes => (0...127))
       when /solaris-10/
         result = exec(Beaker::Command.new("pkginfo #{name}"), :acceptable_exit_codes => (0...127))
+      when /freebsd-9/
+        result = exec(Beaker::Command.new("pkg_info #{name}"), :acceptable_exit_codes => (0...127))
+      when /freebsd-10/
+        result = exec(Beaker::Command.new("pkg info #{name}"), :acceptable_exit_codes => (0...127))
       else
         raise "Package #{name} cannot be queried on #{self}"
     end
@@ -70,6 +74,10 @@ module Unix::Pkg
         execute("pkg #{cmdline_args} install #{name}")
       when /solaris-10/
         execute("pkgutil -i -y #{cmdline_args} #{name}")
+      when /freebsd-9/
+        execute("pkg_add -fr #{cmdline_args} #{name}")
+      when /freebsd-10/
+        execute("pkg #{cmdline_args} install #{name}")
       else
         raise "Package #{name} cannot be installed on #{self}"
     end
@@ -200,4 +208,4 @@ module Unix::Pkg
         raise "Package repo cannot be deployed on #{self}; the platform is not supported"
     end
   end
-end
+end

data/lib/beaker/host_prebuilt_steps.rb

@@ -313,15 +313,18 @@ module Beaker
       end
     end
 
-    #Update /etc/hosts to make it possible for each provided host to reach each other host by name.
-    #Assumes that each provided host has host[:ip] set.
+    # Update /etc/hosts to make it possible for each provided host to reach each other host by name.
+    # Assumes that each provided host has host[:ip] set; in the instance where a provider sets
+    # host['ip'] to an address which facilitates access to the host externally, but the actual host
+    # addresses differ from this, we check first for the presence of a host['vm_ip'] key first,
+    # and use that if present.
     # @param [Host, Array<Host>] hosts An array of hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
     def hack_etc_hosts hosts, opts
       etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
       hosts.each do |host|
-        etc_hosts += "#{host['ip'].to_s}\t#{host[:vmhostname] || host.name}\n"
+        etc_hosts += "#{host['vm_ip'] || host['ip'].to_s}\t#{host[:vmhostname] || host.name}\n"
       end
       hosts.each do |host|
         set_etc_hosts(host, etc_hosts)

data/lib/beaker/hypervisor/docker.rb

@@ -16,7 +16,7 @@ module Beaker
       begin
         ::Docker.validate_version!
       rescue Excon::Errors::SocketError => e
-        raise "Docker instance not found.\nif you are on OSX, you might not have Boot2Docker setup correctly\nCheck your DOCKER_HOST variable has been set"
+        raise "Docker instance not connectable.\nError was: #{e}\nIf you are on OSX, you might not have Boot2Docker setup correctly\nCheck your DOCKER_HOST variable has been set"
       end
 
       # Pass on all the logging from docker-api to the beaker logger instance
@@ -64,7 +64,12 @@ module Beaker
         @logger.debug("node available as  ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@#{ip} -p #{port}")
         host['docker_container'] = container
         host['docker_image'] = image
+        host['vm_ip'] = container.json["NetworkSettings"]["IPAddress"].to_s
+
       end
+
+      hack_etc_hosts @hosts, @options
+
     end
 
     def cleanup

data/lib/beaker/hypervisor/vmpooler.rb

@@ -111,6 +111,7 @@ module Beaker
       @logger.notify 'Tagging vmpooler VMs'
 
       tags = {
+        'beaker_version' => Beaker::Version::STRING,
         'jenkins_build_url' => @options[:jenkins_build_url],
         'department' => @options[:department],
         'project' => @options[:project],

data/lib/beaker/network_manager.rb

@@ -26,7 +26,16 @@ module Beaker
       @machines = {}
       @hypervisors = nil
 
-      @options[:log_prefix]     = File.basename(@options[:hosts_file], '.yml') unless @options[:log_prefix]
+      # user provided prefix has top priority
+      if not @options[:log_prefix]
+        # name it after the hosts file
+        if @options[:hosts_file]
+          @options[:log_prefix] = File.basename(@options[:hosts_file], '.yml')
+        else
+          #here be the default
+          @options[:log_prefix] = @options[:default_log_prefix]
+        end
+      end
       @options[:timestamp]      = Time.now unless @options.has_key?(:timestamp)
       @options[:xml_dated_dir]  = Beaker::Logger.generate_dated_log_folder(@options[:xml_dir], @options[:log_prefix], @options[:timestamp])
       @options[:log_dated_dir]  = Beaker::Logger.generate_dated_log_folder(@options[:log_dir], @options[:log_prefix], @options[:timestamp])

data/lib/beaker/options/presets.rb

@@ -11,9 +11,12 @@ module Beaker
       # us to define multiple environment variables for the same
       # configuration value. They are checked in the order they are arrayed
       # so that preferred and "fallback" values work as expected.
+      #
+      # 'JOB_NAME' and 'BUILD_URL' envs are supplied by Jenkins
+      # https://wiki.jenkins-ci.org/display/JENKINS/Building+a+software+project
       ENVIRONMENT_SPEC = {
         :home                 => 'HOME',
-        :project              => ['BEAKER_PROJECT', 'BEAKER_project'],
+        :project              => ['BEAKER_PROJECT', 'BEAKER_project', 'JOB_NAME'],
         :department           => ['BEAKER_DEPARTMENT', 'BEAKER_department'],
         :jenkins_build_url    => ['BEAKER_BUILD_URL', 'BUILD_URL'],
         :created_by           => ['BEAKER_CREATED_BY'],
@@ -134,6 +137,7 @@ module Beaker
           :xml_dir                => 'junit',
           :xml_file               => 'beaker_junit.xml',
           :xml_stylesheet         => 'junit.xsl',
+          :default_log_prefix     => 'beaker_logs',
           :log_dir                => 'log',
           :log_sut_event          => 'sut.log',
           :color                  => true,

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 = /^(osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
+    PLATFORMS = /^(freebsd|osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el|eos|cumulus)\-.+\-.+$/
 
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =

data/lib/beaker/result.rb

@@ -37,7 +37,7 @@ module Beaker
     end
 
     def log(logger)
-      logger.debug "Exited: #{exit_code}" unless exit_code == 0
+      logger.debug "Exited: #{exit_code}" unless exit_code == 0 or !exit_code
     end
 
     def formatted_output(limit=10)

data/lib/beaker/ssh_connection.rb

@@ -18,6 +18,7 @@ module Beaker
       Errno::ENETUNREACH,
       Net::SSH::Disconnect,
       Net::SSH::AuthenticationFailed,
+      IOError,
     ]
 
     def initialize hostname, user = nil, ssh_opts = {}, options = {}
@@ -34,38 +35,47 @@ module Beaker
       connection
     end
 
+    # connect to the host
     def connect
       try = 1
       last_wait = 0
       wait = 1
       @ssh ||= begin
+                 @logger.debug "Attempting ssh connection to #{@hostname}, user: #{@user}, opts: #{@ssh_opts}"
                  Net::SSH.start(@hostname, @user, @ssh_opts)
                rescue *RETRYABLE_EXCEPTIONS => e
                  if try <= 11
-                   @logger.warn "Try #{try} -- Host #{@hostname} unreachable: #{e.message}"
+                   @logger.warn "Try #{try} -- Host #{@hostname} unreachable: #{e.class.name} - #{e.message}"
                    @logger.warn "Trying again in #{wait} seconds"
                    sleep wait
                   (last_wait, wait) = wait, last_wait + wait
                    try += 1
                    retry
                  else
-                   # why is the logger not passed into this class?
                    @logger.error "Failed to connect to #{@hostname}"
                    raise
                  end
                end
-      @logger.debug "Created ssh connection to #{@hostname}, user: #{@user}, opts: #{@ssh_opts}"
-      self
     end
 
     # closes this SshConnection
     def close
       begin
-        @ssh.close if @ssh
-      rescue
+        if @ssh and not @ssh.closed?
+          @ssh.close
+        else
+          @logger.warn("ssh.close: connection is already closed, no action needed")
+        end
+      rescue *RETRYABLE_EXCEPTIONS => e
+        @logger.warn "Attemped ssh.close, (caught #{e.class.name} - #{e.message})."
+      rescue => e
+        @logger.warn "ssh.close threw unexpected Error: #{e.class.name} - #{e.message}.  Shutting down, and re-raising error below"
         @ssh.shutdown!
+        raise e
+      ensure
+        @ssh = nil
+        @logger.warn("ssh connection to #{@hostname} has been terminated")
       end
-      @ssh = nil
     end
 
     def try_to_execute command, options = {}, stdout_callback = nil,
@@ -93,7 +103,13 @@ module Beaker
 
       # Process SSH activity until we stop doing that - which is when our
       # channel is finished with...
-      @ssh.loop
+      begin
+        @ssh.loop
+      rescue *RETRYABLE_EXCEPTIONS => e
+        # this would indicate that the connection failed post execution, since the channel exec was successful
+        @logger.warn "ssh channel on #{@hostname} received exception post command execution #{e.class.name} - #{e.message}"
+        close
+      end
 
       result.finalize!
       @logger.last_result = result
@@ -102,15 +118,21 @@ module Beaker
 
     def execute command, options = {}, stdout_callback = nil,
                 stderr_callback = stdout_callback
-      attempt = true
+      try = 1
+      wait = 1
+      last_wait = 0
       begin
+        # ensure that we have a current connection object
+        connect
         result = try_to_execute(command, options, stdout_callback, stderr_callback)
       rescue *RETRYABLE_EXCEPTIONS => e
-        if attempt
-          attempt = false
-          @logger.error "Command execution failed, attempting to reconnect to #{@hostname}"
+        if try < 11
+           sleep wait
+          (last_wait, wait) = wait, last_wait + wait
+           try += 1
+          @logger.error "Command execution '#{@hostname}$ #{command}' failed (#{e.class.name} - #{e.message})"
           close
-          connect
+          @logger.debug "Preparing to retry: closed ssh object"
           retry
         else
           raise

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '2.8.0'
+    STRING = '2.9.0'
   end
 end

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

@@ -118,6 +118,7 @@ describe ClassMixedWithDSLInstallUtils do
       it{
         host = double("host")
         allow( host ).to receive(:[]).with('distmoduledir').and_return('/etc/puppetlabs/puppet/modules')
+        allow( host ).to receive(:is_cygwin?).and_return(true)
         result = double
         stdout = target.split('/')[0..-2].join('/') + "\n"
         allow( result ).to receive(:stdout).and_return( stdout )
@@ -167,12 +168,30 @@ describe ClassMixedWithDSLInstallUtils do
         allow( subject ).to receive( :build_ignore_list ).and_return( [] )
         allow( subject ).to receive( :parse_for_modulename ).and_return( [nil, 'modulename'] )
         allow( subject ).to receive( :on ).and_return( double.as_null_object )
-        hosts = [{}, {}]
 
-        expect( subject ).to receive( :scp_to ).twice
+        expect( subject ).to receive( :scp_to ).exactly(4).times
         subject.copy_module_to( hosts )
       end
     end
+
+    describe 'non-cygwin windows' do
+      it 'should have different commands than cygwin' do
+        host = double("host")
+        allow( host ).to receive(:[]).with('platform').and_return('windows')
+        allow( host ).to receive(:[]).with('distmoduledir').and_return('C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules')
+        allow( host ).to receive(:is_cygwin?).and_return(false)
+
+        result = double
+        allow( result ).to receive(:stdout).and_return( 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules' )
+
+        expect( subject ).to receive(:on).with(host, "echo C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules" ).and_return( result )
+
+        expect( subject ).to receive(:scp_to).with(host, "/opt/testmodule2", "C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules", {:ignore => ignore_list})
+        expect( subject ).to receive(:on).with(host, 'move /y C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule2 C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules/testmodule')
+
+        subject.copy_module_to(host, {:module_name => 'testmodule', :source => '/opt/testmodule2'})
+      end
+    end
   end
 
   describe 'split_author_modulename' do

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

@@ -344,18 +344,10 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   RSpec.shared_examples "install-dev-repo" do
-    let( :repo_config ) { "repoconfig" }
-    let( :repo_dir ) { "repodir" }
-
-    before do
-      allow(subject).to receive(:fetch_http_file) { repo_config }
-      allow(subject).to receive(:fetch_http_dir) { repo_dir }
-      allow(subject).to receive(:on).with(host, "apt-get update") { }
-      allow(subject).to receive(:options) { opts }
-      allow(subject).to receive(:link_exists?) { true }
-    end
 
     it "scp's files to SUT then modifies them with find-and-sed 2-hit combo" do
+      allow(rez).to receive(:exit_code) { 0 }
+      allow(subject).to receive(:link_exists?).and_return(true)
       expect(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
       expect(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
       expect(subject).to receive(:scp_to).with( host, repo_dir, /.*/ ).ordered
@@ -382,19 +374,72 @@ describe ClassMixedWithDSLInstallUtils do
           subject.install_puppetlabs_dev_repo host, package_name, package_version
         }.to raise_error(RuntimeError, /No repository installation step for/)
       end
-
     end
 
-    describe "When host is a debian-like platform" do
-      let( :platform ) { Beaker::Platform.new('debian-7-i386') }
-      include_examples "install-dev-repo"
-    end
+    describe 'When on supported platforms' do
+      # These are not factored into the `before` block above because they
+      # are expectations in the share examples, but aren't interesting
+      # beyond those basic tests
+      def stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
+        allow(subject).to receive(:on).with( host, /^mkdir -p .*$/ ).ordered
+        allow(subject).to receive(:scp_to).with( host, repo_config, /.*/ ).ordered
+        allow(subject).to receive(:scp_to).with( host, repo_dir, /.*/ ).ordered
+      end
 
-    describe "When host is a redhat-like platform" do
-      let( :platform ) { Beaker::Platform.new('el-7-i386') }
-      include_examples "install-dev-repo"
-    end
+      let( :repo_config ) { "repoconfig" }
+      let( :repo_dir ) { "repodir" }
+      let( :rez ) { double }
+
+      before do
+        allow(subject).to receive(:fetch_http_file) { repo_config }
+        allow(subject).to receive(:fetch_http_dir) { repo_dir }
+        allow(subject).to receive(:on).with(host, "apt-get update") { }
+        allow(subject).to receive(:options) { opts }
+        allow(subject).to receive(:on).with( host, /^.* -d .*/, {:acceptable_exit_codes =>[0,1]} ).and_return(rez)
+      end
+
+      describe "that are debian-like" do
+        let( :platform ) { Beaker::Platform.new('debian-7-i386') }
+        before { allow(subject).to receive(:link_exists?).and_return(true) }
+
+        include_examples "install-dev-repo"
 
+        it 'sets up the PC1 repository if that was downloaded' do
+          allow(rez).to receive(:exit_code) { 0 }
+
+          stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
+
+          expect(subject).to receive(:on).with( host, /^find .* sed .*PC1.*/ )
+          subject.install_puppetlabs_dev_repo host, package_name, package_version
+        end
+
+        it 'sets up the main repository if that was downloaded' do
+          allow(rez).to receive(:exit_code) { 1 }
+
+          stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
+
+          expect(subject).to receive(:on).with( host, /^find .* sed .*main.*/ )
+          subject.install_puppetlabs_dev_repo host, package_name, package_version
+        end
+
+      end
+
+      describe "that are redhat-like" do
+        let( :platform ) { Beaker::Platform.new('el-7-i386') }
+        include_examples "install-dev-repo"
+
+        it 'downloads PC1, products, or devel repo -- in that order' do
+          allow(subject).to receive(:on).with( host, /^find .* sed .*/ )
+          stub_uninteresting_portions_of_install_puppetlabs_dev_repo!
+
+          expect(subject).to receive(:link_exists?).with(/.*PC1.*/).and_return( false )
+          expect(subject).to receive(:link_exists?).with(/.*products.*/).and_return( false )
+          expect(subject).to receive(:link_exists?).with(/.*devel.*/).and_return( true )
+
+          subject.install_puppetlabs_dev_repo host, package_name, package_version
+        end
+      end
+    end
   end
 
   describe '#install_packages_from_local_dev_repo' do
@@ -518,6 +563,52 @@ describe ClassMixedWithDSLInstallUtils do
 
       subject.install_puppetagent_dev_repo( host, opts )
     end
+  end
 
+  describe '#install_cert_on_windows' do
+    before do
+      subject.stub(:on).and_return(Beaker::Result.new({},''))
+    end
+
+    context 'on windows' do
+      let(:platform) { 'windows-2008R2-amd64' }
+      let(:host) { make_host('testbox.test.local', :platform => 'windows-2008R2-amd64') }
+
+      it 'should install all 3 certs' do
+        cert = 'geotrust_global_ca'
+        content = <<-EOM
+        -----BEGIN CERTIFICATE-----
+        MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+        MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+        YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+        EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+        R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+        9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+        fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+        iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+        1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+        bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+        MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+        ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+        uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+        Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+        tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+        PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+        hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+        5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+        -----END CERTIFICATE-----
+        EOM
+        
+        expect(subject).to receive(:create_remote_file) do |host, file_path, file_content|
+          expect(file_path).to eq("C:\\Windows\\Temp\\#{cert}.pem")
+        end
+
+        expect(subject).to receive(:on) do |host, command|
+          expect(command).to eq("certutil -v -addstore Root C:\\Windows\\Temp\\#{cert}.pem")
+        end
+
+        subject.install_cert_on_windows(host, cert, content)
+      end
+    end
   end
 end

data/spec/beaker/hypervisor/docker_spec.rb

@@ -78,7 +78,8 @@ module Beaker
         allow( ::Docker ).to receive(:validate_version!).and_raise(Excon::Errors::SocketError.new( StandardError.new('oops') ))
       end
       it 'should fail when docker not present' do
-        expect { docker }.to raise_error(RuntimeError, /Docker instance not found/)
+        expect { docker }.to raise_error(RuntimeError, /Docker instance not connectable./)
+        expect { docker }.to raise_error(RuntimeError, /Error was: oops/)
       end
     end
 
@@ -198,6 +199,15 @@ module Beaker
 
       end
 
+      it "should generate a new /etc/hosts file referencing each host" do
+        ENV['DOCKER_HOST'] = nil
+        docker.provision
+        hosts.each do |host|
+          expect( docker ).to receive( :set_etc_hosts ).with( host, "127.0.0.1\tlocalhost localhost.localdomain\n192.0.2.1\tvm1\n192.0.2.1\tvm2\n192.0.2.1\tvm3\n" ).once
+        end
+        docker.hack_etc_hosts( hosts, options )
+      end
+
       it 'should record the image and container for later' do
         docker.provision
 

data/spec/beaker/network_manager_spec.rb

@@ -11,7 +11,9 @@ module Beaker
       make_opts.merge({
         'logger' => double().as_null_object,
         :logger_sut => mock_provisioning_logger,
-        :log_prefix => 'log_prefix_dummy'
+        :log_prefix => @log_prefix,
+        :hosts_file => @hosts_file,
+        :default_log_prefix => 'hello_default',
       })
     }
     let( :network_manager ) { NetworkManager.new(options, options[:logger]) }
@@ -19,6 +21,10 @@ module Beaker
     let( :host ) { hosts[0] }
 
     describe '#log_sut_event' do
+      before :each do
+        @log_prefix = 'log_prefix_dummy'
+        @hosts_file = 'dummy_hosts'
+      end
 
       it 'creates the correct content for an event' do
         log_line = network_manager.log_sut_event host, true
@@ -54,5 +60,29 @@ module Beaker
         expect{ nm.log_sut_event(host, true) }.to raise_error(ArgumentError)
       end
     end
+
+    it 'uses user defined log prefix if it is provided' do
+      @log_prefix = 'dummy_log_prefix'
+      @hosts_file = 'dummy_hosts'
+      nm = network_manager
+      cur_prefix = options[:log_prefix]
+      expect(cur_prefix).to be === @log_prefix
+    end
+
+    it 'uses host based log prefix, when there is not user defined log prefix' do
+      @log_prefix = nil
+      @hosts_file = 'dummy_hosts'
+      nm = network_manager
+      cur_prefix = options[:log_prefix]
+      expect(cur_prefix).to be === @hosts_file
+    end
+
+    it 'uses default log prefix, when there is no user defined and no host file' do
+      @log_prefix = nil
+      @hosts_file = nil
+      nm = network_manager
+      cur_prefix = options[:log_prefix]
+      expect(cur_prefix).to be === 'hello_default'
+    end
   end
-end
+end

data/spec/beaker/ssh_connection_spec.rb

@@ -9,6 +9,10 @@ module Beaker
     let( :options )  { { :logger => double('logger').as_null_object }  }
     subject(:connection) { SshConnection.new host, user, ssh_opts, options }
 
+    before :each do
+      allow( subject ).to receive(:sleep)
+    end
+
     it 'self.connect creates connects and returns a proxy for that connection' do
       # grrr
       expect( Net::SSH ).to receive(:start).with( host, user, ssh_opts )
@@ -27,34 +31,42 @@ module Beaker
       connection.connect
     end
 
-    it 'close runs ssh close' do
-      mock_ssh = Object.new
-      expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
-      connection.connect
+    describe '#close' do
 
-      expect( mock_ssh ).to receive( :close ).once
-      connection.close
-    end
+      it 'runs ssh close' do
+        mock_ssh = Object.new
+        expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
+        connection.connect
 
-    it 'close sets the @ssh variable to nil' do
-      mock_ssh = Object.new
-      expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
-      connection.connect
+        allow( mock_ssh).to receive( :closed? ).once.and_return(false)
+        expect( mock_ssh ).to receive( :close ).once
+        connection.close
+      end
 
-      expect( mock_ssh ).to receive( :close ).once
-      connection.close
+      it 'sets the @ssh variable to nil' do
+        mock_ssh = Object.new
+        expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
+        connection.connect
 
-      expect( connection.instance_variable_get(:@ssh) ).to be_nil
-    end
+        allow( mock_ssh).to receive( :closed? ).once.and_return(false)
+        expect( mock_ssh ).to receive( :close ).once
+        connection.close
 
-    it 'close calls ssh shutdown if ssh close fails' do
-      mock_ssh = Object.new
-      allow( mock_ssh ).to receive( :close ) { raise Error }
-      expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
-      connection.connect
+        expect( connection.instance_variable_get(:@ssh) ).to be_nil
+      end
+
+      it 'calls ssh shutdown & re-raises if ssh close fails with an unexpected Error' do
+        mock_ssh = Object.new
+        allow( mock_ssh ).to receive( :close ) { raise StandardError }
+        expect( Net::SSH ).to receive( :start ).with( host, user, ssh_opts) { mock_ssh }
+        connection.connect
+
+        allow( mock_ssh).to receive( :closed? ).once.and_return(false)
+        expect( mock_ssh ).to receive( :shutdown! ).once
+        expect{ connection.close }.to raise_error(StandardError)
+        expect( connection.instance_variable_get(:@ssh) ).to be_nil
+      end
 
-      expect( mock_ssh ).to receive( :shutdown! ).once
-      connection.close
     end
 
     describe '#execute' do

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'simplecov'
 require 'beaker'
 require 'fakefs/spec_helpers'
 require 'mocks'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,20 +136,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: gitlab-grit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -397,7 +383,6 @@ files:
 - beaker.gemspec
 - bin/beaker
 - ext/completion/beaker-completion.bash
-- history.rb
 - lib/beaker.rb
 - lib/beaker/answers.rb
 - lib/beaker/answers/version20.rb
@@ -435,6 +420,7 @@ files:
 - lib/beaker/host/aix/file.rb
 - lib/beaker/host/aix/group.rb
 - lib/beaker/host/aix/user.rb
+- lib/beaker/host/freebsd.rb
 - lib/beaker/host/mac.rb
 - lib/beaker/host/mac/group.rb
 - lib/beaker/host/mac/user.rb

data/history.rb

@@ -1,60 +0,0 @@
-# Generates a HISTORY.md file for your repo based on tags and commits, defaults to history for 
-#     master branch but can generate history for specified branch
-#
-# Requires: gem install gitlab-grit
-# Usage: ruby history.rb /your/repo/directory
-#
-# Based on https://coderwall.com/p/99mjcg
-
-require 'grit'
-
-if ARGV.size < 1
-  p "Usage: ruby history.rb /your/repo/directory branch(defaults to master)"
-  exit
-end
-
-output_file = 'HISTORY.md'
-repo_dir = ARGV[0]
-branch = ARGV[1] || 'master'
-output = "# #{File.basename(File.absolute_path(repo_dir))} - History\n"
-
-repo = Grit::Repo.new(repo_dir)
-head = Grit::Tag.new(repo.commits(branch).first.sha, repo, repo.commits(branch).first.id)
-tags = repo.tags + [head]
-tags.sort! {|x,y| y.commit.authored_date <=> x.commit.authored_date}
-
-output << "## Tags\n"
-tags.each do |tag|
-  tag_name = tag.name
-  if tag == tags.first
-    tag_name = 'LATEST'
-  end
-  output << "* [#{tag_name} - #{tag.commit.authored_date.strftime("%-d %b, %Y")} (#{tag.commit.sha[0,8]})](##{tag_name})\n"
-end
-
-output << "\n## Details\n"
-tagcount = 0
-tags.each do |tag|
-  tag_name = tag.name
-  if tag == tags.first
-    tag_name = 'LATEST'
-  end
-  output << "### <a name = \"#{tag_name}\">#{tag_name} - #{tag.commit.authored_date.strftime("%-d %b, %Y")} (#{tag.commit.sha[0,8]})\n\n"
-  if (tagcount != tags.size - 1)
-    commit_set = repo.commits_between(tags[tagcount + 1].name, tag.name)
-    commit_set.sort! {|x,y| y.authored_date <=> x.authored_date }
-    commit_set.each do |c|
-      output << "* #{c.short_message} (#{c.sha[0,8]})\n\n"
-      if c.short_message != c.message
-        output << "\n```\n#{c.message.gsub(/```/, "\n")}\n```\n"
-      end
-    end
-  else
-    output << "* Initial release.\n"
-  end
-  tagcount += 1
-end
-
-File.open(output_file, 'w') { |f| f.write(output) }
-
-puts "success, output sent to #{output_file}"