beaker 1.12.1 → 1.12.2

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzhiZGU5NjI3OTViZmFmOTIyZTdiMzA0ZmY4Y2UyZTAyZGZhZWRhMQ==
-  data.tar.gz: !binary |-
-    ZTMxOWNlZjQ5MzRlNWQxZjc0OTA1MTM4MmMzZGZmODgxN2QwOGUzNA==
-SHA512:
-  metadata.gz: !binary |-
-    ZjJhOTc2YzQ0NTZmMWRmN2ZmODU2NWJmNGNjMWNlZDE1Yjg3MDIzMDIzMGVk
-    MmYyMWM2YmQ5ZjA2OTU4NDUyNDg3YmFiNzZkOTgxM2QyOWNjOGU4NDk3ZWVj
-    NDVmNjNiZDI3Nzg3NGFjOWE1NzBkOTFmMTk5NGExMjgzZGIyNDU=
-  data.tar.gz: !binary |-
-    YmM5ZjEyNjVjZDhjZGYwZjY0NGZmY2ZmYTg4NmFiMmI1NWZlY2MxY2VhN2U2
-    YTE4ZGUyMTFiOGIzNjc1MDJmNjg0Y2MyMGVlNTgwMjE2ZTc1ZTE0YTg1NWEw
-    ZTIwYWQwMzNjOTdlNTFlN2I2ZWNlMTU3NjA0ZDgzNjU1ZjYzNWY=
+--- 
+SHA1: 
+  metadata.gz: 327165664795e4a3418eee13044471c769062bdf
+  data.tar.gz: 46c4deee7cfdcf64a2f2903246a4a1f54d132b02
+SHA512: 
+  metadata.gz: 83dd205dea040996a658f04cec6389ba31b8cbccfd38f9dc608fc94bcaee5eca74c718939e0acd7b3794c2aba0236d36a09214279ef678691b903a11c9bb17f0
+  data.tar.gz: b4c851da76c6e21e4e6a8a5ba3ff229f09b9432dc0a409ccdd52cc221ad9e43868c1c9f3c11e343d57b7ecf18d3dde7601166ad94120cff45c832481b272fb1c

data/beaker.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '0.4'
   s.add_development_dependency 'rake', '~> 10.1.0'
   s.add_development_dependency 'simplecov' unless RUBY_VERSION < '1.9'
+  s.add_development_dependency 'pry', '~> 0.9.12.6'
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
@@ -45,7 +46,7 @@ Gem::Specification.new do |s|
 
   # These are transitive dependencies that we include or pin to because...
   # Ruby 1.8 compatibility
-  s.add_runtime_dependency 'nokogiri', '1.5.10'
+  s.add_runtime_dependency 'nokogiri', '~> 1.5.10'
   s.add_runtime_dependency 'mime-types', '~> 1.25' # 2.0 won't install on 1.8
   # So fog doesn't always complain of unmet AWS dependencies
   s.add_runtime_dependency 'unf', '~> 0.1'

data/lib/beaker.rb

@@ -33,4 +33,11 @@ module Beaker
   # Shared methods and helpers
   require 'beaker/shared'
 
+  # Add pry support when available
+  begin
+    require 'pry'
+  rescue LoadError
+    # do nothing
+  end
+
 end

data/lib/beaker/answers.rb

@@ -1,9 +1,5 @@
-[ 'version32', 'version30', 'version28', 'version20' ].each do |file|
-  begin
-    require "beaker/answers/#{file}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), 'answers', file))
-  end
+[ 'version32', 'version30', 'version28', 'version20' ].each do |lib|
+  require "beaker/answers/#{lib}"
 end
 
 module Beaker

data/lib/beaker/dsl.rb

@@ -1,10 +1,6 @@
 [ 'install_utils', 'roles', 'outcomes', 'assertions',
-  'structure', 'helpers', 'wrappers' ].each do |file|
-  begin
-    require "beaker/dsl/#{file}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), 'dsl', file))
-  end
+  'structure', 'helpers', 'wrappers' ].each do |lib|
+  require "beaker/dsl/#{lib}"
 end
 
 module Beaker

data/lib/beaker/dsl/helpers.rb

@@ -930,6 +930,40 @@ module Beaker
         end
       end
 
+      #Is semver-ish version a less than semver-ish version b
+      #@param [String] a A version of the from '\d.\d.\d.*'
+      #@param [String] b A version of the form '\d.\d.\d.*'
+      #@return [Boolean] true if a is less than b, otherwise return false
+      #
+      #@note 3.0.0-160-gac44cfb is greater than 3.0.0, and 2.8.2
+      #@note -rc being less than final builds is not yet implemented.
+      def version_is_less a, b
+        a_nums = a.split('-')[0].split('.')
+        b_nums = b.split('-')[0].split('.')
+        (0...a_nums.length).each do |i|
+          if i < b_nums.length
+            if a_nums[i] < b_nums[i]
+              return true
+            elsif a_nums[i] > b_nums[i]
+              return false
+            end
+          else
+            return false
+          end
+        end
+        #checks all dots, they are equal so examine the rest
+        a_rest = a.split('-', 2)[1]
+        b_rest = b.split('-', 2)[1]
+        if a_rest and b_rest and a_rest < b_rest
+          return false
+        elsif a_rest and not b_rest
+          return false
+        elsif not a_rest and b_rest
+          return true
+        end
+        return false
+      end
+
       #stops the puppet agent running on the host
       def stop_agent_on(agent)
         vardir = agent.puppet['vardir']
@@ -945,9 +979,15 @@ module Beaker
         # that if the script doesn't exist, we should just use `pe-puppet`
         result = on agent, "[ -e /etc/init.d/pe-puppet-agent ]", :acceptable_exit_codes => [0,1]
         agent_service = (result.exit_code == 0) ? 'pe-puppet-agent' : 'pe-puppet'
-        if agent['platform'] =~ /el-4/
-          # On EL4, the init script does not work correctly with
-          # 'puppet resource service'
+
+        # Under a number of stupid circumstances, we can't stop the
+        # agent using puppet.  This is usually because of issues with
+        # the init script or system on that particular configuration.
+        avoid_puppet_at_all_costs = false
+        avoid_puppet_at_all_costs ||= agent['platform'] =~ /el-4/
+        avoid_puppet_at_all_costs ||= agent['pe_ver'] && version_is_less(agent['pe_ver'], '3.2') && agent['platform'] =~ /sles/
+
+        if avoid_puppet_at_all_costs
           on agent, "/etc/init.d/#{agent_service} stop"
         else
           on agent, puppet_resource('service', agent_service, 'ensure=stopped')

data/lib/beaker/dsl/install_utils.rb

@@ -423,40 +423,6 @@ module Beaker
         on install_hosts, puppet_agent('-t'), :acceptable_exit_codes => [0,2]
       end
 
-      #Is PE version a less than PE version b
-      #@param [String] a A PE version of the from '\d.\d.\d.*'
-      #@param [String] b A PE version of the form '\d.\d.\d.*'
-      #@return [Boolean] true if a is less than b, otherwise return false
-      #
-      #@note 3.0.0-160-gac44cfb is greater than 3.0.0, and 2.8.2
-      # @!visibility private
-      def version_is_less a, b
-        a_nums = a.split('-')[0].split('.')
-        b_nums = b.split('-')[0].split('.')
-        (0...a_nums.length).each do |i|
-          if i < b_nums.length
-            if a_nums[i] < b_nums[i]
-              return true
-            elsif a_nums[i] > b_nums[i]
-              return false
-            end
-          else
-            return false
-          end
-        end
-        #checks all dots, they are equal so examine the rest
-        a_rest = a.split('-', 2)[1]
-        b_rest = b.split('-', 2)[1]
-        if a_rest and b_rest and a_rest < b_rest
-          return false
-        elsif a_rest and not b_rest
-          return false
-        elsif not a_rest and b_rest
-          return true
-        end
-        return false
-      end
-
       #Sort array of hosts so that it has the correct order for PE installation based upon each host's role
       # @example
       #  h = sorted_hosts

data/lib/beaker/dsl/roles.rb

@@ -42,11 +42,7 @@ module Beaker
       #     on, master, 'cat /etc/puppet/puppet.conf'
       #
       def master
-        begin
-          find_only_one :master
-        rescue DSL::Outcomes::FailTest => e
-          default
-        end
+        find_only_one :master
       end
 
       # The host for which ['roles'] include 'database'
@@ -89,15 +85,7 @@ module Beaker
       #     on, default, "curl https://#{database}/nodes/#{agent}"
       #
       def default
-        if hosts.length == 1
-          return hosts[0]
-        elsif any_hosts_as? :default
-          return find_only_one :default
-        elsif any_hosts_as? :master
-          return find_only_one :master
-        else
-          raise DSL::Outcomes::FailTest, "no default host specified"
-        end
+        find_only_one :default
       end
 
       # Determine if there is a host or hosts with the given role defined

data/lib/beaker/dsl/wrappers.rb

@@ -32,18 +32,6 @@ module Beaker
         Command.new('hiera', args, options )
       end
 
-      # This is hairy and because of legacy code it will take a bit more
-      # work to disentangle all of the things that are being passed into
-      # this catchall param.
-      #
-      # @api dsl
-      def razor(*args)
-        options = args.last.is_a?(Hash) ? args.pop : {}
-        options['ENV'] ||= {}
-        options['ENV'] = options['ENV'].merge( Command::DEFAULT_GIT_ENV )
-        Command.new('razor', args, options )
-      end
-
       # @param [String] command_string A string of to be interpolated
       #                                within the context of a host in
       #                                question

data/lib/beaker/host.rb

@@ -2,12 +2,8 @@ require 'socket'
 require 'timeout'
 require 'benchmark'
 
-%w(command ssh_connection).each do |lib|
-  begin
-    require "beaker/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'command', 'ssh_connection' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 module Beaker
@@ -222,7 +218,7 @@ module Beaker
 
   end
 
-  require File.expand_path(File.join(File.dirname(__FILE__), 'host/windows'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'host/unix'))
-  require File.expand_path(File.join(File.dirname(__FILE__), 'host/aix'))
+  [ 'windows', 'unix', 'aix' ].each do |lib|
+    require "beaker/host/#{lib}"
+  end
 end

data/lib/beaker/host/aix.rb

@@ -1,11 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'host'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'command_factory'))
+[ 'host', 'command_factory' ].each do |lib|
+    require "beaker/#{lib}"
+end
 
 module Aix
   class Host < Unix::Host
-    require File.expand_path(File.join(File.dirname(__FILE__), 'aix', 'user'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'aix', 'group'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'aix', 'file'))
+    [ 'user', 'group', 'file' ].each do |lib|
+        require "beaker/host/aix/#{lib}"
+    end
 
     include Aix::User
     include Aix::Group

data/lib/beaker/host/unix.rb

@@ -1,15 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'host'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'command_factory'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'command'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'options'))
+[ 'host', 'command_factory', 'command', 'options' ].each do |lib|
+      require "beaker/#{lib}"
+end
 
 module Unix
   class Host < Beaker::Host
-    require File.expand_path(File.join(File.dirname(__FILE__), 'unix', 'user'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'unix', 'group'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'unix', 'exec'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'unix', 'pkg'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'unix', 'file'))
+    [ 'user', 'group', 'exec', 'pkg', 'file' ].each do |lib|
+          require "beaker/host/unix/#{lib}"
+    end
 
     include Unix::User
     include Unix::Group

data/lib/beaker/host/windows.rb

@@ -1,15 +1,12 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'host'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'command_factory'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'command'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'options'))
+[ 'host', 'command_factory', 'command', 'options' ].each do |lib|
+      require "beaker/#{lib}"
+end
 
 module Windows
   class Host < Beaker::Host
-    require File.expand_path(File.join(File.dirname(__FILE__), 'windows', 'user'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'windows', 'group'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'windows', 'exec'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'windows', 'pkg'))
-    require File.expand_path(File.join(File.dirname(__FILE__), 'windows', 'file'))
+    [ 'user', 'group', 'exec', 'pkg', 'file' ].each do |lib|
+          require "beaker/host/windows/#{lib}"
+    end
 
     include Windows::User
     include Windows::Group

data/lib/beaker/host_prebuilt_steps.rb

@@ -1,9 +1,5 @@
-%w(command).each do |lib|
-  begin
-    require "beaker/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'command' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 module Beaker
@@ -413,5 +409,30 @@ module Beaker
       end
     end
 
+    # Setup files for enabling requests to pass to a proxy server
+    # This works for the APT package manager on debian and ubuntu
+    # and YUM package manager on el, centos, fedora and redhat.
+    # @param [Host, Array<Host>, String, Symbol] host One or more hosts to act upon
+    # @param [Hash{Symbol=>String}] opts Options to alter execution.
+    # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
+    def package_proxy host, opts
+      logger = opts[:logger]
+
+      if host.is_a? Array
+          host.map { |h| package_proxy(h, opts) }
+      else
+        logger.debug("enabling proxy support on #{host.name}")
+        case host['platform']
+          when /ubuntu/, /debian/
+            host.exec(Command.new("echo 'Acquire::http::Proxy \"#{opts[:package_proxy]}/\";' >> /etc/apt/apt.conf.d/10proxy"))
+          when /^el-/, /centos/, /fedora/, /redhat/
+            host.exec(Command.new("echo 'proxy=#{opts[:package_proxy]}/' >> /etc/yum.conf"))
+        else
+          logger.debug("Attempting to enable package manager proxy support on non-supported platform: #{host.name}: #{host['platform']}")
+        end
+      end
+    end
+
   end
+
 end

data/lib/beaker/hypervisor.rb

@@ -1,9 +1,5 @@
-%w( host_prebuilt_steps ).each do |lib|
-  begin
-    require lib
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'host_prebuilt_steps' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 module Beaker
@@ -51,7 +47,13 @@ module Beaker
         when /none/
           Beaker::Hypervisor
         else
-          raise "Invalid hypervisor: #{type}"
+          # Custom hypervisor
+          begin
+            require "beaker/hypervisor/#{type}"
+          rescue LoadError
+            raise "Invalid hypervisor: #{type}"
+          end
+          const_get("Beaker::#{type.capitalize}")
         end
 
       hypervisor = hyper_class.new(hosts_to_provision, options)
@@ -89,6 +91,9 @@ module Beaker
       if @options[:add_master_entry]
         add_master_entry(@hosts, @options)
       end
+      if @options[:package_proxy]
+        package_proxy(@hosts, @options)
+      end
     end
 
     #Default validation steps to be run for a given hypervisor
@@ -98,7 +103,7 @@ module Beaker
       end
     end
 
-    #Generate a random straing composted of letter and numbers
+    #Generate a random string composted of letter and numbers
     def generate_host_name
       CHARMAP[rand(25)] + (0...14).map{CHARMAP[rand(CHARMAP.length)]}.join
     end
@@ -106,10 +111,6 @@ module Beaker
   end
 end
 
-%w( vsphere_helper vagrant fusion blimper aws_sdk vsphere vcloud vcloud_pooled aixer solaris docker google_compute_helper google_compute).each do |lib|
-  begin
-    require "hypervisor/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), "hypervisor", lib))
-  end
+[ 'vsphere_helper', 'vagrant', 'fusion', 'blimper', 'aws_sdk', 'vsphere', 'vcloud', 'vcloud_pooled', 'aixer', 'solaris', 'docker', 'google_compute' ].each do |lib|
+    require "beaker/hypervisor/#{lib}"
 end

data/lib/beaker/hypervisor/google_compute.rb

@@ -27,6 +27,7 @@ module Beaker
     #@option options [String] :gce_machine_type A Google Compute machine type used to create instances, defaults to n1-highmem-2
     #@option options [Integer] :timeout The amount of time to attempt execution before quiting and exiting with failure
     def initialize(google_hosts, options)
+      require 'beaker/hypervisor/google_compute_helper'
       @options = options
       @logger = options[:logger]
       @hosts = google_hosts

data/lib/beaker/hypervisor/vsphere_helper.rb

@@ -1,10 +1,6 @@
 require 'yaml' unless defined?(YAML)
 require 'rbvmomi'
-begin
-  require 'beaker/logger'
-rescue LoadError
-  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'logger.rb'))
-end
+require 'beaker/logger'
 
 class VsphereHelper
   def initialize vInfo

data/lib/beaker/network_manager.rb

@@ -1,9 +1,5 @@
-%w(hypervisor).each do |lib|
-  begin
-    require "beaker/#{lib}"
-  rescue LoadError
-    require File.expand_path(File.join(File.dirname(__FILE__), lib))
-  end
+[ 'hypervisor' ].each do |lib|
+  require "beaker/#{lib}"
 end
 
 module Beaker
@@ -77,6 +73,16 @@ module Beaker
       end
     end
 
+    # configure proxy on all provioned machines
+    #@raise [Exception] Raise an exception if virtual machines fail to be configured
+    def package_proxy
+      if @hypervisors
+        @hypervisors.each_key do |type|
+          @hypervisors[type].package_proxy
+        end
+      end
+    end
+
     #Shut down network connections and revert all provisioned virtual machines
     def cleanup
       #shut down connections