beaker-module_install_helper 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1a5d53299f555a39466b8de21cb35006475c29c
-  data.tar.gz: c636a1beb7956aee0a2f169e176d683e6c3d1f2d
+  metadata.gz: 7ede48efbad22234618a4c29a6c867159ea71185
+  data.tar.gz: 4419511fba9522e71a5000fdce82c936ba4d58e6
 SHA512:
-  metadata.gz: e6cbf3cc5e7c67da196b3e65ca8076f1b71c5cee693eb7c4b2f05a499382d7262e3f68f4b3302ff1e45d7ba22117fca86eb570bfdb80b8417ef430c0d69727dd
-  data.tar.gz: a0b526e752430e0dbf37d2c92947a751781b0af24c830110488a4b54a0afc491808e3a79fef3e439a50b9fdef65483894cf51052114502e09326ade80fb5a12d
+  metadata.gz: 6304cb076b5e74fb961e55f09153c9e21a8834c0a2ba1aead19c2edd95c856d1166b1e2be3f6b57ae2fbeedb0b82bf2ad30feb25b89b77f42ea0ea9840683b83
+  data.tar.gz: 674f7c0c5b9f90d0eca68f0faa6922ffec5e924adf6d6be68399b2d0133f38fc3bd9e360644b199d50ee1a2fecb3c497c93fc9b916d2ef77a3c0292b9867ebd2

data/.rubocop.yml

@@ -18,6 +18,9 @@ Lint/AmbiguousRegexpLiteral:
 Style/ClassAndModuleChildren:
   Enabled: false
 
+Style/GlobalVars:
+  Enabled: false
+
 Bundler/DuplicatedGem:
   Enabled: false
 
@@ -28,4 +31,4 @@ Metrics/LineLength:
   Max: 100
 
 Metrics/MethodLength:
-  Enabled: false
+  Enabled: false

data/beaker-module_install_helper.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'beaker-module_install_helper'
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ['Puppet']
   spec.email         = ['wilson@puppet.com']
 

data/lib/beaker/module_install_helper.rb

@@ -15,24 +15,25 @@ module Beaker::ModuleInstallHelper
   # the source on the local machine
   def install_module_on(host)
     copy_module_to(host,
-                   source:      @module_source_dir,
+                   source:      $module_source_dir,
                    module_name: module_name_from_metadata)
   end
 
   # This method calls the install_module_dependencies_on method for each
   # host which is a master, or if no master is present, on all agent nodes.
   def install_module_dependencies
-    hosts_to_install_module_on.each do |host|
-      install_module_dependencies_on(host)
-    end
+    install_module_dependencies_on(host)
   end
 
   # This method will install the module under tests module dependencies on the
   # specified host from the dependencies list in metadata.json
   def install_module_dependencies_on(host)
+    host = [host] if host.is_a?(Hash)
     deps = module_dependencies_from_metadata
-    deps.each do |dep|
-      install_puppet_module_via_pmt_on(host, dep)
+    host.each do |hst|
+      deps.each do |dep|
+        install_puppet_module_via_pmt_on(hst, dep)
+      end
     end
   end
 
@@ -70,7 +71,7 @@ module Beaker::ModuleInstallHelper
 
     # Here we iterate the releases of the given module and pick the most recent
     # that matches to version requirement
-    forge_data['releases'].sort_by { |k| k['version'] }.reverse.each do |rel|
+    forge_data['releases'].each do |rel|
       return rel['version'] if vrs.all? { |vr| vr.match?('', rel['version']) }
     end
 
@@ -120,9 +121,9 @@ module Beaker::ModuleInstallHelper
   # This method uses the module_source_directory path to read the metadata.json
   # file into a json array
   def module_metadata
-    metadata_path = "#{@module_source_dir}/metadata.json"
+    metadata_path = "#{$module_source_dir}/metadata.json"
     unless File.exist?(metadata_path)
-      raise "Error loading metadata.json file from #{@module_source_dir}"
+      raise "Error loading metadata.json file from #{$module_source_dir}"
     end
     JSON.parse(File.read(metadata_path))
   end
@@ -147,4 +148,4 @@ end
 
 include Beaker::ModuleInstallHelper
 # Use the caller (requirer) of this file to begin search for module source dir
-@module_source_dir = get_module_source_directory caller[0][/[^:]+/]
+$module_source_dir = get_module_source_directory caller[0][/[^:]+/]

data/spec/unit/beaker/module_install_helper_spec.rb

@@ -35,7 +35,7 @@ describe Beaker::ModuleInstallHelper do
 
   context 'module_metadata' do
     before do
-      @module_source_dir = '/a/b/c/d'
+      $module_source_dir = '/a/b/c/d'
       allow(File).to receive(:exist?)
         .with('/a/b/c/d/metadata.json')
         .and_return(true)
@@ -71,7 +71,7 @@ describe Beaker::ModuleInstallHelper do
     let(:module_source_dir) { '/a/b/c/d' }
 
     before do
-      @module_source_dir = '/a/b/c/d'
+      $module_source_dir = '/a/b/c/d'
       allow(File).to receive(:exist?).and_return(true)
       allow(File).to receive(:read).and_return('{"name": "puppetlabs-vcsrepo"}')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-module_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec