vanagon 0.15.14 → 0.15.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 037a5f792537eae08958a3ccb82ed908104f52a770d16b81ce75264d594be195
-  data.tar.gz: 8ba2df606dc65a7d0967174d1f5831cba8cc329cfa812bdc322971c995cc233c
+SHA1:
+  metadata.gz: a479ccb554a2a480e5a1f7f7cd9f7e89a5ae5635
+  data.tar.gz: 64f0995acc0459921a607f17d3ebb0b825f0989f
 SHA512:
-  metadata.gz: 6b69a1cf141753c3eabff25f4ab4b58695b3143bfa405c50fa8eb1aa5aceba1013943a461ab99104ceb8538133f41328dcd6a934a80a24b50a1e2bac5978091a
-  data.tar.gz: 2c0f44dee33c41bd21d51485f9ecebced93e43e6baa2fe5205269cf39f4ced5ab86c0a09d5baf31a8771c480ec00633a45cf19c5e43e144f4a9d09da4bb52020
+  metadata.gz: d7eb69451fccf9045fbe6f6cafe82a7339b24eed72c71bf517858c87db94eff2441f0addec52ba30149addf2fe7affc9ff300ccfb17f20b8362b724f813112ef
+  data.tar.gz: 9adf6c7d19853763c218fa9a88f11a177394742821ec148e38c02ceed7bac84f27f52846b4fd70045beb81831a2811beacb4edcaff4c93bf58396cc16b01ebc1

data/bin/build_requirements

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+require 'json'
+require 'vanagon/extensions/ostruct/json'
+require 'vanagon/extensions/set/json'
+require 'vanagon/extensions/hashable'
+
+load File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "vanagon.rb"))
+
+optparse = Vanagon::OptParse.new("#{File.basename(__FILE__)} <project-name> <platform-name> [options]", %i[workdir configdir engine])
+options = optparse.parse! ARGV
+
+project = ARGV[0]
+platform = ARGV[1]
+
+unless project and platform
+  warn "project and platform are both required arguments."
+  warn optparse
+  exit 1
+end
+
+driver = Vanagon::Driver.new(platform, project)
+components = driver.project.components
+component_names = components.map(&:name)
+build_requirements = []
+components.each do |component|
+  build_requirements << component.build_requires.reject do |req|
+    # only include external requirements: i.e. those that do not match
+    # other components in the project
+    component_names.include?(req)
+  end
+end
+$stdout.puts
+$stdout.puts "**** External packages required to build #{project} on #{platform}: ***"
+$stdout.puts JSON.pretty_generate(build_requirements.flatten.uniq.sort)
+

data/lib/vanagon/component.rb

@@ -13,7 +13,8 @@ class Vanagon
     # - Ryan McKern, 2017-01-27
 
     # The name, version, primary source, supplementary sources,
-    # associated patches, upstream URL, and license of a given component
+    # associated patches, upstream URL (for fetching the source),
+    # homepage, and license of a given component
     attr_accessor :name
     attr_accessor :version
     attr_accessor :source
@@ -22,6 +23,7 @@ class Vanagon
     attr_accessor :url
     attr_accessor :mirrors
     attr_accessor :license
+    attr_accessor :homepage
 
     # holds an OpenStruct describing all of the particular details about
     # how any services associated with a given component should be defined.

data/lib/vanagon/component/dsl.rb

@@ -521,6 +521,13 @@ class Vanagon
       def install_only(install_only)
         @component.install_only = install_only
       end
+
+      # Set the homepage for the component
+      #
+      # @param homepage
+      def homepage(homepage)
+        @component.homepage = homepage
+      end
     end
   end
 end

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

@@ -49,7 +49,7 @@ class Vanagon
         # @param ref [String] ref to checkout from git repo
         # @param workdir [String] working directory to clone into
         def initialize(url, workdir:, **options)
-          opts = default_options.merge(options)
+          opts = default_options.merge(options.reject { |k, v| v.nil? })
 
           # Ensure that #url returns a URI object
           @url = URI.parse(url.to_s)

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

@@ -816,6 +816,14 @@ end" }
     end
   end
 
+  describe '#homepage' do
+    it 'adds the homepage to the component' do
+      comp = Vanagon::Component::DSL.new('homepage-test', {}, platform)
+      comp.homepage('https://puppet.com')
+      expect(comp._component.homepage).to eq('https://puppet.com')
+    end
+  end
+
   describe '#directory' do
     it 'adds a directory with the desired path to the directory collection for the component' do
       comp = Vanagon::Component::DSL.new('directory-test', {}, platform)

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

@@ -60,5 +60,11 @@ describe "Vanagon::Component::Source::Git" do
       expect(git_source.ref)
         .to eq('HEAD')
     end
+
+    it "returns a default value of HEAD when Git reference is nil" do
+      git_source = @klass.new(@url, ref: nil, workdir: @workdir)
+      expect(git_source.ref)
+        .to eq('HEAD')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.14
+  version: 0.15.15
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -77,6 +77,7 @@ executables:
 - repo
 - sign
 - build_host_info
+- build_requirements
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,6 +85,7 @@ files:
 - README.md
 - bin/build
 - bin/build_host_info
+- bin/build_requirements
 - bin/inspect
 - bin/render
 - bin/repo
@@ -259,46 +261,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 3
 summary: All of your packages will fit into this van with this one simple trick.
 test_files:
+- spec/lib/git/rev_list_spec.rb
 - spec/lib/makefile_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/platform_spec.rb
-- spec/lib/vanagon/component/source/local_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/rewrite_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source_spec.rb
-- spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
 - spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/common/pathname_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
+- spec/lib/vanagon/driver_spec.rb
 - spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/ec2_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/environment_spec.rb
 - spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/extensions/string_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/project_spec.rb
-- spec/lib/vanagon/driver_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/git/rev_list_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/utilities_spec.rb