beaker 2.13.0 → 2.14.0

data/lib/beaker/dsl/structure.rb

@@ -164,6 +164,9 @@ module Beaker
       #       on( solaris, 'zonename' ) =~ /global/
       #     end
       #
+      # @example Confining to an already defined subset of hosts
+      #     confine :to, {}, agents
+      #
       # @return [Array<Host>] Returns an array of hosts that are still valid
       #   targets for this tests case.
       # @raise [SkipTest] Raises skip test if there are no valid hosts for
@@ -174,7 +177,9 @@ module Beaker
         when :except
           hosts_to_modify = hosts_to_modify - select_hosts(criteria, hosts_to_modify, &block)
         when :to
-          hosts_to_modify = select_hosts(criteria, hosts_to_modify, &block)
+          if criteria and ( not criteria.empty? )
+            hosts_to_modify = select_hosts(criteria, hosts_to_modify, &block)
+          end
         else
           raise "Unknown option #{type}"
         end
@@ -193,6 +198,7 @@ module Beaker
       # @see #confine
       def confine_block(type, criteria, host_array = nil, &block)
         begin
+          host_array ||= hosts
           original_hosts = self.hosts.dup
           confine(type, criteria, host_array)
 

data/lib/beaker/host.rb

@@ -3,7 +3,7 @@ require 'timeout'
 require 'benchmark'
 require 'rsync'
 
-[ 'command', 'ssh_connection' ].each do |lib|
+[ 'command', 'ssh_connection'].each do |lib|
   require "beaker/#{lib}"
 end
 
@@ -26,59 +26,34 @@ module Beaker
       end
     end
 
-    def self.create name, options
-      case options['HOSTS'][name]['platform']
+    def self.create name, host_hash, options
+      case host_hash['platform']
       when /windows/
-        cygwin = options['HOSTS'][name]['is_cygwin']
+        cygwin = host_hash['is_cygwin']
         if cygwin.nil? or cygwin == true
-          Windows::Host.new name, options
+          Windows::Host.new name, host_hash, options
         else
-          PSWindows::Host.new name, options
+          PSWindows::Host.new name, host_hash, options
         end
       when /aix/
-        Aix::Host.new name, options
+        Aix::Host.new name, host_hash, options
       when /osx/
-        Mac::Host.new name, options
+        Mac::Host.new name, host_hash, options
       when /freebsd/
-        FreeBSD::Host.new name, options
+        FreeBSD::Host.new name, host_hash, options
       else
-        Unix::Host.new name, options
+        Unix::Host.new name, host_hash, options
       end
     end
 
     attr_accessor :logger
-    attr_reader :name, :defaults
-    def initialize name, options
-      @logger = options[:logger]
-      @name, @options = name.to_s, options.dup
-
-      # This is annoying and its because of drift/lack of enforcement/lack of having
-      # a explict relationship between our defaults, our setup steps and how they're
-      # related through 'type' and the differences between the assumption of our two
-      # configurations we have for many of our products
-      type = @options.get_type
-      @defaults = merge_defaults_for_type @options, type
-      pkg_initialize
-    end
+    attr_reader :name, :host_hash, :options
+    def initialize name, host_hash, options
+      @logger = host_hash[:logger] || options[:logger]
+      @name, @host_hash, @options = name.to_s, host_hash.dup, options.dup
 
-    # Builds a deprecated keys array, for checking to see if a key is deprecated.
-    # The recommended check after using this method is +result.include?(key)+
-    #
-    # @note an unsupported host type (meaning it has no _aio_defaults_) will return
-    #   an empty hash
-    #
-    # @return [Array<Symbol>] An array of keys that are deprecated for a host
-    def build_deprecated_keys()
-      begin
-        deprecated_keys_hash = self.class.send "foss_defaults".to_sym
-        delete_exceptions_hash = self.class.send "aio_defaults".to_sym
-        deprecated_keys_hash.delete_if do |key, value|
-          delete_exceptions_hash.has_key?(key)
-        end
-      rescue NoMethodError
-        deprecated_keys_hash = {}
-      end
-      deprecated_keys_hash.keys()
+      @host_hash = self.platform_defaults.merge(@host_hash)
+      pkg_initialize
     end
 
     def pkg_initialize
@@ -86,11 +61,6 @@ module Beaker
       # handle whatever packaging-related initialization is necessary.
     end
 
-    def merge_defaults_for_type options, type
-      defaults = self.class.send "#{type}_defaults".to_sym
-      defaults.merge(options.merge((options['HOSTS'][name])))
-    end
-
     def node_name
       # TODO: might want to consider caching here; not doing it for now because
       #  I haven't thought through all of the possible scenarios that could
@@ -132,18 +102,21 @@ module Beaker
     end
 
     def []= k, v
-      @defaults[k] = v
+      host_hash[k] = v
     end
 
+    # Does this host have this key?  Either as defined in the host itself, or globally? 
     def [] k
-      @deprecated_keys ||= build_deprecated_keys()
-      deprecation_message = "deprecated host key '#{k}'. Perhaps you can use host.puppet[] to get what you're looking for."
-      @logger.warn( deprecation_message ) if @logger && @deprecated_keys.include?(k.to_sym)
-      @defaults[k]
+      host_hash[k] || options[k]
     end
 
+    # Does this host have this key?  Either as defined in the host itself, or globally?
     def has_key? k
-      @defaults.has_key?(k)
+      host_hash.has_key?(k) || options.has_key?(k)
+    end
+
+    def delete k
+      host_hash.delete(k)
     end
 
     # The {#hostname} of this host.
@@ -159,7 +132,7 @@ module Beaker
     # Return the public name of the particular host, which may be different then the name of the host provided in
     # the configuration file as some provisioners create random, unique hostnames.
     def hostname
-      @defaults['vmhostname'] || @name
+      host_hash['vmhostname'] || @name
     end
 
     def + other
@@ -167,7 +140,7 @@ module Beaker
     end
 
     def is_pe?
-      @options.is_pe?
+      self['type'] && self['type'].to_s =~ /pe/
     end
 
     def is_cygwin?
@@ -220,7 +193,7 @@ module Beaker
     end
 
     def log_prefix
-      if @defaults['vmhostname']
+      if host_hash['vmhostname']
         "#{self} (#{@name})"
       else
         self.to_s
@@ -376,6 +349,9 @@ module Beaker
 
         # copy each file to the host
         dir_source.each do |s|
+          # Copy files, not directories (as they are copied recursively)
+          next if File.directory?(s)
+
           s_path = Pathname.new(s)
           if s_path.absolute?
             file_path = File.join(target, File.dirname(s).gsub(/#{Regexp.escape(File.dirname(File.absolute_path(source)))}/,''))
@@ -420,7 +396,7 @@ module Beaker
       else
         user = self['user']
       end
-      hostname_with_user = "#{user}@#{self}"
+      hostname_with_user = "#{user}@#{reachable_name}"
 
       Rsync.host = hostname_with_user
 
@@ -442,8 +418,8 @@ module Beaker
         ssh_args << "-i #{key}"
       end
 
-      if ssh_opts.has_key?('port') and
-        ssh_args << "-p #{ssh_opts['port']}"
+      if ssh_opts.has_key?(:port)
+        ssh_args << "-p #{ssh_opts[:port]}"
       end
 
       # We disable prompt when host isn't known
@@ -468,6 +444,7 @@ module Beaker
 
       @logger.notify "rsync: localhost:#{from_path} to #{hostname_with_user}:#{to_path} {:ignore => #{opts[:ignore]}}"
       result = Rsync.run(from_path, to_path, rsync_args)
+      @logger.debug("rsync returned #{result.inspect}")
       result
     end
 

data/lib/beaker/host/freebsd.rb

@@ -13,27 +13,15 @@ module FreeBSD
 
     include FreeBSD::Exec
 
-    def self.foss_defaults
+    def platform_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',
+        'group'             => 'root',
         'pathseparator'     => ':',
         })
     end
+
   end
 
-end
+end

data/lib/beaker/host/mac.rb

@@ -13,50 +13,14 @@ module Mac
     include Mac::Group
     include Mac::Pkg
 
