dpl-releases 1.9.6.travis.2790.5 → 1.9.6.travis.2794.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6c8410800f848c6833f4b6641e65c9003a2d452e4a4a95c1b4d415524b2521
-  data.tar.gz: 5cdbf024c25d3bf986adbf2c8af01490307e558f3b0a0d2788220d1a17ba12d5
+  metadata.gz: 592707c7749ec90af2055ddf774a71701b7b32e22b90aa266a902175ae1f2e49
+  data.tar.gz: e904d41da9bb1c75979d7c751b95d36fbfcd7bac0210e817cec7bc0b961775de
 SHA512:
-  metadata.gz: 80fac2f883d65a3d2f9bb04a1f4a892943b3d11bd9ece64d71d9dbde5f57edf87c8a931210e94e484bda7913be06166e2db7bc59584993a3003b16fd241cc177
-  data.tar.gz: c25783d5c1ef7c9476b9806eca0dab68ab0cea3edd02c9d14a0a3812c9ea09532c0411e90683fc99378ca6a61f3df3f85bdfaba4218d3f056ec140513e88a4d4
+  metadata.gz: b248cb537bb2255e8095026e37ff7284672b2aa97f9c726167cdbb3f780943401da5e3dfdb83b456af759ff261a512c54c7724d935f665d6c53048526af05174
+  data.tar.gz: f052fec7f978d44bef032f825bba7b3120a4dc2cb0fcecef36346a6f88b6f45c71e40ae07d5480bd0ad2af21fbf2b10db528ff5cb8d5ed8f6526ba4da10e9147

data/lib/dpl/provider/releases.rb

@@ -11,21 +11,27 @@ module DPL
         prerelease
       )
 
-      def travis_tag
-        # Check if $TRAVIS_TAG is unset or set but empty
-        if context.env.fetch('TRAVIS_TAG','') == ''
-          nil
-        else
-          context.env['TRAVIS_TAG']
-        end
-      end
+      attr_reader :current_tag
 
-      def get_tag
-        if travis_tag.nil?
-          @tag ||= `git describe --tags --exact-match 2>/dev/null`.chomp
-        else
-          @tag ||= travis_tag
+      def current_tag
+        return @current_tag if @current_tag
+
+        log "Determining tag for this GitHub Release"
+
+        tag = options[:tag_name].tap { |tag| log green("Tag #{tag} set in .travis.yml") } || # first choice
+          if !context.env['TRAVIS_TAG'].to_s.empty?
+            context.env['TRAVIS_TAG'].to_s.tap { |tag| log green("Tag #{tag} set by TRAVIS_TAG (via this commit's tag)")}
+          else
+            log yellow("This commit is not tagged. Fetching tags")
+            context.shell "git fetch --tags"
+            `git describe --tags --exact-match 2>/dev/null`.chomp.tap { |tag| log green("Tag #{tag} fetched") }
+          end
+
+        if tag.empty?
+          log yellow("Unable to compute tag name. GitHub may assign a tag of the form 'untagged-*'.")
         end
+
+        tag
       end
 
       def api
@@ -65,8 +71,7 @@ module DPL
       def check_app
         log "Deploying to repo: #{slug}"
 
-        context.shell 'git fetch --tags' if travis_tag.nil?
-        log "Current tag is: #{get_tag}"
+        log "Current tag is: #{current_tag}"
       end
 
       def setup_auth
@@ -94,7 +99,7 @@ module DPL
           release_url = "https://api.github.com/repos/" + slug + "/releases/" + options[:release_number]
         else
           releases.each do |release|
-            if release.tag_name == get_tag
+            if release.tag_name == current_tag
               release_url = release.rels[:self].href
               tag_matched = true
             end
@@ -103,7 +108,7 @@ module DPL
 
         #If for some reason GitHub hasn't already created a release for the tag, create one
         if tag_matched == false
-          release_url = api.create_release(slug, get_tag, options.merge({:draft => true})).rels[:self].href
+          release_url = api.create_release(slug, current_tag, options.merge({:draft => true})).rels[:self].href
         end
 
         files.each do |file|

data/spec/provider/releases_spec.rb

@@ -7,23 +7,21 @@ describe DPL::Provider::Releases do
     described_class.new(DummyContext.new, :api_key => '0123445789qwertyuiop0123445789qwertyuiop', :file => 'blah.txt')
   end
 
-  describe "#travis_tag" do
-    example "When $TRAVIS_TAG is nil" do
-      provider.context.env['TRAVIS_TAG'] = nil
+  let(:a_release) { double('a_release', tag_name: 'foo', rels: {self: double('href', href: "https://")}) }
 
-      expect(provider.travis_tag).to eq(nil)
-    end
+  before { allow(provider).to receive(:log).and_return(true) }
 
-    example "When $TRAVIS_TAG if set but empty" do
-      provider.context.env['TRAVIS_TAG'] = nil
+  describe "#current_tag" do
+    example "When $TRAVIS_TAG is nil" do
+      provider.context.env['TRAVIS_TAG'] = ''
 
-      expect(provider.travis_tag).to eq(nil)
+      expect(provider.current_tag).to eq('')
     end
 
     example "When $TRAVIS_TAG if set" do
       provider.context.env['TRAVIS_TAG'] = "foo"
 
-      expect(provider.travis_tag).to eq("foo")
+      expect(provider.current_tag).to eq("foo")
     end
   end
 
@@ -94,11 +92,9 @@ describe DPL::Provider::Releases do
 
   describe "#check_app" do
     example "Without $TRAVIS_TAG" do
-      allow(provider).to receive(:travis_tag).and_return(nil)
       allow(provider).to receive(:slug).and_return("foo/bar")
-      allow(provider).to receive(:get_tag).and_return("foo")
+      allow(provider).to receive(:current_tag).and_return("foo")
 
-      expect(provider.context).to receive(:shell).with("git fetch --tags")
       expect(provider).to receive(:log).with("Deploying to repo: foo/bar")
       expect(provider).to receive(:log).with("Current tag is: foo")
 
@@ -106,7 +102,7 @@ describe DPL::Provider::Releases do
     end
 
     example "With $TRAVIS_TAG" do
-      allow(provider).to receive(:travis_tag).and_return("bar")
+      allow(provider).to receive(:current_tag).and_return("bar")
       allow(provider).to receive(:slug).and_return("foo/bar")
 
       expect(provider.context).not_to receive(:shell).with("git fetch --tags")
@@ -117,21 +113,6 @@ describe DPL::Provider::Releases do
     end
   end
 
-  describe "#get_tag" do
-    example "Without $TRAVIS_TAG" do
-      allow(provider).to receive(:travis_tag).and_return(nil)
-      allow(provider).to receive(:`).and_return("bar")
-
-      expect(provider.get_tag).to eq("bar")
-    end
-
-    example "With $TRAVIS_TAG" do
-      allow(provider).to receive(:travis_tag).and_return("foo")
-
-      expect(provider.get_tag).to eq("foo")
-    end
-  end
-
   describe "#check_auth" do
     example "With proper permissions" do
       allow_message_expectations_on_nil
@@ -159,7 +140,7 @@ describe DPL::Provider::Releases do
       provider.options.update(:file => ["test/foo.bar", "bar.txt"])
 
       allow(provider).to receive(:releases).and_return([""])
-      allow(provider).to receive(:get_tag).and_return("v0.0.0")
+      allow(provider).to receive(:current_tag).and_return("v0.0.0")
       expect(File).to receive(:file?).with("test/foo.bar").and_return(true)
       expect(File).to receive(:file?).with("bar.txt").and_return(true)
 
@@ -187,7 +168,7 @@ describe DPL::Provider::Releases do
       provider.options.update(:file => ["test/foo.bar", "bar.txt"])
 
       allow(provider).to receive(:releases).and_return([""])
-      allow(provider).to receive(:get_tag).and_return("v0.0.0")
+      allow(provider).to receive(:current_tag).and_return("v0.0.0")
       expect(File).to receive(:file?).with("test/foo.bar").and_return(true)
       expect(File).to receive(:file?).with("bar.txt").and_return(true)
 
@@ -216,7 +197,7 @@ describe DPL::Provider::Releases do
       provider.options.update(:overwrite => true)
 
       allow(provider).to receive(:releases).and_return([""])
-      allow(provider).to receive(:get_tag).and_return("v0.0.0")
+      allow(provider).to receive(:current_tag).and_return("v0.0.0")
       expect(File).to receive(:file?).with("exists.txt").and_return(true)
 
       provider.releases.map do |release|
@@ -242,12 +223,12 @@ describe DPL::Provider::Releases do
 
       provider.options.update(:file => ["test/foo.bar", "bar.txt"])
 
-      allow(provider).to receive(:releases).and_return([""])
+      allow(provider).to receive(:releases).and_return([a_release])
       expect(File).to receive(:file?).with("test/foo.bar").and_return(true)
       expect(File).to receive(:file?).with("bar.txt").and_return(true)
 
       provider.releases.map do |release|
-        allow(release).to receive(:tag_name).and_return("foo")
+        allow(release).to receive(:current_tag).and_return("foo")
         allow(release).to receive(:rels).and_return({:self => nil})
         allow(release.rels[:self]).to receive(:href)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-releases
 version: !ruby/object:Gem::Version
-  version: 1.9.6.travis.2790.5
+  version: 1.9.6.travis.2794.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2790.5
+        version: 1.9.6.travis.2794.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.6.travis.2790.5
+        version: 1.9.6.travis.2794.5
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement