dpl 1.5.11.travis.430.1 → 1.5.11.travis.432.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODYxNDkwMTJhMTUxNmJjMTc1Y2VlM2JjYTNlZTIxNWE3NGRmYWQ2ZQ==
+    ODU0NmUzNzEwNDk0YjQ2MGQzODIyMGI2MzIwZDY3MjEzMmVkOWNmZQ==
   data.tar.gz: !binary |-
-    Y2ZlMjRhZDYwMGFhMzdlOGEwMzcxZWU1OWEyMTZkNjZmMDhkMDNjNw==
+    ZDVkNGM1N2MwNjM2NWM1NjIwYzFiYWU2NGEzNjQyMmVkNGYxZmQzZg==
 SHA512:
   metadata.gz: !binary |-
-    OTg4MjczMGQzZGYyM2Q2MjZiMDIyYzAxNGMyNzA2YmE1N2U3MTA3NDRmMzdh
-    MGQ1Yzk2MDAwNDU3ZjliZmU1Mzg5NWRhMDhlYTFhYjBlYTg1MmViYzExZTNm
-    OThmNjViNzMzZDRjMWE5YWY1ZDhlNmU3NTQwYTM1MGE4Y2FiY2U=
+    MTZlMGIyNzk0YTM3ZmFjNTdjMTE1ODcwYWYwOWQ5MDJiMTY2N2Y5MGI3MjM3
+    MjRmNmZlNjA1Y2JjMDk2ZTdmZmRlMGE0MWE0NWRjMGNiOTBjNWM0MzJmY2Qz
+    MmRiNGFmZmVmMDVmMzExODk0NmYyNWI2NDhiNDZhYjkyYzk4NTI=
   data.tar.gz: !binary |-
-    OGJhNmU1YzE5M2QyODJkMmRhZGE3ZmQwODczN2Y5YmU1MjY3NmQwYmQ0NjQw
-    NDQ0YjcyZGVlMjE3MzI5NGNkOWVkNjk1MTg5N2I3MDdmN2M1NzExY2ViZjgx
-    MDg5NmE1ZmI4NmM2ZDJlOTRjOWI5ODU3ZjYyOTcwZDQzOGNhYzM=
+    NzA0NzI3NGY0YzdjNjJkMjk5NjJiMDgyYzQ4N2ZmOTg3MmFlNDlhODA2MTJm
+    YTFmMzUzZmI2Zjc2OTI5ZTQ3MDVjNzUwMWVkNDFkZjBkNDhiZTNjZDY0NTU4
+    Y2NmMDRiOTJkODlmYTRmY2M5NTY2MjFkMDFlNzE5YzEyYmU1ZGE=

data/lib/dpl/provider/openshift.rb

@@ -33,7 +33,12 @@ module DPL
       end
 
       def push_app
-        context.shell "git push #{app.git_url} -f"
+        if app.deployment_branch
+          context.shell "rhc app configure #{app.name} --deployment-branch #{app.deployment_branch}"
+          context.shell "git push #{app.git_url} -f #{app.deployment_branch}"
+        else
+          context.shell "git push #{app.git_url} -f"
+        end
       end
 
       def restart

data/spec/provider/openshift_spec.rb

@@ -65,10 +65,19 @@ describe DPL::Provider::Openshift do
     end
 
     describe :push_app do
-      example do
+      example "when app.deployment_branch is not set" do
+        provider.app.should_receive :deployment_branch
         provider.context.should_receive(:shell).with("git push git://something -f")
         provider.push_app
       end
+
+      example "when app.deployment_branch is set" do
+        provider.app.stub(:deployment_branch) { "test-branch" }
+
+        provider.context.should_receive(:shell).with("rhc app configure example --deployment-branch test-branch")
+        provider.context.should_receive(:shell).with("git push git://something -f test-branch")
+        provider.push_app
+      end
     end
 
     describe :restart do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.5.11.travis.430.1
+  version: 1.5.11.travis.432.1
 platform: ruby
 authors:
 - Konstantin Haase