vanagon 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b41f01dda75f8d40767ea3c7e290cf11462ff94
-  data.tar.gz: 7c9b7ce98ff34e60371dbf087366cb0fd488c53d
+  metadata.gz: c06666ceca69a65fb5cd8ed50f5d879d13405e32
+  data.tar.gz: b172cfec4a27c00b6e8817f5cf7514fc2a8a6cb2
 SHA512:
-  metadata.gz: 5dda1a3fde0dfb600e38da84061bfd3f006b4f8a199e04900d067a4a96408affb102e916622d88b8fa0e04f6773f686bf5e2ef13aef108c5560d2c42e009df54
-  data.tar.gz: 4263fedb95452fefc118f7a199d70756455cb02c0fadd1c36b9ad630cdfd8d67d647c7a358c683295ca5cc0d2c53f2eca1a5a1ee4efde71b9d91f02a864118f5
+  metadata.gz: fa03f9d6849a5d65ad269146547b7482fd9488bd936521ec8a5a65b6f2b5089a9eaa6054b348fcd620713ad8d6e999ac4210c3c256ea04f120420dde14b66443
+  data.tar.gz: 027c3f6e8cbf5a12378783d4871fad4cd41fe1a549cedb717c7927d6fe74abe8a87de2ca9aa202bab9ffba62fbe94676b73ff5a3f0a81e256488325113bf155e

data/README.md

@@ -291,10 +291,4 @@ For more detailed examples of the DSLs available, please see the
 [examples](https://github.com/puppetlabs/vanagon/tree/master/examples) directory and the YARD documentation for vanagon.
 
 ## Maintainers
-The Release Engineering team at Puppet Labs
-
-Maintainer: Michael Stahnke <stahnma@puppet.com>
-
-Please log tickets and issues at our [Issue Tracker](https://tickets.puppet.com/browse/CPR). Set compononent to Vanagon.
-
-In addition there is an active #puppet-dev channel on Freenode.
+See MAINTAINERS file.

data/lib/vanagon/component/dsl.rb

@@ -278,6 +278,23 @@ class Vanagon
       # @param md5 [String] md5 sum of the source for verification
       def md5sum(md5)
         @component.options[:sum] = md5
+        @component.options[:sum_type] = "md5"
+      end
+
+      # Sets the sha256 sum to verify the sum of the source
+      #
+      # @param sha256 [String] sha256 sum of the source for verification
+      def sha256sum(sha256)
+        @component.options[:sum] = sha256
+        @component.options[:sum_type] = "sha256"
+      end
+
+      # Sets the sha512 sum to verify the sum of the source
+      #
+      # @param sha512 [String] sha512 sum of the source for verification
+      def sha512sum(sha512)
+        @component.options[:sum] = sha512
+        @component.options[:sum_type] = "sha512"
       end
 
       # Sets the ref of the source for use in a git source

data/lib/vanagon/component/source.rb

@@ -87,7 +87,8 @@ class Vanagon
           if Vanagon::Component::Source::Http.valid_url?(parse_and_rewrite(uri))
             return Vanagon::Component::Source::Http.new parse_and_rewrite(uri),
               sum: options[:sum],
-              workdir: options[:workdir]
+              workdir: options[:workdir],
+              sum_type: options[:sum_type]
           end
 
           # Then we try local

data/lib/vanagon/component/source/http.rb

@@ -10,7 +10,7 @@ class Vanagon
         include Vanagon::Utilities
 
         # Accessors :url, :file, :extension, :workdir, :cleanup are inherited from Local
-        attr_accessor :sum
+        attr_accessor :sum, :sum_type
 
         class << self
           def valid_url?(target_url) # rubocop:disable Metrics/AbcSize
@@ -42,14 +42,19 @@ class Vanagon
         # @param url [String] url of the http source to fetch
         # @param sum [String] sum to verify the download against
         # @param workdir [String] working directory to download into
+        # @param sum_type [String] type of sum we are verifying
         # @raise [RuntimeError] an exception is raised is sum is nil
-        def initialize(url, sum:, workdir:, **options)
+        def initialize(url, sum:, workdir:, sum_type:, **options)
           unless sum
             fail "sum is required to validate the http source"
           end
+          unless sum_type
+            fail "sum_type is required to validate the http source"
+          end
           @url = url
           @sum = sum
           @workdir = workdir
+          @sum_type = sum_type
         end
 
         # Download the source from the url specified. Sets the full path to the
@@ -65,12 +70,12 @@ class Vanagon
         # Verify the downloaded file matches the provided sum
         #
         # @raise [RuntimeError] an exception is raised if the sum does not match the sum of the file
-        def verify
+        def verify # rubocop:disable Metrics/AbcSize
           puts "Verifying file: #{file} against sum: '#{sum}'"
-          actual = get_md5sum(File.join(workdir, file))
+          actual = get_sum(File.join(workdir, file), sum_type)
           return true if sum == actual
 
-          fail "Unable to verify '#{File.join(workdir, file)}': md5sum mismatch (expected '#{sum}', got '#{actual}'')"
+          fail "Unable to verify '#{File.join(workdir, file)}': #{sum_type} mismatch (expected '#{sum}', got '#{actual}')"
         end
 
         # Downloads the file from @url into the @workdir

data/lib/vanagon/utilities.rb

@@ -19,7 +19,7 @@ class Vanagon
     # @param file [String] file to md5sum
     # @return [String] md5sum of the given file
     def get_md5sum(file)
-      Digest::MD5.file(file).hexdigest.to_s
+      get_sum(file, 'md5')
     end
 
     # Generic file summing utility
@@ -32,6 +32,8 @@ class Vanagon
       case type.downcase
       when 'md5'
         Digest::MD5.file(file).hexdigest.to_s
+      when 'sha256'
+        Digest::SHA256.file(file).hexdigest.to_s
       when 'sha512'
         Digest::SHA512.file(file).hexdigest.to_s
       else

data/resources/rpm/project.spec.erb

@@ -1,5 +1,21 @@
 %global debug_package %{nil}
 
+<%- if @platform.is_cisco_wrlinux? -%>
+# Our cisco-5/7 build platforms are missing the definition of
+# __os_install_post, so we have to manually set it here. This
+# then enables the brp strip scripts, which are needed to reduce
+# the size of our agent packages for these platforms. This is
+# necessary as some targets will fail to even install the package
+# without stripped binaries because yum's package cache is kept
+# on a partition with ~50MB of free space.
+%global __os_install_post    \
+    /usr/lib64/rpm/brp-compress \
+    /usr/lib64/rpm/brp-strip %{__strip} \
+    /usr/lib64/rpm/brp-strip-static-archive %{__strip} \
+    /usr/lib64/rpm/brp-strip-comment-note %{__strip} %{__objdump} \
+%{nil}
+<%- end -%>
+
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 <% if @platform.is_cross_compiled_linux? -%>

data/spec/lib/vanagon/component/source/http_spec.rb

@@ -10,21 +10,59 @@ describe "Vanagon::Component::Source::Http" do
   let (:plaintext_url) { "#{base_url}/#{plaintext_filename}" }
   let (:plaintext_dirname) { './' }
   let (:md5sum) { 'abcdssasasa' }
+  let (:sha256sum) { 'foobarbaz' }
+  let (:sha512sum) { 'teststring' }
   let (:workdir) { "/tmp" }
 
   describe "#dirname" do
     it "returns the name of the tarball, minus extension for archives" do
-      http_source = Vanagon::Component::Source::Http.new(tar_url, sum: md5sum, workdir: workdir)
+      http_source = Vanagon::Component::Source::Http.new(tar_url, sum: md5sum, workdir: workdir, sum_type: "md5")
       expect(http_source).to receive(:download).and_return(tar_filename)
       http_source.fetch
       expect(http_source.dirname).to eq(tar_dirname)
     end
 
     it "returns the current directory for non-archive files" do
-      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: md5sum, workdir: workdir)
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: md5sum, workdir: workdir, sum_type: "md5")
       expect(http_source).to receive(:download).and_return(plaintext_filename)
       http_source.fetch
       expect(http_source.dirname).to eq(plaintext_dirname)
     end
   end
+
+  describe "verify" do
+    it "fails with a bad sum_type" do
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: md5sum, workdir: workdir, sum_type: "md4")
+      expect(http_source).to receive(:download).and_return(plaintext_filename)
+      http_source.fetch
+      expect{ http_source.verify }.to raise_error(RuntimeError)
+    end
+
+    it "calls md5 digest when it's supposed to" do
+      Digest::MD5.any_instance.stub(:file).and_return(Digest::MD5.new)
+      Digest::MD5.any_instance.stub(:hexdigest).and_return(md5sum)
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: md5sum, workdir: workdir, sum_type: "md5")
+      expect(http_source).to receive(:download).and_return(plaintext_filename)
+      http_source.fetch
+      http_source.verify
+    end
+
+    it "calls sha256 digest when it's supposed to" do
+      Digest::SHA256.any_instance.stub(:file).and_return(Digest::SHA256.new)
+      Digest::SHA256.any_instance.stub(:hexdigest).and_return(sha256sum)
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: sha256sum, workdir: workdir, sum_type: "sha256")
+      expect(http_source).to receive(:download).and_return(plaintext_filename)
+      http_source.fetch
+      http_source.verify
+    end
+
+    it "calls sha512 digest when it's supposed to" do
+      Digest::SHA512.any_instance.stub(:file).and_return(Digest::SHA512.new)
+      Digest::SHA512.any_instance.stub(:hexdigest).and_return(sha512sum)
+      http_source = Vanagon::Component::Source::Http.new(plaintext_url, sum: sha512sum, workdir: workdir, sum_type: "sha512")
+      expect(http_source).to receive(:download).and_return(plaintext_filename)
+      http_source.fetch
+      http_source.verify
+    end
+  end
 end

data/spec/lib/vanagon/component/source_spec.rb

@@ -94,12 +94,12 @@ describe "Vanagon::Component::Source" do
       end
 
       it "returns an object of the correct type for http:// URLS" do
-        expect(klass.source(http_url, sum: sum, workdir: workdir).class)
+        expect(klass.source(http_url, sum: sum, workdir: workdir, sum_type: "md5").class)
           .to equal(Vanagon::Component::Source::Http)
       end
 
       it "returns an object of the correct type for https:// URLS" do
-        expect(klass.source(https_url, sum: sum, workdir: workdir).class)
+        expect(klass.source(https_url, sum: sum, workdir: workdir, sum_type: "md5").class)
           .to equal(Vanagon::Component::Source::Http)
       end
 
@@ -108,7 +108,7 @@ describe "Vanagon::Component::Source" do
           'http://buildsources.delivery.puppetlabs.net'
       end
       it "applies rewrite rules to HTTP URLs" do
-        expect(klass.source(original_http_url, sum: sum, workdir: workdir).url)
+        expect(klass.source(original_http_url, sum: sum, workdir: workdir, sum_type: "md5").url)
           .to eq(rewritten_http_url)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-11 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -229,40 +229,40 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
 - 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/http_spec.rb
 - spec/lib/vanagon/component/source/local_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/rules_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/driver_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/pooler_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
 - spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/extensions/ostruct/json_spec.rb
 - spec/lib/vanagon/extensions/string_spec.rb
-- spec/lib/vanagon/optparse_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
 - spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform/dsl_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/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/optparse_spec.rb
 - spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/engine/base_spec.rb
+- spec/lib/vanagon/engine/pooler_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/docker_spec.rb
+- spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
 - spec/lib/vanagon/utilities_spec.rb
+- spec/lib/vanagon/platform_spec.rb