shuttle-deploy 0.2.0.beta9 → 0.2.0.beta10

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTA2N2Y4N2VkZTI2YTRlMjE0YWJlYjM0NWQ0ODFlM2FlZjkzYTY4Mg==
+  data.tar.gz: !binary |-
+    ZDU2NjdiMGIxYmYxYmI0ZjQ5M2QxMWQ2NjRkNWIyMTYwOGVhMzg1YQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTE3ZWY4MzIwYmMwZThhNTA0MjdkZDdlMWRjYzBjZGQwOTQ5NjI3NjU1MTcw
+    N2QyZGU2MGE2MmFlYzAwNzg4MDNlOWZjZjgzZmY3YzdhMDM5ZWUzYWEwMzNm
+    OWM1YTkzNjVjNGZjY2FiODUwMGNjMjk1ODI1M2YxYTBlNDllMjg=
+  data.tar.gz: !binary |-
+    YmJlNjA1MjJkMWI4M2MxNGE3ZDYwZDYwN2VkZjk2MDNhZTk5YTdkMjg3ZGU5
+    Yjg4MzQzNTk4YWJhN2JhYmFiYjdiOTU3YzZkOWY0Mzg1NzQ0ZDM1ZDkxODgz
+    NDRmNzc2MmE0YmMxZGIxNTYxZjZjMWRkOTBkNmZkNDY0YjlhNzQ=

data/lib/shuttle/strategy.rb

@@ -94,6 +94,11 @@ module Shuttle
 
       ssh.run("cd #{scm_path} && git fetch")
 
+      # Make sure to pull changes from current non-master branch
+      if branch != 'master'
+        ssh.run("cd #{scm_path} && git pull origin #{branch}")
+      end
+
       log "Using branch '#{branch}'"
       result = ssh.run("cd #{scm_path} && git checkout -m #{branch}")
 
@@ -143,6 +148,9 @@ module Shuttle
     end
 
     def checkout_code(path=nil)
+      # Trigger hook before checking out code
+      execute_hook(:before_checkout_code)
+
       checkout_path = [release_path, path].compact.join('/')
       res = ssh.run("cp -a #{scm_path} #{checkout_path}")
       
@@ -152,6 +160,9 @@ module Shuttle
         ssh.run("cd #{release_path} && rm -rf $(find . | grep .git)")
         ssh.run("cd #{release_path} && rm -rf $(find . -name .svn)")
       end
+
+      # Trigger hook after checking out code
+      execute_hook(:after_checkout_code)
     end
 
     def link_release

data/lib/shuttle/version.rb

@@ -1,3 +1,3 @@
 module Shuttle
-  VERSION = '0.2.0.beta9'
+  VERSION = '0.2.0.beta10'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: shuttle-deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta9
-  prerelease: 6
+  version: 0.2.0.beta10
 platform: ruby
 authors:
 - Dan Sosedoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh-session
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal_helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -226,30 +205,26 @@ files:
 - spec/target_spec.rb
 homepage: https://github.com/sosedoff/shuttle
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -900810902781667857
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimalistic deployment tool
 test_files:
 - spec/cli_spec.rb
@@ -260,3 +235,4 @@ test_files:
 - spec/path_helpers_spec.rb
 - spec/spec_helper.rb
 - spec/target_spec.rb
+has_rdoc: