dpl 1.6.1.travis.452.1 → 1.6.1.travis.453.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWM0YzJlZjM3ZTZjYThkY2FkYzBiOGFlOGEwZmU3MDA5OGE5NzIxYQ==
+    YzU4NDk4NDY1MWEwODE4MWE0NWZkZTVjNzNiODFmODUzMmI3OTJmOQ==
   data.tar.gz: !binary |-
-    ZTkxYjY5ZjNmZDc0N2MzOGUwZWI3MTY0ODc4NzkxNzdmYWY1OWMwOQ==
+    Nzg1NzIxOTc5NDAxMGIyMTZlMGQ5MzQ5NmQ2ZTQ0ZDhlMzA5YmE4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM0M2MyY2NlZjQxOTE3NjI5ZDQwNjhmMDllZWUwY2JlY2JjNmJiZTQxNzhi
-    OGRmNTg3MDZjZTZkNmMxOWNjY2JmOTM3ODQ0NTA4M2Y1NGRmMjNkYWZmYWI5
-    MDk5M2Q3MTAyOWUxYjFlNDA4NzkyMGEzZDNiZjIzODc2MDcwY2U=
+    ZjE0YWM0OTUzNDNiYjFmMDg0NzM4MjE3ZDQzMzUzNjkxZTk3NDNjZjllZmI4
+    YzdjOGZlMTY2NzFhNmJiMWYyYTA3OGJkMjExMTVlNDVmODU4NmY1NzM5MmUz
+    NmUxMTk0ZjNkZDJlYWFiMjcwN2FmMjIyZmFhY2QwMGJlNzhjYTE=
   data.tar.gz: !binary |-
-    YzAwZjJlZmNlMTk1YmU5MTkzZDE2M2JhNWEzNWJhNmE4MWY4OGU4NTVmNmNl
-    NGQ5MDRlMGFhZGZkMmMxNWZkZTRlMGRkYjgzNmJkOTNmZmRlMzExMDY0NjAy
-    NTZmNThkYTEzMDg3ZGI4NmFjOWQ3YmM0Yjc5NWZlYjJlNzYxNzk=
+    YzZhZGI0ZDdjZGEzNzg1NWJhMDMxZjBlOWRiZGViZjVkZTM4ZDY2N2YwNDM5
+    YzIxNGIyY2RmMDI1NGIxYmVlMTI3NWRkNjYzNTg0YTE2ZGYxYzgxOGExMjdl
+    YzJmMzBmODNiNzgxZTE3ZGQxNzU0NWQxMjUxMGQ1YjRkNWIyNzA=

data/lib/dpl/provider/openshift.rb

@@ -3,6 +3,10 @@ module DPL
     class Openshift < Provider
       requires 'rhc'
 
+      def initialize(context, options)
+        super
+        @deployment_branch = option(:deployment_branch)
+      end
       def api
         @api ||= ::RHC::Rest::Client.new(:user => option(:user), :password => option(:password), :server => 'openshift.redhat.com')
       end
@@ -33,12 +37,12 @@ module DPL
       end
 
       def push_app
-        if app.deployment_branch && app.deployment_branch != 'master'
-          log "deployment_branch detected: #{app.deployment_branch}"
-          context.shell "rhc app configure #{app.name} --deployment-branch #{app.deployment_branch}"
-          context.shell "git push --verbose #{app.git_url} -f #{app.deployment_branch}"
+        if @deployment_branch
+          log "deployment_branch detected: #{@deployment_branch}"
+          app.deployment_branch = @deployment_branch
+          context.shell "git push #{app.git_url} -f #{app.deployment_branch}"
         else
-          context.shell "git push --verbose #{app.git_url} -f"
+          context.shell "git push #{app.git_url} -f"
         end
       end
 

data/spec/provider/openshift_spec.rb

@@ -4,7 +4,7 @@ require 'dpl/provider/openshift'
 
 describe DPL::Provider::Openshift do
   subject :provider do
-    described_class.new(DummyContext.new, :user => 'foo', :password => 'foo', :domain => 'foo', :app => 'example', :key_name => 'key')
+    described_class.new(DummyContext.new, :user => 'foo', :password => 'foo', :domain => 'foo', :app => 'example', :key_name => 'key', :deployment_branch => nil)
   end
 
   describe "#api" do
@@ -66,17 +66,18 @@ describe DPL::Provider::Openshift do
 
     describe "#push_app" do
       example "when app.deployment_branch is not set" do
-        expect(provider.app).to receive :deployment_branch
-        expect(provider.context).to receive(:shell).with("git push --verbose git://something -f")
+        expect(provider.context).to receive(:shell).with("git push git://something -f")
         provider.push_app
       end
+    end
 
-      example "when app.deployment_branch is set" do
-        allow(provider.app).to receive(:deployment_branch) { "test-branch" }
+    context "when app.deployment_branch is set" do
+      subject :provider do
+        described_class.new(DummyContext.new, :user => 'foo', :password => 'foo', :domain => 'foo', :app => 'example', :key_name => 'key', :deployment_branch => 'test-branch')
 
-        expect(provider.context).to receive(:shell).with("rhc app configure example --deployment-branch test-branch")
-        expect(provider.context).to receive(:shell).with("git push --verbose git://something -f test-branch")
-        provider.push_app
+      expect(provider.app).to receive(:deployment_branch=).with("test-branch")
+      expect(provider.context).to receive(:shell).with("git push git://something -f test-branch")
+      provider.push_app
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.6.1.travis.452.1
+  version: 1.6.1.travis.453.1
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec