vanagon 0.15.6 → 0.15.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a83822020767811cd2c7b42d16b094752b1c9f
-  data.tar.gz: ec3e49e59648f42c731ad2a0e96d0ee954b23816
+  metadata.gz: 4336ec3a1ac6ab79828d52af974690dbeedcfe99
+  data.tar.gz: 73c7603edc4fd846c4342bf663d8bf72d5325c72
 SHA512:
-  metadata.gz: 62f44cecb7fa71043ac71cde7f64fb5b8b1c74fed0f05392e9b9b683762c73c7af7afae99d46c15622eac31259a8bacf1b03686eacbeff65ff2ae4e274025ebc
-  data.tar.gz: 588443a7cbc72940736c2964b15e8da0dc61d90c23e7a009dd8ac1ca0c5a2a6c6f75e8228436a6e7ae9985943b4a6657f773d3a6fd537828c41af39c7f12ed4f
+  metadata.gz: 4822d6e213a8b76ebf7ff5815b9dfa9c2d3ad33f67da339709a9dd2b1e81926c847c915980f319c20640fc71aeeba9b43605618f8b62b77f98851f464e739f07
+  data.tar.gz: ae5344f15540d70bda07160ab8988c37f7fd27525bfea99b9c8a8ca14a4c6e72ed6a86ed7f94156883780a6b4113d227b59c40df9b79047f28e6621c5a622d02

data/bin/build

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
 
-optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [<target>] [options]",
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name>[,<platform-name>...] [<target>,<target>...] [options]",
                                  %i[workdir configdir engine preserve verbose skipcheck only_build remote-workdir])
 options = optparse.parse! ARGV
 

data/bin/sign

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+ENV["PROJECT_ROOT"] = Dir.pwd
+
+# Begin warning: This sign script is an internal tool.
+# This is not intended to function outside of Puppet Labs' infrastructure.
+# End of warning.
+
+if Dir["output/**/*"].select { |entry| File.file?(entry) }.empty?
+  fail "No packages to sign in the output directory. Maybe you want to build some first?"
+end
+
+require 'packaging'
+Pkg::Util::RakeUtils.load_packaging_tasks
+Pkg::Util::RakeUtils.invoke_task('pl:jenkins:sign_all', 'output')

data/lib/vanagon/component.rb

@@ -349,7 +349,12 @@ class Vanagon
       unless @patches.empty?
         patchdir = File.join(workdir, "patches")
         FileUtils.mkdir_p(patchdir)
-        FileUtils.cp(@patches.map(&:path), patchdir)
+        @patches.each do |p|
+          target = File.join(patchdir, File.basename(p.path))
+          raise Vanagon::Error, "Duplicate patch files detected, '#{p.path}' would have overwritten '#{target}'! Please ensure patch file names are unique across all components." if File.exist?(target)
+
+          FileUtils.cp(p.path, patchdir)
+        end
       end
     end
 

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

@@ -136,7 +136,7 @@ class Vanagon
         # Checkout desired ref/sha, make noise about it, and fail
         # entirely if we're unable to checkout that given ref/sha
         def checkout!
-          warn "Checking out '#{ref}'' from Git repo '#{dirname}'"
+          warn "Checking out '#{ref}' from Git repo '#{dirname}'"
           clone.checkout(ref)
         rescue ::Git::GitExecuteError
           raise Vanagon::CheckoutFailed, "unable to checkout #{ref} from '#{url}'"

data/lib/vanagon/optparse.rb

@@ -44,12 +44,6 @@ class Vanagon
           @options[:configdir] = configuration_directory
         end
 
-        opts.on("-t HOST",
-                "--target HOST",
-                "Name of target machine for build and packaging (defaults to requesting from the pooler)") do |target|
-          @options[:target] = target
-        end
-
         opts.on("-e ENGINE",
                 "--engine ENGINE",
                 "Custom engine to use [base, local, docker, pooler] (defaults to \"pooler\")") do |engine|

data/lib/vanagon/platform.rb

@@ -319,14 +319,14 @@ class Vanagon
     # @return [true, false] true if it is a redhat variety or uses rpm
     # under the hood, false otherwise
     def is_rpm?
-      return !!@name.match(/^(aix|cisco-wrlinux|el|eos|fedora|sles|redhat)-.*$/)
+      return !!@name.match(/^(aix|cisco-wrlinux|el|eos|fedora|sles|redhat|redhatfips)-.*$/)
     end
 
     # Utility matcher to determine is the platform is an enterprise linux variety
     #
     # @return [true, false] true if it is a enterprise linux variety, false otherwise
     def is_el?
-      return !!@name.match(/^(el|redhat)-.*$/)
+      return !!@name.match(/^(el|redhat|redhatfips)-.*$/)
     end
 
     # Utility matcher to determine is the platform is a sles variety
@@ -469,13 +469,27 @@ class Vanagon
       final_archive = "output/#{name_and_version_and_platform}.tar.gz"
       archive_directory = "#{project.name}-archive"
       metadata = project.build_manifest_json(true)
+
+      # previously, we weren't properly handling the case of custom BOM paths.
+      # If we have a custom BOM path, during Makefile execution, the top-level
+      # BOM is moved to the custom path. So, when cleaning up BOMs for non-custom
+      # paths we just want to remove the BOM at the top level of the tarball.
+      # But, if we have a custom BOM path we want to move it back to where it
+      # was prior to the Makefile execution so we can preserve it as an artifact
+      # but not leave it to conflict if it's installed in the same custom path
+      # as a project using this archive.
+      bill_of_materials_command = 'rm -f bill-of-materials'
+      if project.bill_of_materials
+        bill_of_materials_command = "mv .#{project.bill_of_materials.path}/bill-of-materials ../.."
+      end
+
       metadata.gsub!(/\n/, '\n')
       [
         "mkdir output",
         "mkdir #{archive_directory}",
         "gunzip -c #{name_and_version}.tar.gz | '#{tar}' -C #{archive_directory} -xf -",
         "rm #{name_and_version}.tar.gz",
-        "cd #{archive_directory}/#{name_and_version}; rm -f bill-of-materials; #{tar} cf ../../#{name_and_version_and_platform}.tar *",
+        "cd #{archive_directory}/#{name_and_version}; #{bill_of_materials_command}; #{tar} cf ../../#{name_and_version_and_platform}.tar *",
         "gzip -9c #{name_and_version_and_platform}.tar > #{name_and_version_and_platform}.tar.gz",
         "echo -e \"#{metadata}\" > output/#{name_and_version_and_platform}.json",
         "cp bill-of-materials output/#{name_and_version_and_platform}-bill-of-materials ||:",

data/lib/vanagon/platform/dsl.rb

@@ -30,7 +30,7 @@ class Vanagon
         @platform = case platform_name
                     when /^aix-/
                       Vanagon::Platform::RPM::AIX.new(@name)
-                    when /^(cisco-wrlinux|el|fedora|redhat)-/
+                    when /^(cisco-wrlinux|el|fedora|redhat|redhatfips)-/
                       Vanagon::Platform::RPM.new(@name)
                     when /^sles-/
                       Vanagon::Platform::RPM::SLES.new(@name)

data/lib/vanagon/project.rb

@@ -525,7 +525,13 @@ class Vanagon
     #
     # @return [Array] all the files and directories that should be included in the tarball
     def get_tarball_files
-      files = ['file-list', 'bill-of-materials']
+      files = ['bill-of-materials']
+
+      if bill_of_materials
+        files = ["#{bill_of_materials.path}/bill-of-materials"]
+      end
+
+      files.push 'file-list'
       files.push get_files.map(&:path)
       files.push get_configfiles.map(&:path)
       if @platform.is_windows?

data/spec/lib/vanagon/component_spec.rb

@@ -193,4 +193,35 @@ describe "Vanagon::Component" do
       subject.get_sources(@workdir)
     end
   end
+
+  describe "#get_patches" do
+    before :each do
+      @workdir = Dir.mktmpdir
+    end
+
+    let(:platform) do
+      plat = Vanagon::Platform::DSL.new('el-5-x86_64')
+      plat.instance_eval("platform 'el-5-x86_64' do |plat| end")
+      plat._platform
+    end
+
+    let(:component) { Vanagon::Component::DSL.new('patches-test', {}, platform) }
+
+    context("when new patch file would overwrite existing patch file") do
+      let(:patch_file) { 'path/to/test.patch' }
+
+      before :each do
+        allow(FileUtils).to receive(:mkdir_p)
+        allow(FileUtils).to receive(:cp)
+
+        expect(File).to receive(:exist?).with(File.join(@workdir, 'patches', File.basename(patch_file))).and_return(true)
+
+        component.apply_patch(patch_file)
+      end
+
+      it "fails the build" do
+        expect { component._component.get_patches(@workdir) }.to raise_error(Vanagon::Error, /duplicate patch files/i)
+      end
+    end
+  end
 end

data/spec/lib/vanagon/optparse_spec.rb

@@ -45,7 +45,7 @@ describe Vanagon::OptParse do
 
 
   describe "options that take a value" do
-    [:workdir, :configdir, :target, :engine].each do |option|
+    [:workdir, :configdir, :engine].each do |option|
       it "can create an option parser that accepts the #{option} option" do
         subject = described_class.new("test", [option])
         expect(subject.parse!(["--#{option}", "hello"])).to include(option => "hello")
@@ -53,7 +53,7 @@ describe Vanagon::OptParse do
     end
 
     describe "short options" do
-      [["w", :workdir], ["c", :configdir], ["t", :target], ["e", :engine]].each do |short, long|
+      [["w", :workdir], ["c", :configdir], ["e", :engine]].each do |short, long|
         it "maps the short option #{short} to #{long}" do
           subject = described_class.new("test", [long])
           expect(subject.parse!(["-#{short}", "hello"])).to include(long => "hello")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.15.7
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -75,6 +75,7 @@ executables:
 - ship
 - render
 - repo
+- sign
 - build_host_info
 extensions: []
 extra_rdoc_files: []
@@ -87,6 +88,7 @@ files:
 - bin/render
 - bin/repo
 - bin/ship
+- bin/sign
 - lib/git/basic_submodules.rb
 - lib/git/rev_list.rb
 - lib/makefile.rb
@@ -257,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.