vanagon 0.15.22 → 0.15.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d918b0447fd3dfad90bb8246f1f7e3e89ed06dd928c9d10dc0afc799bf22ba
-  data.tar.gz: 8c645b45b957188ef340b0080d279bd53c3f31779c9c366295ed17825632cbae
+  metadata.gz: 7bf8cec1d39b4fe95d0d109181be2d573f5be24eb8e1241936b5b9035022ebbd
+  data.tar.gz: bc390abf3fe18a06fb82d7ed4936f54ca4f64840bb1b4374ec7f4a5d0c3119f7
 SHA512:
-  metadata.gz: e986cb4d690ee09d39c395e6835b677def887f2f90553c6b3086466470eb325c445647a8ee67d75d84e499d5410d4de68b540f6738f3758699412085c4c558b2
-  data.tar.gz: d29f4ea07e13b83918d697015857a0860a27fab8b1b491b93f0cbec0092bc8d88e9e36b627f60b079fd1ddb2799f82fee9fedd80fa4fdabcb58961bc590ff41e
+  metadata.gz: afd0ca4f73413d2f228e520f1456aa4f8c59cd9c28cd36522fc43a74d8b38d0e43b3a032de8703f3d821d469d02d12d9e9cf03c2456920bf820bfe218d86955a
+  data.tar.gz: '08197372b61873aacff50c307f23fa80e7b566e6ad2c45bd98b7d662d101650f79594227438cd192febe4037d8746b44b472810663e3d13e80c6cfab2036b8cc'

data/lib/vanagon/component.rb

@@ -383,6 +383,23 @@ class Vanagon
       end
     end
 
+    # Force version determination for components
+    #
+    # If the component doesn't already have a version set (which normally happens for git sources),
+    # the source will be fetched into a temporary directory to attempt to figure out the version if the
+    # source type supports :version. This directory will be cleaned once the get_sources method returns
+    #
+    # @raise Vanagon::Error raises a vanagon error if we're unable to determine the version
+    def force_version
+      if @version.nil?
+        Dir.mktmpdir do |dir|
+          get_source(dir)
+        end
+      end
+      raise Vanagon::Error, "Unable to determine source version for component #{@name}!" if @version.nil?
+      @version
+    end
+
     # Prints the environment in a way suitable for use in a Makefile
     # or shell script. This is deprecated, because all Env. Vars. are
     # moving directly into the Makefile (and out of recipe subshells).

data/lib/vanagon/component/dsl.rb

@@ -512,6 +512,17 @@ class Vanagon
         @component.preremove_actions << OpenStruct.new(:pkg_state => pkg_state, :scripts => scripts)
       end
 
+      # Force version determination for components
+      #
+      # If the component doesn't already have a version set (which normally happens for git sources),
+      # the source will be fetched into a temporary directory to attempt to figure out the version if the
+      # source type supports :version. This directory will be cleaned once the get_sources method returns
+      #
+      # @raise Vanagon::Error raises a vanagon error if we're unable to determine the version
+      def get_version_forced
+        @component.force_version
+      end
+
       # Adds action to run during the postremoval phase of packaging
       #
       # @param pkg_state [Array] the state in which the scripts should execute. Can be

data/lib/vanagon/engine/docker.rb

@@ -21,7 +21,10 @@ class Vanagon
       def build_host_name
         if @build_host_name.nil?
           validate_platform
-          @build_host_name = @platform.docker_image
+          # Docker requires container names to match: [a-zA-Z0-9][a-zA-Z0-9_.-]
+          # So, transform slashes and colons commonly used as separators in
+          # image names.
+          @build_host_name = @platform.docker_image.gsub(%r{[/:]}, '_')
         end
 
         @build_host_name
@@ -31,7 +34,9 @@ class Vanagon
       # a docker container.
       # @raise [Vanagon::Error] if a target cannot be obtained
       def select_target
-        Vanagon::Utilities.ex("#{@docker_cmd} run -d --name #{build_host_name}-builder -p #{@platform.ssh_port}:22 #{build_host_name}")
+        extra_args = @platform.docker_run_args.nil? ? [] : @platform.docker_run_args
+
+        Vanagon::Utilities.ex("#{@docker_cmd} run -d --name #{build_host_name}-builder -p #{@platform.ssh_port}:22 #{extra_args.join(' ')} #{@platform.docker_image}")
         @target = 'localhost'
 
         # Wait for ssh to come up in the container

data/lib/vanagon/platform.rb

@@ -114,6 +114,7 @@ class Vanagon
 
     # Docker engine specific
     attr_accessor :docker_image
+    attr_accessor :docker_run_args
 
     # AWS engine specific
     attr_accessor :aws_ami

data/lib/vanagon/platform/dsl.rb

@@ -277,6 +277,13 @@ class Vanagon
         @platform.docker_image = image_name
       end
 
+      # Set additional `docker run` arguments to pass when creating containers
+      #
+      # @param args [Array<String>] array of CLI arguments for `docker run`
+      def docker_run_args(args)
+        @platform.docker_run_args = Array(args)
+      end
+
       # Set the ami for the platform to use
       #
       # @param ami [String] the ami id used.

data/spec/lib/vanagon/component_spec.rb

@@ -242,6 +242,49 @@ describe "Vanagon::Component" do
     end
   end
 
+  describe '#force_version' do
+    let(:source) {
+      allow(File).to receive(:realpath).and_return('/this/is/a/test')
+      Vanagon::Component::Source::Git.new('git://github.com/puppetlabs/facter', workdir: '/this/is/a/test')
+    }
+
+    let(:component) {
+      Vanagon::Component.new('force-version-test', {}, {}).tap do |comp|
+        comp.url = 'git://github.com/puppetlabs/facter'
+        comp.source = source
+      end
+    }
+
+    let(:versioned_component) {
+      Vanagon::Component.new('force-version-test', {}, {}).tap do |comp|
+        comp.version = '1.2.3'
+      end
+    }
+
+    it 'returns a version if it\'s already set' do
+      expect(versioned_component).not_to receive(:get_source)
+      expect(versioned_component.force_version).to eq('1.2.3')
+    end
+
+    it 'fetches sources if no version is set' do
+      clone = double(Git::Base)
+      allow(::Git).to receive(:clone).and_return(clone)
+      allow(clone).to receive(:describe).and_return('4.5.6')
+      allow(clone).to receive(:checkout).and_return(nil)
+      allow(clone).to receive(:update_submodules).and_return(nil)
+      expect(component.force_version).to eq('4.5.6')
+    end
+
+    it 'fails if it can\'t determine the version' do
+      clone = double(Git::Base)
+      allow(::Git).to receive(:clone).and_return(clone)
+      allow(clone).to receive(:describe).and_return(nil)
+      allow(clone).to receive(:checkout).and_return(nil)
+      allow(clone).to receive(:update_submodules).and_return(nil)
+      expect{ component.force_version }.to raise_error(Vanagon::Error, /unable to determine source version/i)
+    end
+  end
+
   describe 'rpm ghost files' do
     let(:component) { Vanagon::Component.new('ghost-test', {}, {}) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.15.22
+  version: 0.15.23
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-04 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -260,46 +260,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.6
 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/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/source_spec.rb
 - 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/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/pooler_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/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/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/deb_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/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/component/source/rewrite_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_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/project_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/engine/always_be_scheduling_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