packaging 0.99.56 → 0.99.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91478585428801cdfc12e3da5f0dcb54b748d0f1ca3fc21517287b8ffddc53d1
-  data.tar.gz: ef8871c674e926d599edcee2be2d58ada0d0bad919f33a078e163f40c65d3e2a
+  metadata.gz: 5a26342fa551df9cbae2afbc9b8c1c03aa03bd7001ef16511598013735d1b400
+  data.tar.gz: d29a92aa8e936a01df40db513e02e98763c0e6a74a8a5801ad47a242f4e4b67b
 SHA512:
-  metadata.gz: 9d529dea7fac73e55a9f634feb3cde54d082de316bcc30c886ad9471484432bff5a1e410984d916946e26124a7903f86e45833461b8b71770dc3e702c96e0096
-  data.tar.gz: c3b9ddbd1a08552ec7488091b55429cbc5e74a2029a2839bcb427bcb7b4930e58b469641b715b68134af73dc0d96827cb999f4451c67ca5887fac3dd8698c4c5
+  metadata.gz: 3bfafe308304409ca317f83c3fc514607a9732fb064c040fe6a12f35eb8282620d3c9c3acf58acfa66d2c269318b8938a83126c10fecf546b8be61cc4350e540
+  data.tar.gz: cde4572cbe48d14bd039d7b8e94bedc2d3584a674637a47a1310049180a651661ed7e450af2977b15bae435b0bc8bb6fb44e371f36922507311ebe02941f6107

data/lib/packaging/artifactory.rb

@@ -506,18 +506,33 @@ module Pkg
       end
     end
 
-    # Download an artifact based on name, repo, and path to artifact
+    # Search for artifacts matching `artifact_name` in `repo` with path matching
+    # `path`
     # @param artifact_name [String] name of artifact to download
     # @param repo [String] repo the artifact lives
     # @param path [String] path to artifact in the repo
-    def download_artifact(artifact_name, repo, path)
+    #
+    # @return [Array<Artifactory::Resource::Artifact>] A list of artifacts that
+    #         match the query
+    def search_with_path(artifact_id, repo, path)
       check_authorization
-      artifacts = Artifactory::Resource::Artifact.search(name: artifact_name, repos: repo)
-      artifacts.each do |artifact|
-        if artifact.download_uri.include? path
-          artifact.download('.')
-        end
-      end
+      artifacts = Artifactory::Resource::Artifact.search(name: artifact_id, repos: repo)
+      artifacts.select { |artifact| artifact.download_uri.include? path }
+    end
+
+    # Download an artifact based on name, repo, and path to artifact
+    # @param artifact_name [String] name of artifact to download
+    # @param repo [String] repo the artifact lives
+    # @param path [String] path to artifact in the repo
+    # @param target [String] directory to download artifact to. Defaults to '.'
+    # @param filename [String] Filename to save artifact as. Defaults to artifact_name
+    def download_artifact(artifact_name, repo, path, target: '.', filename: nil)
+      filename ||= artifact_name
+      artifacts = search_with_path(artifact_name, repo, path)
+      return nil if artifacts.empty?
+      # Only download the first of the artifacts since we're saving them to
+      # the same location anyways
+      artifacts.first.download(target, filename: filename)
     end
 
     # Download final pe tarballs to local path based on name, repo, and path on artifactory

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.56
+  version: 0.99.57
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -245,27 +245,27 @@ specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
 - spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/gem_spec.rb
 - spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/paths_spec.rb