vanagon 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda77708ce132b1087ddce71cffc9235971f7e14777e2f76094c39ef678b9f1a
-  data.tar.gz: 913cb403236bcde10ba56c482003796a4043ed7c1ff87c6494c488bb76a45739
+  metadata.gz: d89b835aabbdb8b3cfc47e4eb34b4da0b9d9e10a6106db1fdb3cfd3baed3ed47
+  data.tar.gz: 30d161311d0249732208c36b732e39afc2325d2fbdc05619d3498186790c19dd
 SHA512:
-  metadata.gz: 1d22bd8f7f64c5315e1ca851207fc494d0c57ba087213ab1572d69b3b94d1370f71c63f667c5b540ff28547c7edc4fce16b27a98dde6a81b9332d217254c33ce
-  data.tar.gz: ab78fff0bdbe7124d05c9b433f463e619f488536f58437df79856a27db45d85d1adb4d52615b2008bb870b913bff7e1ace84141cd5575097de7e826338f38e89
+  metadata.gz: 6e8530d3c2327ee1b193a2cb80c0bd5264f67f3e0914b08ff62fb374a078579ca3c47f09177602d1cc3603b1598c61bc2a6101e94a718e2d4d1a97e5d6453eee
+  data.tar.gz: 0f4d8ced9f652f6bc9394a98e663ebb9cdc7cb606256e798a1d720b3f9c73094c30d34a56e3e852b7e985734f392535bd4291de9a9f38725304f36dc9caff281

data/lib/vanagon/cli/build.rb

@@ -45,9 +45,14 @@ class Vanagon
           target_list = options[:targets].split(',')
         end
 
+        only_build = []
+        unless options[:only_build].nil? || options[:only_build].empty?
+          only_build = options[:only_build].split(',')
+        end
+
         platform_list.zip(target_list).each do |pair|
           platform, target = pair
-          artifact = Vanagon::Driver.new(platform, project, options.merge({ :target => target }))
+          artifact = Vanagon::Driver.new(platform, project, options.merge({ :target => target, :only_build => only_build }))
           artifact.run
         end
       end

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

@@ -18,11 +18,12 @@ class Vanagon
 
         class << self
           # Attempt to connect to whatever URL is provided and
-          # return True or False depending on whether or not
+          # return true or false depending on whether or not
           # `git` thinks it's a valid Git repo.
           #
-          # @param url
-          # @param timeout Time (in seconds) to wait before assuming the
+          # @param url [#to_s] A URI::HTTPS, URI:HTTP, or String with the the URL of the
+          #        remote git repository.
+          # @param timeout [Number] Time (in seconds) to wait before assuming the
           #        git command has failed. Useful in instances where a URL
           #        prompts for credentials despite not being a git remote
           # @return [Boolean] whether #url is a valid Git repo or not
@@ -34,30 +35,22 @@ class Vanagon
           # with: NoMethodError: undefined method `split' for nil:NilClass
           #
           # We'll work around that case by calling 'git ls-remote' directly ourselves.
-          #
-          # I'm leaving in the broken version here for a time when the ruby-git library
-          # is fixed.
-
-          #def valid_remote?(url, timeout = 0)
-          #  Timeout.timeout(timeout) do
-          #    !!::Git.ls_remote(url)
-          #  end
-          #rescue ::Git::GitExecuteError
-          #  false
-          #rescue Timeout::Error
-          #  false
-          #end
 
           def valid_remote?(url, timeout = 0)
-            Timeout.timeout(timeout) do
-              Vanagon::Utilities.local_command("git ls-remote --heads #{url} > /dev/null 2>&1")
-              return false unless $?.exitstatus.zero?
-              return true
+            # RE-15209. To relieve github rate-limiting, if the URL starts with
+            # https://github.com/... just accept it rather than ping github over and over.
+            return true if url.to_s.start_with?('https://github.com/')
+
+            begin
+              Timeout.timeout(timeout) do
+                Vanagon::Utilities.local_command("git ls-remote --heads #{url} > /dev/null 2>&1")
+                $?.exitstatus.zero?
+              end
+            rescue RuntimeError
+              # Either a Timeout::Error or some other execution exception that we'll just call
+              # 'invalid'
+              false
             end
-          rescue Timeout::Error
-            return false
-          rescue RuntimeError
-            return false
           end
         end
 

data/lib/vanagon/driver.rb

@@ -37,7 +37,9 @@ class Vanagon
       )
       @project.settings[:verbose] = options[:verbose]
       @project.settings[:skipcheck] = options[:skipcheck] || false
-      filter_out_components(only_build) if only_build
+      if only_build && !only_build.empty?
+        filter_out_components(only_build)
+      end
       loginit('vanagon_hosts.log')
 
       @remote_workdir = options[:"remote-workdir"]

data/spec/lib/vanagon/engine/always_be_scheduling_spec.rb

@@ -125,12 +125,17 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
       allow(File).to receive(:exist?)
                          .with(floaty_config)
                          .and_return(true)
+
     end
     token_value = 'decade'
     it %(reads a token from '~/.vmfloaty.yml at the top level') do
       allow(YAML).to receive(:load_file)
                          .with(floaty_config)
                          .and_return({'token' => token_value})
+      allow(ENV).to receive(:[])
+      allow(ENV).to receive(:[])
+                         .with('VMPOOLER_TOKEN')
+                         .and_return(nil)
 
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       expect(abs_service.token).to eq(token_value)
@@ -142,6 +147,10 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
                          .and_return({'services' =>
                                           {'MYabs' => {'type'=>'abs', 'token'=>token_value, 'url'=>'foo'}}
                                      })
+      allow(ENV).to receive(:[])
+      allow(ENV).to receive(:[])
+                         .with('VMPOOLER_TOKEN')
+                         .and_return(nil)
 
       abs_service = Vanagon::Engine::AlwaysBeScheduling.new(platform, nil)
       expect(abs_service.token).to eq(token_value)
@@ -193,4 +202,4 @@ describe 'Vanagon::Engine::AlwaysBeScheduling' do
       expect(abs_service.target).to eq(hostname)
     end
   end
-end
+end

data/spec/lib/vanagon/utilities/extra_files_signer_spec.rb

@@ -80,6 +80,7 @@ describe Vanagon::Utilities::ExtraFilesSigner do
       context 'when success' do
         context 'when macos' do
           it 'generates signing commands for each file using --extended-attributes' do
+            stub_const('ENV', ENV.to_hash.merge('VANAGON_SSH_KEY' => nil))
             commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
             expected_commands = [
               %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),
@@ -112,6 +113,7 @@ describe Vanagon::Utilities::ExtraFilesSigner do
           let(:platform) { Vanagon::Platform::DSL.new('windows-2012r2-x86_64') }
 
           it 'generates signing commands for each file' do
+            stub_const('ENV', ENV.to_hash.merge('VANAGON_SSH_KEY' => nil))
             commands = Vanagon::Utilities::ExtraFilesSigner.commands(project._project, mktemp, source_dir)
             expected_commands = [
               %q(/usr/bin/ssh -p 22  -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no test@abc "echo 'codesign /tmp/xyz/a.rb' > /tmp/xyz/sign_extra_file"),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2023-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: fustigit
   requirement: !ruby/object:Gem::Requirement
@@ -327,42 +327,42 @@ 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/platform_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/solaris_10_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/windows_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
+- spec/lib/makefile_spec.rb
+- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/component_spec.rb
+- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
+- spec/lib/vanagon/utilities/shell_utilities_spec.rb
+- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
+- spec/lib/vanagon/engine/hardware_spec.rb
 - spec/lib/vanagon/engine/docker_spec.rb
+- spec/lib/vanagon/engine/local_spec.rb
 - spec/lib/vanagon/engine/base_spec.rb
 - spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
 - spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/project_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/environment_spec.rb
+- spec/lib/vanagon/common/pathname_spec.rb
+- spec/lib/vanagon/common/user_spec.rb
 - spec/lib/vanagon/driver_spec.rb
+- spec/lib/vanagon/cli_spec.rb
+- spec/lib/vanagon/project_spec.rb
+- spec/lib/vanagon/utilities_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/common/pathname_spec.rb
-- spec/lib/vanagon/common/user_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
+- spec/lib/vanagon/extensions/set/json_spec.rb
+- spec/lib/vanagon/platform/windows_spec.rb
+- spec/lib/vanagon/platform/solaris_10_spec.rb
+- spec/lib/vanagon/platform/osx_spec.rb
+- spec/lib/vanagon/platform/solaris_11_spec.rb
+- spec/lib/vanagon/platform/rpm/aix_spec.rb
+- spec/lib/vanagon/platform/deb_spec.rb
+- spec/lib/vanagon/platform/dsl_spec.rb
+- spec/lib/vanagon/platform/rpm_spec.rb
+- spec/lib/vanagon/platform_spec.rb
 - spec/lib/vanagon/component/rules_spec.rb
-- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/component/dsl_spec.rb
 - spec/lib/vanagon/component/source/rewrite_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/dsl_spec.rb
-- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/makefile_spec.rb
+- spec/lib/vanagon/component/source/git_spec.rb
+- spec/lib/vanagon/component/source_spec.rb
+- spec/lib/vanagon/environment_spec.rb
 - spec/lib/git/rev_list_spec.rb