packaging 0.99.60 → 0.99.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e8b1e8d8c9808cdd80c79e28d6519f13081ca834e0d4acd248172266bfed78e
-  data.tar.gz: e7bfb31ff88466e0b4f5a56869c5be06345a1973f573ec3c95bcde7379b007ca
+  metadata.gz: 8e2d980f6d0a3108046057e9a0637b58547bd2e68a16ab3004f9d08f7536b2c7
+  data.tar.gz: 2ac12f3edd599dfbfa9a4af501e833a12685a1efd31c17a9f176af7197aba79f
 SHA512:
-  metadata.gz: 0717a42c7027cf767466e0cd86f0e69c1f9b4e69be18152016015de39f11f011fd905ceba6b948661f2290b2a23da2aaf50aa867b6c3238d79eb00a8e130cfd1
-  data.tar.gz: 28511e75d267dccd1a2d5d022729f46002d0847d2ea62a656882f3b9d1f4d73342d0d15cf9cb926c961704f316419a6c05b3fba930cc0d5ad332ae084c76fe67
+  metadata.gz: a6bbad34de17a6da0e1168dafc780fb6a1eedd3106cc04493aa6d0c21839852a01f3b9be33dbae817e7d0c483cb446b96a991efe2aca3b7f6ebd9ad3eb8b82d4
+  data.tar.gz: 7d2d02b9039b9be3eff34fa066b573e5b7adb82e5515aaf23fa08ea72badada429229005c9ac58116daf1bf2c4ed132f9a1618db8eb1798b5581589cf13a2019

data/lib/packaging/artifactory.rb

@@ -2,67 +2,7 @@ require 'artifactory'
 require 'uri'
 require 'open-uri'
 require 'digest'
-
-#
-# [eric.griswold] This is unfortunate. The 'pattern_search' class method really does belong in
-# the Artifactory gem. However, because of some of Chef's social policies,
-# I am unwilling to contribute this code there. If that changes, I'll submit a PR. Until
-# then, it'll live here.
-#
-module Artifactory
-  class Resource::Artifact
-    #
-    # Search for an artifact in a repo using an Ant-like pattern.
-    # Unlike many Artifactory searches, this one is restricted to a single
-    # repository.
-    #
-    # @example Search in a repository named 'foo_local' for an artifact in a directory containing
-    #   the word "recent", named "artifact[0-9].txt"
-    #   Artifact.pattern_search(pattern: '*recent*/artifact[0-9].txt',
-    #                           repo: 'foo_local')
-    #
-    # @param [Hash] options
-    #   A hash of options, as follows:
-    #
-    # @option options [Artifactory::Client] :client
-    #   the client object to make the request with
-    # @option options [String] :pattern
-    #   the Ant-like pattern to use for finding artifacts within the repos. Note that the
-    #   Ant pattern '**' is barred in this case by JFrog.
-    # @option options [String] :repo
-    #   the repo to search
-    #
-    # @return [Array<Resource::Artifact>]
-    #   a list of artifacts that match the query
-    #
-    def self.pattern_search(options = {})
-      client = extract_client!(options)
-      params = Util.slice(options, :pattern, :repo)
-      pattern_search_parameter = { :pattern => "#{params[:repo]}:#{params[:pattern]}" }
-      response = client.get('/api/search/pattern', pattern_search_parameter)
-      return [] if response['files'].nil? || response['files'].empty?
-
-      # A typical response:
-      # {
-      #  "repoUri"=>"https:<artifactory endpoint>/<repo>",
-      #  "sourcePattern"=>"<repo>:<provided search pattern>",
-      #  "files"=>[<filename that matched pattern>, ...]
-      # }
-      #
-      # Inserting '/api/storage' before the repo makes the 'from_url' call work correctly.
-      #
-      repo_uri = response['repoUri']
-      unless repo_uri.include?('/api/storage/')
-        # rubocop:disable Style/PercentLiteralDelimiters
-        repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
-      end
-      response['files'].map do |file_path|
-        from_url("#{repo_uri}/#{file_path}", client: client)
-      end
-    end
-  end
-end
-
+require 'packaging/artifactory/extensions'
 
 module Pkg
 
@@ -111,7 +51,6 @@ module Pkg
     def location_for(platform_tag)
       toplevel_repo = DEFAULT_REPO_TYPE
       repo_subdirectories = File.join(@repo_base, @project, @project_version)
-      alternate_subdirectories = repo_subdirectories
 
       unless platform_tag == DEFAULT_REPO_TYPE
         format = Pkg::Platforms.package_format_for_tag(platform_tag)
@@ -122,20 +61,16 @@ module Pkg
       when 'rpm'
         toplevel_repo = 'rpm'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       when 'deb'
         toplevel_repo = 'debian__local'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}")
-        alternate_subdirectories = File.join('pool', repo_subdirectories)
       when 'swix', 'dmg', 'svr4', 'ips'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       when 'msi'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{architecture}")
-        alternate_subdirectories = repo_subdirectories
       end
 
-      [toplevel_repo, repo_subdirectories, alternate_subdirectories]
+      [toplevel_repo, repo_subdirectories]
     end
 
     # @param platform_tag [String] The platform tag specific to the information
@@ -150,8 +85,8 @@ module Pkg
         end
       end
 
-      repo_name, repo_subdirectories, alternate_subdirectories = location_for(platform_tag)
-      full_artifactory_path = File.join(repo_name, alternate_subdirectories)
+      repo_name, repo_subdirectories = location_for(platform_tag)
+      full_artifactory_path = File.join(repo_name, repo_subdirectories)
 
       {
         platform: platform,
@@ -161,7 +96,6 @@ module Pkg
         package_format: package_format,
         repo_name: repo_name,
         repo_subdirectories: repo_subdirectories,
-        alternate_subdirectories: alternate_subdirectories,
         full_artifactory_path: full_artifactory_path
       }
     end
@@ -286,7 +220,7 @@ module Pkg
       headers = { "X-Checksum-Md5" => artifact_md5 }
       artifact.upload(
         data[:repo_name],
-        File.join(data[:alternate_subdirectories], File.basename(package)),
+        File.join(data[:repo_subdirectories], File.basename(package)),
         deploy_properties(platform_tag, File.basename(package)),
         headers
       )
@@ -420,21 +354,20 @@ module Pkg
       manifest.each do |dist, packages|
         puts "Grabbing the #{dist} packages from artifactory"
         packages.each do |name, info|
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"])
+          filename = info['filename']
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
           artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
           # If we found matching artifacts, but not in the correct path, copy the artifact to the correct path
           # This should help us keep repos up to date with the packages we are expecting to be there
           # while helping us avoid 'what the hell, could not find package' errors
           if artifact_to_download.nil? && !artifacts.empty?
             artifact_to_copy = artifacts.first
-            filename = info['filename'] || File.basename(artifact_to_copy.download_uri)
             copy_artifact(artifact_to_copy, artifact_to_copy.repo, "#{remote_path}/#{dist}/#{filename}")
-            artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"])
+            artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename)
             artifact_to_download = artifacts.select { |artifact| artifact.download_uri.include? remote_path }.first
           end
 
           if artifact_to_download.nil?
-            filename = info["filename"] || name
             message = "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
             unless remote_path.empty?
               message += " in #{remote_path}"
@@ -442,7 +375,6 @@ module Pkg
             raise message
           else
             full_staging_path = "#{staging_directory}/#{dist}"
-            filename = info['filename'] || File.basename(artifact_to_download.download_uri)
             puts "downloading #{artifact_to_download.download_uri} to #{File.join(full_staging_path, filename)}"
             artifact_to_download.download(full_staging_path, filename: filename)
           end
@@ -599,7 +531,7 @@ module Pkg
     # @param target_path [String] path copy tarballs to, assumes same repo
     def copy_final_pe_tarballs(pe_version, repo, remote_path, target_path)
       check_authorization
-      final_tarballs = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo)
+      final_tarballs = Artifactory::Resource::Artifact.search(name: pe_version, repos: repo, exact_match: false)
       final_tarballs.each do |artifact|
         next unless artifact.download_uri.include? remote_path
         next if artifact.download_uri.include? "-rc"
@@ -646,12 +578,11 @@ module Pkg
       manifest.each do |dist, packages|
         puts "Copying #{dist} packages..."
         packages.each do |name, info|
-          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"]).first
+          filename = info["filename"]
+          artifact = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: ["rpm_enterprise__local", "debian_enterprise__local"], name: filename).first
           if artifact.nil?
-            filename = info["filename"] || name
             raise "Error: what the hell, could not find package #{filename} with md5sum #{info["md5"]}"
           end
-          filename = info["filename"] || File.basename(artifact.download_uri)
           copy_artifact(artifact, artifact.repo, "#{target_path}/#{dist}/#{filename}")
         end
       end
@@ -681,7 +612,8 @@ module Pkg
       manifest.each do |dist, packages|
         packages.each do |package_name, info|
           next unless package_name == package
-          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos)
+          filename = info["filename"]
+          artifacts = Artifactory::Resource::Artifact.checksum_search(md5: "#{info["md5"]}", repos: repos, name: filename)
           artifacts.each do |artifact|
             next unless artifact.download_uri.include? remote_path
             puts "Removing reverted package #{artifact.download_uri}"
@@ -701,7 +633,7 @@ module Pkg
       Dir.foreach("#{tarball_path}/") do |pe_tarball|
         next if pe_tarball == '.' || pe_tarball == ".."
         md5 = Digest::MD5.file("#{tarball_path}/#{pe_tarball}").hexdigest
-        artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo)
+        artifacts_to_delete = Artifactory::Resource::Artifact.checksum_search(md5: md5, repos: pe_repo, name: pe_tarball)
         next if artifacts_to_delete.nil?
         begin
           artifacts_to_delete.each do |artifact|

data/lib/packaging/artifactory/extensions.rb

@@ -0,0 +1,94 @@
+require 'artifactory'
+
+module ArtifactoryExtensions
+  module ClassMethods
+    #
+    # Search for an artifact in a repo using an Ant-like pattern.
+    # Unlike many Artifactory searches, this one is restricted to a single
+    # repository.
+    #
+    # @example Search in a repository named 'foo_local' for an artifact in a directory containing
+    #   the word "recent", named "artifact[0-9].txt"
+    #   Artifact.pattern_search(pattern: '*recent*/artifact[0-9].txt',
+    #                           repo: 'foo_local')
+    #
+    # @param [Hash] options
+    #   A hash of options, as follows:
+    #
+    # @option options [Artifactory::Client] :client
+    #   the client object to make the request with
+    # @option options [String] :pattern
+    #   the Ant-like pattern to use for finding artifacts within the repos. Note that the
+    #   Ant pattern '**' is barred in this case by JFrog.
+    # @option options [String] :repo
+    #   the repo to search
+    #
+    # @return [Array<Resource::Artifact>]
+    #   a list of artifacts that match the query
+    #
+    def pattern_search(options = {})
+      client = extract_client!(options)
+      params = Artifactory::Util.slice(options, :pattern, :repo)
+      pattern_search_parameter = { :pattern => "#{params[:repo]}:#{params[:pattern]}" }
+      response = client.get('/api/search/pattern', pattern_search_parameter)
+      return [] if response['files'].nil? || response['files'].empty?
+
+      # A typical response:
+      # {
+      #  "repoUri"=>"https:<artifactory endpoint>/<repo>",
+      #  "sourcePattern"=>"<repo>:<provided search pattern>",
+      #  "files"=>[<filename that matched pattern>, ...]
+      # }
+      #
+      # Inserting '/api/storage' before the repo makes the 'from_url' call work correctly.
+      #
+      repo_uri = response['repoUri']
+      unless repo_uri.include?('/api/storage/')
+        # rubocop:disable Style/PercentLiteralDelimiters
+        repo_uri.sub!(%r(/#{params[:repo]}$), "/api/storage/#{params[:repo]}")
+      end
+      response['files'].map do |file_path|
+        from_url("#{repo_uri}/#{file_path}", client: client)
+      end
+    end
+
+    # This adds the `exact_match` option to artifactory search, and defaults it
+    # to true. With `exact_match` set to `true` the artifact will only be
+    # returned if the name in the download uri matches the name we're trying to
+    # download
+    def search(options = {})
+      exact_match = options[:exact_match].nil? ? true : options[:exact_match]
+      artifacts = super
+
+      if exact_match
+        artifacts.select! { |artifact| File.basename(artifact.download_uri) == options[:name] }
+      end
+      artifacts
+    end
+
+    # This adds the `name` option to artifactory checksum search. It defaults to
+    # unset. If set, the artifact is only returned if the download uri matches
+    # the passed name
+    def checksum_search(options = {})
+      artifacts = super
+      if options[:name]
+        artifacts.select! { |artifact| File.basename(artifact.download_uri) == options[:name] }
+      end
+      artifacts
+    end
+  end
+
+  # needed to prepend class methods, see https://stackoverflow.com/questions/18683750/how-to-prepend-classmethods
+  def self.prepended(base)
+    class << base
+      prepend ClassMethods
+    end
+  end
+end
+
+module Artifactory
+  class Resource::Artifact
+    # use prepend instead of monkeypatching so we can call `super`
+    prepend ArtifactoryExtensions
+  end
+end

data/lib/packaging/paths.rb

@@ -70,15 +70,6 @@ module Pkg::Paths
     end
   end
 
-  # Method to determine if files should be shipped to legacy or current path
-  # structures. Any repo name matching /^puppet/ is a current repo, everything
-  # else is should be shipped to legacy paths.
-  #
-  # @param repo_name The repo name to check
-  def is_legacy_repo?(repo_name)
-    repo_name !~ /^puppet/
-  end
-
   # Method to determine the yum repo name. Maintains compatibility with legacy
   # projects, where `Pkg::Config.yum_repo_name` is set instead of
   # `Pkg::Config.repo_name`. Defaults to 'products' if nothing is set.
@@ -110,65 +101,83 @@ module Pkg::Paths
     return Pkg::Config.repo_link_target
   end
 
-  # TODO: please please please clean this up
-  # This is so terrible. I really dislike it. But in order to maintain backward
-  # compatibility, we need to maintain these path differences between PC1 and
-  # everything else. Once we stop shipping things to PC1, we can remove all the
-  # PC1 specific cases. That's likely to not happen until the current LTS
-  # (2016.4) is EOL'd. Hopefully also we do not choose to further change these
-  # path structures, as it is no bueno.
-  # --MAS 2017-08-16
-  def artifacts_base_path_and_link_path(platform_tag, path_prefix = 'artifacts', nonfinal = false)
-    platform, version, architecture = Pkg::Platforms.parse_platform_tag(platform_tag)
-    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
+  # Construct a platform-dependent symlink target path.
+  def construct_base_path(path_data)
+    package_format = path_data[:package_format]
+    prefix = path_data[:prefix]
+    is_nonfinal = path_data[:is_nonfinal]
+    platform_name = path_data[:platform_name]
+    platform_tag = path_data[:platform_tag]
 
     case package_format
+    when 'deb'
+      debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
+      return File.join(prefix, debian_code_name, apt_repo_name(is_nonfinal))
+    when 'dmg'
+      return File.join(prefix, 'mac', repo_name(is_nonfinal))
+    when 'msi'
+      return File.join(prefix, platform_name, repo_name(is_nonfinal))
     when 'rpm'
-      if is_legacy_repo?(yum_repo_name(nonfinal))
-        [File.join(path_prefix, platform, version, yum_repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, yum_repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, link_name(nonfinal))]
-      end
+      return File.join(prefix, yum_repo_name(is_nonfinal))
     when 'swix'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, platform, version, repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
-      end
+      return File.join(prefix, platform_name, repo_name(is_nonfinal))
+    when 'svr4', 'ips'
+      return File.join(prefix, 'solaris', repo_name(is_nonfinal))
+    else
+      raise "Error: Unknown package format '#{package_format}'"
+    end
+  end
+
+  # Construct a platform-dependent link path
+  def construct_link_path(path_data)
+    package_format = path_data[:package_format]
+    prefix = path_data[:prefix]
+    platform_name = path_data[:platform_name]
+    platform_tag = path_data[:platform_tag]
+    link = path_data[:link]
+
+    return nil if link.nil?
+
+    case package_format
+    when 'rpm'
+      return File.join(prefix, link)
+    when 'swix'
+      return File.join(prefix, platform_name, link)
     when 'deb'
-      [File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), apt_repo_name(nonfinal)),
-       link_name(nonfinal).nil? ? nil : File.join(path_prefix, Pkg::Platforms.get_attribute(platform_tag, :codename), link_name(nonfinal))]
+      debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
+      return File.join(prefix, debian_code_name, link)
     when 'svr4', 'ips'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'solaris', repo_name(nonfinal), version), nil]
-      else
-        [File.join(path_prefix, 'solaris', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'solaris', link_name(nonfinal))]
-      end
+      return File.join(prefix, 'solaris', link)
     when 'dmg'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'mac', version, repo_name(nonfinal)), nil]
-      else
-        [File.join(path_prefix, 'mac', repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, 'mac', link_name(nonfinal))]
-      end
+      return File.join(prefix, 'mac', link)
     when 'msi'
-      if is_legacy_repo?(repo_name(nonfinal))
-        [File.join(path_prefix, 'windows'), nil]
-      else
-        [File.join(path_prefix, platform, repo_name(nonfinal)), link_name(nonfinal).nil? ? nil : File.join(path_prefix, platform, link_name(nonfinal))]
-      end
+      return File.join(prefix, platform, link)
     else
-      raise "Not sure where to find packages with a package format of '#{package_format}'"
+      raise "Error: Unknown package format '#{package_format}'"
     end
   end
 
-  # TODO: please please please clean this up
-  # This is so terrible. I really dislike it. But in order to maintain backward
-  # compatibility, we need to maintain these path differences between PC1 and
-  # everything else. Once we stop shipping things to PC1, we can remove all the
-  # PC1 specific cases. That's likely to not happen until the current LTS
-  # (2016.4) is EOL'd. Hopefully also we do not choose to further change these
-  # path structures, as it is no bueno.
-  # --MAS 2017-08-16
+  # Given platform information, create symlink target (base_path) and link path in the
+  # form of a 2-element array
+  def artifacts_base_path_and_link_path(platform_tag, prefix = 'artifacts', is_nonfinal = false)
+    platform_name, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
+    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
+
+    path_data = {
+      is_nonfinal: is_nonfinal,
+      link: link_name(is_nonfinal),
+      package_format: package_format,
+      platform_name: platform_name,
+      platform_tag: platform_tag,
+      prefix: prefix
+    }
+
+    return [
+      construct_base_path(path_data),
+      construct_link_path(path_data)
+    ]
+  end
+
   def artifacts_path(platform_tag, path_prefix = 'artifacts', nonfinal = false)
     base_path, _ = artifacts_base_path_and_link_path(platform_tag, path_prefix, nonfinal)
     platform, version, architecture = Pkg::Platforms.parse_platform_tag(platform_tag)
@@ -176,31 +185,15 @@ module Pkg::Paths
 
     case package_format
     when 'rpm'
-      if is_legacy_repo?(yum_repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, platform, version, architecture)
-      end
+      File.join(base_path, platform, version, architecture)
     when 'swix'
-      if is_legacy_repo?(repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, version, architecture)
-      end
+      File.join(base_path, version, architecture)
     when 'deb'
       base_path
     when 'svr4', 'ips'
-      if is_legacy_repo?(repo_name(nonfinal))
-        base_path
-      else
-        File.join(base_path, version)
-      end
+      File.join(base_path, version)
     when 'dmg'
-      if is_legacy_repo?(repo_name(nonfinal))
-        File.join(base_path, architecture)
-      else
-        File.join(base_path, version, architecture)
-      end
+      File.join(base_path, version, architecture)
     when 'msi'
       base_path
     else

data/lib/packaging/platforms.rb

@@ -109,6 +109,14 @@ module Pkg
         }
       },
 
+      'eos' => {
+        '4' => {
+          architectures: ['i386'],
+          package_format: 'swix',
+          repo: false,
+        },
+      },
+
       'fedora' => {
         '30' => {
           architectures: ['x86_64'],
@@ -129,6 +137,11 @@ module Pkg
       },
 
       'osx' => {
+        '10.13' => {
+          architectures: ['x86_64'],
+          package_format: 'dmg',
+          repo: false,
+        },
         '10.14' => {
           architectures: ['x86_64'],
           package_format: 'dmg',

data/spec/lib/packaging/artifactory_spec.rb

@@ -36,6 +36,11 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
       },
+      'eos-4-i386' => {
+        :artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
+        :repo_config => '',
+        :additional_artifacts => ["./eos/4/PC1/i386/puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix"],
+      },
       'osx-10.15-x86_64' => {
         :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
         :repo_config => '',
@@ -84,6 +89,12 @@ describe 'artifactory.rb' do
       :package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
       :all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
     },
+    'eos-4-i386' => {
+      :toplevel_repo => 'generic',
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/eos-4-i386",
+      :package_name => 'path/to/an/eos/4/package/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix',
+      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix']
+    },
     'osx-10.15-x86_64' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.15-x86_64",
@@ -114,7 +125,6 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
-            File.join('pool', platform_tag_data[:repo_subdirectories])
           ])
         end
       else
@@ -122,7 +132,6 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
-            platform_tag_data[:repo_subdirectories]
           ])
         end
       end
@@ -131,7 +140,6 @@ describe 'artifactory.rb' do
         expect(artifact.location_for('generic')).to match_array([
           'generic',
           File.join(default_repo_name, project, project_version),
-          File.join(default_repo_name, project, project_version)
         ])
       end
     end

data/spec/lib/packaging/config_spec.rb

@@ -202,6 +202,7 @@ describe "Pkg::Config" do
 
   describe "#platform_data" do
     platform_tags = [
+      'eos-4-i386',
       'osx-10.15-x86_64',
       'cisco-wrlinux-7-x86_64',
       'ubuntu-16.04-i386',
@@ -211,6 +212,7 @@ describe "Pkg::Config" do
     ]
 
     artifacts = \
+      "./artifacts/eos/4/PC1/i386/puppet-agent-5.3.2-1.eos4.i386.swix\n" \
       "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
       "./artifacts/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.3.2-1.cisco_wrlinux7.x86_64.rpm\n" \
       "./artifacts/deb/xenial/PC1/puppet-agent_5.3.2-1xenial_i386.deb\n" \

data/spec/lib/packaging/paths_spec.rb

@@ -33,6 +33,7 @@ describe 'Pkg::Paths' do
       'pkg/el/7/PC1/x86_64/puppetdb-4.3.1-1.el7.noarch.rpm' => 'el-7-x86_64',
       'pkg/apple/10.14/PC1/x86_64/puppet-agent-1.9.0-1.osx10.14.dmg' => 'osx-10.14-x86_64',
       'artifacts/mac/10.15/PC1/x86_64/puppet-agent-1.9.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
+      'artifacts/eos/4/PC1/i386/puppet-agent-1.9.0-1.eos4.i386.swix' => 'eos-4-i386',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
       'artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz' => 'ubuntu-16.04-source',
       'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-amd64',
@@ -208,32 +209,6 @@ describe 'Pkg::Paths' do
     end
   end
 
-  describe '#is_legacy_repo?' do
-    it 'returns true for empty strings' do
-      expect(Pkg::Paths.is_legacy_repo?('')).to be_true
-    end
-
-    it 'returns true for PC1' do
-      expect(Pkg::Paths.is_legacy_repo?('PC1')).to be_true
-    end
-
-    it 'returns true for foopuppetbar' do
-      expect(Pkg::Paths.is_legacy_repo?('foopuppetbar')).to be_true
-    end
-
-    it 'returns false for puppet5' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet5')).to be_false
-    end
-
-    it 'returns false for puppet8-nightly' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet8-nightly')).to be_false
-    end
-
-    it 'returns false for puppet' do
-      expect(Pkg::Paths.is_legacy_repo?('puppet')).to be_false
-    end
-  end
-
   describe '#remote_repo_base' do
     before :each do
       allow(Pkg::Config).to receive(:yum_repo_path).and_return('foo')

data/spec/lib/packaging/platforms_spec.rb

@@ -12,14 +12,14 @@ describe 'Pkg::Platforms' do
 
   describe '#formats' do
     it 'should return all package formats' do
-      fmts = ['rpm', 'deb', 'dmg', 'svr4', 'ips', 'msi']
+      fmts = ['rpm', 'deb', 'swix', 'dmg', 'svr4', 'ips', 'msi']
       expect(Pkg::Platforms.formats).to match_array(fmts)
     end
   end
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
+      platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end
@@ -113,7 +113,7 @@ describe 'Pkg::Platforms' do
     end
 
     it 'fails with a reasonable error when specified attribute is not defined' do
-      expect { Pkg::Platforms.get_attribute('osx-10.15-x86_64', :signature_format) }.to raise_error(/doesn't have information/)
+      expect { Pkg::Platforms.get_attribute('eos-4-i386', :signature_format) }.to raise_error(/doesn't have information/)
     end
   end
 

data/spec/lib/packaging/retrieve_spec.rb

@@ -12,7 +12,7 @@ describe 'Pkg::Retrieve' do
     'aix-6.1-power' => {:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix6.1.ppc.rpm'},
     'el-7-x86_64' => {:artifact => './el/7/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.el7.x86_64.rpm'},
     'osx-10.11-x86_64' => {:artifact => './apple/10.11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.11.dmg'},
-    'sles-11-s390x' => {:artifact => './sles/11/PC1/s390x/puppet-agent-5.3.2.155.gb25e649-1.sles11.s390x.rpm'},
+    'sles-11-i386' => {:artifact => './sles/11/PC1/i386/puppet-agent-5.3.2.155.gb25e649-1.sles11.i386.rpm'},
     'solaris-10-sparc' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2.155.gb25e649-1.sparc.pkg.gz'},
     'ubuntu-16.04-amd64' => {:artifact => './deb/xenial/PC1/puppet-agent_5.3.2.155.gb25e649-1xenial_amd64.deb'},
     'windows-2012-x64' => {:artifact => './windows/puppet-agent-x64.msi'},

data/spec/lib/packaging/util/ship_spec.rb

@@ -8,6 +8,15 @@ describe '#Pkg::Util::Ship' do
       'pkg/windowsfips/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x64.msi',
       'pkg/windowsfips/puppet5/puppet-agent-x64.msi'
     ]
+    swix_pkgs = [
+      'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+      'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
+    ]
+
+    it 'returns an array of packages found on the filesystem' do
+      allow(Dir).to receive(:glob).with('pkg/**/*.swix*').and_return(swix_pkgs)
+      expect(Pkg::Util::Ship.collect_packages(['pkg/**/*.swix*'])).to eq(swix_pkgs)
+    end
 
     describe 'define excludes' do
       before :each do
@@ -39,6 +48,8 @@ local_pkgs = [
   'pkg/sles/11/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
   'pkg/sles/12/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
   'pkg/mac/10.15/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
+  'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+  'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
 ]
 new_pkgs = [
@@ -47,6 +58,8 @@ new_pkgs = [
   'pkg/puppet5/sles/11/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
   'pkg/puppet5/sles/12/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
   'pkg/mac/puppet5/10.15/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
+  'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
+  'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
 ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.60
+  version: 0.99.65
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - lib/packaging.rb
 - lib/packaging/archive.rb
 - lib/packaging/artifactory.rb
+- lib/packaging/artifactory/extensions.rb
 - lib/packaging/config.rb
 - lib/packaging/config/params.rb
 - lib/packaging/deb.rb
@@ -244,28 +245,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging_spec.rb