pushapp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a8cd5f41dc3abef8137554e402bfd99a0d34fb
-  data.tar.gz: 2edd0f050968289f8d9d63d69909d53efceb0518
+  metadata.gz: 1f0350ae01e3025935899744b2a50baecffb8d66
+  data.tar.gz: ceb92cb8030bfac6d17b294ce0ab13e632e933c2
 SHA512:
-  metadata.gz: 4753df68773932645082f32ff97c6c227403ccb27663b2bc50963f7fae2ba8d3cab27ee3c914f72d0cb092eea9b088537052d7517c7a95e6a0e886d877df2f03
-  data.tar.gz: 047466e618fd906f74b539fa776af5bccf21bacca9adf53c9c5989da23914208a4b1249a8427a19ae46d0696d023c6dbb8b612bdd56a31a4da5c692626e3c43a
+  metadata.gz: 704bfbd4c0ec5bd280c7cc6d445d21788eb8aab8251019a5fb678d098b6b07ccb3d8937f3b9b3b57698fe551f3ca6d5c5d80bc876dbf0e7e59cf9efb7eae103e
+  data.tar.gz: e7871a1228f353ffb85a78f6a7bfda03ba6596c7bda8671183e2d4af65063e286b56efc12fb5fbf1378a70520373af8f2bc541f54f034e033dbbe2822346b7ac

data/lib/pushapp/commands.rb

@@ -60,6 +60,7 @@ module Pushapp
       event = @options[:event]
       local = @options[:local]
       if local
+        logger.info "Starting tasks on #{event} event"
         remotes.each do |r|
           r.tasks_on(event).each do |t|
             logger.info "run: #{t.inspect}"

data/lib/pushapp/hook.rb

@@ -110,7 +110,7 @@ module Pushapp
     end
 
     def set_setup_flag
-      @remote.run "touch .git/.pushapp.setup.flag"
+      @remote.run "touch #{@remote.path}/.git/.pushapp.setup.flag"
     end
 
     def copy_hook

data/lib/pushapp/tasks/nginx_export.rb

@@ -2,7 +2,7 @@ require 'pushapp/tasks/base'
 
 module Pushapp
   module Tasks
-    class NginxExport < Nginx
+    class NginxExport < Base
       def run
         system "#{sudo} cp #{nginx_conf} #{nginx_sites}"
 

data/lib/pushapp/tasks/upstart.rb

@@ -45,7 +45,7 @@ module Pushapp
 
     class UpstartRestart < Upstart
       def run_on job
-        system "#{sudo} initctl start #{job} || initctl restart #{job}"
+        system "#{sudo} initctl start #{job} || #{sudo} initctl restart #{job}"
       end
 
       register_as :upstart_restart
@@ -53,7 +53,7 @@ module Pushapp
 
     class UpstartReload < Upstart
       def run_on job
-        system "#{sudo} initctl start #{job} || initctl restart #{job}"
+        system "#{sudo} initctl start #{job} || #{sudo} initctl restart #{job}"
       end
 
       register_as :upstart_reload

data/lib/pushapp/version.rb

@@ -1,3 +1,3 @@
 module Pushapp
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/templates/hook/base.erb

@@ -1,4 +1,8 @@
 <%= load_template 'hook/setup' %>
 <%= load_template 'hook/git-reset' %>
+
+set -e
+set -o pipefail
+
 <%= load_template 'hook/bundler' %>
 <%= load_template 'hook/tasks' %>

data/templates/hook/tasks.erb

@@ -1,6 +1,6 @@
-if [ -s "${GIT_DIR}/.pushapp.setup.flag" ]; then
+if [ -f ".git/.pushapp.setup.flag" ]; then
   bundle exec pushapp trigger setup $PAP_REMOTE --local true <%= colorize %>
-  rm "${GIT_DIR}/.pushapp.setup.flag"
+  rm ".git/.pushapp.setup.flag"
 fi
 
 bundle exec pushapp trigger push $PAP_REMOTE --local true <%= colorize %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushapp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yury Korolev