bricks-deploy 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206959cc48161d213b59128c6b39336a9ab736dc
-  data.tar.gz: 3980bf1ffd7ce1239acf32e6b3fd92651aae89dd
+  metadata.gz: 09d4a4cbcab76b8e5917aeffb058da208cc2ffac
+  data.tar.gz: 10d7779d76f93758dfed2ea1675de2973975b910
 SHA512:
-  metadata.gz: b8b4de09be23a91e4f6916ad6f451cee70728036ab9318b5eb1c46cd6c84062d1b20ac65423a9979c8ea1407ae8efa3cbe28da7c3799318972a5447d5730128b
-  data.tar.gz: 3e7b7f2efec4b32085b194e43f8e39c97f4a0702c3180a5c2b8cfd0883d9eb2f10d16396a544694d554a4099459ea27e937c9cd6a4a70f9e7403fb9899307a4b
+  metadata.gz: c9e4f43e6c44c5590286ae61bbe3457ae105c5a3f696f99ffdb8c9c556f5519e6e40a394cc000f99dd53b68c4de07f4096df2d3d9fe39a81406630adaefca9db
+  data.tar.gz: 40d08c1f51b28801f226d0e4cbe8d1d547986ca280bf7db58f755111e930e8651606d3fdd4d9508364f684f406afa25a0da5a59a3db58712412600ce64f7af5f

data/lib/bricks_deploy/generator.rb

@@ -8,15 +8,15 @@ class BricksDeploy::Generator < Thor::Group
   end
 
   def copy_main_hook
-    copy_hook 'after_push.sh', 'deploy/after_push'
+    copy_hook 'after_push.sh', 'bin/deploy/remote/after_push'
   end
 
   def copy_restart_hook
-    copy_hook 'restart.sh', 'deploy/restart'
+    copy_hook 'restart.sh', 'bin/deploy/remote/restart'
   end
 
   def copy_restart_callbacks
-    copy_hook 'before_restart.rb', 'deploy/before_restart'
+    copy_hook 'before_restart.rb', 'bin/deploy/remote/before_restart'
   end
 
   private

data/lib/bricks_deploy/templates/after_push.sh

@@ -13,5 +13,5 @@ umask 002
 
 git submodule sync && git submodule update --init --recursive
 
-run deploy/before_restart
-run deploy/restart && run deploy/after_restart
+run bin/deploy/remote/before_restart
+run bin/deploy/remote/restart && run bin/deploy/remote/after_restart

data/lib/bricks_deploy/templates/restart.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-touch tmp/restart.txt
+touch var/tmp/restart.txt
 echo "restarting Passenger app"

data/lib/bricks_deploy.rb

@@ -42,8 +42,8 @@ class BricksDeploy < Thor
       cmd << "git config --bool receive.denyNonFastForwards false" if options.shared?
       cmd << "git config receive.denyCurrentBranch ignore"
       cmd << "mkdir deploy"
-      cmd << "echo #{options.stage} > deploy/stage"
-      cmd << "echo #{options.color} > deploy/color"
+      cmd << "echo #{options.stage} > app/config/stage"
+      cmd << "echo #{options.color} > app/config/color"
     end
 
     invoke :hooks
@@ -60,7 +60,7 @@ class BricksDeploy < Thor
 
   desc "restart", "Restarts the application on the server"
   def restart
-    run "cd #{deploy_to} && deploy/restart 2>&1 | tee -a log/deploy.log"
+    run "cd #{deploy_to} && bin/deploy/remote/restart 2>&1 | tee -a var/logs/deploy.log"
   end
 
   desc "rerun", "Runs the `deploy/after_push' callback as if a new revision was pushed via git"
@@ -69,7 +69,7 @@ class BricksDeploy < Thor
       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
+        bin/deploy/remote/after_push ${revs[@]} 2>&1 | tee -a var/logs/deploy.log
       '
     BASH
   end
@@ -82,8 +82,8 @@ class BricksDeploy < Thor
         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
+        [ -x bin/deploy/remote/rollback ] && callback=rollback
+        bin/deploy/remote/$callback ${revs[@]} 2>&1 | tee -a var/logs/deploy.log
       '
     BASH
   end
@@ -93,7 +93,7 @@ class BricksDeploy < Thor
   method_option :lines, :aliases => '-l', :type => :numeric, :default => 20
   def log(n = nil)
     tail_args = options.tail? ? '-f' : "-n#{n || options.lines}"
-    run "tail #{tail_args} #{deploy_to}/log/deploy.log"
+    run "tail #{tail_args} #{deploy_to}/var/logs/deploy.log"
   end
 
   desc "upload <files>", "Copy local files to the remote app"

data/lib/hooks/post-receive.sh

@@ -31,13 +31,13 @@ fi
 umask 002
 git reset --hard
 
-logfile=log/deploy.log
-restart=tmp/restart.txt
+logfile=var/logs/deploy.log
+restart=var/tmp/restart.txt
 
 if [ -z "${oldrev//0}" ]; then
   # this is the first push; this branch was just created
-  mkdir -p log tmp
-  chmod 0775 log tmp
+  mkdir -p var/logs var/tmp
+  chmod 0775 var/logs var/tmp
   touch $logfile $restart
   chmod 0664 $logfile $restart
 
@@ -45,11 +45,11 @@ if [ -z "${oldrev//0}" ]; then
   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
+  [ -x bin/deploy/remote/setup ] && bin/deploy/remote/setup $oldrev $newrev 2>&1 | tee -a $logfile
 else
   # log timestamp
   echo ==== $(date) ==== >> $logfile
 
   # execute the main deploy hook
-  [ -x deploy/after_push ] && deploy/after_push $oldrev $newrev 2>&1 | tee -a $logfile
+  [ -x bin/deploy/remote/after_push ] && bin/deploy/remote/after_push $oldrev $newrev 2>&1 | tee -a $logfile
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bricks-deploy
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Mislav Marohnić