beaker 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWYxNzhkNWRkYTM2NzkxODFjODhjMDlhMmE2YWZhOWI0OWU1NjM3ZQ==
+    NzRhYTI0NDgzNDBlZWRjMWU3YzVlZGQyMTY0MGZiNzQ2M2I3NDljMg==
   data.tar.gz: !binary |-
-    ZWM4OWNhOTU3NzRlZGU1ZmUzODkyN2M5MmI1ZTRmYWEzYmNlY2I5Mw==
+    NTE0ZTIyNGY4ZDc0NjZlYWJhNjc0YTQyZjA3NjVjM2U4OTdhZTlmYw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmZiYzYyYWQ5MDY1NGE0MmI2ZjZhY2QxZWVkZmE4OTY0MWI0ZjA2MDlkYjQx
-    ZTczY2E5ODUzMzcyY2QxNjg1YzllNjNiZDIzNjQwNDRlODRiNzJmMGZjZWY0
-    YTI4ZGEyN2FjOWEzOGI1MDI3MmY2ZGE0Mzk5MDcwMDlhMzZmOTA=
+    MWQyNGMyM2EyNGRkNGY1NTYyNGQ0NjgxOGY3ZmE2NzhiM2ExNzVlMDYyMzg2
+    ZmE3Y2E3NzZkYmIyY2I0ZGZiYTk0ZDA3MGM2Y2RhOWI5MDQ2Y2Q2YjJkNzA1
+    NmI2MzI0ODQ2MDM4NWNmMjcwNmU1NTQyMTc4YTA4YjExNzdlYzE=
   data.tar.gz: !binary |-
-    NzgxNDdiNjYyMDEwMTYzM2I0M2RlZWU2NmMzNTVhZGQxMGZkMWUzOGQ5Mjc0
-    M2Q0YmIyMzZmOGQzZDVlYzZiMzRiOTJiZmQyYmJhNDJmNDhjMTczNjg4NDk1
-    MmFhMjM1YjUwYzRmNTBkOTkxMDZiM2M2ZDM3OTE1YmRhYTNkMzI=
+    ZWJhMDExYmVmYTU0MzE0ZWJhZTUzODJjZDIxMjMwNTMyYjRkMTE4NTYyYTk4
+    NDQ5ZDI4NTA3NzI3YWMwM2MxYmQyZjRkNGZiZWNmNzFlZDFlMWI1ZTg4ZDNj
+    NzkyZDMzNGMzNmQwNjk2NDVmMDI5Mzk3OTNlMWIzMzNiOWJjMGE=

data/README.md

@@ -101,7 +101,7 @@ Additionaly, Beaker supports the following host options:
 * snapshot
   * the name of the snapshot to revert to before testing
 * roles
-  * the 'job' of this host, an array of `master`, `agent`, `dashboard`, `database`, `default` or any user-defined string
+  * the 'job' of this host, an array of `master`, `agent`, `frictionless`, `dashboard`, `database`, `default` or any user-defined string
 * pe_dir
   * the directory where PE builds are located, may be local directory or a URL
 * pe_ver

data/beaker.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "beaker"
-  s.version     = '1.2.0'
+  s.version     = '1.3.0'
   s.authors     = ["Puppetlabs"]
   s.email       = ["delivery@puppetlabs.com"]
   s.homepage    = "https://github.com/puppetlabs/beaker"

data/lib/beaker/cli.rb

@@ -26,7 +26,7 @@ module Beaker
         @logger.notify(VERSION_STRING % spec.version)
         exit
       end
-      @logger.notify(@options.dump)
+      @logger.info(@options.dump)
 
       #add additional paths to the LOAD_PATH
       if not @options[:load_path].empty?

data/lib/beaker/dsl/helpers.rb

@@ -646,14 +646,18 @@ module Beaker
       # @options opts [Hash]    :environment Additional environment variables to be
       #                         passed to the 'puppet apply' command
       #
-      # @option opts [Boolean]  :catch_failures (false) By default
-      #                         `puppet --apply` will exit with 0,
-      #                         which does not count as a test
-      #                         failure, even if there were errors applying
-      #                         the manifest. This option enables detailed
-      #                         exit codes and causes a test failure if
-      #                         `puppet --apply` indicates there was a
-      #                         failure during its execution.
+      # @option opts [Boolean]  :catch_failures (false) By default `puppet
+      #                         --apply` will exit with 0, which does not count
+      #                         as a test failure, even if there were errors or
+      #                         changes when applying the manifest. This option
+      #                         enables detailed exit codes and causes a test
+      #                         failure if `puppet --apply` indicates there was
+      #                         a failure during its execution.
+      #
+      # @option opts [Boolean]  :catch_changes (false) This option enables
+      #                         detailed exit codes and causes a test failure
+      #                         if `puppet --apply` indicates that there were
+      #                         changes or failures during its execution.
       #
       # @option opts [Boolean]  :expect_failures (false) This option enables
       #                         detailed exit codes and causes a test failure
@@ -666,7 +670,7 @@ module Beaker
       #
       def apply_manifest_on(host, manifest, opts = {}, &block)
         on_options = {:stdin => manifest + "\n"}
-        on_options[:acceptable_exit_codes] = Array(opts.delete(:acceptable_exit_codes)) 
+        on_options[:acceptable_exit_codes] = Array(opts.delete(:acceptable_exit_codes))
         args = ["--verbose"]
         args << "--parseonly" if opts[:parseonly]
         args << "--trace" if opts[:trace]
@@ -675,10 +679,15 @@ module Beaker
         # "... an exit code of '2' means there were changes, an exit code of
         # '4' means there were failures during the transaction, and an exit
         # code of '6' means there were both changes and failures."
-        if opts[:catch_failures] and opts[:expect_failures]
-          raise(ArgumentError, "Cannot specify both `catch_failures` and `expect_failures` for a single manifest")
+        if [opts[:catch_changes],opts[:catch_failures],opts[:expect_failures]].select{|x|x}.length > 1
+          raise(ArgumentError, "Cannot specify more than one of `catch_failures`, `catch_changes`, or `expect_failures` for a single manifest")
         end
-        if opts[:catch_failures]
+        if opts[:catch_changes]
+          args << '--detailed-exitcodes'
+
+          # We're after idempotency so allow exit code 0 only.
+          on_options[:acceptable_exit_codes] |= [0]
+        elsif opts[:catch_failures]
           args << '--detailed-exitcodes'
 
           # We're after only complete success so allow exit codes 0 and 2 only.
@@ -878,7 +887,7 @@ module Beaker
       #
       # @param [Host] host  The host to sign for
       #
-      # @returns nil
+      # @return nil
       # @raise [FailTest] if process times out
       def sign_certificate_for(host)
         if [master, dashboard, database].include? host
@@ -916,7 +925,7 @@ module Beaker
       # @param [String] name The name of the fact to query for
       # @!macro common_opts
       #
-      # @returns String The value of the fact 'name' on the provided host
+      # @return String The value of the fact 'name' on the provided host
       # @raise  [FailTest] Raises an exception if call to facter fails
       def fact_on(host, name, opts = {})
         result = on host, facter(name, opts)

data/lib/beaker/dsl/install_utils.rb

@@ -144,9 +144,11 @@ module Beaker
         if host['platform'] =~ /windows/
           version = options[:pe_ver_win] || host['pe_ver']
           "cd #{host['working_dir']} && msiexec.exe /qn /i puppet-enterprise-#{version}.msi"
-        else
+        elsif host['roles'].include? 'frictionless'
           version = options[:pe_ver] || host['pe_ver']
-          "cd #{host['working_dir']}/#{host['dist']} && ./#{options[:installer]}"
+          "cd #{host['working_dir']} && curl -kO https://#{master}:8140/packages/#{version}/#{host['platform']}.bash && bash #{host['platform']}.bash"
+        else
+          "cd #{host['working_dir']}/#{host['dist']} && ./#{options[:installer]} -a #{host['working_dir']}/answers"
         end
       end
 
@@ -178,6 +180,9 @@ module Beaker
       # @api private
       def fetch_puppet(hosts, options)
         hosts.each do |host|
+          # We install Puppet from the master for frictionless installs, so we don't need to *fetch* anything
+          next if host['roles'].include? 'frictionless'
+
           windows = host['platform'] =~ /windows/
           path = options[:pe_dir] || host['pe_dir']
           local = File.directory?(path)
@@ -262,10 +267,13 @@ module Beaker
           if host['platform'] =~ /windows/
             on host, "#{installer_cmd(host, options)} PUPPET_MASTER_SERVER=#{master} PUPPET_AGENT_CERTNAME=#{host}"
           else
-            answers = Beaker::Answers.answers(options[:pe_ver] || host['pe_ver'], hosts, master_certname, options)
-            create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
+            # We only need answers if we're using the classic installer
+            if ! host['roles'].include? 'frictionless'
+              answers = Beaker::Answers.answers(options[:pe_ver] || host['pe_ver'], hosts, master_certname, options)
+              create_remote_file host, "#{host['working_dir']}/answers", Beaker::Answers.answer_string(host, answers)
+            end
 
-            on host, "#{installer_cmd(host, options)} -a #{host['working_dir']}/answers"
+            on host, installer_cmd(host, options)
           end
         end
 

data/lib/beaker/hypervisor/vagrant.rb

@@ -133,8 +133,17 @@ module Beaker
 
     def vagrant_cmd(args)
       Dir.chdir(@vagrant_path) do
-        run = system("vagrant #{args}")
-        if not run
+        exit_status = 1
+        Open3.popen3("vagrant #{args}") {|stdin, stdout, stderr, wait_thr|
+          while line = stdout.gets
+            @logger.debug(line)
+          end
+          if not wait_thr.value.success?
+            raise "Failed to exec 'vagrant #{args}'"
+          end
+          exit_status = wait_thr.value 
+        }
+        if exit_status != 0
           raise "Failed to execute vagrant_cmd ( #{args} )"
         end
       end

data/lib/beaker/hypervisor/vcloud_pooled.rb

@@ -26,6 +26,31 @@ module Beaker
       raise 'You must specify a folder for vCloud instances!' unless @options['folder']
     end
 
+    def check_url url
+      begin
+        URI.parse(url)
+      rescue
+        return false
+      end
+      true
+    end
+
+    def get_template_url pooling_api, template
+      if not check_url(pooling_api)
+        raise ArgumentError, "Invalid pooling_api URL: #{pooling_api}"
+      end
+      scheme = ''
+      if not URI.parse(pooling_api).scheme
+        scheme = 'http://'
+      end
+      #check that you have a valid uri
+      template_url = scheme + pooling_api + '/vm/' + template
+      if not check_url(template_url)
+        raise ArgumentError, "Invalid full template URL: #{template_url}"
+      end
+      template_url
+    end
+
     def provision
       start = Time.now
       try = 1
@@ -38,7 +63,7 @@ module Beaker
         @logger.notify "Requesting '#{h['template']}' VM from vCloud host pool"
 
         begin
-          uri = URI.parse(@options['pooling_api']+'/vm/'+h['template'])
+          uri = URI.parse(get_template_url(@options['pooling_api'], h['template']))
 
           http = Net::HTTP.new( uri.host, uri.port )
           request = Net::HTTP::Post.new(uri.request_uri)
@@ -78,7 +103,7 @@ module Beaker
       vm_names.each do |name|
         @logger.notify "Handing '#{name}' back to pooling API for VM destruction"
 
-        uri = URI.parse(@options['pooling_api']+'/vm/'+name)
+        uri = URI.parse(get_template_url(@options['pooling_api'], name))
 
         http = Net::HTTP.new( uri.host, uri.port )
         request = Net::HTTP::Delete.new(uri.request_uri)

data/lib/beaker/logger.rb

@@ -1,4 +1,8 @@
 module Beaker
+    # The Beaker Logger class
+    # This class handles message reporting for Beaker, it reports based upon a provided log level
+    # to a given destination (be it a string or file)
+    #
   class Logger
     NORMAL         = "\e[00;00m"
     BRIGHT_NORMAL  = "\e[00;01m"
@@ -19,19 +23,47 @@ module Beaker
     BRIGHT_CYAN    = "\e[01;36m"
     BRIGHT_WHITE   = "\e[01;37m"
 
+    # The defined log levels.  Each log level also reports messages at levels lower than itself
     LOG_LEVELS      = {
-      :debug  => 1,
-      :warn   => 2,
-      :normal => 3,
-      :info   => 4
+      :debug   => 5,
+      :verbose => 3,
+      :info    => 2,
+      :notify  => 1,
+      :warn    => 0,
     }
 
     attr_accessor :color, :log_level, :destinations
 
+    # Initialization of the Logger class
+    # @overload initialize(dests)
+    #   Initialize a Logger object that reports to the provided destinations, use default options
+    #   @param [Array<String, IO>] Array of IO and strings (assumed to be file paths) to be reported to
+    # @overload initialize(dests, options)
+    #   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] :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
+    #                          log_level and lower will be reported.
     def initialize(*args)
       options = args.last.is_a?(Hash) ? args.pop : {}
       @color = options[:color]
-      @log_level = options[:debug] ? :debug : :normal
+      case options[:log_level]
+      when /debug/i
+        @log_level = :debug
+      when   /verbose/i
+        @log_level = :verbose
+      when /info/i
+        @log_level = :info
+      when /notify/i
+        @log_level = :notify
+      when /warn/i
+        @log_level = :warn
+      else
+        @log_level = :info
+      end
       @destinations = []
 
       dests = args
@@ -40,6 +72,8 @@ module Beaker
       dests.each {|dest| add_destination(dest)}
     end
 
+    # Construct an array of open steams for printing log messages to
+    # @param [Array<IO, String>] dest Array of strings (each used as a file path) and IO steams that messages will be printed to
     def add_destination(dest)
       case dest
       when IO
@@ -51,6 +85,8 @@ module Beaker
       end
     end
 
+    # Remove a steam from the destinations array based upon it's name or file path
+    # @param [String, IO] dest String representing a file path or IO stream
     def remove_destination(dest)
       case dest
       when IO
@@ -62,14 +98,40 @@ module Beaker
       end
     end
 
+    # Are we at {LOG_LEVELS} debug?
+    # @return [Boolean] true if 'debug' or higher, false if not 'debug' {LOG_LEVELS} or lower
     def is_debug?
-      LOG_LEVELS[@log_level] <= LOG_LEVELS[:debug]
+      LOG_LEVELS[@log_level] >= LOG_LEVELS[:debug]
+    end
+
+    # Are we at {LOG_LEVELS} verbose?
+    # @return [Boolean] true if 'verbose' or higher, false if not 'verbose' {LOG_LEVELS} or lower
+    def is_verbose?
+      LOG_LEVELS[@log_level] >= LOG_LEVELS[:verbose]
     end
 
+    # Are we at {LOG_LEVELS} warn?
+    # @return [Boolean] true if 'warn' or higher, false if not 'warn' {LOG_LEVELS} or lower
     def is_warn?
-      LOG_LEVELS[@log_level] <= LOG_LEVELS[:warn]
+      LOG_LEVELS[@log_level] >= LOG_LEVELS[:warn]
+    end
+
+    # Are we at {LOG_LEVELS} info?
+    # @return [Boolean] true if 'info' or higher, false if not 'info' {LOG_LEVELS} or lower
+    def is_info?
+      LOG_LEVELS[@log_level] >= LOG_LEVELS[:info]
     end
 
+    # Are we at {LOG_LEVELS} notify?
+    # @return [Boolean] true if 'notify' or higher, false if not 'notify' {LOG_LEVELS} or lower
+    def is_notify?
+      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} 'debug' 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
       return unless is_debug?
       strings = strip_colors_from args
@@ -77,35 +139,67 @@ module Beaker
       optionally_color GREY, string, false
     end
 
+    # 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
-      return unless is_debug?
+      return unless is_verbose?
       optionally_color WHITE, args
     end
 
+    # Report a warning message.
+    # 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?
       strings = args.map {|msg| "Warning: #{msg}" }
       optionally_color YELLOW, strings
     end
 
+    # 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.  
+    # @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.  
+    # @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.  
+    # @param args[Array<String>] Strings to be reported
     def error *args
       optionally_color BRIGHT_RED, args
     end
 
+    # Strip any color codes from provided string(s)
+    # @param [String] lines A single or array of lines to removed color codes from
+    # @return [Array<String>] An array of strings that do not have color codes
     def strip_colors_from lines
       Array(lines).map do |line|
         line.gsub /\e\[(\d+;)?\d+m/, ''
       end
     end
 
+    # Print the provided message to the set destination streams, using color codes if appropriate
+    # @param [String] color_code The color code to pre-pend to the message
+    # @param [String] msg The message to be reported
+    # @param [Boolean] add_newline (true) Add newlines between the color codes and the message
     def optionally_color color_code, msg, add_newline = true
       print_statement = add_newline ? :puts : :print
       @destinations.each do |to|
@@ -115,15 +209,22 @@ module Beaker
       end
     end
 
-    # utility method to get the current call stack and format it
+    # Utility method to get the current call stack and format it
     # to a human-readable string (which some IDEs/editors
-    # will recognize as links to the line numbers in the trace)
+    # will recognize as links to the line numbers in the trace).
+    # Beaker associated files will be purged from backtrace unless log level is 'debug' or higher
+    # @param [String] backtrace (caller(1)) The backtrace to format
+    # @return [String] The formatted backtrace
     def pretty_backtrace backtrace = caller(1)
-      trace = purge_harness_files_from( Array( backtrace ) )
+      trace = is_debug? ? backtrace : purge_harness_files_from( backtrace )
       expand_symlinks( trace ).join "\n"
     end
 
-   private
+    private
+    # Expand each symlink found to its full path
+    # Lines are assumed to be in the format "String : Integer"
+    # @param [String] backtrace The string to search and expand symlinks in
+    # @return [String] The backtrace with symlinks expanded
     def expand_symlinks backtrace
       backtrace.collect do |line|
         file_path, line_num = line.split( ":" )
@@ -132,6 +233,9 @@ module Beaker
       end
     end
 
+    # Remove Beaker associated lines from a given String
+    # @param [String] backtrace The string to remove Beaker associated lines from
+    # @return [String] The cleaned backtrace
     def purge_harness_files_from backtrace
       mostly_purged = backtrace.reject do |line|
         # LOADED_FEATURES is an array of anything `require`d, i.e. everything
@@ -145,9 +249,11 @@ module Beaker
       completely_purged = mostly_purged.reject {|line| line.include? $0 }
     end
 
-    # utility method that takes a path as input, checks each component
+    # Utility method that takes a path as input, checks each component
     # of the path to see if it is a symlink, and expands
-    # it if it is.  returns the expanded path.
+    # it if it is.
+    # @param [String] file_path The path to be examined
+    # @return [String] The fully expanded file_path
     def expand_symlink file_path
       file_path.split( "/" ).inject do |full_path, next_dir|
         next_path = full_path + "/" + next_dir

data/lib/beaker/options/command_line_parser.rb

@@ -118,10 +118,21 @@ module Beaker
             @cmd_options[:color] = bool
           end
 
+          opts.on '--log-level LEVEL',
+                  'Log level',
+                  'Supported LEVEL keywords:',
+                  'debug   : all messages, plus full stack trace of errors',
+                  'verbose : all messages',
+                  'info    : info messages, notifications and warnings',
+                  'notify  : notifications and warnings',
+                  'warn    : warnings only',
+                  '(default: info)' do |val|
+            @cmd_options[:log_level] = val
+          end
+
           opts.on '--[no-]debug',
-                  'Enable full debugging',
-                  '(default: false)' do |bool|
-            @cmd_options[:debug] = bool
+                  'DEPRECATED, use --log-level' do |bool|
+            @cmd_options[:log_level] =  bool ? 'debug' : 'info'
           end
 
           opts.on  '-d', '--[no-]dry-run',

data/lib/beaker/options/parser.rb

@@ -80,7 +80,7 @@ module Beaker
               if discover_files.empty?
                 parser_error "empty directory used as an option (#{root})!"
               end
-              files += discover_files
+              files += discover_files.sort
             end
           end
         end
@@ -269,6 +269,9 @@ module Beaker
           if role_array.include?('master')
             master += 1
           end
+          if role_array.include?('frictionless') and !(role_array & ['master', 'database', 'dashboard', 'console']).empty?
+            parser_error "Only agent nodes may have the role 'frictionless', fix #{@options[:hosts_file]}"
+          end
         end
         if master > 1 or master < 1
           parser_error "One and only one host/node may have the role 'master', fix #{@options[:hosts_file]}"

data/lib/beaker/options/presets.rb

@@ -29,6 +29,7 @@ module Beaker
       def self.presets
         h = Beaker::Options::OptionsHash.new
         h.merge({
+          :log_level => 'info',
           :hosts_file => 'sample.cfg',
           :options_file => nil,
           :type => 'pe',
@@ -38,7 +39,6 @@ module Beaker
           :quiet => false,
           :xml => false,
           :color => true,
-          :debug => false,
           :dry_run => false,
           :timeout => 300,
           :fail_mode => nil,

data/lib/beaker/test_suite.rb

@@ -30,7 +30,6 @@ module Beaker
 
       report_and_raise(@logger, RuntimeError.new("#{@name}: no test files found..."), "TestSuite: initialize") if @test_files.empty?
 
-      @test_files = @test_files.sort
     rescue => e
       report_and_raise(@logger, e, "TestSuite: initialize")
     end

data/spec/beaker/dsl/helpers_spec.rb

@@ -340,6 +340,25 @@ describe ClassMixedWithDSLHelpers do
                                 :trace => true,
                                 :catch_failures => true )
     end
+    it 'enforces a 0 exit code through :catch_changes' do
+      subject.should_receive( :puppet ).
+        with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).
+        and_return( 'puppet_command' )
+
+      subject.should_receive( :on ).with(
+        'my_host',
+        'puppet_command',
+        :acceptable_exit_codes => [0],
+        :stdin                 => "class { \"boo\": }\n"
+      )
+
+      subject.apply_manifest_on(
+        'my_host',
+        'class { "boo": }',
+        :trace         => true,
+        :catch_changes => true
+      )
+    end
     it 'enforces exit codes through :expect_failures' do
       subject.should_receive( :puppet ).
         with( 'apply', '--verbose', '--trace', '--detailed-exitcodes' ).

data/spec/beaker/dsl/install_utils_spec.rb

@@ -130,7 +130,7 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'generates a unix PE install command for a unix host' do
-      expect( subject.installer_cmd( unixhost, { :installer => 'puppet-enterprise-installer' } ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer"
+      expect( subject.installer_cmd( unixhost, { :installer => 'puppet-enterprise-installer' } ) ).to be === "cd /tmp/puppet-enterprise-3.1.0-rc0-230-g36c9e5c-debian-7-i386 && ./puppet-enterprise-installer -a /tmp/answers"
     end
   end
 
@@ -199,6 +199,14 @@ describe ClassMixedWithDSLInstallUtils do
       subject.fetch_puppet( [winhost], {} )
 
     end
+
+    it "does nothing for a frictionless agent" do
+      unixhost['roles'] << 'frictionless'
+
+      subject.should_not_receive(:scp_to)
+      subject.should_not_receive(:on)
+      subject.fetch_puppet( [unixhost], {} )
+    end
   end
 
   describe 'do_install' do

data/spec/beaker/hypervisor/vcloud_pooled_spec.rb

@@ -15,6 +15,32 @@ module Beaker
       Socket.stub( :getaddrinfo ).and_return( true )
     end
 
+    describe '#get_template_url' do
+
+      it 'works returns the valid url when passed valid pooling_api and template name' do
+        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
+        uri = vcloud.get_template_url("http://pooling.com", "template")
+        expect( uri ).to be === "http://pooling.com/vm/template"
+      end
+      
+      it 'adds a missing scheme to a given URL' do
+        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
+        uri = vcloud.get_template_url("pooling.com", "template")
+        expect( URI.parse(uri).scheme ).to_not be === nil
+      end
+
+      it 'raises an error on an invalid pooling api url' do
+        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
+        expect{ vcloud.get_template_url("pooling###   ", "template")}.to raise_error ArgumentError
+      end
+
+      it 'raises an error on an invalide template name' do
+        vcloud = Beaker::VcloudPooled.new( make_hosts, make_opts )
+        expect{ vcloud.get_template_url("pooling.com", "t!e&m*p(l\\a/t e")}.to raise_error ArgumentError
+      end
+      
+    end
+
     describe "#provision" do
 
       it 'provisions hosts from the pool' do 

data/spec/beaker/logger_spec.rb

@@ -16,7 +16,7 @@ module Beaker
       context 'default for' do
         its(:destinations)  { should include(STDOUT)  }
         its(:color)         { should be_nil           }
-        its(:log_level)     { should be :normal       }
+        its(:log_level)     { should be :info       }
       end
     end
 
@@ -57,7 +57,7 @@ module Beaker
 
       context 'at debug log_level' do
         subject( :debug_logger )  { Logger.new( my_io,
-                                              :debug => true,
+                                              :log_level => 'debug',
                                               :quiet => true,
                                               :color => true )
                                   }
@@ -80,14 +80,13 @@ module Beaker
         end
       end
 
-      context 'at normal log_level' do
-        subject( :normal_logger ) { Logger.new( my_io,
+      context 'at info log_level' do
+        subject( :info_logger ) { Logger.new( my_io,
                                               :quiet => true,
                                               :color => true )
                                   }
 
         its( :is_debug? ) { should be_false }
-        its( :is_warn? )  { should be_false }
 
 
         context 'skip' do
@@ -96,8 +95,7 @@ module Beaker
             my_io.should_not_receive :print
           end
 
-          it( 'warnings' )  { normal_logger.warn 'NOT A WARNING!'  }
-          it( 'debugs' )    { normal_logger.debug 'NOT DEBUGGING!' }
+          it( 'debugs' )    { info_logger.debug 'NOT DEBUGGING!' }
         end
 
 
@@ -107,9 +105,9 @@ module Beaker
             my_io.should_receive( :print ).twice
           end
 
-          it( 'successes' )     { normal_logger.success 'SUCCESS!'  }
-          it( 'notifications' ) { normal_logger.notify 'NOTFIY!'    }
-          it( 'errors' )        { normal_logger.error 'ERROR!'      }
+          it( 'successes' )     { info_logger.success 'SUCCESS!'  }
+          it( 'notifications' ) { info_logger.notify 'NOTFIY!'    }
+          it( 'errors' )        { info_logger.error 'ERROR!'      }
         end
       end
     end

data/spec/beaker/options/command_line_parser_spec.rb

@@ -6,14 +6,14 @@ module Beaker
 
       let(:parser) {Beaker::Options::CommandLineParser.new}
       let(:test_opts) {["-h", "vcloud.cfg", "--debug", "--tests", "test.rb", "--help"]}
-      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version"]}
+      let(:full_opts) {["--hosts", "host.cfg", "--options", "opts_file", "--type", "pe", "--helper", "path_to_helper", "--load-path", "load_path", "--tests", "test1.rb,test2.rb,test3.rb", "--pre-suite", "pre_suite.rb", "--post-suite", "post_suite.rb", "--no-provision", "--preserve-hosts", "--root-keys", "--keyfile", "../.ssh/id_rsa", "--install", "gitrepopath", "-m", "module", "-q", "--no-xml", "--dry-run", "--no-ntp", "--repo-proxy", "--add-el-extras", "--config", "anotherfile.cfg", "--fail-mode", "fast", "--no-color", "--version", "--log-level", "info"]}
 
       it "can correctly read command line input" do
-        expect(parser.parse!(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :debug=>true, :tests=>"test.rb", :help=>true}
+        expect(parser.parse!(test_opts)).to be === {:hosts_file=>"vcloud.cfg", :log_level=>"debug", :tests=>"test.rb", :help=>true}
       end
 
       it "supports all our command line options" do
-        expect(parser.parse!(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>true, :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true}
+        expect(parser.parse!(full_opts)).to be === {:hosts_file=>"anotherfile.cfg", :options_file=>"opts_file", :type=>"pe", :helper=>"path_to_helper", :load_path=>"load_path", :tests=>"test1.rb,test2.rb,test3.rb", :pre_suite=>"pre_suite.rb", :post_suite=>"post_suite.rb", :provision=>false, :preserve_hosts=>true, :root_keys=>true, :keyfile=>"../.ssh/id_rsa", :install=>"gitrepopath", :modules=>"module", :quiet=>true, :xml=>false, :dry_run=>true, :timesync=>false, :repo_proxy=>true, :add_el_extras=>true, :fail_mode=>"fast", :color=>false, :version=>true, :log_level=>"info"}
       end
 
       it "can produce a usage description" do

data/spec/beaker/options/parser_spec.rb

@@ -44,23 +44,23 @@ module Beaker
       #test parse_install_options
       it "can transform --install PUPPET/3.1 into #{repo}/puppet.git#3.1" do
         opts = ["PUPPET/3.1"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1"] 
+        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1"]
       end
       it "can transform --install FACTER/v.1.0 into #{repo}/facter.git#v.1.0" do
         opts = ["FACTER/v.1.0"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/facter.git#v.1.0"] 
+        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/facter.git#v.1.0"]
       end
       it "can transform --install HIERA/xyz into #{repo}/hiera.git#xyz" do
         opts = ["HIERA/xyz"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera.git#xyz"] 
+        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera.git#xyz"]
       end
       it "can transform --install HIERA-PUPPET/path/to/repo into #{repo}/hiera-puppet.git#path/to/repo" do
         opts = ["HIERA-PUPPET/path/to/repo"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera-puppet.git#path/to/repo"] 
+        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/hiera-puppet.git#path/to/repo"]
       end
       it "can transform --install PUPPET/3.1,FACTER/v.1.0 into #{repo}/puppet.git#3.1,#{repo}/facter.git#v.1.0" do
         opts = ["PUPPET/3.1", "FACTER/v.1.0"]
-        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1", "#{repo}/facter.git#v.1.0"] 
+        expect(parser.parse_git_repos(opts)).to be === ["#{repo}/puppet.git#3.1", "#{repo}/facter.git#v.1.0"]
       end
       it "can leave --install git://github.com/puppetlabs/puppet.git#my/full/path alone" do
         opts = ["git://github.com/puppetlabs/puppet.git#my/full/path"]
@@ -98,7 +98,7 @@ module Beaker
         it 'raises an error when no ruby files are found' do
           @files = [ pl_test, sh_test ]
           paths
-          expect{parser.file_list([File.expand_path(test_dir)])}.to raise_error(ArgumentError) 
+          expect{parser.file_list([File.expand_path(test_dir)])}.to raise_error(ArgumentError)
         end
         it 'raises an error when no paths are specified for searching' do
           @files = ''
@@ -107,6 +107,40 @@ module Beaker
 
       end
 
+      context 'combining split_arg and file_list maintain test file ordering', :use_fakefs => true do
+        let(:test_dir) { 'tmp/tests/' }
+        let(:other_test_dir) {'tmp/tests2/' }
+
+        before :each do
+          @files = ['00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb', '01_TestSetup.rb', '03_PuppetMasterSanity.rb', '06_InstallModules.rb', '02_PuppetUserAndGroup.rb', '04_ValidateSignCert.rb', '07_InstallCACerts.rb'].shuffle!.map!{|x| test_dir + x }
+          @other_files = ['00_EnvSetup.rb', '035_StopFirewall.rb', '05_HieraSetup.rb', '01_TestSetup.rb', '03_PuppetMasterSanity.rb', '06_InstallModules.rb', '02_PuppetUserAndGroup.rb', '04_ValidateSignCert.rb', '07_InstallCACerts.rb'].shuffle!.map!{|x| other_test_dir + x }
+          create_files(@files)
+          create_files(@other_files)
+          create_files(['08_foss.rb'])
+        end
+
+        it "when provided a file followed by dir, runs the file first" do
+          arg = "08_foss.rb,#{test_dir}"
+          expect(parser.file_list(parser.split_arg(arg))).to be === ["08_foss.rb", "#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb"]
+        end
+
+        it "when provided a dir followed by a file, runs the file last" do
+          arg = "#{test_dir},08_foss.rb"
+          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb", "08_foss.rb"]
+        end
+
+        it "correctly orders files in a directory" do
+          arg = "#{test_dir}"
+          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb"]
+        end
+
+        it "when provided two directories orders each directory separately" do
+          arg = "#{test_dir}/,#{other_test_dir}/"
+          expect(parser.file_list(parser.split_arg(arg))).to be === ["#{File.expand_path(test_dir)}/00_EnvSetup.rb", "#{File.expand_path(test_dir)}/01_TestSetup.rb", "#{File.expand_path(test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(test_dir)}/035_StopFirewall.rb", "#{File.expand_path(test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(test_dir)}/05_HieraSetup.rb", "#{File.expand_path(test_dir)}/06_InstallModules.rb", "#{File.expand_path(test_dir)}/07_InstallCACerts.rb", "#{File.expand_path(other_test_dir)}/00_EnvSetup.rb", "#{File.expand_path(other_test_dir)}/01_TestSetup.rb", "#{File.expand_path(other_test_dir)}/02_PuppetUserAndGroup.rb", "#{File.expand_path(other_test_dir)}/035_StopFirewall.rb", "#{File.expand_path(other_test_dir)}/03_PuppetMasterSanity.rb", "#{File.expand_path(other_test_dir)}/04_ValidateSignCert.rb", "#{File.expand_path(other_test_dir)}/05_HieraSetup.rb", "#{File.expand_path(other_test_dir)}/06_InstallModules.rb", "#{File.expand_path(other_test_dir)}/07_InstallCACerts.rb"]
+        end
+
+      end
+
       #test yaml file checking
       it "raises error on improperly formatted yaml file" do
         FakeFS.deactivate!
@@ -119,19 +153,19 @@ module Beaker
 
       it "can correctly combine arguments from different sources" do
         FakeFS.deactivate!
-        args = ["-h", hosts_path, "--debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
-        expect(parser.parse_args(args)).to be === {:hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>false, :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :debug=>true, :dry_run=>false, :timeout=>300, :fail_mode=>nil, :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
+        args = ["-h", hosts_path, "--log-level", "debug", "--type", "git", "--install", "PUPPET/1.0,HIERA/hello"]
+        expect(parser.parse_args(args)).to be === {:log_level=>"debug", :hosts_file=>hosts_path, :options_file=>nil, :type=>"git", :provision=>true, :preserve_hosts=>false, :root_keys=>false, :quiet=>false, :xml=>false, :color=>true, :dry_run=>false, :timeout=>300, :fail_mode=>nil, :timesync=>false, :repo_proxy=>false, :add_el_extras=>false, :consoleport=>443, :pe_dir=>"/opt/enterprise/dists", :pe_version_file=>"LATEST", :pe_version_file_win=>"LATEST-win", :dot_fog=>"#{home}/.fog", :help=>false, :ec2_yaml=>"config/image_templates/ec2.yaml", :ssh=>{:config=>false, :paranoid=>false, :timeout=>300, :auth_methods=>["publickey"], :port=>22, :forward_agent=>true, :keys=>["#{home}/.ssh/id_rsa"], :user_known_hosts_file=>"#{home}/.ssh/known_hosts"}, :install=>["git://github.com/puppetlabs/puppet.git#1.0", "git://github.com/puppetlabs/hiera.git#hello"], :HOSTS=>{:"pe-ubuntu-lucid"=>{:roles=>["agent", "dashboard", "database", "master"], :vmname=>"pe-ubuntu-lucid", :platform=>"ubuntu-10.04-i386", :snapshot=>"clean-w-keys", :hypervisor=>"fusion"}, :"pe-centos6"=>{:roles=>["agent"], :vmname=>"pe-centos6", :platform=>"el-6-i386", :hypervisor=>"fusion", :snapshot=>"clean-w-keys"}}, :nfs_server=>"none", :helper=>[], :load_path=>[], :tests=>[], :pre_suite=>[], :post_suite=>[], :modules=>[]}
       end
 
       it "ensures that file-mode is one of fast/stop" do
         FakeFS.deactivate!
-        args = ["-h", hosts_path, "--debug", "--fail-mode", "slow"] 
+        args = ["-h", hosts_path, "--log-level", "debug", "--fail-mode", "slow"] 
         expect{parser.parse_args(args)}.to raise_error(ArgumentError)
       end
 
       it "ensures that type is one of pe/git" do
         FakeFS.deactivate!
-        args = ["-h", hosts_path, "--debug", "--type", "unkowns"]
+        args = ["-h", hosts_path, "--log-level", "debug", "--type", "unkowns"]
         expect{parser.parse_args(args)}.to raise_error(ArgumentError)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec