vanagon 0.15.12 → 0.15.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2c4eb81b2e7e740b09969dc3e70f4a7293ce2b1
-  data.tar.gz: fd11e4e76da97f18170b90e2a80c2ef6863be29a
+  metadata.gz: d09b65231595380fce620f446ce16458401d8d75
+  data.tar.gz: 2f854891d6e33677468e8a1442fb7b03a943a1b4
 SHA512:
-  metadata.gz: 9a9ee542de85c254ffc753e8355d6236953aff2dbf2d9107e664d234b172fbf7de469499892411f3efb902be94d52c3ba470fdb946d10f3b6d2e9194b6a2e9b9
-  data.tar.gz: 656bffd6573ae387c554eaf0fd935665d2114236532eda69a81b68b1d99b8de6e816c78190dc242fe9297b34b4a0932409cafa9964a93d2baa98bfe6d00ecc9e
+  metadata.gz: 6f311cd091dcb5839a08a38e2bc515a76219ad2745c39103015c01d40fd1ab7e8dbda7c9b10299ebfff2e85f71da4f9818069fefe14ddb97bee59e87003a7a6d
+  data.tar.gz: 798f85247448b1bc3cb6705358450577cbe44823dd301ec5e4250dbbf883c068dc70534385a655e361adc756259a23ff141fcb938aeb3ed0a282b45f70ee9c10

data/lib/vanagon/engine/local.rb

@@ -40,9 +40,15 @@ class Vanagon
         FileUtils.cp_r(Dir.glob("#{workdir}/*"), @remote_workdir)
       end
 
-      def retrieve_built_artifact
-        FileUtils.mkdir_p("output")
-        FileUtils.cp_r(Dir.glob("#{@remote_workdir}/output/*"), "output/")
+      def retrieve_built_artifact(artifacts_to_fetch, no_packaging)
+        output_path = 'output/'
+        FileUtils.mkdir_p(output_path)
+        unless no_packaging
+          artifacts_to_fetch << "#{@remote_workdir}/output/*"
+        end
+        artifacts_to_fetch.each do |path|
+          FileUtils.cp_r(Dir.glob(path), "output/")
+        end
       end
     end
   end

data/spec/lib/vanagon/engine/local_spec.rb

@@ -26,6 +26,24 @@ describe 'Vanagon::Engine::Local' do
     end
   end
 
+  describe '#retrieve_built_artifacts' do
+    it 'copies everything if we package' do
+      engine = Vanagon::Engine::Local.new(platform)
+      expect(FileUtils).to receive(:mkdir_p).with('output/').and_return true
+      expect(Dir).to receive(:glob).with('/output/*').and_return(['tmp/foo', 'tmp/bar'])
+      expect(FileUtils).to receive(:cp_r).with(['tmp/foo', 'tmp/bar'], 'output/')
+      engine.retrieve_built_artifact([], false)
+    end
+
+    it "only copies what you tell it to if we don't package" do
+      engine = Vanagon::Engine::Local.new(platform)
+      expect(FileUtils).to receive(:mkdir_p).with('output/').and_return true
+      expect(Dir).to receive(:glob).with('tmp/bar').and_return(['tmp/bar'])
+      expect(FileUtils).to receive(:cp_r).with(['tmp/bar'], 'output/')
+      engine.retrieve_built_artifact(['tmp/bar'], true)
+    end
+  end
+
   it 'returns "local" name' do
     expect(Vanagon::Engine::Local.new(platform).name).to eq('local')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.12
+  version: 0.15.13
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.