git-deploy 0.5.5 → 0.6.0

data/README.markdown

@@ -101,16 +101,34 @@ repository. This is how your code on the server is kept up to date. This script
 checks out the latest version of your project from the current branch and
 runs the following callback scripts:
 
+* `deploy/setup` - on first push.
 * `deploy/after_push` - on subsequent pushes. It in turn executes:
   * `deploy/before_restart`
   * `deploy/restart`
   * `deploy/after_restart`
+* `deploy/rollback` - executed for `git deploy rollback`.
 
 All of the callbacks are optional. These scripts are ordinary Unix executables.
 The ones which get generated for you by `git deploy init` are written in shell
 script and Ruby.
 
-It's worth remembering that "after_push" is done **asynchronously from your git push**. This is because migrating the database and updating submodules might take a long time and you don't want to wait for all that during a git push. But, this means that when the push is done, the server has *not yet restarted*. You might need to wait a few seconds or a minute.
+
+Extra commands
+--------------
+
+* `git deploy hooks` - Updates git hooks on the remote repository
+
+* `git deploy log [N=20]` - Shows last 20 lines of deploy log on the server
+
+* `git deploy rerun` - Re-runs the `deploy/after_push` callback as if a git push happened
+
+* `git deploy restart` - Runs the `deploy/restart` callback
+
+* `git deploy rollback` - Undo a deploy by checking out the previous revision,
+  runs `deploy/callback` if exists instead of `deploy/after_push`
+
+* `git deploy upload <files>` - Copy local files to the remote app
+
 
 
   [heroku]: http://heroku.com/

data/lib/git_deploy.rb

@@ -20,8 +20,8 @@ class GitDeploy < Thor
   end
 
   desc "setup", "Create the remote git repository and install push hooks for it"
-  method_option :shared, :aliases => '-g', :type => :boolean, :default => true
-  method_option :sudo, :aliases => '-s', :type => :boolean, :default => true
+  method_option :shared, :aliases => '-g', :type => :boolean, :default => false
+  method_option :sudo, :aliases => '-s', :type => :boolean, :default => false
   def setup
     sudo = options.sudo? ? "#{sudo_cmd} " : ''
 
@@ -58,10 +58,29 @@ class GitDeploy < Thor
     run "cd #{deploy_to} && deploy/restart 2>&1 | tee -a log/deploy.log"
   end
 
+  desc "rerun", "Runs the `deploy/after_push' callback as if a new revision was pushed via git"
+  def rerun
+    run <<-BASH, :echo => false
+      bash -e -c '
+        cd '#{deploy_to}'
+        declare -a revs=( $(git rev-parse HEAD@{1} HEAD) )
+        deploy/after_push ${revs[@]} 2>&1 | tee -a log/deploy.log
+      '
+    BASH
+  end
+
   desc "rollback", "Rolls back the checkout to before the last push"
   def rollback
-    run "cd #{deploy_to} && git reset --hard ORIG_HEAD"
-    invoke :restart
+    run <<-BASH, :echo => false
+      bash -e -c '
+        cd '#{deploy_to}'
+        declare -a revs=( $(git rev-parse HEAD HEAD@{1}) )
+        git reset --hard ${revs[1]}
+        callback=after_push
+        [ -x deploy/rollback ] && callback=rollback
+        deploy/$callback ${revs[@]} 2>&1 | tee -a log/deploy.log
+      '
+    BASH
   end
 
   desc "log", "Shows the last part of the deploy log on the server"

data/lib/git_deploy/ssh_methods.rb

@@ -11,10 +11,13 @@ class GitDeploy
       super unless options.noop?
     end
 
-    def run(cmd = nil)
+    def run(cmd = nil, opt = {})
       cmd = yield(cmd) if block_given?
       cmd = cmd.join(' && ') if Array === cmd
-      puts "[#{options[:remote]}] $ " + cmd.gsub(' && ', " && \\\n  ")
+
+      if opt.fetch(:echo, true)
+        puts "[#{options[:remote]}] $ " + cmd.gsub(' && ', " && \\\n  ")
+      end
 
       unless options.noop?
         status, output = ssh_exec cmd do |ch, stream, data|

data/lib/hooks/post-receive.sh

@@ -43,10 +43,13 @@ if [ -z "${oldrev//0}" ]; then
 
   # init submodules
   git submodule update --recursive --init 2>&1 | tee -a $logfile
+
+  # execute the one-time setup hook
+  [ -x deploy/setup ] && deploy/setup $oldrev $newrev 2>&1 | tee -a $logfile
 else
   # log timestamp
   echo ==== $(date) ==== >> $logfile
 
-  # execute the deploy hook in background
-  [ -x deploy/after_push ] && (nohup deploy/after_push $oldrev $newrev 1>>$logfile 2>>$logfile &)
+  # execute the main deploy hook
+  [ -x deploy/after_push ] && deploy/after_push $oldrev $newrev 2>&1 | tee -a $logfile
 fi

metadata

@@ -2,14 +2,14 @@
 name: git-deploy
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false