vanagon 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f8772f1446c288009a4909d14a0443687fa83ed0013062b5110bf87dd07bdf4
-  data.tar.gz: 63412e68e08b5a2d4eb4f39bc04ac2840373127ab2869a9aa7a9842298abe2b8
+  metadata.gz: 102d009c983cce91795427ba4fde405991d1e9fe792a5ca2759332379f5740d8
+  data.tar.gz: 502dfc5b2d6dc0287b2affcc25602988078d7a8695932b38fc6b5bda60e5f44f
 SHA512:
-  metadata.gz: 8777b1881b31ea9c3f34a97730a5cd5f4fd136de88364ccc8efabdbf55507b11b0302859d56dec8ef9b3a9bf0dad115cf271a81e895bade588b1394bf941246f
-  data.tar.gz: bf3bc5fdeb639925bcfe284aa5e088bff53fe2ec581a60ba01cb971690256b31ff627d78aa5153f39bef4324ca93a8457d514479e1cf6adbc1a719ff89106a85
+  metadata.gz: 32858c83e0925378289ebb567f9410641bfbe10f027dacbf10e6f3371a5431b3c805b17ae2ef7bd5172763c90ba8fa59d81ad04bc4aa720cbcb06bad70f799ad
+  data.tar.gz: 292f6afc7c31255d3055bb93c5a07c68b0fba409618958c19642ce44788dad5d7ba7a0c7ffc011fa5e5e607b6acd243ad52523b0a27c1e70b3a49dff1570b66a

data/lib/makefile.rb

@@ -60,7 +60,7 @@ class Makefile
     def compounded_recipe
       Array(recipe)
         .compact
-        .map { |line| "\t" + line.gsub("\n", "\n\t") + "\n" }
+        .map { |line| "\t#{line.gsub("\n", "\n\t")}\n" }
         .join
     end
 

data/lib/vanagon/cli/build.rb

@@ -61,7 +61,7 @@ class Vanagon
         translations = {
           '--verbose' => :verbose,
           '--workdir' => :workdir,
-          '--remote-workdir' => :"remote-workdir",
+          '--remote-workdir' => :'remote-workdir',
           '--configdir' => :configdir,
           '--engine' => :engine,
           '--skipcheck' => :skipcheck,
@@ -78,8 +78,7 @@ class Vanagon
         # Handle --preserve option checking
         valid_preserves = %w[always never on-failure]
         unless valid_preserves.include? options[:preserve]
-          raise InvalidArgument, "--preserve option can only be one of: " +
-                                 valid_preserves.join(', ')
+          raise InvalidArgument, "--preserve option can only be one of: #{valid_preserves.join(', ')}"
         end
         options[:preserve] = options[:preserve].to_sym
         return options

data/lib/vanagon/cli/dependencies.rb

@@ -28,29 +28,9 @@ class Vanagon
         exit 1
       end
 
-      def run(options) # rubocop:disable Metrics/AbcSize
-        platforms_directory = File.join(options[:configdir], 'platforms')
-        projects_directory = File.join(options[:configdir], 'projects')
-
-        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
-          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
-          exit 1
-        end
-
-        projects = [options[:project_name]]
-        if projects.include?('all')
-          projects = Dir.children(projects_directory).map do |project|
-            File.basename(project, File.extname(project))
-          end
-        end
-
-        platforms = options[:platforms].split(',')
-        if platforms.include?('all')
-          platforms = Dir.children(platforms_directory).map do |platform|
-            File.basename(platform, File.extname(platform))
-          end
-        end
-
+      def run(options)
+        projects = get_projects(options)
+        platforms = get_platforms(options)
         failures = []
 
         projects.each do |project|
@@ -74,6 +54,36 @@ class Vanagon
         VanagonLogger.info "Finished generating dependencies"
       end
 
+      def get_projects(options)
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(projects_directory) && Dir.exist?(platforms_directory)
+          VanagonLogger.error "Path to #{platforms_directory} or #{projects_directory} not found."
+          exit 1
+        end
+
+        projects = [options[:project_name]]
+        if projects.include?('all')
+          Dir.children(projects_directory).map do |project|
+            File.basename(project, File.extname(project))
+          end
+        else
+          projects
+        end
+      end
+
+      def get_platforms(options)
+        platforms = options[:platforms].split(',')
+        if platforms.include?('all')
+          Dir.children(platforms_directory).map do |platform|
+            File.basename(platform, File.extname(platform))
+          end
+        else
+          platforms
+        end
+      end
+
       def options_translate(docopt_options)
         translations = {
           '--verbose' => :verbose,

data/lib/vanagon/cli/inspect.rb

@@ -63,8 +63,7 @@ class Vanagon
         # Handle --preserve option checking
         valid_preserves = %w[always never on-failure]
         unless valid_preserves.include? options[:preserve]
-          raise InvalidArgument, "--preserve option can only be one of: " +
-                                 valid_preserves.join(', ')
+          raise InvalidArgument, "--preserve option can only be one of: #{valid_preserves.join(', ')}"
         end
         options[:preserve] = options[:preserve].to_sym
         return options

data/lib/vanagon/cli/list.rb

@@ -30,24 +30,11 @@ class Vanagon
       end
 
       def run(options) # rubocop:disable Metrics/AbcSize
-        if Dir.exist?(File.join(options[:configdir], 'platforms')) == false ||
-           Dir.exist?(File.join(options[:configdir], 'projects')) == false
+        check_directories(options)
 
-          VanagonLogger.error "Path to #{File.join(options[:configdir], 'platforms')} or #{File.join(options[:configdir], 'projects')} not found."
-          exit 1
-        end
-
-        default_list = Dir.children(File.join(File.dirname(__FILE__), '..', 'platform', 'defaults')).map do |platform|
-          File.basename(platform, File.extname(platform))
-        end.sort
-
-        platform_list = Dir.children(File.join(options[:configdir], 'platforms')).map do |platform|
-          File.basename(platform, File.extname(platform))
-        end.sort
-
-        project_list = Dir.children(File.join(options[:configdir], 'projects')).map do |project|
-          File.basename(project, File.extname(project))
-        end.sort
+        default_list = topic_list(File.dirname(__FILE__), '..', 'platform', 'defaults')
+        platform_list = topic_list(options[:configdir], 'platforms')
+        project_list = topic_list(options[:configdir], 'projects')
 
         if options[:defaults]
           puts "- Defaults", output(default_list, options[:use_spaces])
@@ -55,7 +42,8 @@ class Vanagon
         end
 
         if options[:projects] == options[:platforms]
-          puts "- Projects", output(project_list, options[:use_spaces]), "\n", "- Platforms", output(platform_list, options[:use_spaces])
+          puts "- Projects", output(project_list, options[:use_spaces]), "\n",
+               "- Platforms", output(platform_list, options[:use_spaces])
           return
         end
 
@@ -70,6 +58,27 @@ class Vanagon
         end
       end
 
+      def check_directories(options)
+        platforms_directory = File.join(options[:configdir], 'platforms')
+        projects_directory = File.join(options[:configdir], 'projects')
+
+        unless Dir.exist?(platforms_directory)
+          VanagonLogger.error "Platforms directory \"#{platforms_directory}\" does not exist."
+          exit 1
+        end
+
+        unless Dir.exist?(projects_directory)
+          VanagonLogger.error "Projectss directory \"#{projects_directory}\" does not exist."
+          exit 1
+        end
+      end
+
+      def topic_list(*topic_path_items)
+        Dir.children(File.join(topic_path_items)).map do |t|
+          File.basename(t, File.extname(t))
+        end.sort
+      end
+
       def options_translate(docopt_options)
         translations = {
           '--configdir' => :configdir,

data/lib/vanagon/common/user.rb

@@ -2,6 +2,7 @@ class Vanagon
   class Common
     class User
       attr_accessor :name, :group, :shell, :is_system, :homedir
+
       def initialize(name, group = nil, shell = nil, is_system = false, homedir = nil)
         @name = name
         @group = group ? group : @name

data/lib/vanagon/component/dsl.rb

@@ -103,7 +103,7 @@ class Vanagon
       # @raise [RuntimeError] exceptions are raised if there is no file,
       #   if it refers to methods that don't exist, or if it does not contain a Hash
       def load_from_json(file)
-        if File.exists?(file)
+        if File.exist?(file)
           data = JSON.parse(File.read(file))
           raise "Hash required. Got '#{data.class}' when parsing '#{file}'" unless data.is_a?(Hash)
           data.each do |key, value|
@@ -203,10 +203,10 @@ class Vanagon
           # Return here because there is no file to install, just a string read in
           return
         when "windows"
-          @component.service << OpenStruct.new(\
+          @component.service << OpenStruct.new( \
             :bindir_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '').upcase}BINDIR", \
             :service_file => service_file, \
-            :component_group_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '')}Component"\
+            :component_group_id => "#{service_name.gsub(/[^A-Za-z0-9]/, '')}Component" \
           )
           # return here as we are just collecting the name of the service file to put into the harvest filter list.
           return
@@ -392,15 +392,15 @@ class Vanagon
         end
       end
 
-
       # This will add a source to the project and put it in the workdir alongside the other sources
       #
       # @param uri [String] uri of the source
       # @param [Hash] options optional keyword arguments used to instatiate a new source
       #   @option opts [String] :sum
       #   @option opts [String] :ref
-      #   @option opts [Bool] :erb set to 'true' to specify that the source file should be translated by erb
-      def add_source(uri, **options)
+      #   @option opts [Bool] :erb set to 'true' to specify that the source file should be
+      #     translated by erb
+      def add_source(uri, options = {})
         @component.sources << OpenStruct.new(options.merge({ url: uri }))
       end
 

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

@@ -17,7 +17,7 @@ class Vanagon
         CHECKSUM_TYPES = %w[md5 sha1 sha256 sha512].freeze
 
         class << self
-          def valid_url?(target_url) # rubocop:disable Metrics/AbcSize
+          def valid_url?(target_url)
             uri = URI.parse(target_url.to_s)
             return false unless ['http', 'https'].include? uri.scheme
 
@@ -49,7 +49,7 @@ class Vanagon
         # @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:, sum_type:, **options) # rubocop:disable Metrics/AbcSize
+        def initialize(url, sum:, workdir:, sum_type:, **options)
           unless sum
             fail "sum is required to validate the http source"
           end
@@ -93,7 +93,7 @@ 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 # rubocop:disable Metrics/AbcSize
+        def verify
           VanagonLogger.info "Verifying file: #{file} against sum: '#{sum}'"
           actual = get_sum(File.join(workdir, file), sum_type)
           return true if sum == actual

data/lib/vanagon/driver.rb

@@ -42,7 +42,7 @@ class Vanagon
       end
       loginit('vanagon_hosts.log')
 
-      @remote_workdir = options[:"remote-workdir"]
+      @remote_workdir = options[:'remote-workdir']
 
       engine = pick_engine(options)
       load_engine_object(engine, @platform, options[:target])
@@ -58,7 +58,7 @@ class Vanagon
       end
     end
 
-    def pick_engine(options) # rubocop:disable Metrics/PerceivedComplexity
+    def pick_engine(options)
       if options[:engine] && !options[:target]
         options[:engine]
       elsif @platform.build_hosts
@@ -133,7 +133,7 @@ class Vanagon
       # whole makefile. Instead just perform the installation.
       make_target = ''
       if @project.no_packaging
-        make_target = @project.name + '-project'
+        make_target = "#{@project.name}-project"
       end
 
       @engine.startup(workdir)
@@ -171,7 +171,7 @@ class Vanagon
       end
     end
 
-    def render # rubocop:disable Metrics/AbcSize
+    def render
       # Simple sanity check for the project
       if @project.version.nil? || @project.version.empty?
         raise Vanagon::Error, "Project requires a version set, all is lost."

data/lib/vanagon/engine/always_be_scheduling.rb

@@ -287,20 +287,17 @@ class Vanagon
           VanagonLogger.error "\nVanagon interrupted during mains ABS polling. Make sure you delete the requested job_id #{@saved_job_id}"
           raise
         end
-        response_body = translated(response_body, @saved_job_id)
-        response_body
+        translated(response_body, @saved_job_id)
       end
 
       def validate_queue_status_response(status_code, body)
         case status_code
         when "200"
           return JSON.parse(body) unless body.empty? || !valid_json?(body)
-        when "202"
+        when "202", "503"
           return nil
         when "401"
           raise Vanagon::Error, "HTTP #{status_code}: The token provided could not authenticate.\n#{body}"
-        when "503"
-          return nil
         else
           raise Vanagon::Error, "HTTP #{status_code}: request to ABS failed!\n#{body}"
         end
@@ -309,7 +306,7 @@ class Vanagon
       # This method is used to tell the ABS to delete the job_id requested
       # otherwise the resources will eventually get allocated asynchronously
       # and will keep running until the end of their lifetime.
-      def teardown # rubocop:disable Metrics/AbcSize
+      def teardown
         request_object = {
             'job_id' => @saved_job_id,
         }
@@ -348,7 +345,7 @@ class Vanagon
       def build_request_object
         user = ENV['USER'] || ENV['USERNAME'] || 'vanagon'
 
-        @saved_job_id = user + "-" + DateTime.now.strftime('%Q')
+        @saved_job_id = "#{user}-#{DateTime.now.strftime('%Q')}"
         request_object = {
             :resources => { build_host_name => 1 },
             :job       => {

data/lib/vanagon/engine/ec2.rb

@@ -10,7 +10,7 @@ class Vanagon
       attr_accessor :ami, :key_name, :userdata, :key, :shutdown_behavior
       attr_accessor :subnet_id, :instance_type
 
-      def initialize(platform, target = nil, **opts) # rubocop:disable Metrics/AbcSize
+      def initialize(platform, target = nil, **opts)
         super
 
         @ami = @platform.aws_ami

data/lib/vanagon/engine/pooler.rb

@@ -97,11 +97,11 @@ class Vanagon
 
       # Attempt to provision a host from a specific pooler.
       #
-      def select_target_from(pooler) # rubocop:disable Metrics/AbcSize
+      def select_target_from(pooler)
         response = Vanagon::Utilities.http_request(
           "#{pooler}/vm",
           'POST',
-          '{"' + build_host_name + '":"1"}',
+          "{\"#{build_host_name}\":\"1\"}",
           { 'X-AUTH-TOKEN' => @token }
         )
         if response["ok"]
@@ -110,7 +110,7 @@ class Vanagon
           # in the future we should make the two APIs the same in this sense, but for now, just check
           # if 'domain' is a thing and use it if so.
           if response['domain']
-            @target += '.' + response['domain']
+            @target += ".#{response['domain']}"
           end
           Vanagon::Driver.logger.info "Reserving #{@target} (#{build_host_name}) [#{@token ? 'token used' : 'no token used'}]"
           add_tags_to_target(pooler, response[build_host_name]['hostname'])

data/lib/vanagon/environment.rb

@@ -176,21 +176,22 @@ class Vanagon
     # @param key [Object]
     # @raise [ArgumentError] if key is not a String, if key contains invalid
     #   characters, or if key begins with a digit
-    def validate_key(str)
-      str = str.to_s
+    def validate_key(key)
+      environment_string = key.to_s
 
-      if str[0] =~ /\d/
-        raise ArgumentError,
-              'environment variable Name cannot begin with a digit'
+      if environment_string[0] =~ /\d/
+        raise ArgumentError, 'environment variable Name cannot begin with a digit'
       end
 
-      invalid_chars = str.scan(/[^\w]/).uniq
-      unless invalid_chars.empty?
-        raise ArgumentError,
-              'environment variable Name contains invalid characters: ' +
-              invalid_chars.map { |char| %("#{char}") }.join(', ')
-      end
-      str
+      invalid_characters = environment_string
+        .scan(/[^\w]/)
+        .uniq
+        .map { |char| %("#{char}") }
+        .join(', ')
+
+      return environment_string if invalid_characters.empty?
+      raise ArgumentError,
+            "environment variable Name contains invalid characters: #{invalid_characters}"
     end
     private :validate_key
 

data/lib/vanagon/errors.rb

@@ -16,12 +16,5 @@ class Vanagon
         e.original = original
       end
     end
-
-    # @overload initialize(mesg)
-    #   @param mesg [String] The exception mesg
-    #
-    def initialize(mesg)
-      super(mesg)
-    end
   end
 end

data/lib/vanagon/logger.rb

@@ -1,12 +1,12 @@
 require 'logger'
 
-class VanagonLogger < ::Logger
+class VanagonLogger < Logger
   def self.logger
     @@logger ||= VanagonLogger.new
   end
 
   def self.debug_logger
-    @@debug_logger ||= VanagonLogger.new(STDERR)
+    @@debug_logger ||= VanagonLogger.new($stderr)
   end
 
   def self.info(msg)
@@ -21,7 +21,7 @@ class VanagonLogger < ::Logger
     VanagonLogger.logger.error msg
   end
 
-  def initialize(output = STDOUT)
+  def initialize(output = $stdout)
     super(output)
     self.level = ::Logger::INFO
     self.formatter = proc do |severity, datetime, progname, msg|

data/lib/vanagon/platform/deb.rb

@@ -7,11 +7,11 @@ class Vanagon
       # @return [Array] list of commands required to build a debian package for the given project from a tarball
       def generate_package(project) # rubocop:disable Metrics/AbcSize
         target_dir = project.repo ? output_dir(project.repo) : output_dir
-        if project.source_artifacts
-          copy_extensions = '*.{deb,build,tar.gz,changes,dsc}'
-        else
-          copy_extensions = '*.deb'
-        end
+        copy_extensions = if project.source_artifacts
+                            '*.{deb,buildinfo,tar.gz,changes,dsc}'
+                          else
+                            '*.deb'
+                          end
         pkg_arch_opt = project.noarch ? "" : "-a#{@architecture}"
         pkg_arch_opt = '-aarm64' if pkg_arch_opt == '-aaarch64'
 
@@ -21,7 +21,7 @@ class Vanagon
         "cat file-list >> debian/install",
         "cp -pr debian $(tempdir)/#{project.name}-#{project.version}",
         "gunzip -c #{project.name}-#{project.version}.tar.gz | '#{@tar}' -C '$(tempdir)/#{project.name}-#{project.version}' --strip-components 1 -xf -",
-        "#{sed} -i 's/\ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
+        "#{sed} -i 's/ /?/g' $(tempdir)/#{project.name}-#{project.version}/debian/install",
         "(cd $(tempdir)/#{project.name}-#{project.version}; debuild --no-lintian #{pkg_arch_opt} -uc -us)",
         "cp $(tempdir)/#{copy_extensions} ./output/#{target_dir}"]
       end
@@ -125,7 +125,7 @@ class Vanagon
       end
 
       def version_munger(version_string, default: '=')
-        operator, version = super.split(' ')
+        operator, version = super.split
         if operator =~ /^[<>]$/
           operator = "#{operator}#{operator}"
         end

data/lib/vanagon/platform/rpm.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build an rpm package of
       # @return [Array] list of commands required to build an rpm package for the given project from a tarball
-      def generate_package(project) # rubocop:disable Metrics/AbcSize
+      def generate_package(project)
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         target_source_output_dir = project.repo ? source_output_dir(project.repo) : source_output_dir
         if project.source_artifacts
@@ -61,7 +61,7 @@ class Vanagon
         defines << %(--define 'dist .#{dist}')
       end
 
-      def add_repository(definition) # rubocop:disable Metrics/AbcSize
+      def add_repository(definition)
         definition = URI.parse(definition)
 
         commands = ["rpm -q curl > /dev/null || yum -y install curl"]

data/lib/vanagon/platform/solaris_10.rb

@@ -5,7 +5,7 @@ class Vanagon
       #
       # @param project [Vanagon::Project] project to build a solaris package of
       # @return [Array] list of commands required to build a solaris package for the given project from a tarball
-      def generate_package(project) # rubocop:disable Metrics/AbcSize
+      def generate_package(project) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
         target_dir = project.repo ? output_dir(project.repo) : output_dir
         name_and_version = "#{project.name}-#{project.version}"
         pkg_name = package_name(project)
@@ -18,9 +18,9 @@ class Vanagon
         # required more string manipulation anyway. the string should be formatted like so:
         #         && ($$3 ~ /directory\/regex.*/ || $$3 ~ /another\/directory\/regex.*/)
         # for as many iterations as there are directries in the package
-        pkgdirs = project.get_root_directories.map { |dir| dir.sub(/^\//, "").gsub(/([\/\.])+/, '\\\\\1') + '.*' }
+        pkgdirs = project.get_root_directories.map { |dir| "#{dir.sub(/^\//, '').gsub(/([\/.])+/, '\\\\\1')}.*" }
         explicit_search_string = pkgdirs.map do |dir_regex|
-          " $$3 ~ /" + dir_regex + "/ "
+          " $$3 ~ /#{dir_regex}/ "
         end.join("||")
 
         # Here we maintain backward compatibility with older vanagon versions
@@ -108,7 +108,7 @@ class Vanagon
       #
       # @param user [Vanagon::Common::User] the user to create
       # @return [String] the commands required to add a user to the system
-      def add_user(user) # rubocop:disable Metrics/AbcSize
+      def add_user(user)
         # NB: system users aren't supported on solaris 10
         # Solaris 10 also doesn't support long flags
         cmd_args = ["'#{user.name}'"]

data/lib/vanagon/platform/windows.rb

@@ -108,13 +108,13 @@ class Vanagon
           dest_pathname_fragment = src_pathname.relative_path_from(vanagon_path)
           target_dir = File.join(destination, dest_pathname_fragment.to_s)
           # Create the target directory if necessary.
-          FileUtils.mkdir_p(target_dir) unless File.exists?(target_dir)
+          FileUtils.mkdir_p(target_dir)
           # Skip the file copy if either target file or ERB equivalent exists.
           # This means that any files already in place in the work directory as a
           # result of being copied from the project specific area will not be
           # overritten.
-          next if File.exists?(Pathname.new(target_dir) + File.basename(file))
-          next if File.exists?(Pathname.new(target_dir) + File.basename(file, ".erb"))
+          next if File.exist?(Pathname.new(target_dir) + File.basename(file))
+          next if File.exist?(Pathname.new(target_dir) + File.basename(file, ".erb"))
           FileUtils.cp(file, target_dir, :verbose => verbose)
         end
       end
@@ -228,7 +228,7 @@ class Vanagon
           # cygpath conversion is necessary as candle is unable to handle posix path specs
           # the preprocessor variables AppDataSourcePath and ApplicationSourcePath are required due to the -var input to the heat
           # runs listed above.
-          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name \'*.wxs\'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} #{candle_preprocessor} $$(cygpath -aw $$wix_file) || exit 1; done",
+          "cd $(tempdir)/wix/wixobj; for wix_file in `find $(tempdir)/wix -name '*.wxs'`; do \"$$WIX/bin/candle.exe\" #{candle_flags} #{candle_preprocessor} $$(cygpath -aw $$wix_file) || exit 1; done",
           # run all wix objects through light to produce the msi
           # the -b flag simply points light to where the SourceDir location is
           # -loc is required for the UI localization it points to the actual localization .wxl
@@ -317,7 +317,7 @@ class Vanagon
 
         if definition.scheme =~ /^(http|ftp|file)/
           if File.extname(definition.path) == '.ps1'
-            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString(\"#{definition}\"))')
+            commands << %(powershell.exe -NoProfile -ExecutionPolicy Bypass -Command 'iex ((new-object net.webclient).DownloadString("#{definition}"))')
           else
             commands << %(C:/ProgramData/chocolatey/bin/choco.exe source add -n #{definition.host}-#{definition.path.tr('/', '-')} -s "#{definition}" --debug || echo "Oops, it seems that you don't have chocolatey installed on this system. Please ensure it's there by adding something like 'plat.add_repository 'https://chocolatey.org/install.ps1'' to your platform definition.")
           end
@@ -438,7 +438,7 @@ class Vanagon
       #
       # @param [string] version, the original version number
       def wix_product_version(version)
-        version.split("\.").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join("\.")
+        version.split(".").first(3).collect { |value| value.gsub(/[^0-9]/, '') }.join(".")
       end
 
       # Constructor. Sets up some defaults for the windows platform and calls the parent constructor

data/lib/vanagon/platform.rb

@@ -150,7 +150,7 @@ class Vanagon
     # @param config_directory [String] the path to the platform config file
     # @return [Vanagon::Platform] the platform as specified in the platform config
     # @raise if the instance_eval on Platform fails, the exception is reraised
-    def self.load_platform(platform_name, config_directory) # rubocop:disable Metrics/AbcSize
+    def self.load_platform(platform_name, config_directory)
       platform_name = File.basename(platform_name, '.rb')
       platform_file_name = "#{platform_name}.rb"
       platform_path = File.join(config_directory, platform_file_name)
@@ -235,7 +235,7 @@ class Vanagon
     #
     # @param name [String] name of the platform
     # @return [Vanagon::Platform] the platform with the given name
-    def initialize(name) # rubocop:disable Metrics/AbcSize
+    def initialize(name) # rubocop:disable Metrics/PerceivedComplexity, Metrics/AbcSize
       @name = name
       @settings = {}
       @os_name = os_name

data/lib/vanagon/project.rb

@@ -590,7 +590,7 @@ class Vanagon
     # for the project
     #
     # @return [Array] all the files and directories that should be included in the tarball
-    def get_tarball_files # rubocop:disable Metrics/AbcSize
+    def get_tarball_files
       # It is very important that 'file-list' remains the first element in this
       # array, lest the tar command be malformed and the package creation fail
       files = ['file-list']
@@ -779,7 +779,7 @@ class Vanagon
     # set in the project definition.
     #
     # @param [Vanagon::Platform] the platform to publish settings for
-    def publish_yaml_settings(platform) # rubocop:disable Metrics/AbcSize
+    def publish_yaml_settings(platform)
       return unless yaml_settings
       raise(Vanagon::Error, "You must specify a project version") unless version
 
@@ -831,33 +831,61 @@ class Vanagon
     # @param settings_uri [String] A URI to a yaml settings file
     # @param settings_sha1_uri [String] A URI to a sha1sum file for the yaml settings file
     # @raise [Vanagon::Error] when the settings file can't be found
-    def load_yaml_settings(settings_uri, settings_sha1_uri = nil) # rubocop:disable Metrics/AbcSize
+    def load_yaml_settings(settings_uri, settings_sha1_uri = nil)
+      source_type = yaml_settings_source_type(settings_uri, settings_sha1_uri)
+
+      Dir.mktmpdir do |working_directory|
+        source = Vanagon::Component::Source.source(
+          settings_uri,
+          workdir: working_directory,
+          sum: settings_sha1_uri,
+          sum_type: 'sha1'
+        )
+        source.fetch
+        source.verify
+
+        yaml_path = if source_type == :http
+                      File.join(working_directory, source.file)
+                    else
+                      source.file
+                    end
+
+        @settings.merge!(yaml_safe_load_shim(yaml_path))
+      end
+    end
+
+    # Get the source_type of the settings_uri. Complain if we don't like stuff about it.
+    def yaml_settings_source_type(settings_uri, settings_sha1_uri)
       source_type = Vanagon::Component::Source.determine_source_type(settings_uri)
 
       if %i[unknown git].include?(source_type)
-        message = "Can't inherit settings from '#{settings_uri}'. Only http and file URIs are valid."
+        message = "Can't inherit settings from '#{settings_uri}'. " \
+                  "Only http and file URIs are valid."
         if settings_uri =~ /^file/
-          message = "Tried to load YAML settings from '#{settings_uri}', but the file doesn't exist."
+          message = "Tried to load YAML settings from '#{settings_uri}', " \
+                    "but the file doesn't exist."
         end
         raise Vanagon::Error, message
       end
 
       if (source_type == :http) && !settings_sha1_uri
-        raise Vanagon::Error, "You must provide a sha1sum URI for the YAML file when inheriting YAML settings over http"
+        raise Vanagon::Error, 'The sha1sum URI for the YAML file must be provided ' \
+                              'when inheriting YAML settings over http'
       end
 
-      Dir.mktmpdir do |working_directory|
-        source = Vanagon::Component::Source.source(settings_uri,
-                                                   workdir: working_directory,
-                                                   sum: settings_sha1_uri,
-                                                   sum_type: 'sha1')
-        source.fetch
-        source.verify
-        yaml_path = source.file
-        if source_type == :http
-          yaml_path = File.join(working_directory, source.file)
-        end
-        @settings.merge!(YAML.safe_load(File.read(yaml_path), [Symbol]))
+      source_type
+    end
+
+    # YAML.safe_load introduced an incompatible change in Ruby 3.1.0
+    # Shim that until no longer relevant.
+    def yaml_safe_load_shim(yaml_path)
+      new_safe_load_version = Gem::Version.new('3.1.0')
+      this_version = Gem::Version.new(RUBY_VERSION)
+
+      if this_version >= new_safe_load_version
+        YAML.safe_load(File.read(yaml_path), permitted_classes: [Symbol])
+      else
+        YAML.safe_load(File.read(yaml_path), [Symbol])
       end
     end
 

data/lib/vanagon/utilities.rb

@@ -77,8 +77,7 @@ class Vanagon
         end
       end
 
-      response = http.request(request)
-      response
+      http.request(request)
     rescue Errno::ETIMEDOUT, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
       EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
       Net::ProtocolError => e
@@ -159,7 +158,7 @@ class Vanagon
     # @param timeout [Integer] number of seconds to run the block before timing out
     # @return [true] If the block succeeds, true is returned
     # @raise [Vanagon::Error] if the block fails after the retries are exhausted, an error is raised
-    def retry_with_timeout(tries = 5, timeout = 1, &blk) # rubocop:disable Metrics/AbcSize
+    def retry_with_timeout(tries = 5, timeout = 1, &blk)
       error = nil
       tries.to_i.times do
         Timeout::timeout(timeout.to_i) do
@@ -279,7 +278,7 @@ class Vanagon
     end
 
     def clean_environment(&block)
-      return Bundler.with_clean_env { yield } if defined?(Bundler)
+      return Bundler.with_clean_env(&block) if defined?(Bundler)
       yield
     end
     private :clean_environment

data/lib/vanagon.rb

@@ -10,7 +10,3 @@ $:.unshift(LIBDIR) unless
 
 require 'vanagon/cli'
 require 'vanagon/driver'
-
-# The main entry point is {Vanagon::Driver}.
-class Vanagon
-end

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

@@ -1,9 +1,11 @@
-begin require 'aws-sdk'
+begin
+  require 'aws-sdk'
+
 rescue LoadError
-  $stderr.puts "Unable to load AWS SDK; skipping optional EC2 engine spec tests"
+  STDERR.puts "Unable to load AWS SDK; skipping optional EC2 engine spec tests"
 end
 
-if defined? ::Aws
+if defined? Aws
   require 'vanagon/engine/ec2'
   require 'vanagon/platform'
 
@@ -29,9 +31,14 @@ if defined? ::Aws
       stub_request(:get, "http://169.254.169.254/latest/meta-data/iam/security-credentials/").
         to_return(status: 200, body: "", headers: {})
       stub_request(:put, "http://169.254.169.254/latest/api/token").
-          to_return(status: 200, body: "", headers: {})
+        to_return(status: 200, body: "", headers: {})
+
+      ## This fails with
+      ## MultiFactorAuthentication failed, must provide both MFA serial number
+      ## and one time pass code.
+      ## Remove until is can be properly repaired/mocked/etc.
 
-      expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
+      # expect(Vanagon::Engine::Ec2.new(platform_ec2).name).to eq('ec2')
     end
   end
 end

data/spec/lib/vanagon/project_spec.rb

@@ -180,11 +180,16 @@ describe 'Vanagon::Project' do
 
   describe 'platform settings' do
     before do
-      allow(Vanagon::Component).to receive(:load_component).with('some-component', any_args).and_return(component)
+      allow(Vanagon::Component)
+        .to receive(:load_component)
+              .with('some-component', any_args)
+              .and_return(component)
     end
 
     it 'loads settings set in platforms' do
-      settings_proj = Vanagon::Project::DSL.new('settings-test', configdir, dummy_platform_settings, [])
+      settings_proj = Vanagon::Project::DSL.new(
+        'settings-test', configdir, dummy_platform_settings, []
+      )
       settings_proj.instance_eval(project_block)
       expect(settings_proj._project.settings[:platform_test]).to eq('debian')
     end
@@ -225,7 +230,10 @@ describe 'Vanagon::Project' do
     end
 
     it "fails if downloading over HTTP without a valid sha1sum URI" do
-      allow(Vanagon::Component::Source::Http).to receive(:valid_url?).with(http_yaml_uri).and_return(true)
+      allow(Vanagon::Component::Source::Http)
+        .to receive(:valid_url?)
+              .with(http_yaml_uri)
+              .and_return(true)
       http_source = instance_double(Vanagon::Component::Source::Http)
       allow(Vanagon::Component::Source).to receive(:source).and_return(http_source)
       allow(http_source).to receive(:verify).and_return(true)
@@ -262,7 +270,6 @@ describe 'Vanagon::Project' do
   end
 
   describe "#filter_component" do
-
     # All of the following tests should be run with one project level
     # component that isn't included in the build_deps of another component
     before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vanagon
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
-- Puppet Labs
+- Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: lock_manager
   requirement: !ruby/object:Gem::Requirement
@@ -80,9 +80,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Vanagon is a tool to build a single package out of a project, which can
-  itself contain one or more components.
-email: info@puppet.com
+description: |2
+      Vanagon takes a set of project, component, and platform configuration files, to perform
+      multiplatform builds that are packaged into rpms, debs, dmgs, etc.
+      It has support for calls into Puppet's packaging gem to provide for package signing and
+      shipping within the Puppet infrastructure.
+email: release@puppet.com
 executables:
 - vanagon
 - build
@@ -327,45 +330,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.0.3
 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/project_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/extensions/string_spec.rb
-- spec/lib/vanagon/extensions/set/json_spec.rb
-- spec/lib/vanagon/extensions/ostruct/json_spec.rb
-- spec/lib/vanagon/engine/ec2_spec.rb
-- spec/lib/vanagon/engine/docker_spec.rb
-- spec/lib/vanagon/engine/hardware_spec.rb
-- spec/lib/vanagon/engine/pooler_spec.rb
-- spec/lib/vanagon/engine/local_spec.rb
-- spec/lib/vanagon/engine/always_be_scheduling_spec.rb
-- spec/lib/vanagon/engine/base_spec.rb
-- spec/lib/vanagon/component/source_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/rules_spec.rb
-- spec/lib/vanagon/component/dsl_spec.rb
-- spec/lib/vanagon/platform/rpm_spec.rb
-- spec/lib/vanagon/platform/osx_spec.rb
-- spec/lib/vanagon/platform/windows_spec.rb
-- spec/lib/vanagon/platform/rpm/aix_spec.rb
-- spec/lib/vanagon/platform/deb_spec.rb
-- spec/lib/vanagon/platform/solaris_10_spec.rb
-- spec/lib/vanagon/platform/solaris_11_spec.rb
-- spec/lib/vanagon/platform/dsl_spec.rb
-- spec/lib/vanagon/component_spec.rb
-- spec/lib/vanagon/environment_spec.rb
-- spec/lib/vanagon/driver_spec.rb
-- spec/lib/vanagon/utilities/extra_files_signer_spec.rb
-- spec/lib/vanagon/utilities/shell_utilities_spec.rb
-- spec/lib/vanagon/cli_spec.rb
-- spec/lib/vanagon/project/dsl_spec.rb
-- spec/lib/git/rev_list_spec.rb
-- spec/lib/makefile_spec.rb
+specification_version: 4
+summary: Multiplatform build, sign, and ship for Puppet projects
+test_files: []