dpl 1.5.11.travis.430.1 → 1.5.11.travis.432.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/lib/dpl/provider/openshift.rb +6 -1
- data/spec/provider/openshift_spec.rb +10 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
ODU0NmUzNzEwNDk0YjQ2MGQzODIyMGI2MzIwZDY3MjEzMmVkOWNmZQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
ZDVkNGM1N2MwNjM2NWM1NjIwYzFiYWU2NGEzNjQyMmVkNGYxZmQzZg==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
MTZlMGIyNzk0YTM3ZmFjNTdjMTE1ODcwYWYwOWQ5MDJiMTY2N2Y5MGI3MjM3
|
|
10
|
+
MjRmNmZlNjA1Y2JjMDk2ZTdmZmRlMGE0MWE0NWRjMGNiOTBjNWM0MzJmY2Qz
|
|
11
|
+
MmRiNGFmZmVmMDVmMzExODk0NmYyNWI2NDhiNDZhYjkyYzk4NTI=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
NzA0NzI3NGY0YzdjNjJkMjk5NjJiMDgyYzQ4N2ZmOTg3MmFlNDlhODA2MTJm
|
|
14
|
+
YTFmMzUzZmI2Zjc2OTI5ZTQ3MDVjNzUwMWVkNDFkZjBkNDhiZTNjZDY0NTU4
|
|
15
|
+
Y2NmMDRiOTJkODlmYTRmY2M5NTY2MjFkMDFlNzE5YzEyYmU1ZGE=
|
|
@@ -33,7 +33,12 @@ module DPL
|
|
|
33
33
|
end
|
|
34
34
|
|
|
35
35
|
def push_app
|
|
36
|
-
|
|
36
|
+
if app.deployment_branch
|
|
37
|
+
context.shell "rhc app configure #{app.name} --deployment-branch #{app.deployment_branch}"
|
|
38
|
+
context.shell "git push #{app.git_url} -f #{app.deployment_branch}"
|
|
39
|
+
else
|
|
40
|
+
context.shell "git push #{app.git_url} -f"
|
|
41
|
+
end
|
|
37
42
|
end
|
|
38
43
|
|
|
39
44
|
def restart
|
|
@@ -65,10 +65,19 @@ describe DPL::Provider::Openshift do
|
|
|
65
65
|
end
|
|
66
66
|
|
|
67
67
|
describe :push_app do
|
|
68
|
-
example do
|
|
68
|
+
example "when app.deployment_branch is not set" do
|
|
69
|
+
provider.app.should_receive :deployment_branch
|
|
69
70
|
provider.context.should_receive(:shell).with("git push git://something -f")
|
|
70
71
|
provider.push_app
|
|
71
72
|
end
|
|
73
|
+
|
|
74
|
+
example "when app.deployment_branch is set" do
|
|
75
|
+
provider.app.stub(:deployment_branch) { "test-branch" }
|
|
76
|
+
|
|
77
|
+
provider.context.should_receive(:shell).with("rhc app configure example --deployment-branch test-branch")
|
|
78
|
+
provider.context.should_receive(:shell).with("git push git://something -f test-branch")
|
|
79
|
+
provider.push_app
|
|
80
|
+
end
|
|
72
81
|
end
|
|
73
82
|
|
|
74
83
|
describe :restart do
|