-    def self.pe_defaults
+    def platform_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({
-        'user'          => 'root',
-        'group'         => 'pe-puppet',
-        'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-        'puppetservice'    => 'pe-httpd',
-        'puppetpath'       => '/etc/puppetlabs/puppet',
-        'puppetconfdir'    => '/etc/puppetlabs/puppet',
-        'puppetcodedir'    => '/etc/puppetlabs/puppet',
-        'puppetbin'        => '/opt/puppet/bin/puppet',
-        'puppetbindir'     => '/opt/puppet/bin',
-        'puppetsbindir'    => '/opt/puppet/sbin',
-        'puppetvardir'     => '/var/opt/lib/pe-puppet',
-        'hieradatadir'     => '/var/lib/hiera',
-        'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
-        'distmoduledir'    => '/etc/puppetlabs/puppet/modules',
-        'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
+        'user'             => 'root',
+        'group'            => 'root',
         'pathseparator'    => ':',
       })
     end
 
-    def self.foss_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'              => 'root',
-        'group'             => 'puppet',
-        'puppetserver-confdir' => '/etc/puppetserver/conf.d',
-        'puppetservice'     => 'puppetmaster',
-        'puppetpath'        => '/etc/puppet',
-        'puppetconfdir'     => '/etc/puppet',
-        'puppetcodedir'     => '/etc/puppet',
-        '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'      => '/etc/puppet/hieradata',
-        'hieraconf'         => '/etc/puppet/hiera.yaml',
-        'distmoduledir'     => '/etc/puppet/modules',
-        'sitemoduledir'     => '/usr/share/puppet/modules',
-        'pathseparator'     => ':',
-      })
-    end
   end
 end

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

@@ -6,7 +6,8 @@ module Mac::Pkg
   end
 
   def install_package(name, cmdline_args = '', version = nil)
-    raise "Package #{name} cannot be installed on #{self}"
+    execute("hdiutil attach #{name}.dmg")
+    execute("installer -pkg /Volumes/#{name}/#{name}.pkg -target /")
   end
 
   def uninstall_package(name, cmdline_args = '')

data/lib/beaker/host/pswindows.rb

@@ -14,40 +14,14 @@ module PSWindows
     include PSWindows::Exec
     include PSWindows::Pkg
 
-    def self.pe_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'          => 'Administrator',
-        'group'         => 'Administrators',
-        'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
-        'sitemoduledir' => 'C:\\usr\\share\\puppet\\modules',
-        'puppetservice' => 'pe-httpd',
-        'pathseparator' => ';',
-        'puppetpath'    => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
-        'puppetconfdir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
-        'puppetcodedir' => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc',
-        'hieraconf'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\hiera.yaml',
-        'puppetvardir'  => 'C:\\ProgramData\\PuppetLabs\\puppet\\var',
-        'puppetbindir'  => '"C:\\Program Files (x86)\\PuppetLabs\\Puppet Enterprise\\bin";"C:\\Program Files\\PuppetLabs\\Puppet Enterprise\\bin"'
-      })
-    end
-
-    def self.foss_defaults
+    def platform_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({
         'user'              => 'Administrator',
         'group'             => 'Administrators',
-        'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\puppet\\etc\\modules',
-        'sitemoduledir'     => 'C:\\usr\\share\\puppet\\modules',
-        'hieralibdir'       => 'C:\\opt\\puppet-git-repos\\hiera\\lib',
-        'hierapuppetlibdir' => 'C:\\opt\\puppet-git-repos\\hiera-puppet\\lib',
-        'hierabindir'       => 'C:\\opt\\puppet-git-repos\\hiera\\bin',
         'pathseparator'     => ';',
-        'puppetpath'        => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc";"C:\\Program Files\\Puppet Labs\\Puppet\\etc"',
-        'hieraconf'         => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\etc\\hiera.yaml";"C:\\Program Files\\Puppet Labs\\Puppet\\etc\\hiera.yaml"',
-        'puppetvardir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\var";"C:\\Program Files\\Puppet Labs\\Puppet\\var"',
-        'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
       })
     end
+
   end
 end

data/lib/beaker/host/unix.rb

@@ -14,62 +14,14 @@ module Unix
     include Unix::Exec
     include Unix::Pkg
 
-    def self.pe_defaults
+    def platform_defaults
       h = Beaker::Options::OptionsHash.new
       h.merge({
-        'user'          => 'root',
-        'group'         => 'pe-puppet',
-        'puppetserver-confdir' => '/etc/puppetlabs/puppetserver/conf.d',
-        'puppetservice'    => 'pe-httpd',
-        'puppetpath'       => '/etc/puppetlabs/puppet',
-        'puppetconfdir'    => '/etc/puppetlabs/puppet',
-        'puppetbin'        => '/opt/puppet/bin/puppet',
-        'puppetbindir'     => '/opt/puppet/bin',
-        'puppetsbindir'    => '/opt/puppet/sbin',
-        'privatebindir'    => '/opt/puppetlabs/puppet/bin',
-        'puppetvardir'     => '/var/opt/lib/pe-puppet',
-        'hieradatadir'     => '/var/lib/hiera',
-        'hieraconf'        => '/etc/puppetlabs/puppet/hiera.yaml',
-        'distmoduledir'    => '/etc/puppetlabs/puppet/modules',
-        'sitemoduledir'    => '/opt/puppet/share/puppet/modules',
+        'user'             => 'root',
+        'group'            => 'root',
         'pathseparator'    => ':',
       })
     end
 
-    def self.foss_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'              => 'root',
-        'group'             => 'puppet',
-        'puppetserver-confdir' => '/etc/puppetserver/conf.d',
-        'puppetservice'     => 'puppetmaster',
-        'puppetpath'        => '/etc/puppet',
-        'puppetconfdir'     => '/etc/puppet',
-        'puppetvardir'      => '/var/lib/puppet',
-        'puppetbin'         => '/usr/bin/puppet',
-        'puppetbindir'      => '/usr/bin',
-        'privatebindir'     => '/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'      => '/etc/puppet/hieradata',
-        'hieraconf'         => '/etc/puppet/hiera.yaml',
-        'distmoduledir'     => '/etc/puppet/modules',
-        'sitemoduledir'     => '/usr/share/puppet/modules',
-        'pathseparator'     => ':',
-      })
-    end
-
-    def self.aio_defaults
-      h = Beaker::Options::OptionsHash.new
-      h.merge({
-        'user'                  => 'root',
-        'puppetbindir'          => '/opt/puppetlabs/bin',
-        'privatebindir'         => '/opt/puppetlabs/puppet/bin',
-        'distmoduledir'         => '/etc/puppetlabs/code/modules',
-        'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
-        'pathseparator'         => ':',
-      })
-    end
   end
 end

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

@@ -17,28 +17,29 @@ module Unix::Pkg
     end
   end
 
-  def check_for_package(name)
+  def check_for_package(name, opts = {})
+    opts = {:accept_all_exit_codes => true}.merge(opts)
     case self['platform']
       when /sles-10/
-        result = exec(Beaker::Command.new("zypper se -i --match-exact #{name}"), :accept_all_exit_codes => true)
+        result = execute("zypper se -i --match-exact #{name}", opts) { |result| result }
         result.stdout =~ /No packages found/ ? (return false) : (return result.exit_code == 0)
       when /sles-/
-        result = exec(Beaker::Command.new("zypper se -i --match-exact #{name}"), :accept_all_exit_codes => true)
+        result = execute("zypper se -i --match-exact #{name}", opts) { |result| result }
       when /el-4/
         @logger.debug("Package query not supported on rhel4")
         return false
-      when /fedora|centos|eos|el-/
-        result = exec(Beaker::Command.new("rpm -q #{name}"), :accept_all_exit_codes => true)
+      when /cisco|fedora|centos|eos|el-/
+        result = execute("rpm -q #{name}", opts) { |result| result }
       when /ubuntu|debian|cumulus/
-        result = exec(Beaker::Command.new("dpkg -s #{name}"), :accept_all_exit_codes => true)
+        result = execute("dpkg -s #{name}", opts) { |result| result }
       when /solaris-11/
-        result = exec(Beaker::Command.new("pkg info #{name}"), :accept_all_exit_codes => true)
+        result = execute("pkg info #{name}", opts) { |result| result }
       when /solaris-10/
-        result = exec(Beaker::Command.new("pkginfo #{name}"), :accept_all_exit_codes => true)
+        result = execute("pkginfo #{name}", opts) { |result| result }
       when /freebsd-9/
-        result = exec(Beaker::Command.new("pkg_info #{name}"), :accept_all_exit_codes => true)
+        result = execute("pkg_info #{name}", opts) { |result| result }
       when /freebsd-10/
-        result = exec(Beaker::Command.new("pkg info #{name}"), :accept_all_exit_codes => true)
+        result = execute("pkg info #{name}", opts) { |result| result }
       else
         raise "Package #{name} cannot be queried on #{self}"
     end
@@ -56,50 +57,50 @@ module Unix::Pkg
     end
   end
 
-  def install_package(name, cmdline_args = '', version = nil)
+  def install_package(name, cmdline_args = '', version = nil, opts = {})
     case self['platform']
       when /sles-/
-        execute("zypper --non-interactive in #{name}")
+        execute("zypper --non-interactive in #{name}", opts)
       when /el-4/
         @logger.debug("Package installation not supported on rhel4")
-      when /fedora|centos|eos|el-/
+      when /cisco|fedora|centos|eos|el-/
         if version
           name = "#{name}-#{version}"
         end
-        execute("yum -y #{cmdline_args} install #{name}")
+        execute("yum -y #{cmdline_args} install #{name}", opts)
       when /ubuntu|debian|cumulus/
         if version
           name = "#{name}=#{version}"
         end
         update_apt_if_needed
-        execute("apt-get install --force-yes #{cmdline_args} -y #{name}")
+        execute("apt-get install --force-yes #{cmdline_args} -y #{name}", opts)
       when /solaris-11/
-        execute("pkg #{cmdline_args} install #{name}")
+        execute("pkg #{cmdline_args} install #{name}", opts)
       when /solaris-10/
-        execute("pkgutil -i -y #{cmdline_args} #{name}")
+        execute("pkgutil -i -y #{cmdline_args} #{name}", opts)
       when /freebsd-9/
-        execute("pkg_add -fr #{cmdline_args} #{name}")
+        execute("pkg_add -fr #{cmdline_args} #{name}", opts)
       when /freebsd-10/
-        execute("pkg #{cmdline_args} install #{name}")
+        execute("pkg #{cmdline_args} install #{name}", opts)
       else
         raise "Package #{name} cannot be installed on #{self}"
     end
   end
 
-  def uninstall_package(name, cmdline_args = '')
+  def uninstall_package(name, cmdline_args = '', opts = {})
     case self['platform']
       when /sles-/
-        execute("zypper --non-interactive rm #{name}")
+        execute("zypper --non-interactive rm #{name}", opts)
       when /el-4/
         @logger.debug("Package uninstallation not supported on rhel4")
-      when /fedora|centos|eos|el-/
-        execute("yum -y #{cmdline_args} remove #{name}")
+      when /cisco|fedora|centos|eos|el-/
+        execute("yum -y #{cmdline_args} remove #{name}", opts)
       when /ubuntu|debian|cumulus/
-        execute("apt-get purge #{cmdline_args} -y #{name}")
+        execute("apt-get purge #{cmdline_args} -y #{name}", opts)
       when /solaris-11/
-        execute("pkg #{cmdline_args} uninstall #{name}")
+        execute("pkg #{cmdline_args} uninstall #{name}", opts)
       when /solaris-10/
-        execute("pkgutil -r -y #{cmdline_args} #{name}")
+        execute("pkgutil -r -y #{cmdline_args} #{name}", opts)
       else
         raise "Package #{name} cannot be installed on #{self}"
     end
@@ -110,21 +111,21 @@ module Unix::Pkg
   # @param [String] name          The name of the package to update
   # @param [String] cmdline_args  Additional command line arguments for
   #                               the package manager
-  def upgrade_package(name, cmdline_args = '')
+  def upgrade_package(name, cmdline_args = '', opts = {})
     case self['platform']
       when /sles-/
-        execute("zypper --non-interactive --no-gpg-checks up #{name}")
+        execute("zypper --non-interactive --no-gpg-checks up #{name}", opts)
       when /el-4/
         @logger.debug("Package upgrade is not supported on rhel4")
-      when /fedora|centos|eos|el-/
-        execute("yum -y #{cmdline_args} update #{name}")
+      when /cisco|fedora|centos|eos|el-/
+        execute("yum -y #{cmdline_args} update #{name}", opts)
       when /ubuntu|debian|cumulus/
         update_apt_if_needed
-        execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}")
+        execute("apt-get install -o Dpkg::Options::='--force-confold' #{cmdline_args} -y --force-yes #{name}", opts)
       when /solaris-11/
-        execute("pkg #{cmdline_args} update #{name}")
+        execute("pkg #{cmdline_args} update #{name}", opts)
       when /solaris-10/
-        execute("pkgutil -u -y #{cmdline_args} ${name}")
+        execute("pkgutil -u -y #{cmdline_args} ${name}", opts)
       else
         raise "Package #{name} cannot be upgraded on #{self}"
     end