vanagon 0.15.11 → 0.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7f47d8b1278c31171ea168f3fd9c256852fa60
-  data.tar.gz: 5d8fe77d2118bcc5d504d63af7579f51ca6a1551
+  metadata.gz: d2c4eb81b2e7e740b09969dc3e70f4a7293ce2b1
+  data.tar.gz: fd11e4e76da97f18170b90e2a80c2ef6863be29a
 SHA512:
-  metadata.gz: 39ba4af17ff65f15b90a8c79944e32251986978b3c90102827fb978a9b2aee0ffec071041d7fd44b622b6c237edcc2a698776389c4cddf2049f9104dab8bbccc
-  data.tar.gz: 372a532f5eedc4efbd2f33c830c1a3835a91218a737d61c5359f37fd96a3de8cbf78674574972473377304e0c2030c7c259240753b3a9a4b231e29b78ae53acd
+  metadata.gz: 9a9ee542de85c254ffc753e8355d6236953aff2dbf2d9107e664d234b172fbf7de469499892411f3efb902be94d52c3ba470fdb946d10f3b6d2e9194b6a2e9b9
+  data.tar.gz: 656bffd6573ae387c554eaf0fd935665d2114236532eda69a81b68b1d99b8de6e816c78190dc242fe9297b34b4a0932409cafa9964a93d2baa98bfe6d00ecc9e

data/lib/vanagon/project.rb

@@ -3,6 +3,7 @@ require 'vanagon/environment'
 require 'vanagon/platform'
 require 'vanagon/project/dsl'
 require 'vanagon/utilities'
+require 'digest'
 require 'ostruct'
 
 class Vanagon
@@ -671,20 +672,19 @@ class Vanagon
     # set in the project definition.
     #
     # @param [Vanagon::Platform] the platform to publish settings for
-    def publish_yaml_settings(platform)
+    def publish_yaml_settings(platform) # rubocop:disable Metrics/AbcSize
       return unless yaml_settings
       raise(Vanagon::Error, "You must specify a project version") unless version
 
       filename = "#{name}-#{version}.#{platform.name}.settings.yaml"
-      filepath = File.join('output', filename)
+      filepath = File.expand_path(File.join('output', filename))
 
       File.open(filepath, 'w') do |f|
         f.write(@settings.to_yaml)
       end
 
-      File.open("#{filepath}.sha1", 'w') do |f|
-        f.write(system("#{platform.shasum} #{filepath}", err: File::NULL))
-      end
+      sha1 = Digest::SHA1.file(filepath).hexdigest
+      File.open("#{filepath}.sha1", 'w') { |f| f.puts(sha1) }
     end
 
     # Load the settings hash from an upstream vanagon project.
@@ -743,6 +743,7 @@ class Vanagon
                                                    sum: settings_sha1_uri,
                                                    sum_type: 'sha1')
         source.fetch
+        source.verify
         yaml_path = source.file
         if source_type == :http
           yaml_path = File.join(working_directory, source.file)

data/spec/lib/vanagon/project_spec.rb

@@ -165,6 +165,7 @@ describe 'Vanagon::Project' do
       allow(Vanagon::Component::Source::Http).to receive(:valid_url?).with(http_yaml_uri).and_return(true)
       http_source = instance_double(Vanagon::Component::Source::Http)
       allow(Vanagon::Component::Source).to receive(:source).and_return(http_source)
+      allow(http_source).to receive(:verify).and_return(true)
 
       expect { project.load_yaml_settings(http_yaml_uri) }.to raise_error(Vanagon::Error)
     end
@@ -173,6 +174,7 @@ describe 'Vanagon::Project' do
       before(:each) do
         local_source = instance_double(Vanagon::Component::Source::Local)
         allow(local_source).to receive(:fetch)
+        allow(local_source).to receive(:verify).and_return(true)
         allow(local_source).to receive(:file).and_return(yaml_path)
 
         allow(Vanagon::Component::Source).to receive(:determine_source_type).and_return(:local)
@@ -390,17 +392,21 @@ describe 'Vanagon::Project' do
       project
     end
 
-    let(:yaml_output_path) { "output/test-project-version.#{platform_name}.settings.yaml" }
-    let(:sha1_output_path) { "output/test-project-version.#{platform_name}.settings.yaml.sha1" }
+    let(:yaml_output_path) { File.expand_path("test-project-version.#{platform_name}.settings.yaml", "output") }
+    let(:sha1_output_path) { File.expand_path("test-project-version.#{platform_name}.settings.yaml.sha1", "output") }
 
     let(:yaml_file) { double('yaml_file') }
     let(:sha1_file) { double('sha1_file') }
 
+    let(:sha1_content) { 'abcdef' }
+    let(:sha1_object) { instance_double(Digest::SHA1, hexdigest: sha1_content) }
+
     it 'writes project settings as yaml and a sha1sum for the settings to the output directory' do
       expect(File).to receive(:open).with(yaml_output_path, "w").and_yield(yaml_file)
+      expect(Digest::SHA1).to receive(:file).with(yaml_output_path).and_return(sha1_object)
       expect(File).to receive(:open).with(sha1_output_path, "w").and_yield(sha1_file)
       expect(yaml_file).to receive(:write).with({key: 'value'}.to_yaml)
-      expect(sha1_file).to receive(:write)
+      expect(sha1_file).to receive(:puts).with(sha1_content)
       expect { project.publish_yaml_settings(platform) }.not_to raise_error
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.11
+  version: 0.15.12
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -259,46 +259,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/component/source/rewrite_spec.rb
+- spec/lib/git/rev_list_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
 - spec/lib/vanagon/component/source/git_spec.rb
-- spec/lib/vanagon/component/source/local_spec.rb
 - spec/lib/vanagon/component/source/http_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
+- spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/rewrite_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
 - spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/makefile_spec.rb
-- spec/lib/git/rev_list_spec.rb
+- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/string_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/utilities_spec.rb