beaker 1.11.0 → 1.11.1

data/lib/beaker/hypervisor/vcloud.rb

@@ -131,7 +131,7 @@ module Beaker
         @logger.notify 'Spent %.2f seconds deploying VMs' % (Time.now - start)
 
         try = (Time.now - start) / 5
-        duration = run_and_report_duration do 
+        duration = run_and_report_duration do
           @hosts.each_with_index do |h, i|
             booting_host(h, try, attempts)
           end

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -2,7 +2,7 @@ require 'yaml' unless defined?(YAML)
 require 'json'
 require 'net/http'
 
-module Beaker 
+module Beaker
   class VcloudPooled < Beaker::Hypervisor
     SSH_EXCEPTIONS = [
       SocketError,
@@ -75,7 +75,7 @@ module Beaker
           attempts = @options[:timeout].to_i / 5
           response = http.request(request)
           parsed_response = JSON.parse(response.body)
-          if parsed_response[h['template']] && parsed_response[h['template']]['ok'] && parsed_response[h['template']]['hostname'] 
+          if parsed_response[h['template']] && parsed_response[h['template']]['ok'] && parsed_response[h['template']]['hostname']
             h['vmhostname'] = parsed_response[h['template']]['hostname']
           else
             raise "VcloudPooled.provision - no vCloud host free for #{h.name} in pool"
@@ -115,7 +115,7 @@ module Beaker
         rescue *SSH_EXCEPTIONS => e
           report_and_raise(@logger, e, 'vCloudPooled.cleanup (http.request)')
         end
-      end 
+      end
 
       @logger.notify "Spent %.2f seconds cleaning up" % (Time.now - start)
     end

data/lib/beaker/hypervisor/vsphere.rb

@@ -1,6 +1,6 @@
 require 'yaml' unless defined?(YAML)
 
-module Beaker 
+module Beaker
   class Vsphere < Beaker::Hypervisor
 
     def initialize(vsphere_hosts, options)

data/lib/beaker/logger.rb

@@ -42,7 +42,7 @@ module Beaker
     #   Initialize a Logger object that reports to the provided destinations, use options from provided option hash
     #   @param [Array<String, IO>] Array of IO and strings (assumed to be file paths) to be reported to
     #   @param [Hash] options Hash of options
-    #   @option options [Boolean] :color (true) Print color code before log messages 
+    #   @option options [Boolean] :color (true) Print color code before log messages
     #   @option options [Boolean] :quiet (false) Do not log messages to STDOUT
     #   @option options [String] :log_level ("info") Log level (one of "debug" - highest level, "verbose", "info",
     #                          "notify" and "warn" - lowest level (see {LOG_LEVELS}))  The log level indicates that messages at that
@@ -128,8 +128,8 @@ module Beaker
       LOG_LEVELS[@log_level] >= LOG_LEVELS[:notify]
     end
 
-    # Custom reporting for messages generated by host SUTs.  
-    # Will not print unless we are at {LOG_LEVELS} 'verbose' or higher.  
+    # Custom reporting for messages generated by host SUTs.
+    # Will not print unless we are at {LOG_LEVELS} 'verbose' or higher.
     # Strips any color codes already in the provided messages, then adds logger color codes before reporting
     # @param args[Array<String>] Strings to be reported
     def host_output *args
@@ -139,7 +139,7 @@ module Beaker
       optionally_color GREY, string, false
     end
 
-    # Report a debug message.  
+    # Report a debug message.
     # Will not print unless we are at {LOG_LEVELS} 'debug' or higher.
     # @param args[Array<String>] Strings to be reported
     def debug *args
@@ -148,8 +148,8 @@ module Beaker
     end
 
     # Report a warning message.
-    # Will not print unless we are at {LOG_LEVELS} 'warn' or higher.  
-    # Will pre-pend the message with "Warning: ".  
+    # Will not print unless we are at {LOG_LEVELS} 'warn' or higher.
+    # Will pre-pend the message with "Warning: ".
     # @param args[Array<String>] Strings to be reported
     def warn *args
       return unless is_warn?
@@ -157,31 +157,31 @@ module Beaker
       optionally_color YELLOW, strings
     end
 
-    # Report an info message.  
-    # Will not print unless we are at {LOG_LEVELS} 'info' or higher.  
+    # Report an info message.
+    # Will not print unless we are at {LOG_LEVELS} 'info' or higher.
     # @param args[Array<String>] Strings to be reported
     def info *args
       return unless is_info?
       optionally_color BLUE, args
     end
 
-    # Report a success message.  
-    # Will always be reported.  
+    # Report a success message.
+    # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def success *args
       optionally_color GREEN, args
     end
 
-    # Report a notify message.  
-    # Will not print unless we are at {LOG_LEVELS} 'notify' or higher.  
+    # Report a notify message.
+    # Will not print unless we are at {LOG_LEVELS} 'notify' or higher.
     # @param args[Array<String>] Strings to be reported
     def notify *args
       return unless is_notify?
       optionally_color BRIGHT_WHITE, args
     end
 
-    # Report an error message.  
-    # Will always be reported.  
+    # Report an error message.
+    # Will always be reported.
     # @param args[Array<String>] Strings to be reported
     def error *args
       optionally_color BRIGHT_RED, args

data/lib/beaker/network_manager.rb

@@ -17,9 +17,9 @@ module Beaker
     # - only if we have a hypervisor
     # - only if either the specific hosts has no specification or has 'provision' in its config
     # - always if it is a vagrant box (vagrant boxes are always provisioned as they always need ssh key hacking)
-    def provision? options, host 
-      command_line_says = options[:provision] 
-      host_says = host['hypervisor'] && (host.has_key?('provision') ? host['provision'] : true) 
+    def provision? options, host
+      command_line_says = options[:provision]
+      host_says = host['hypervisor'] && (host.has_key?('provision') ? host['provision'] : true)
       (command_line_says && host_says) or (host['hypervisor'] =~/vagrant/)
     end
 
@@ -38,10 +38,10 @@ module Beaker
         cleanup
       end
       @hypervisors = {}
-      #sort hosts by their hypervisor, use hypervisor 'none' if no hypervisor is specified 
+      #sort hosts by their hypervisor, use hypervisor 'none' if no hypervisor is specified
       @options['HOSTS'].each_key do |name|
         host = @options['HOSTS'][name]
-        hypervisor = host['hypervisor'] 
+        hypervisor = host['hypervisor']
         hypervisor = provision?(@options, host) ? host['hypervisor'] : 'none'
         @logger.debug "Hypervisor for #{name} is #{hypervisor}"
         @machines[hypervisor] = [] unless @machines[hypervisor]

data/lib/beaker/options/command_line_parser.rb

@@ -4,8 +4,8 @@ module Beaker
     class CommandLineParser
 
       # @example Create a CommanLineParser
-      #   a = CommandLineParser.new     
-      #    
+      #   a = CommandLineParser.new
+      #
       # @note All of Beaker's supported command line options are defined here
       def initialize
         @cmd_options = Beaker::Options::OptionsHash.new
@@ -95,7 +95,7 @@ module Beaker
           end
 
           opts.on '-i URI', '--install URI',
-                  'Install a project repo/app on the SUTs', 
+                  'Install a project repo/app on the SUTs',
                   'Provide full git URI or use short form KEYWORD/name',
                   'supported keywords: PUPPET, FACTER, HIERA, HIERA-PUPPET' do |value|
             @cmd_options[:install] = value
@@ -176,15 +176,15 @@ module Beaker
             @cmd_options[:validate] = bool
           end
 
-          opts.on('--version', 'Report currently running version of beaker' ) do 
+          opts.on('--version', 'Report currently running version of beaker' ) do
             @cmd_options[:version] = true
           end
 
-          opts.on('--parse-only', 'Display beaker parsed options and exit' ) do 
+          opts.on('--parse-only', 'Display beaker parsed options and exit' ) do
             @cmd_options[:parse_only] = true
           end
 
-          opts.on('--help', 'Display this screen' ) do 
+          opts.on('--help', 'Display this screen' ) do
             @cmd_options[:help] = true
           end
 
@@ -208,25 +208,24 @@ module Beaker
       # @example
       #   args = ['--option', 'value', '--option2', 'value2', '--switch']
       #   parser = CommandLineParser.new
-      #   parser.parse!(args) == {:option => 'value, :options2 => value, :switch => true}
+      #   parser.parse(args) == {:option => 'value, :options2 => value, :switch => true}
       #
       # @return [Hash] Return the Hash of options
-      def parse!( args = ARGV )
-        @optparse.parse!(args)
+      def parse( args = ARGV )
+        @optparse.parse(args)
         @cmd_options
       end
 
       # Generate a string representing the supported arguments
       #
-      # @example 
-      #    parser = CommandLineParser.new 
-      #    parser.usage = "Options:  ..." 
+      # @example
+      #    parser = CommandLineParser.new
+      #    parser.usage = "Options:  ..."
       #
       # @return [String] Return a string representing the available arguments
       def usage
         @optparse.help
       end
-
     end
   end
 end

data/lib/beaker/options/hosts_file_parser.rb

@@ -6,7 +6,7 @@ module Beaker
       # Read the contents of the hosts.cfg into an OptionsHash, merge the 'CONFIG' section into the OptionsHash, return OptionsHash
       # @param [String] hosts_file_path The path to the hosts file
       #
-      # @example 
+      # @example
       #     hosts_hash = HostsFileParser.parse_hosts_file('sample.cfg')
       #     hosts_hash == {:HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], ... }
       #

data/lib/beaker/options/options_file_parser.rb

@@ -8,22 +8,22 @@ module Beaker
       #
       # Options file is assumed to contain extra options stored in a Hash
       #
-      # ie, 
+      # ie,
       #   {
       #     :debug => true,
       #     :tests => "test.rb",
       #   }
-      #   
+      #
       # @param [String] options_file_path The path to the options file
       #
-      # @example 
+      # @example
       #     options_hash = OptionsFileParser.parse_options_file('sample.cfg')
       #     options_hash == {:debug=>true, :tests=>"test.rb", :pre_suite=>["pre-suite.rb"], :post_suite=>"post_suite1.rb,post_suite2.rb"}
       #
       # @return [OptionsHash] The contents of the options file as an OptionsHash
       # @raise [ArgumentError] Raises if options_file_path is not a path to a file
       # @note Since the options_file is Eval'ed, any other Ruby commands will also be executed, this can be used
-      #    to set additional environment variables 
+      #    to set additional environment variables
       def self.parse_options_file(options_file_path)
         result = Beaker::Options::OptionsHash.new
         if options_file_path

data/lib/beaker/options/parser.rb

@@ -5,7 +5,7 @@ module Beaker
     #An Object that parses, merges and normalizes all supported Beaker options and arguments
     class Parser
       GITREPO      = 'git://github.com/puppetlabs'
-      #These options can have the form of arg1,arg2 or [arg] or just arg, 
+      #These options can have the form of arg1,arg2 or [arg] or just arg,
       #should default to []
       LONG_OPTS    = [:helper, :load_path, :tests, :pre_suite, :post_suite, :install, :modules]
       #These options expand out into an array of .rb files
@@ -139,29 +139,35 @@ module Beaker
       # @param [Array] args ARGV or a provided arguments array
       # @raise [ArgumentError] Raises error on bad input
       def parse_args(args = ARGV)
-        #NOTE on argument precedence:
-        #
+        # NOTE on argument precedence:
         # Will use env, then hosts/config file, then command line, then file options
-        #
+
+
         @options = Beaker::Options::Presets.presets
-        cmd_line_options = @command_line_parser.parse!(args)
+        cmd_line_options = @command_line_parser.parse(args)
         file_options = Beaker::Options::OptionsFileParser.parse_options_file(cmd_line_options[:options_file])
+
         # merge together command line and file_options
         #   overwrite file options with command line options
         cmd_line_and_file_options = file_options.merge(cmd_line_options)
+
         # merge command line and file options with defaults
         #   overwrite defaults with command line and file options
         @options = @options.merge(cmd_line_and_file_options)
+        @options[:command_line] = ([$0] + args).join(' ')
 
         if not @options[:help] and not @options[:version]
           #read the hosts file that contains the node configuration and hypervisor info
           hosts_options = Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
+
           # merge in host file vars
           #   overwrite options (default, file options, command line, env) with host file options
           @options = @options.merge(hosts_options)
+
           # merge in env vars
           #   overwrite options (default, file options, command line, hosts file) with env
           env_vars = Beaker::Options::Presets.env_vars
+
           @options = @options.merge(env_vars)
 
           normalize_args

data/lib/beaker/options/pe_version_scraper.rb

@@ -8,11 +8,11 @@ module Beaker
       # Version file is of the format
       #
       #  3.0.1-3-g57b669e
-      #   
+      #
       # @param [String] dist_dir The directory containing the version_file
       # @param [String] version_file The file to scrape
       #
-      # @return [String, nil] The PE version in the version_file or nil if not found 
+      # @return [String, nil] The PE version in the version_file or nil if not found
       # @raise [ArgumentError] Raises if version_file does not exist or cannot be opened
       def self.load_pe_version dist_dir, version_file
         version = nil

data/lib/beaker/platform.rb

@@ -1,15 +1,15 @@
 module Beaker
-  #This class create a Platform object inheriting from String.  It supports all String methods while adding 
+  #This class create a Platform object inheriting from String.  It supports all String methods while adding
   #several platform-specific use cases.
   class Platform < String
     #Supported platforms
-    PLATFORMS = /^(centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
+    PLATFORMS = /^(osx|centos|fedora|debian|oracle|redhat|scientific|sles|ubuntu|windows|solaris|aix|el)\-.+\-.+$/
     #Platform version numbers vs. codenames conversion hash
-    PLATFORM_VERSION_CODES = 
+    PLATFORM_VERSION_CODES =
       { :debian => { "wheezy"  => "7",
                      "squeeze" => "6",
                    },
-        :ubuntu => { "trusty"  => "1404", 
+        :ubuntu => { "trusty"  => "1404",
                      "saucy"   => "1310",
                      "raring"  => "1304",
                      "quantal" => "1210",

data/lib/beaker/shared/error_handler.rb

@@ -1,4 +1,4 @@
-module Beaker 
+module Beaker
   module Shared
     module ErrorHandler
 
@@ -8,7 +8,7 @@ module Beaker
       bt = e.backtrace
       logger.pretty_backtrace(bt).each_line do |line|
         logger.error(line)
-      end 
+      end
       raise e
     end
 

data/lib/beaker/shared/host_role_parser.rb

@@ -1,4 +1,4 @@
-module Beaker 
+module Beaker
   module Shared
     #Methods for selecting host or hosts that match roles.
     module HostRoleParser
@@ -11,25 +11,25 @@ module Beaker
         hosts.select do |host|
           desired_role.nil? or host['roles'].include?(desired_role.to_s)
         end
-      end 
+      end
 
-      #Find a single host with the role provided.  Raise an error if more than one host is found to have the 
+      #Find a single host with the role provided.  Raise an error if more than one host is found to have the
       #provided role.
       #@param [Array<Host>] hosts The hosts to examine
       #@param [String] role The host returned will have this role in its role list
       #@return [Host] The single host with the desired role in its roles list
-      #@raise [ArgumentError] Raised if more than one host has the given role defined, or if no host has the 
+      #@raise [ArgumentError] Raised if more than one host has the given role defined, or if no host has the
       #                       role defined.
       def only_host_with_role(hosts, role)
         a_host = hosts_with_role(hosts, role)
-        case 
+        case
           when a_host.length == 0
             raise ArgumentError, "There should be one host with #{role} defined!"
           when a_host.length > 1
             host_string = ( a_host.map { |host| host.name } ).join( ', ')
-            raise ArgumentError, "There should be only one host with #{role} defined, but I found #{a_host.length} (#{host_string})" 
+            raise ArgumentError, "There should be only one host with #{role} defined, but I found #{a_host.length} (#{host_string})"
         end
-        a_host.first 
+        a_host.first
       end
     end
   end

data/lib/beaker/ssh_connection.rb

@@ -57,7 +57,7 @@ module Beaker
       begin
         @ssh.close if @ssh
       rescue
-        @ssh.shutdown! 
+        @ssh.shutdown!
       end
       @ssh = nil
     end
@@ -103,7 +103,7 @@ module Beaker
           attempt = false
           puts "Command execution failed, attempting to reconnect to #{@hostname}"
           close
-          connect 
+          connect
           retry
         else
           raise

data/lib/beaker/test_suite.rb

@@ -38,7 +38,7 @@ module Beaker
       @run = true
       @start_time = Time.now
 
-      configure_logging 
+      configure_logging
 
       @test_files.each do |test_file|
         @logger.notify

data/lib/beaker/version.rb

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

data/spec/beaker/hypervisor/docker_spec.rb

@@ -116,21 +116,10 @@ module Beaker
         docker.provision
       end
 
-      it 'should tag the Image with the host.name' do
-        hosts.each do |host|
-          image.should_receive(:tag).with({
-            :repo => host.name,
-            :force => true,
-          })
-        end
-
-        docker.provision
-      end
-
-      it 'should create a container based on the Image (identified by host.name)' do
+      it 'should create a container based on the Image (identified by image.id)' do
         hosts.each do |host|
           ::Docker::Container.should_receive(:create).with({
-            'Image' => host.name,
+            'Image' => image.id,
             'Hostname' => host.name,
           })
         end
@@ -180,6 +169,23 @@ module Beaker
         image.should_receive(:delete)
         docker.cleanup
       end
+
+      it 'should not delete the image if docker_preserve_image is set to true' do
+        hosts.each do |host|
+          host['docker_preserve_image']=true
+        end
+        image.should_not_receive(:delete)
+        docker.cleanup
+      end
+
+      it 'should delete the image if docker_preserve_image is set to false' do
+        hosts.each do |host|
+          host['docker_preserve_image']=false
+        end
+        image.should_receive(:delete)
+        docker.cleanup
+      end
+
     end
 
     describe '#dockerfile_for' do