capistrano-toolbox 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8aedc2dac879ff0ce1105c398f6d49e2cd293ca
-  data.tar.gz: 5cca6709b92d33f36553dd2b79dbb7927f1244ca
+  metadata.gz: 24946192ec201ff25510b07b39f5787b9bb96205
+  data.tar.gz: 81d97deeb0549e641ce8873d997fc60b709ecba6
 SHA512:
-  metadata.gz: 4af725d02037cbfaaf18687ed831d197b1a5406bc9f0a716661807c784a0e7f7fe1739f91d052c87e704bc375dde8118f9e1e623289aeff88255ee60f8b36e00
-  data.tar.gz: aec3423878638b1742fd8d2fbba25da169e3c9644089b62c57fb6b91955b31fd67b0c4000363bb536ca27d3a4ce7d223b9ca6694734a281abedfadffe7fd0603
+  metadata.gz: 869f8a6603a1108e530c854a7c9600635cc0c2caa3563fa44dc5f98f1546ec24e67076a8a668026eabb7f0cf5f66ce17ffaf02566dc2b16c6c5182c01916df34
+  data.tar.gz: 38c10ecd1430ba3a2420d0c76442ae26eb8f0ce43f31ce030b2fcc428a6500b2c1e3bb0692413114330af5607fc202ebc28548f281963419a54a2d9d2c0a215d

data/lib/capistrano-toolbox/helpers.rb

@@ -1,34 +1,38 @@
 require 'securerandom'
 
 Capistrano::Configuration.instance(:must_exist).load do
-  def put_as_root (user, contents, target, sudo=false)
+  def put_nginx_config (user, contents, target, sudo=false)
     tempfile = Tempfile.new(File.basename(target))
     tempfile.write(contents)
     tempfile.close
-    suscp(user, tempfile.path, target, sudo)
-    surun(user, "chmod 644 #{target}", sudo)
-    surun(user, "chown root:root #{target}", sudo)
+
+    remote_tempfile ="#{release_path}/tmp/new-nginx-config"
+    restart_nginx_file = "#{release_path}/tmp/nginx_restart.txt"
+
+    suscp(user, tempfile.path, remote_tempfile, sudo)
+    surun(user, "diff -q #{remote_tempfile} #{target} && rm #{remote_tempfile} || (mv #{remote_tempfile} #{target} && touch #{restart_nginx_file})", sudo)
+    surun(user, "chmod 644 #{target} && chown root:root #{target}", sudo)
     tempfile.unlink
   end
 
   def suscp (user, from, to, sudo=false)
     servers = find_servers_for_task(current_task)
     servers.each do |server|
-      tempfile = "~/suscp-upload-#{SecureRandom.hex(6)}"
-      command = "scp #{from} #{user}@#{server}:#{tempfile}"
+      command = "scp #{from} #{user}@#{server}:#{to}"
       puts "  * \033[1;33mexecuting \"#{command}\"\033[0m"
       raise unless system command
-      surun(user, "mv #{tempfile} #{to}", sudo)
     end
   end
 
+
   def surun (user, command, sudo=false)
     puts "  * \033[1;33mexecuting sudo \"#{command}\"\033[0m"
     servers = find_servers_for_task(current_task)
     puts "    servers: #{servers.inspect}"
     servers.each do |server|
       puts "    [#{server}] executing command"
-      raise unless system %!ssh #{server} -l #{user} "#{"sudo" if sudo} #{command.gsub('"','\\"')}"!
+      maybe_sudo = sudo ? "sudo -s /bin/bash -c #{command.inspect}" : command
+      raise unless system %!ssh #{server} -l #{user} #{maybe_sudo.inspect}!
     end
   end
 

data/lib/capistrano-toolbox/nginx.rb

@@ -13,16 +13,19 @@ Capistrano::Configuration.instance(:must_exist).load do
         config     = fetch(:nginx_config, nil)
         if config
           available_path = File.join(config_dir, "#{application}.conf")
-          put_as_root(nginx_user, config, available_path, nginx_use_sudo)
+          put_nginx_config(nginx_user, config, available_path, nginx_use_sudo)
           surun(nginx_user, "nxensite #{application}.conf", nginx_use_sudo)
         end
 
         ssl_config = fetch(:nginx_ssl_config, nil)
         if ssl_config
           available_ssl_path = File.join(config_dir, "#{application}-ssl.conf")
-          put_as_root(nginx_user, ssl_config, available_ssl_path, nginx_use_sudo)
+          put_nginx_config(nginx_user, ssl_config, available_ssl_path, nginx_use_sudo)
           surun(nginx_user, "nxensite #{application}-ssl.conf", nginx_use_sudo)
         end
+
+        restart_nginx = "#{release_path}/tmp/nginx_restart.txt"
+        surun(nginx_user, "! test -f #{restart_nginx} || service nginx reload", nginx_use_sudo)
       end
 
       desc "Reload nginx config"
@@ -32,8 +35,15 @@ Capistrano::Configuration.instance(:must_exist).load do
 
         surun(nginx_user, "service nginx reload", nginx_use_sudo)
       end
+
+      desc "Restart nginx"
+      task :restart, :roles => :app, :except => { :no_release => true } do
+        nginx_user     = fetch(:nginx_user, "root")
+        nginx_use_sudo = fetch(:nginx_use_sudo, false)
+
+        surun(nginx_user, "service nginx restart", nginx_use_sudo)
+      end
+
     end
   end
-
-  after "deploy:nginx:update_config", "deploy:nginx:reload"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jean-Louis Giordano
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano