shuttle-deploy 0.2.0.beta11 → 0.2.0.beta12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c5026144047d47932a2f9784aa8c1013753018
-  data.tar.gz: d191d795f8ebe1383b240050b23c15366bb619e3
+  metadata.gz: b6ee5e81023988deeb094a7226c78f9f9e6a46f9
+  data.tar.gz: 846bf3cfa380f9c6a47f07f94e05841bb23f4780
 SHA512:
-  metadata.gz: 10080dc471876738d0b6192509fcb0a94cfc2d12ec8a307809738d7cdaf49575212bc21bd9f30034160f3ea1bfdcea98a2d567736ce77ac7209f9c9400a5c9e2
-  data.tar.gz: 2ccf2a708303bf5b0c512a6bbbfd469ce0e3373e9692d46d33b918850ebfe23fde3618ca384f38f944db1086eb875d90230cc450cdf7f30b6a40a471ca0cacee
+  metadata.gz: 33a43a7688bb0aacc7a277792551cb9bacd9d1ddba041b520fea4471f73614c0c0f7c58a63a3b74b202629e2a08cb458e8fa22339a3a329a4edf765df5b3c445
+  data.tar.gz: d97492ce75db43bb90dc0be0413721f2f2b9732cca3c81629782d1e9ecc0c2fb8869386fc00b054aaeb33d4f4db611d549796d5953c070193e971ad0aedab44b

data/lib/shuttle/strategy.rb

@@ -62,6 +62,8 @@ module Shuttle
       error "Git is not installed" if !git_installed?
       error "Git source url is not defined. Please define :git option first" if config.app.git.nil?
 
+      branch = config.app.branch || 'master'
+
       if ssh.directory_exists?(scm_path)
         # Check if git remote has changed
         current_remote = git_remote
@@ -76,7 +78,7 @@ module Shuttle
         end
 
         log "Fetching latest code"
-        res = ssh.run "cd #{scm_path} && git pull origin master"
+        res = ssh.run "cd #{scm_path} && git pull origin #{branch}"
 
         if res.failure?
           error "Unable to fetch latest code: #{res.output}"
@@ -90,8 +92,6 @@ module Shuttle
         end
       end
 
-      branch = config.app.branch || 'master'
-
       ssh.run("cd #{scm_path} && git fetch")
 
       # Make sure to pull changes from current non-master branch

data/lib/shuttle/version.rb

@@ -1,3 +1,3 @@
 module Shuttle
-  VERSION = '0.2.0.beta11'
+  VERSION = '0.2.0.beta12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shuttle-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta11
+  version: 0.2.0.beta12
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Minimalistic deployment tool