beaker 1.18.0 → 1.19.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQxM2VhODU1MzlmN2Q3NjRmYmU0Y2ExM2QyMDBiYWNlNjg0ODAwMg==
+    YWJiZmFiYjMyZjkyZjc0ODE5ZWQ3NDJiY2MwOGY2ODQ3OTI0NDNkMw==
   data.tar.gz: !binary |-
-    NjQ1YjA0NzYxMTllZDMxYWE1Yjk1MzVjNzY4NzA2NzQ5N2MyNjU2Ng==
+    NzljMGNhYmQwYTAyNDk1MDFjODAzMzBkMzZjMDM3ZTNhZmZmYmZkYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjViZjlhMDg2OWVmNzkzMTUwYmFkODc5MjBhNDJmNGZiNGFlZmMwZGFmMTY4
-    NDkwMWMzMGMzYTE1NmFhMDllYjA4MTUzZmJlOGZhMzkxNjNhZDFjYjdkNDQ2
-    NjRiMjNiZTBjMGI0Y2ZiY2E1NzViM2VmODE2ZGZjMGI5ZmY5OWU=
+    MDg2YTkwYzc3ODk5YTQyN2IxNWQzMmNiZDFkZTA3OGUwMmRmNGQyZWRlMTJk
+    NjI1MzMyYjA0YzAwNTA3ZmJlMWNmNmQ1ZTg2MDY1NWFjOTFiN2Y2OTg3ZTNl
+    ZDg4YTc4YmE5ZGM4YmUwODAwMjk3N2ZmMmYxZGUyOGI5MmEwYTc=
   data.tar.gz: !binary |-
-    YTU0NWUzMDAyZjM0ODkzNzNlODU0MjZlMGQwZDVmZDA3MmFjOGYwMjA0OTI4
-    ZTdmOGY5NjY5OTQ2OTU4NjI0NmEzYzFlNzRkZmI5YjEyYzNkNmUwODY1MTgy
-    MTZkZjUwZGIxMzZlY2RjZDhkMjM4NDc3Y2JiNzg4OTNhMjM2YzA=
+    NzNiMjMzN2IzNDNhNGI2NTA1ODgxYjgxMDVlNjE1Mjg0MTlhOTYwZDNkNjdl
+    M2IzZTRkZDgyZjY5NTYxYWUzYzhiN2IyNzE1ZjVkOTI4MTJkNTM5Mzc1NzU1
+    MjFmNmRjOGNkMzBhYjM3M2NjNGEyMTU2MzdmNjA3ZTQ1NzJlMGQ=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # beaker - History
 ## Tags
-* [LATEST - 18 Sep, 2014 (116ecd2e)](#LATEST)
+* [LATEST - 18 Sep, 2014 (b4e69b83)](#LATEST)
+* [beaker1.18.0 - 18 Sep, 2014 (b9171d9c)](#beaker1.18.0)
 * [beaker1.17.7 - 2 Sep, 2014 (e47881f0)](#beaker1.17.7)
 * [beaker1.17.6 - 27 Aug, 2014 (bfb257bf)](#beaker1.17.6)
 * [beaker1.17.5 - 22 Aug, 2014 (7e553089)](#beaker1.17.5)
@@ -60,7 +61,40 @@
 * [pe1.2 - 6 Sep, 2011 (ba3dadd2)](#pe1.2)
 
 ## Details
-### <a name = "LATEST">LATEST - 18 Sep, 2014 (116ecd2e)
+### <a name = "LATEST">LATEST - 18 Sep, 2014 (b4e69b83)
+
+* (GEM) version bump for beaker 1.19.0 gem (b4e69b83)
+
+* Merge pull request #459 from justinstoller/bug/master/QENG-1212_better (c683a928)
+
+
+```
+Merge pull request #459 from justinstoller/bug/master/QENG-1212_better
+
+(QENG-1212) Improve module installation experience
+```
+* (QENG-1212) Improve module installation experience (61f05e90)
+
+
+```
+(QENG-1212) Improve module installation experience
+
+Prior to this puppet module installation was carried out with either
+`puppet_module_install` or `copy_module_to`. This replaces them with a
+method `install_dev_puppet_module` that will install either via scp or
+pmt from a staging forge depending on arguements and environment
+```
+### <a name = "beaker1.18.0">beaker1.18.0 - 18 Sep, 2014 (b9171d9c)
+
+* Merge pull request #461 from anodelman/make-gem (b9171d9c)
+
+
+```
+Merge pull request #461 from anodelman/make-gem
+
+create beaker 1.18.0 gem
+```
+* (HISTORY) update history for beaker 1.18.0 gem release (8f22c5c9)
 
 * (GEM) version bump for beaker 1.18.0 (116ecd2e)
 

data/lib/beaker/dsl/helpers.rb

@@ -28,8 +28,6 @@ module Beaker
     # @api dsl
     module Helpers
 
-      PUPPET_MODULE_INSTALL_IGNORE = ['.bundle', '.git', '.idea', '.vagrant', '.vendor', 'acceptance', 'spec', 'tests', 'log']
-
       # @!macro common_opts
       #   @param [Hash{Symbol=>String}] opts Options to alter execution.
       #   @option opts [Boolean] :silent (false) Do not produce log output
@@ -206,36 +204,6 @@ module Beaker
         end
       end
 
-      # Check to see if a package is installed on a remote host
-      #
-      # @param [Host] host             A host object
-      # @param [String] package_name   Name of the package to check for.
-      #
-      # @return [Boolean] true/false if the package is found
-      def check_for_package host, package_name
-        host.check_for_package package_name
-      end
-
-      # Install a package on a host
-      #
-      # @param [Host] host             A host object
-      # @param [String] package_name   Name of the package to install
-      #
-      # @return [Result]   An object representing the outcome of *install command*.
-      def install_package host, package_name, package_version = nil
-        host.install_package package_name, '', package_version
-      end
-
-      # Upgrade a package on a host. The package must already be installed
-      #
-      # @param [Host] host             A host object
-      # @param [String] package_name   Name of the package to install
-      #
-      # @return [Result]   An object representing the outcome of *upgrade command*.
-      def upgrade_package host, package_name
-        host.upgrade_package package_name
-      end
-
       # Deploy packaging configurations generated by
       # https://github.com/puppetlabs/packaging to a host.
       #
@@ -338,25 +306,6 @@ module Beaker
         run_script_on(default, script, opts, &block)
       end
 
-      # Copy a puppet module from a given source to all hosts under test.
-      # Assumes each host under test has an associated 'distmoduledir' (set in the
-      # host configuration YAML file).
-      #
-      # @param opts [Hash]
-      # @option opts [String] :source The location on the test runners box where the files are found
-      # @option opts [String] :module_name The name of the module to be copied over
-      def puppet_module_install_on(host, opts = {})
-        block_on host do | h |
-          on h, puppet("module install #{opts[:module_name]}")
-        end
-      end
-
-      # Copy a puppet module from a given source to all hosts under test.
-      # @see #puppet_module_install_on
-      def puppet_module_install opts = {}
-        puppet_module_install_on(hosts, opts)
-      end
-
       # Limit the hosts a test case is run against
       # @note This will modify the {Beaker::TestCase#hosts} member
       #   in place unless an array of hosts is passed into it and
@@ -1038,8 +987,8 @@ module Beaker
         end
       end
 
-      # This method accepts a block and using the puppet resource 'host' will
-      # setup host aliases before and after that block.
+      # This method using the puppet resource 'host' will setup host aliases
+      # and register the remove of host aliases via Beaker::TestCase#teardown
       #
       # A teardown step is also added to make sure unstubbing of the host is
       # removed always.
@@ -1066,6 +1015,36 @@ module Beaker
         end
       end
 
+      # This method accepts a block and using the puppet resource 'host' will
+      # setup host aliases before and after that block.
+      #
+      # @param [Host, Array<Host>, String, Symbol] host    One or more hosts to act upon,
+      #                            or a role (String or Symbol) that identifies one or more hosts.
+      # @param ip_spec [Hash{String=>String}] a hash containing the host to ip
+      #   mappings
+      # @example Stub puppetlabs.com on the master to 127.0.0.1
+      #   with_host_stubbed_on(master, 'forgeapi.puppetlabs.com' => '127.0.0.1') do
+      #     puppet( "module install puppetlabs-stdlib" )
+      #   end
+      def with_host_stubbed_on(host, ip_spec, &block)
+        begin
+          block_on host do |host|
+            ip_spec.each_pair do |address, ip|
+              logger.notify("Stubbing address #{address} to IP #{ip} on machine #{host}")
+              on( host, puppet('resource', 'host', address, 'ensure=present', "ip=#{ip}") )
+            end
+          end
+
+          block.call
+
+        ensure
+          ip_spec.each do |address, ip|
+            logger.notify("Unstubbing address #{address} to IP #{ip} on machine #{host}")
+            on( host, puppet('resource', 'host', address, 'ensure=absent') )
+          end
+        end
+      end
+
       # This method accepts a block and using the puppet resource 'host' will
       # setup host aliases before and after that block on the default host
       #
@@ -1095,6 +1074,31 @@ module Beaker
         end
       end
 
+      # This wraps the method `with_host_stubbed_on` and makes the stub specific to
+      # the forge alias.
+      #
+      # forge api v1 canonical source is forge.puppetlabs.com
+      # forge api v3 canonical source is forgeapi.puppetlabs.com
+      #
+      # @param host [String] the host to perform the stub on
+      # @param forge_host [String] The URL to use as the forge alias, will default to using :forge_host in the
+      #                             global options hash
+      def with_forge_stubbed_on( host, forge_host = nil, &block )
+        #use global options hash
+        forge_host ||= options[:forge_host]
+        @forge_ip ||= Resolv.getaddress(forge_host)
+        with_host_stubbed_on( host,
+                              {'forge.puppetlabs.com'  => @forge_ip,
+                             'forgeapi.puppetlabs.com' => @forge_ip},
+                              &block                                    )
+      end
+
+      # This wraps `with_forge_stubbed_on` and provides it the default host
+      # @see with_forge_stubbed_on
+      def with_forge_stubbed( forge_host = nil, &block )
+        with_forge_stubbed_on( default, forge_host, &block )
+      end
+
       # This wraps the method `stub_hosts` and makes the stub specific to
       # the forge alias.
       #
@@ -1296,130 +1300,6 @@ module Beaker
           on host, "curl %s" % cmd, opts, &block
         end
       end
-
-
-      # Install local module for acceptance testing
-      # should be used as a presuite to ensure local module is copied to the hosts you want, particularly masters
-      # @api dsl
-      # @param [Host, Array<Host>, String, Symbol] host
-      #                   One or more hosts to act upon,
-      #                   or a role (String or Symbol) that identifies one or more hosts.
-      # @option opts [String] :source ('./')
-      #                   The current directory where the module sits, otherwise will try
-      #                         and walk the tree to figure out
-      # @option opts [String] :module_name (nil)
-      #                   Name which the module should be installed under, please do not include author,
-      #                     if none is provided it will attempt to parse the metadata.json and then the Modulefile to determine
-      #                     the name of the module
-      # @option opts [String] :target_module_path (host['distmoduledir']/modules)
-      #                   Location where the module should be installed, will default
-      #                    to host['distmoduledir']/modules
-      # @option opts [Array] :ignore_list
-      # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
-      #
-      def copy_module_to(host, opts = {})
-        opts = {:source => './',
-                :target_module_path => host['distmoduledir'],
-                :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
-        ignore_list = build_ignore_list(opts)
-        target_module_dir = opts[:target_module_path]
-        if opts.has_key?(:module_name)
-          module_name = opts[:module_name]
-        else
-          module_name = parse_for_modulename(opts[:source])
-        end
-        scp_to host, File.join(opts[:source]), File.join(target_module_dir, module_name), {:ignore => ignore_list}
-      end
-      alias :copy_root_module_to :copy_module_to
-
-
-      #Recursive method for finding the module root
-      # Assumes that a Modulefile exists
-      # @param [String] possible_module_directory
-      #                   will look for Modulefile and if none found go up one level and try again until root is reached
-      #
-      # @return [String,nil]
-      def parse_for_moduleroot(possible_module_directory)
-        if File.exists?("#{possible_module_directory}/Modulefile")
-          possible_module_directory
-        elsif possible_module_directory === '/'
-          logger.error "At root, can't parse for another directory"
-          nil
-        else
-          logger.debug "No Modulefile found at #{possible_module_directory}, moving up"
-          parse_for_moduleroot File.expand_path(File.join(possible_module_directory,'..'))
-        end
-      end
-
-
-      #Parse root directory of a module for module name
-      # Searches for metadata.json and then if none found, Modulefile and parses for the Name attribute
-      # @param [String] root_module_dir
-      # @return [String] module name
-      def parse_for_modulename(root_module_dir)
-        module_name = nil
-        if File.exists?("#{root_module_dir}/metadata.json")
-          logger.debug "Attempting to parse Modulename from metadata.json"
-          module_json = JSON.parse(File.read "#{root_module_dir}/metadata.json")
-          if(module_json.has_key?('name'))
-            module_name = get_module_name(module_json['name'])
-          end
-        end
-        if !module_name && File.exists?("#{root_module_dir}/Modulefile")
-          logger.debug "Attempting to parse Modulename from Modulefile"
-          if /^name\s+'?(\w+-\w+)'?\s*$/i.match(File.read("#{root_module_dir}/Modulefile"))
-            module_name = get_module_name(Regexp.last_match[1])
-          end
-        end
-        if !module_name
-          logger.debug "Unable to determine name, returning null"
-        end
-        module_name
-      end
-
-      #Parse modulename from the pattern 'Auther-ModuleName'
-      #
-      # @param [String] author_module_name <Author>-<ModuleName> pattern
-      #
-      # @return [String,nil]
-      #
-      def get_module_name(author_module_name)
-        split_name = split_author_modulename(author_module_name)
-        if split_name
-          split_name[:module]
-        end
-      end
-
-      #Split the Author-Name into a hash
-      # @param [String] author_module_attr
-      #
-      # @return [Hash<Symbol,String>,nil] :author and :module symbols will be returned
-      #
-      def split_author_modulename(author_module_attr)
-        result = /(\w+)-(\w+)/.match(author_module_attr)
-        if result
-          {:author => result[1], :module => result[2]}
-        else
-          nil
-        end
-      end
-
-      # Build an array list of files/directories to ignore when pushing to remote host
-      # Automatically adds '..' and '.' to array.  If not opts of :ignore list is provided
-      # it will use the static variable PUPPET_MODULE_INSTALL_IGNORE
-      #
-      # @param opts [Hash]
-      # @option opts [Array] :ignore_list A list of files/directories to ignore
-      def build_ignore_list(opts = {})
-        ignore_list = opts[:ignore_list] || PUPPET_MODULE_INSTALL_IGNORE
-        if !ignore_list.kind_of?(Array) || ignore_list.nil?
-          raise ArgumentError "Ignore list must be an Array"
-        end
-        ignore_list << '.' unless ignore_list.include? '.'
-        ignore_list << '..' unless ignore_list.include? '..'
-        ignore_list
-      end
-
     end
   end
 end

data/lib/beaker/dsl/install_utils.rb

@@ -25,6 +25,9 @@ module Beaker
       # Github's ssh signature for cloning via ssh
       GitHubSig   = 'github.com,207.97.227.239 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=='
 
+      # The directories in the module directory that will not be scp-ed to the test system when using `copy_module_to`
+      PUPPET_MODULE_INSTALL_IGNORE = ['.bundle', '.git', '.idea', '.vagrant', '.vendor', 'acceptance', 'spec', 'tests', 'log']
+
       # @param [String] uri A uri in the format of <git uri>#<revision>
       #                     the `git://`, `http://`, `https://`, and ssh
       #                     (if cloning as the remote git user) protocols
@@ -1078,6 +1081,219 @@ module Beaker
         do_higgs_install higgs_host, options
       end
 
+      # Install the desired module on all hosts using either the PMT or a
+      #   staging forge
+      #
+      # @see install_dev_puppet_module
+      def install_dev_puppet_module_on( host, opts )
+        if options[:forge_host]
+          with_forge_stubbed_on( host ) do
+            install_puppet_module_via_pmt_on( host, opts )
+          end
+        else
+          copy_module_to( host, opts )
+        end
+      end
+      alias :puppet_module_install_on :install_dev_puppet_module_on
+
+      # Install the desired module on all hosts using either the PMT or a
+      #   staging forge
+      #
+      # Passes options through to either `install_puppet_module_via_pmt_on`
+      #   or `copy_module_to`
+      #
+      # @param opts [Hash]
+      #
+      # @example Installing a module from the local directory
+      #   install_dev_puppet_module( :source => './', :module_name => 'concat' )
+      #
+      # @example Installing a module from a staging forge
+      #   options[:forge_host] = 'my-forge-api.example.com'
+      #   install_dev_puppet_module( :source => './', :module_name => 'concat' )
+      #
+      # @see install_puppet_module_via_pmt
+      # @see copy_module_to
+      def install_dev_puppet_module( opts )
+        block_on( hosts ) {|h| install_dev_puppet_module_on( h, opts ) }
+      end
+      alias :puppet_module_install :install_dev_puppet_module
+
+      # Install the desired module with the PMT on a given host
+      #
+      # @param opts [Hash]
+      # @option opts [String] :module_name The short name of the module to be installed
+      # @option opts [String] :version The version of the module to be installed
+      def install_puppet_module_via_pmt_on( host, opts = {} )
+        block_on host do |h|
+          version_info = opts[:version] ? "-v #{opts[:version]}" : ""
+          if opts[:source]
+            author_name, module_name = parse_for_modulename( opts[:source] )
+            modname = "#{author_name}-#{module_name}"
+          else
+            modname = opts[:module_name]
+          end
+
+          on h, puppet("module install #{modname} #{version_info}")
+        end
+      end
+
+      # Install the desired module with the PMT on all known hosts
+      # @see #install_puppet_module_via_pmt_on
+      def install_puppet_module_via_pmt( opts = {} )
+        install_puppet_module_via_pmt_on(hosts, opts)
+      end
+
+      # Install local module for acceptance testing
+      # should be used as a presuite to ensure local module is copied to the hosts you want, particularly masters
+      # @api dsl
+      # @param [Host, Array<Host>, String, Symbol] host
+      #                   One or more hosts to act upon,
+      #                   or a role (String or Symbol) that identifies one or more hosts.
+      # @option opts [String] :source ('./')
+      #                   The current directory where the module sits, otherwise will try
+      #                         and walk the tree to figure out
+      # @option opts [String] :module_name (nil)
+      #                   Name which the module should be installed under, please do not include author,
+      #                     if none is provided it will attempt to parse the metadata.json and then the Modulefile to determine
+      #                     the name of the module
+      # @option opts [String] :target_module_path (host['distmoduledir']/modules)
+      #                   Location where the module should be installed, will default
+      #                    to host['distmoduledir']/modules
+      # @option opts [Array] :ignore_list
+      # @raise [ArgumentError] if not host is provided or module_name is not provided and can not be found in Modulefile
+      #
+      def copy_module_to(host, opts = {})
+        opts = {:source => './',
+                :target_module_path => host['distmoduledir'],
+                :ignore_list => PUPPET_MODULE_INSTALL_IGNORE}.merge(opts)
+        ignore_list = build_ignore_list(opts)
+        target_module_dir = on( host, "echo #{opts[:target_module_path]}" ).stdout.chomp
+        source = File.expand_path( opts[:source] )
+        if opts.has_key?(:module_name)
+          module_name = opts[:module_name]
+        else
+          _, module_name = parse_for_modulename( source )
+        end
+        scp_to host, source, File.join(target_module_dir, module_name), {:ignore => ignore_list}
+      end
+      alias :copy_root_module_to :copy_module_to
+
+      # Install a package on a host
+      #
+      # @param [Host] host             A host object
+      # @param [String] package_name   Name of the package to install
+      #
+      # @return [Result]   An object representing the outcome of *install command*.
+      def install_package host, package_name, package_version = nil
+        host.install_package package_name, '', package_version
+      end
+
+      # Check to see if a package is installed on a remote host
+      #
+      # @param [Host] host             A host object
+      # @param [String] package_name   Name of the package to check for.
+      #
+      # @return [Boolean] true/false if the package is found
+      def check_for_package host, package_name
+        host.check_for_package package_name
+      end
+
+      # Upgrade a package on a host. The package must already be installed
+      #
+      # @param [Host] host             A host object
+      # @param [String] package_name   Name of the package to install
+      #
+      # @return [Result]   An object representing the outcome of *upgrade command*.
+      def upgrade_package host, package_name
+        host.upgrade_package package_name
+      end
+
+      #Recursive method for finding the module root
+      # Assumes that a Modulefile exists
+      # @param [String] possible_module_directory
+      #                   will look for Modulefile and if none found go up one level and try again until root is reached
+      #
+      # @return [String,nil]
+      def parse_for_moduleroot(possible_module_directory)
+        if File.exists?("#{possible_module_directory}/Modulefile")
+          possible_module_directory
+        elsif possible_module_directory === '/'
+          logger.error "At root, can't parse for another directory"
+          nil
+        else
+          logger.debug "No Modulefile found at #{possible_module_directory}, moving up"
+          parse_for_moduleroot File.expand_path(File.join(possible_module_directory,'..'))
+        end
+      end
+
+
+      #Parse root directory of a module for module name
+      # Searches for metadata.json and then if none found, Modulefile and parses for the Name attribute
+      # @param [String] root_module_dir
+      # @return [String] module name
+      def parse_for_modulename(root_module_dir)
+        author_name, module_name = nil, nil
+        if File.exists?("#{root_module_dir}/metadata.json")
+          logger.debug "Attempting to parse Modulename from metadata.json"
+          module_json = JSON.parse(File.read "#{root_module_dir}/metadata.json")
+          if(module_json.has_key?('name'))
+            author_name, module_name = get_module_name(module_json['name'])
+          end
+        end
+        if !module_name && File.exists?("#{root_module_dir}/Modulefile")
+          logger.debug "Attempting to parse Modulename from Modulefile"
+          if /^name\s+'?(\w+-\w+)'?\s*$/i.match(File.read("#{root_module_dir}/Modulefile"))
+            author_name, module_name = get_module_name(Regexp.last_match[1])
+          end
+        end
+        if !module_name && !author_name
+          logger.debug "Unable to determine name, returning null"
+        end
+        return author_name, module_name
+      end
+
+      #Parse modulename from the pattern 'Auther-ModuleName'
+      #
+      # @param [String] author_module_name <Author>-<ModuleName> pattern
+      #
+      # @return [String,nil]
+      #
+      def get_module_name(author_module_name)
+        split_name = split_author_modulename(author_module_name)
+        if split_name
+          return split_name[:author], split_name[:module]
+        end
+      end
+
+      #Split the Author-Name into a hash
+      # @param [String] author_module_attr
+      #
+      # @return [Hash<Symbol,String>,nil] :author and :module symbols will be returned
+      #
+      def split_author_modulename(author_module_attr)
+        result = /(\w+)-(\w+)/.match(author_module_attr)
+        if result
+          {:author => result[1], :module => result[2]}
+        else
+          nil
+        end
+      end
+
+      # Build an array list of files/directories to ignore when pushing to remote host
+      # Automatically adds '..' and '.' to array.  If not opts of :ignore list is provided
+      # it will use the static variable PUPPET_MODULE_INSTALL_IGNORE
+      #
+      # @param opts [Hash]
+      # @option opts [Array] :ignore_list A list of files/directories to ignore
+      def build_ignore_list(opts = {})
+        ignore_list = opts[:ignore_list] || PUPPET_MODULE_INSTALL_IGNORE
+        if !ignore_list.kind_of?(Array) || ignore_list.nil?
+          raise ArgumentError "Ignore list must be an Array"
+        end
+        ignore_list << '.' unless ignore_list.include? '.'
+        ignore_list << '..' unless ignore_list.include? '..'
+        ignore_list
+      end
     end
   end
 end

data/lib/beaker/options/presets.rb

@@ -94,7 +94,6 @@ module Beaker
           :department           => ENV['USER'] || ENV['USERNAME'] || 'unknown',
           :validate             => true,
           :jenkins_build_url    => nil,
-          :forge_host           => 'vulcan-acceptance.delivery.puppetlabs.net',
           :log_level            => 'verbose',
           :trace_limit          => 10,
           :"master-start-curl-retries" => 120,

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '1.18.0'
+    STRING = '1.19.0'
   end
 end

data/spec/beaker/dsl/helpers_spec.rb

@@ -304,25 +304,6 @@ describe ClassMixedWithDSLHelpers do
     end
   end
 
-  describe '#puppet_module_install_on' do
-    it 'scps the module to the module dir' do
-      subject.stub( :hosts ).and_return( hosts )
-
-      subject.should_receive( :puppet ).with('module install test' ).once
-      subject.puppet_module_install_on( master, {:source => '/module', :module_name => 'test'} )
-    end
-  end
-
-  describe '#puppet_module_install' do
-    it 'delegates to #puppet_module_install_on with the hosts list' do
-      subject.stub( :hosts ).and_return( hosts )
-
-      subject.should_receive( :puppet_module_install_on ).with( hosts, {:source => '/module', :module_name => 'test'}).once
-
-      subject.puppet_module_install( {:source => '/module', :module_name => 'test'} )
-    end
-  end
-
   describe 'confine' do
     let(:logger) { double.as_null_object }
     before do
@@ -1226,109 +1207,6 @@ describe ClassMixedWithDSLHelpers do
         end
         include_examples('modify-tk-config-without-error')
       end
-
-    end
-
-  end
-
-  describe 'copy_module_to' do
-    let(:ignore_list) { Beaker::DSL::Helpers::PUPPET_MODULE_INSTALL_IGNORE }
-    let(:source){'./'}
-    let(:target){'/etc/puppetlabs/puppet/modules/testmodule'}
-    let(:module_parse_name){'testmodule'}
-
-    shared_examples 'copy_module_to' do  |opts|
-      it{
-        host = double("host")
-        host.stub(:[]).with('distmoduledir').and_return('/etc/puppetlabs/puppet/modules')
-        Dir.stub(:getpwd).and_return(source)
-
-        subject.stub(:parse_for_moduleroot).and_return(source)
-        if module_parse_name
-          subject.stub(:parse_for_modulename).with(any_args()).and_return(module_parse_name)
-        else
-          subject.should_not_receive(:parse_for_modulename)
-        end
-
-        File.stub(:exists?).with(any_args()).and_return(false)
-        File.stub(:directory?).with(any_args()).and_return(false)
-
-        subject.should_receive(:scp_to).with(host,source, target, {:ignore => ignore_list})
-        if opts.nil?
-          subject.copy_module_to(host)
-        else
-          subject.copy_module_to(host,opts)
-        end
-      }
-    end
-    describe 'should call scp with the correct info, with only providing host' do
-      let(:target){'/etc/puppetlabs/puppet/modules/testmodule'}
-
-      it_should_behave_like 'copy_module_to'
-    end
-    describe 'should call scp with the correct info, when specifying the modulename' do
-      let(:target){'/etc/puppetlabs/puppet/modules/bogusmodule'}
-      let(:module_parse_name){false}
-      it_should_behave_like 'copy_module_to', {:module_name =>'bogusmodule'}
-    end
-    describe 'should call scp with the correct info, when specifying the target to a different path' do
-      target = '/opt/shared/puppet/modules'
-      let(:target){"#{target}/testmodule"}
-      it_should_behave_like 'copy_module_to', {:target_module_path => target}
-    end
-  end
-
-  describe 'split_author_modulename' do
-    it 'should return a correct modulename' do
-      result =  subject.split_author_modulename('myname-test_43_module')
-      expect(result[:author]).to eq('myname')
-      expect(result[:module]).to eq('test_43_module')
-    end
-  end
-
-  describe 'get_module_name' do
-    it 'should return a has of author and modulename' do
-      expect(subject.get_module_name('myname-test_43_module')).to eq('test_43_module')
-    end
-    it 'should return nil for invalid names' do
-      expect(subject.get_module_name('myname-')).to eq(nil)
-    end
-  end
-
-  describe 'parse_for_modulename' do
-    directory = '/testfilepath/myname-testmodule'
-    it 'should return name from metadata.json' do
-      File.stub(:exists?).with("#{directory}/metadata.json").and_return(true)
-      File.stub(:read).with("#{directory}/metadata.json").and_return(" {\"name\":\"myname-testmodule\"} ")
-      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from metadata.json")
-      subject.logger.should_not_receive(:debug).with('Unable to determine name, returning null')
-      subject.parse_for_modulename(directory).should eq('testmodule')
-    end
-    it 'should return name from Modulefile' do
-      File.stub(:exists?).with("#{directory}/metadata.json").and_return(false)
-      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
-      File.stub(:read).with("#{directory}/Modulefile").and_return("name    'myname-testmodule'  \nauthor   'myname'")
-      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from Modulefile")
-      subject.logger.should_not_receive(:debug).with("Unable to determine name, returning null")
-      expect(subject.parse_for_modulename(directory)).to eq('testmodule')
     end
   end
-
-  describe 'parse_for_module_root' do
-    directory = '/testfilepath/myname-testmodule'
-    it 'should recersively go up the directory to find the module files' do
-      File.stub(:exists?).with("#{directory}/acceptance/Modulefile").and_return(false)
-      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
-      subject.logger.should_not_receive(:debug).with("At root, can't parse for another directory")
-      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}/acceptance, moving up")
-      expect(subject.parse_for_moduleroot("#{directory}/acceptance")).to eq(directory)
-    end
-    it 'should recersively go up the directory to find the module files' do
-      File.stub(:exists?).and_return(false)
-      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}, moving up")
-      subject.logger.should_receive(:error).with("At root, can't parse for another directory")
-      expect(subject.parse_for_moduleroot(directory)).to eq(nil)
-    end
-
-  end
 end

data/spec/beaker/dsl/install_utils_spec.rb

@@ -2,9 +2,15 @@ require 'spec_helper'
 
 class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::InstallUtils
+  include Beaker::DSL::Wrappers
+  include Beaker::DSL::Helpers
   include Beaker::DSL::Structure
   include Beaker::DSL::Roles
   include Beaker::DSL::Patterns
+
+  def logger
+    @logger ||= RSpec::Mocks::Mock.new('logger').as_null_object
+  end
 end
 
 describe ClassMixedWithDSLInstallUtils do
@@ -724,4 +730,175 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#install_dev_puppet_module_on' do
+    context 'having set a stub forge' do
+      it 'stubs the forge on the host' do
+        master = hosts.first
+        subject.stub( :options ).and_return( {:forge_host => 'ahost.com'} )
+
+        subject.should_receive( :with_forge_stubbed_on )
+
+        subject.install_dev_puppet_module_on( master, {:source => '/module', :module_name => 'test'} )
+      end
+
+      it 'installs via #install_puppet_module_via_pmt' do
+        master = hosts.first
+        subject.stub( :options ).and_return( {:forge_host => 'ahost.com'} )
+        subject.stub( :with_forge_stubbed_on ).and_yield
+
+        subject.should_receive( :install_puppet_module_via_pmt_on )
+
+        subject.install_dev_puppet_module_on( master, {:source => '/module', :module_name => 'test'} )
+      end
+    end
+    context 'without a stub forge (default)' do
+      it 'calls copy_module_to to get the module on the SUT' do
+        master = hosts.first
+        subject.stub( :options ).and_return( {} )
+
+        subject.should_receive( :copy_module_to )
+
+        subject.install_dev_puppet_module_on( master, {:source => '/module', :module_name => 'test'} )
+      end
+    end
+  end
+
+  describe '#install_dev_puppet_module' do
+    it 'delegates to #install_dev_puppet_module_on with the hosts list' do
+      subject.stub( :hosts ).and_return( hosts )
+      subject.stub( :options ).and_return( {} )
+
+      hosts.each do |host|
+        subject.should_receive( :install_dev_puppet_module_on ).
+          with( host, {:source => '/module', :module_name => 'test'})
+      end
+
+      subject.install_dev_puppet_module( {:source => '/module', :module_name => 'test'} )
+    end
+  end
+
+  describe '#install_puppet_module_via_pmt_on' do
+    it 'installs module via puppet module tool' do
+      subject.stub( :hosts ).and_return( hosts )
+      master = hosts.first
+
+      subject.should_receive( :puppet ).with('module install test ' ).once
+
+      subject.install_puppet_module_via_pmt_on( master, {:module_name => 'test'} )
+    end
+  end
+
+  describe '#install_puppet_module_via_pmt' do
+    it 'delegates to #install_puppet_module_via_pmt with the hosts list' do
+      subject.stub( :hosts ).and_return( hosts )
+
+      subject.should_receive( :install_puppet_module_via_pmt_on ).with( hosts, {:source => '/module', :module_name => 'test'}).once
+
+      subject.install_puppet_module_via_pmt( {:source => '/module', :module_name => 'test'} )
+    end
+  end
+
+  describe 'copy_module_to' do
+    let(:ignore_list) { Beaker::DSL::InstallUtils::PUPPET_MODULE_INSTALL_IGNORE }
+    let(:source){ File.expand_path('./')}
+    let(:target){'/etc/puppetlabs/puppet/modules/testmodule'}
+    let(:module_parse_name){'testmodule'}
+
+    shared_examples 'copy_module_to' do  |opts|
+      it{
+        host = double("host")
+        host.stub(:[]).with('distmoduledir').and_return('/etc/puppetlabs/puppet/modules')
+        result = double
+        stdout = target.split('/')[0..-2].join('/') + "\n"
+        result.stub(:stdout).and_return( stdout )
+        host.stub(:exec).with( any_args ).and_return( result )
+        Dir.stub(:getpwd).and_return(source)
+
+        subject.stub(:parse_for_moduleroot).and_return(source)
+        if module_parse_name
+          subject.stub(:parse_for_modulename).with(any_args()).and_return(module_parse_name)
+        else
+          subject.should_not_receive(:parse_for_modulename)
+        end
+
+        File.stub(:exists?).with(any_args()).and_return(false)
+        File.stub(:directory?).with(any_args()).and_return(false)
+
+        subject.should_receive(:scp_to).with(host,source, target, {:ignore => ignore_list})
+        if opts.nil?
+          subject.copy_module_to(host)
+        else
+          subject.copy_module_to(host,opts)
+        end
+      }
+    end
+    describe 'should call scp with the correct info, with only providing host' do
+      let(:target){'/etc/puppetlabs/puppet/modules/testmodule'}
+
+      it_should_behave_like 'copy_module_to', :module_name => 'testmodule'
+    end
+    describe 'should call scp with the correct info, when specifying the modulename' do
+      let(:target){'/etc/puppetlabs/puppet/modules/bogusmodule'}
+      let(:module_parse_name){false}
+      it_should_behave_like 'copy_module_to', {:module_name =>'bogusmodule'}
+    end
+    describe 'should call scp with the correct info, when specifying the target to a different path' do
+      target = '/opt/shared/puppet/modules'
+      let(:target){"#{target}/testmodule"}
+      it_should_behave_like 'copy_module_to', {:target_module_path => target, :module_name => 'testmodule'}
+    end
+  end
+
+  describe 'split_author_modulename' do
+    it 'should return a correct modulename' do
+      result =  subject.split_author_modulename('myname-test_43_module')
+      expect(result[:author]).to eq('myname')
+      expect(result[:module]).to eq('test_43_module')
+    end
+  end
+
+  describe 'get_module_name' do
+    it 'should return an array of author and modulename' do
+      expect(subject.get_module_name('myname-test_43_module')).to eq(['myname', 'test_43_module'])
+    end
+    it 'should return nil for invalid names' do
+      expect(subject.get_module_name('myname-')).to eq(nil)
+    end
+  end
+
+  describe 'parse_for_modulename' do
+    directory = '/testfilepath/myname-testmodule'
+    it 'should return name from metadata.json' do
+      File.stub(:exists?).with("#{directory}/metadata.json").and_return(true)
+      File.stub(:read).with("#{directory}/metadata.json").and_return(" {\"name\":\"myname-testmodule\"} ")
+      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from metadata.json")
+      subject.logger.should_not_receive(:debug).with('Unable to determine name, returning null')
+      subject.parse_for_modulename(directory).should eq(['myname', 'testmodule'])
+    end
+    it 'should return name from Modulefile' do
+      File.stub(:exists?).with("#{directory}/metadata.json").and_return(false)
+      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
+      File.stub(:read).with("#{directory}/Modulefile").and_return("name    'myname-testmodule'  \nauthor   'myname'")
+      subject.logger.should_receive(:debug).with("Attempting to parse Modulename from Modulefile")
+      subject.logger.should_not_receive(:debug).with("Unable to determine name, returning null")
+      expect(subject.parse_for_modulename(directory)).to eq(['myname', 'testmodule'])
+    end
+  end
+
+  describe 'parse_for_module_root' do
+    directory = '/testfilepath/myname-testmodule'
+    it 'should recersively go up the directory to find the module files' do
+      File.stub(:exists?).with("#{directory}/acceptance/Modulefile").and_return(false)
+      File.stub(:exists?).with("#{directory}/Modulefile").and_return(true)
+      subject.logger.should_not_receive(:debug).with("At root, can't parse for another directory")
+      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}/acceptance, moving up")
+      expect(subject.parse_for_moduleroot("#{directory}/acceptance")).to eq(directory)
+    end
+    it 'should recersively go up the directory to find the module files' do
+      File.stub(:exists?).and_return(false)
+      subject.logger.should_receive(:debug).with("No Modulefile found at #{directory}, moving up")
+      subject.logger.should_receive(:error).with("At root, can't parse for another directory")
+      expect(subject.parse_for_moduleroot(directory)).to eq(nil)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest