dpl 1.5.11.travis.414.1 → 1.5.11.travis.430.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNmOWY1YzlmMmM1NTEyMDFkMjA2YTQ2MzJjMDdlNmUwN2QyYzMxOQ==
+    ODYxNDkwMTJhMTUxNmJjMTc1Y2VlM2JjYTNlZTIxNWE3NGRmYWQ2ZQ==
   data.tar.gz: !binary |-
-    YmY0ZTk0NzgzMTQ5YTAwY2M1ZWIzOWM4OTRjMTJjZDY5MTA4MTMxMw==
+    Y2ZlMjRhZDYwMGFhMzdlOGEwMzcxZWU1OWEyMTZkNjZmMDhkMDNjNw==
 SHA512:
   metadata.gz: !binary |-
-    YmU5MDJlN2JjODZjOWU2YzdhMGZlOTQ0OWRiNmNjODc3NGRhNGI3NTNkNTdm
-    ZDBhYzBlMzk4NjFkZTlhNTRlYjZmYzVjNTFkNzRhZjE5MzFhZjExMjY3YTdk
-    YWEyMDgzMDBhZjQ5ZTI1NmIzYWY1NDE3MGIwMGM3MWVjODY3ZjY=
+    OTg4MjczMGQzZGYyM2Q2MjZiMDIyYzAxNGMyNzA2YmE1N2U3MTA3NDRmMzdh
+    MGQ1Yzk2MDAwNDU3ZjliZmU1Mzg5NWRhMDhlYTFhYjBlYTg1MmViYzExZTNm
+    OThmNjViNzMzZDRjMWE5YWY1ZDhlNmU3NTQwYTM1MGE4Y2FiY2U=
   data.tar.gz: !binary |-
-    OGI2YmU2M2RkYTFiNzg3MjcwYzAyNDIyOGIxY2QxZjM3MjkxMDg0NDMxYTcx
-    NGMxZjkxMDg5ODNhNTcyZGQ5ZWY2M2M3NzUyNjkyNzQ1ZjM5NDUzYzExNTZi
-    Y2IxYzA2NjI4MTk5NWRhOTMzZGVmZmRlYzNmMTQ5ZjFiYjE5OGM=
+    OGJhNmU1YzE5M2QyODJkMmRhZGE3ZmQwODczN2Y5YmU1MjY3NmQwYmQ0NjQw
+    NDQ0YjcyZGVlMjE3MzI5NGNkOWVkNjk1MTg5N2I3MDdmN2M1NzExY2ViZjgx
+    MDg5NmE1ZmI4NmM2ZDJlOTRjOWI5ODU3ZjYyOTcwZDQzOGNhYzM=

data/README.md

@@ -271,6 +271,7 @@ As a rule of thumb, you should switch to the Git strategy if you run into issues
 * **password**: GitHub Password. Not necessary if `api-key` is used.
 * **repo**: GitHub Repo. Defaults to git repo's name.
 * **file**: File to upload to GitHub Release.
+* **release-number**: Overide automatic release detection, set a release manually.
 
 #### GitHub Two Factor Authentication
 

data/lib/dpl/provider/cloudcontrol.rb

@@ -42,7 +42,7 @@ module DPL
 
       def push_app
         branch = (dep_name == 'default') ? 'master' : dep_name
-        context.shell "git push #{ @repository } HEAD:#{ branch };"
+        context.shell "git push #{ @repository } HEAD:#{ branch } -f"
         deploy_app
       end
 

data/lib/dpl/provider/releases.rb

@@ -56,11 +56,16 @@ module DPL
       def push_app
         tag_matched = false
         release_url = nil
-
-        releases.each do |release|
-          if release.tag_name == get_tag
-            release_url = release.rels[:self].href
-            tag_matched = true
+        
+        if options[:release_number]
+          tag_matched = true
+          release_url = "https://api.github.com/repos/" + slug + "/releases/" + options[:release_number]
+        else 
+          releases.each do |release|
+            if release.tag_name == get_tag
+              release_url = release.rels[:self].href
+              tag_matched = true
+            end
           end
         end
 

data/spec/provider/cloudcontrol_spec.rb

@@ -85,7 +85,7 @@ describe DPL::Provider::CloudControl do
   it '#push_app shuld deploy the app' do
     provider.instance_variable_set(:@repository, 'foo_repo.git')
     context = double(:shell)
-    context.should receive(:shell).with("git push foo_repo.git HEAD:master;")
+    context.should receive(:shell).with("git push foo_repo.git HEAD:master -f")
     provider.should receive(:context).and_return context
     provider.should receive(:deploy_app)
 

data/spec/provider/releases_spec.rb

@@ -144,5 +144,23 @@ describe DPL::Provider::Releases do
 
       provider.push_app
     end
+
+    example "With Release Number" do
+      allow_message_expectations_on_nil
+
+      provider.options.update(:file => ["bar.foo"])
+      provider.options.update(:release_number => "1234")
+
+      provider.stub(:slug).and_return("foo/bar")
+
+      provider.api.stub(:release)
+      provider.api.release.stub(:rels).and_return({:assets => nil})
+      provider.api.release.rels[:assets].stub(:get).and_return({:data => nil})
+      provider.api.release.rels[:assets].get.stub(:data).and_return([])
+
+      provider.api.should_receive(:upload_asset).with("https://api.github.com/repos/foo/bar/releases/1234", "bar.foo", {:name=>"bar.foo", :content_type=>""})
+
+      provider.push_app
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.11.travis.414.1
+  version: 1.5.11.travis.430.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec