capistrano-toolbox 0.0.8 → 0.0.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d8aedc2dac879ff0ce1105c398f6d49e2cd293ca
+  data.tar.gz: 5cca6709b92d33f36553dd2b79dbb7927f1244ca
+SHA512:
+  metadata.gz: 4af725d02037cbfaaf18687ed831d197b1a5406bc9f0a716661807c784a0e7f7fe1739f91d052c87e704bc375dde8118f9e1e623289aeff88255ee60f8b36e00
+  data.tar.gz: aec3423878638b1742fd8d2fbba25da169e3c9644089b62c57fb6b91955b31fd67b0c4000363bb536ca27d3a4ce7d223b9ca6694734a281abedfadffe7fd0603

data/lib/capistrano-toolbox/helpers.rb

@@ -1,29 +1,34 @@
+require 'securerandom'
+
 Capistrano::Configuration.instance(:must_exist).load do
-  def put_as_root(contents, target)
+  def put_as_root (user, contents, target, sudo=false)
     tempfile = Tempfile.new(File.basename(target))
     tempfile.write(contents)
     tempfile.close
-    rootscp(tempfile.path, target)
-    surun "chmod 644 #{target}"
+    suscp(user, tempfile.path, target, sudo)
+    surun(user, "chmod 644 #{target}", sudo)
+    surun(user, "chown root:root #{target}", sudo)
     tempfile.unlink
   end
 
-  def rootscp(from, to)
+  def suscp (user, from, to, sudo=false)
     servers = find_servers_for_task(current_task)
     servers.each do |server|
-      command = "scp #{from} root@#{server}:#{to}"
+      tempfile = "~/suscp-upload-#{SecureRandom.hex(6)}"
+      command = "scp #{from} #{user}@#{server}:#{tempfile}"
       puts "  * \033[1;33mexecuting \"#{command}\"\033[0m"
-      system command
+      raise unless system command
+      surun(user, "mv #{tempfile} #{to}", sudo)
     end
   end
 
-  def surun (command)
+  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"
-      `ssh #{server} -l root "#{command.gsub('"','\\"')}"`
+      raise unless system %!ssh #{server} -l #{user} "#{"sudo" if sudo} #{command.gsub('"','\\"')}"!
     end
   end
 

data/lib/capistrano-toolbox/nginx.rb

@@ -6,29 +6,34 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "Updates nginx config"
       task :update_config do
-        config_dir = fetch(:nginx_remote_config_dir)
+        nginx_user     = fetch(:nginx_user, "root")
+        nginx_use_sudo = fetch(:nginx_use_sudo, false)
 
-        config = fetch(:nginx_config, nil)
+        config_dir = fetch(:nginx_remote_config_dir)
+        config     = fetch(:nginx_config, nil)
         if config
           available_path = File.join(config_dir, "#{application}.conf")
-          put_as_root(config, available_path)
-          surun "nxensite #{application}.conf"
+          put_as_root(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(ssl_config, available_ssl_path)
-          surun "nxensite #{application}-ssl.conf"
+          put_as_root(nginx_user, ssl_config, available_ssl_path, nginx_use_sudo)
+          surun(nginx_user, "nxensite #{application}-ssl.conf", nginx_use_sudo)
         end
       end
 
       desc "Reload nginx config"
       task :reload, :roles => :app, :except => { :no_release => true } do
-        surun "service nginx reload"
+        nginx_user     = fetch(:nginx_user, "root")
+        nginx_use_sudo = fetch(:nginx_use_sudo, false)
+
+        surun(nginx_user, "service nginx reload", nginx_use_sudo)
       end
     end
   end
 
   after "deploy:nginx:update_config", "deploy:nginx:reload"
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.9
 platform: ruby
 authors:
 - Jean-Louis Giordano
@@ -11,26 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Some useful capistrano tools, such as unicorn restart, nginx config etc.
-email: dev@spnab.com
+email: dev@pugglepay.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -43,26 +40,25 @@ files:
 - lib/capistrano-toolbox/helpers.rb
 homepage: http://github.com/spnab/
 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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Some useful capistrano tools.
 test_files: []