shuttle-deploy 0.2.0.beta11 → 0.2.0.beta12
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 +4 -4
- data/lib/shuttle/strategy.rb +3 -3
- data/lib/shuttle/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b6ee5e81023988deeb094a7226c78f9f9e6a46f9
|
|
4
|
+
data.tar.gz: 846bf3cfa380f9c6a47f07f94e05841bb23f4780
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 33a43a7688bb0aacc7a277792551cb9bacd9d1ddba041b520fea4471f73614c0c0f7c58a63a3b74b202629e2a08cb458e8fa22339a3a329a4edf765df5b3c445
|
|
7
|
+
data.tar.gz: d97492ce75db43bb90dc0be0413721f2f2b9732cca3c81629782d1e9ecc0c2fb8869386fc00b054aaeb33d4f4db611d549796d5953c070193e971ad0aedab44b
|
data/lib/shuttle/strategy.rb
CHANGED
|
@@ -62,6 +62,8 @@ module Shuttle
|
|
|
62
62
|
error "Git is not installed" if !git_installed?
|
|
63
63
|
error "Git source url is not defined. Please define :git option first" if config.app.git.nil?
|
|
64
64
|
|
|
65
|
+
branch = config.app.branch || 'master'
|
|
66
|
+
|
|
65
67
|
if ssh.directory_exists?(scm_path)
|
|
66
68
|
# Check if git remote has changed
|
|
67
69
|
current_remote = git_remote
|
|
@@ -76,7 +78,7 @@ module Shuttle
|
|
|
76
78
|
end
|
|
77
79
|
|
|
78
80
|
log "Fetching latest code"
|
|
79
|
-
res = ssh.run "cd #{scm_path} && git pull origin
|
|
81
|
+
res = ssh.run "cd #{scm_path} && git pull origin #{branch}"
|
|
80
82
|
|
|
81
83
|
if res.failure?
|
|
82
84
|
error "Unable to fetch latest code: #{res.output}"
|
|
@@ -90,8 +92,6 @@ module Shuttle
|
|
|
90
92
|
end
|
|
91
93
|
end
|
|
92
94
|
|
|
93
|
-
branch = config.app.branch || 'master'
|
|
94
|
-
|
|
95
95
|
ssh.run("cd #{scm_path} && git fetch")
|
|
96
96
|
|
|
97
97
|
# Make sure to pull changes from current non-master branch
|
data/lib/shuttle/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: shuttle-deploy
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.0.
|
|
4
|
+
version: 0.2.0.beta12
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dan Sosedoff
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-08-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|
|
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
222
222
|
version: 1.3.1
|
|
223
223
|
requirements: []
|
|
224
224
|
rubyforge_project:
|
|
225
|
-
rubygems_version: 2.0.
|
|
225
|
+
rubygems_version: 2.0.5
|
|
226
226
|
signing_key:
|
|
227
227
|
specification_version: 4
|
|
228
228
|
summary: Minimalistic deployment tool
|