dpl 1.6.6.travis.521.1 → 1.6.6.travis.524.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTZiNzZlMTZmODlkOGRhMDY5YjNjYmU2ODBlMjc2MjI2M2EyMjkyMg==
+    ZGUxZjAyYWQwNTkxNGY4M2M0YjI3ZGIzZGI3ZjRmY2Y4OTY2NTU0ZA==
   data.tar.gz: !binary |-
-    NWY1YzA3OWI2ZDEwOGNhMDQxMmY1M2RlZDBmYTVlNjY2ZjlkMmE4ZQ==
+    OGUwNmFlYzc4OTMwNzM5MmUxNWRkODYzYjQzOTYzNDZlZWMxMWM0MQ==
 SHA512:
   metadata.gz: !binary |-
-    NzQ5ZjhlMDUxY2VlMThjYzcwNGU5NDg1NjdjNmM4MjZhNmFlYTIxNmEyZjY1
-    Y2VlOGNlMjQ3ZThjYTc4OTVkYzNiNzU2NjM2MmVmNzgxYThjZDZhMmU2YjM1
-    NzMzNDYzNGFkNjU5ZTY0YmExOWYwNmEyNWRlMmY2YmViMGJjODI=
+    ZDZiNWYxNjBiZGJjYzFmMmNiYzNiODNkOGMyZDc3YWU0Y2RiZWEwODVkZTY5
+    MDBlYmFjZjVkODA5NGI1OTFiZWVjZWM3MDIyNWYxNDEzZWNiZTNkY2ZmNmQ5
+    YzE4OGY0NDM2MjM2OThmMGY2MzNhNDllYjc2ZTk2MjQzMmQxY2M=
   data.tar.gz: !binary |-
-    NzgzNmFjZDJhNTJjMWQzMTM3YzUyOTIwMzcwMmFmZmY1N2JlYjg0YzdjOWE4
-    NDhmM2NlNWY5Mjg2ZjI3ZTliNGQxOWRmODhlODVjODQ5NTZiMjcxZDA1ZDcw
-    NDAyNWRkNDRmZGE2Y2Y0ODAyZTZiMWQ3ZDU3MWQ0YTllMjAyMmM=
+    ZTc1N2M0OGYxMDJkNzJlODk1N2E1M2JlYzlhODRkMWY0ZjhkNzcyNjdiMjU5
+    YTFmOWQ4NmIzMWQ1MTAzMGM4YjBmZGNkMDc5ZmQ5MGRjNDVhYmM3NmZkYmFi
+    OTBmMjdlNTYxNjlkYzQzNjlkZTE3NWVjODY5OGE0ZmQ5ZTI4OTk=

data/lib/dpl/provider/releases.rb

@@ -6,8 +6,21 @@ module DPL
       requires 'octokit'
       requires 'mime-types'
 
+      def travis_tag
+        # Check if $TRAVIS_TAG is unset or set but empty
+        if ENV.fetch('TRAVIS_TAG','') == ''
+          nil
+        else
+          ENV['TRAVIS_TAG']
+        end
+      end
+
       def get_tag
-        `git describe --tags --exact-match 2>/dev/null`.chomp
+        if travis_tag.nil?
+          @tag ||= `git describe --tags --exact-match 2>/dev/null`.chomp     
+        else
+          @tag ||= travis_tag
+        end
       end
 
       def api
@@ -36,6 +49,8 @@ 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}"
       end
 

data/spec/provider/releases_spec.rb

@@ -7,6 +7,26 @@ 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
+      ENV['TRAVIS_TAG'] = nil
+
+      expect(provider.travis_tag).to eq(nil)
+    end
+
+    example "When $TRAVIS_TAG if set but empty" do
+      ENV['TRAVIS_TAG'] = nil
+
+      expect(provider.travis_tag).to eq(nil)
+    end
+
+    example "When $TRAVIS_TAG if set" do
+      ENV['TRAVIS_TAG'] = "foo"
+
+      expect(provider.travis_tag).to eq("foo")
+    end
+  end
+
   describe "#api" do
     example "With API key" do
       api = double(:api)
@@ -46,6 +66,46 @@ describe DPL::Provider::Releases do
     end
   end
 
+  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")
+
+      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")
+
+      provider.check_app
+    end
+
+    example "With $TRAVIS_TAG" do
+      allow(provider).to receive(:travis_tag).and_return("bar")
+      allow(provider).to receive(:slug).and_return("foo/bar")
+
+      expect(provider.context).not_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: bar")
+      
+      provider.check_app
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.6.travis.521.1
+  version: 1.6.6.travis.524.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec