dpl 1.8.12.travis.1286.4 → 1.8.12.travis.1291.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzczNTJiNjRkOWY0OTE0MTk5YTJjNTBmMzMyN2YyZmYyYzg2NzM0YQ==
+    Y2NhMzg0NmUyYjI1OGY4Y2E5MTAwMGMxMjNlMzNlMDkwNGIxNDRmZA==
   data.tar.gz: !binary |-
-    OTYyNjZkNTdjM2M5MjY1MTUxMDNjMThmZjJiMzNlZDc4NWRjMDQzMQ==
+    ZTFlMDdjZmIwMDZmNDdiZTZiNDI5NjgyN2ExNTUwNTA1NGM2YWRhNg==
 SHA512:
   metadata.gz: !binary |-
-    YWI1MWYxOTA4NTRjOTA3N2QyY2JmNzFhOTRkODVjZjIzN2E4M2IwZTVhOTUw
-    YjIxOTQ4MDY1Y2MyYmFmNDNiMWZkZGU5YjFlOTkwNGJkZTBkNGZjNjMxNWZh
-    MDkxNTJmNmFlOGE5ZTlmYmU1ZWI0NmM5MDFjMjkwOWFiNTU3M2U=
+    ZTQ3ZTg2OTRmMTgzMWJjZTQ5ZjJhMDQ0MTYyNmQ2N2E5NTYyMzQ4YWY4YjVm
+    NzY5YTYwYjkyMTdiNTk1ZDRiMzhlNDcwMGQ1OWM1MjliZjJiMmQ2NjQ5NGM2
+    MTA2NjViODgyODY4NGQ4ZGNiOGZhNjk0ZDVmNmM2NzA3NjBmMzI=
   data.tar.gz: !binary |-
-    MzhjZjdjMWY2ZGMwNzRiZDYwNjA3Mzg0N2VlYzBmNmI1OTkwYjA2ZTBkMjA4
-    OGFhYzZiNGY2N2NjN2U3YTE4ODg1ZDYyODdkMTljNTVhYjAzNGI0YjJkZWRi
-    YjFkZTJlMmI2Mzc5Y2NjYzg2OGQzYzdkN2Y2N2U1MDQzMjY1NmM=
+    YmU5NGNiNjkwMTVlMzFlNWFlMDgyMDIxNWQwY2E5YmZkNGU3NjA1YmEyMTg2
+    OTBlZDQ2OWMwMmZmZGFhOWI3YzczYmMzNTVhMjdmMzBhZGE2NzJhZGQ4MTcz
+    ODlkZDZhNjk1MDYwZTM1MzczMzAzODA5NmRmNWRkYWNkYzI3MTM=

data/README.md

@@ -526,6 +526,7 @@ You first need to create an [Atlas account](https://atlas.hashicorp.com/account/
 * **repo**: GitHub Repo. Defaults to git repo's name.
 * **file**: File to upload to GitHub Release.
 * **file_glob**: If files should be interpreted as globs (\* and \*\* wildcards). Defaults to false.
+* **overwrite**: If files with the same name should be overwritten. Defaults to false.
 * **release-number**: Overide automatic release detection, set a release manually.
 
 Additionally, options can be passed to [Octokit](https://github.com/octokit/octokit.rb) client.

data/lib/dpl/provider/releases.rb

@@ -100,27 +100,35 @@ module DPL
         end
 
         files.each do |file|
-          already_exists = false
+          existing_url = nil
           filename = Pathname.new(file).basename.to_s
           api.release(release_url).rels[:assets].get.data.each do |existing_file|
             if existing_file.name == filename
-              already_exists = true
+              existing_url = existing_file.url
             end
           end
-          if already_exists
-            log "#{filename} already exists, skipping."
+          if !existing_url
+            upload_file(file, filename, release_url)
+          elsif existing_url && options[:overwrite]
+            log "#{filename} already exists, overwriting."
+            api.delete_release_asset(existing_url)
+            upload_file(file, filename, release_url)
           else
-            content_type = MIME::Types.type_for(file).first.to_s
-            if content_type.empty?
-              # Specify the default content type, as it is required by GitHub
-              content_type = "application/octet-stream"
-            end
-            api.upload_asset(release_url, file, {:name => filename, :content_type => content_type})
+            log "#{filename} already exists, skipping."
           end
         end
 
         api.update_release(release_url, {:draft => false}.merge(options))
       end
+
+      def upload_file(file, filename, release_url)
+        content_type = MIME::Types.type_for(file).first.to_s
+        if content_type.empty?
+          # Specify the default content type, as it is required by GitHub
+          content_type = "application/octet-stream"
+        end
+        api.upload_asset(release_url, file, {:name => filename, :content_type => content_type})
+      end
     end
   end
 end

data/spec/provider/releases_spec.rb

@@ -196,7 +196,7 @@ describe DPL::Provider::Releases do
       allow(provider.api).to receive(:release)
       allow(provider.api.release).to receive(:rels).and_return({:assets => nil})
       allow(provider.api.release.rels[:assets]).to receive(:get).and_return({:data => [""]})
-      allow(provider.api.release.rels[:assets].get).to receive(:data).and_return([double(:name => "foo.bar"), double(:name => "foo.foo")])
+      allow(provider.api.release.rels[:assets].get).to receive(:data).and_return([double(:name => "foo.bar", :url => 'foo-bar-url'), double(:name => "foo.foo", :url => 'foo-foo-url')])
 
       expect(provider.api).to receive(:upload_asset).with(anything, "bar.txt", {:name=>"bar.txt", :content_type=>"text/plain"})
       expect(provider).to receive(:log).with("foo.bar already exists, skipping.")
@@ -205,6 +205,33 @@ describe DPL::Provider::Releases do
       provider.push_app
     end
 
+    example "When Release Exists and has Files but overwrite flag is true" do
+      allow_message_expectations_on_nil
+
+      provider.options.update(:file => ["exists.txt"])
+      provider.options.update(:overwrite => true)
+
+      allow(provider).to receive(:releases).and_return([""])
+      allow(provider).to receive(:get_tag).and_return("v0.0.0")
+
+      provider.releases.map do |release|
+        allow(release).to receive(:tag_name).and_return("v0.0.0")
+        allow(release).to receive(:rels).and_return({:self => nil})
+        allow(release.rels[:self]).to receive(:href)
+      end
+
+      allow(provider.api).to receive(:release)
+      allow(provider.api.release).to receive(:rels).and_return({:assets => nil})
+      allow(provider.api.release.rels[:assets]).to receive(:get).and_return({:data => [""]})
+      allow(provider.api.release.rels[:assets].get).to receive(:data).and_return([double(:name => "exists.txt", :url => "release-url")])
+
+      expect(provider.api).to receive(:delete_release_asset).with("release-url").and_return(true)
+      expect(provider.api).to receive(:upload_asset).with(anything, "exists.txt", {:name=>"exists.txt", :content_type=>"text/plain"})
+      expect(provider.api).to receive(:update_release).with(anything, hash_including(:draft => false))
+
+      provider.push_app
+    end
+
     example "When Release Doesn't Exist" do
       allow_message_expectations_on_nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.12.travis.1286.4
+  version: 1.8.12.travis.1291.4
 platform: ruby
 authors:
 - Konstantin Haase