beaker-puppet 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6082215f1011bfa1a62afb5863e4d207477fe23
-  data.tar.gz: 5f43469bc7a545f5bbda83d78b5425120723e1f3
+  metadata.gz: 6454b6b6a2bb05e3b0ae6ba82f8238cccb73bfce
+  data.tar.gz: 958e42dc43c40e04f5aa8c69441c706d0bad6563
 SHA512:
-  metadata.gz: f0023d9eb1b559504e4994f7b233d3d8e80f63618f865a0f6c1d0358c9dc08ee7596cd6f852f16c8ce8c2d2c9f81b5231822c6727a84664fa5cce8395440fc1e
-  data.tar.gz: 9a49f5b8afbe19505f5002fcfa9409f979fc6da8a970f8dc442a06e2c085772142786d9fd43d91ebf8164eccf57513d265497340b6fcd4e486d3f5949dfefdf9
+  metadata.gz: 183642058a37616a50c16d42f8abb88589bc04ca69ee21da363581bc02510cb34abb118620228ad27215de8c31b2924421a796a09ce9cab2a30427bbbc7d1fd8
+  data.tar.gz: 13adb1d9345353a944582d5572e28def90d9c9a97f092780627f1ba75e212b2470cb4c82240d3832b53fc01b3e35221ace42d2b015cd75e6c375b5005cdf604c

data/lib/beaker-puppet/install_utils/module_utils.rb

@@ -118,9 +118,8 @@ module Beaker
                     :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
+            target_module_dir = get_target_module_path(host, opts[:target_module_path])
             source_path = File.expand_path( opts[:source] )
-            source_dir = File.dirname(source_path)
             source_name = File.basename(source_path)
             if opts.has_key?(:module_name)
               module_name = opts[:module_name]
@@ -157,6 +156,16 @@ module Beaker
         end
         alias :copy_root_module_to :copy_module_to
 
+        def get_target_module_path(host, path=nil)
+          if path
+            on( host, "echo #{path}" ).stdout.chomp
+          else
+            path = host.puppet['basemodulepath'].split(':').first
+            raise ArgumentError, 'Unable to find target module path to copy to' unless path
+            path
+          end
+        end
+
         #Recursive method for finding the module root
         # Assumes that a Modulefile exists
         # @param [String] possible_module_directory

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.13.0'
+  VERSION = '1.14.0'
 end

data/spec/beaker-puppet/install_utils/module_utils_spec.rb

@@ -237,6 +237,61 @@ describe ClassMixedWithDSLInstallUtils do
     end
   end
 
+  describe 'get_target_module_path' do
+    let(:host) do
+      host = make_host("echo '/explicit/modulepath'", {stdout: "/explicit/modulepath\n"})
+      allow(host).to receive(:puppet).and_return(puppet)
+      host
+    end
+    let(:puppet) do
+      puppet = instance_double('PuppetConfigReader')
+      allow(puppet).to receive(:[]).with('basemodulepath').and_return(basemodulepath)
+      puppet
+    end
+
+    context 'no modulepath' do
+      let(:basemodulepath) { '' }
+
+      it 'should prefer the explicit path' do
+        expect(subject.get_target_module_path(host, '/explicit/modulepath')).to eq('/explicit/modulepath')
+        expect(puppet).not_to have_received(:[]).with('basemodulepath')
+      end
+
+      it 'should raise an error if no directory is found' do
+        expect { subject.get_target_module_path(host) }.to raise_error(ArgumentError, 'Unable to find target module path to copy to')
+        expect(puppet).to have_received(:[]).with('basemodulepath')
+      end
+    end
+
+    context 'single modulepath' do
+      let(:basemodulepath) { '/path/to/modulepath' }
+
+      it 'should prefer the explicit path' do
+        expect(subject.get_target_module_path(host, '/explicit/modulepath')).to eq('/explicit/modulepath')
+        expect(puppet).not_to have_received(:[]).with('basemodulepath')
+      end
+
+      it 'should fall back to autodetection' do
+        expect(subject.get_target_module_path(host)).to eq('/path/to/modulepath')
+        expect(puppet).to have_received(:[]).with('basemodulepath')
+      end
+    end
+
+    context 'multiple directories' do
+      let(:basemodulepath) { '/home/puppet/modules:/path/to/modulepath' }
+
+      it 'should prefer the explicit path' do
+        expect(subject.get_target_module_path(host, '/explicit/modulepath')).to eq('/explicit/modulepath')
+        expect(puppet).not_to have_received(:[]).with('basemodulepath')
+      end
+
+      it 'should return the first directory' do
+        expect(subject.get_target_module_path(host)).to eq('/home/puppet/modules')
+        expect(puppet).to have_received(:[]).with('basemodulepath')
+      end
+    end
+  end
+
   describe 'parse_for_modulename' do
     directory = '/testfilepath/myname-testmodule'
     it 'should return name from metadata.json' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec