packaging 0.99.39 → 0.99.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 0d7286763b12e7c288455cdf7902117a08b1251b6b6f3a28ec94e279afc027ce
-  data.tar.gz: c536d62b0020974a628d87fa14fd2993a24cfe2a6b2244ae6bfbee739e7db98d
+SHA1:
+  metadata.gz: 29234ce00ec3d4e6b806de21de5146a170c5ae50
+  data.tar.gz: 225084d9ba126f53ef36aab40c3a35a48696a5bd
 SHA512:
-  metadata.gz: 6ba4a2c1611da21b156847a8731bb9ac747c017976db953ab223315d792f3b7cb1e5bb27e6124bb31e9026a29446ece42078562e94ee646789d4087bdd0b0ee4
-  data.tar.gz: 5b5169a5d6baf5a2fc9eb9ccb3c64ac324ee1810f15f2322ea0a5253c9325aa339cbbb1b75cb41e7e93ab2b39ab44381e9fb80409c89e0755cddc548a990cca4
+  metadata.gz: 4f9ec133dc94d0cd44ff0c8a926ced515688a2bbfbf9810ab4cd7c5a7c9b3e0dabb2224c14814723965c3477fc0a0bc0381a6030519a46dfd70cb55f4f181ebd
+  data.tar.gz: 0a030c97eb33c623b9852a0459a45a3e2ec0906cafd9d5a9536a5b433852687358f3444c183e524244f809422252db15b7c05ce7f8240a4e96a2bf14b729a10d

data/lib/packaging/artifactory.rb

@@ -190,6 +190,20 @@ module Pkg
       properties_hash
     end
 
+    # Basic method to check if a package exists on artifactory
+    # @param package [String] The full relative path to the package to be
+    #   checked, relative from the current working directory
+    # Return true if package already exists on artifactory
+    def package_exists_on_artifactory?(package)
+      check_authorization
+      artifact = Artifactory::Resource::Artifact.search(name: File.basename(package), :artifactory_uri => @artifactory_uri)
+      if artifact.empty?
+        return false
+      else
+        return true
+      end
+    end
+
     # @param package [String] The full relative path to the package to be
     #   shipped, relative from the current working directory
     def deploy_package(package)

data/tasks/ship.rake

@@ -545,7 +545,11 @@ namespace :pl do
 
       local_dir = args.local_dir || 'pkg'
       Dir.glob("#{local_dir}/**/*").reject { |e| File.directory? e }.each do |artifact|
-        artifactory.deploy_package(artifact)
+        if artifactory.package_exists_on_artifactory?(artifact)
+          warn "Attempt to upload '#{artifact}' failed. Package already exists!"
+        else
+          artifactory.deploy_package(artifact)
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.39
+  version: 0.99.40
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -224,33 +224,34 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/tar_spec.rb
 - spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/git_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging_spec.rb