beaker-module_install_helper 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 335eced6501675a1215d9492779c7efca77c62bc
-  data.tar.gz: 32c5045a4faed8fc92bc44e019164f6d711b9176
+  metadata.gz: 7f42bb555dae48d87cf1130b46c794a807ae06c6
+  data.tar.gz: f8f649a6dbadd789bd5ccce94893f65d3d05edd5
 SHA512:
-  metadata.gz: 53e39c82c94044ee48d18d07004b47dd0e55dc90427f976e924a49044c6416c1d2a7080dda980420372a7947f62bd04fd87ef518736152f79fdb27b55ce180d6
-  data.tar.gz: 23e6824f988c904633fde2338bce5fb72c4950a1cefa093df1113cbc43ef1551ea43dbc9b772c3e0855066e07acd797c890dc66a47c03a7aca1ccb31d46f39fb
+  metadata.gz: d21312fee8851d74a85ea5363b8b6b93df78a9573d25cbb1c3483158563f6e65eed574b794c9fe5dc06fabfff08ac130e1f59d2ac2e9da918051b3341c8b2bfc
+  data.tar.gz: deb63867b68ab82b6ce302021d38dc6ee8f97b21172083cdaccb5770ea7611b0d331a9f5ee8b0b0a33c6b1ea680adb3c36654897664db33f84b2a1b7c6691eaf

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.3'
+  spec.version       = '0.1.4'
   spec.authors       = ['Puppet']
   spec.email         = ['wilson@puppet.com']
 

data/lib/beaker/module_install_helper.rb

@@ -153,7 +153,14 @@ module Beaker::ModuleInstallHelper
 
   # Use this property to store the module_source_dir, so we don't traverse
   # the tree every time
-  def get_module_source_directory(search_in)
+  def get_module_source_directory(call_stack)
+    matching_caller = call_stack.select { |i| i =~ /(spec_helper_acceptance|_spec)/i }
+
+    raise 'Error finding module source directory' if matching_caller.empty?
+
+    matching_caller = matching_caller[0] if matching_caller.is_a?(Array)
+    search_in = matching_caller[/[^:]+/]
+
     module_source_dir = nil
     # here we go up the file tree and search the directories for a
     # valid metadata.json
@@ -193,4 +200,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

data/spec/unit/beaker/module_install_helper_spec.rb

@@ -50,8 +50,8 @@ describe Beaker::ModuleInstallHelper do
   end
 
   context 'get_module_source_directory' do
-    let(:search_in) { '/a/b/c/d/e/f/g/h.rb' }
-    let(:search_in_no_metadata) { '/test/test/test/blah.rb' }
+    let(:call_stack) { ['/a/b/c/d/e/f/g/spec_helper_acceptance.rb'] }
+    let(:call_stack_no_metadata) { ['/test/test/test/spec_helper_acceptance.rb'] }
 
     before do
       allow(File).to receive(:exist?).with(anything).and_return(false)
@@ -59,11 +59,11 @@ describe Beaker::ModuleInstallHelper do
     end
 
     it 'traverses file tree until it finds a folder containing metadata.json' do
-      expect(get_module_source_directory(search_in)).to eq('/a')
+      expect(get_module_source_directory(call_stack)).to eq('/a')
     end
 
     it 'traverses file tree without a metadata.json file' do
-      expect(get_module_source_directory(search_in_no_metadata)).to be_nil
+      expect(get_module_source_directory(call_stack_no_metadata)).to be_nil
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-module_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec