capistrano-node-deploy 1.0.9 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.1.0

data/capistrano-node-deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-node-deploy"
-  s.version = "1.0.9"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-09-19"
+  s.date = "2012-10-30"
   s.description = "Capistrano recipes for deploying node apps"
   s.email = "james@loopj.com"
   s.extra_rdoc_files = [

data/lib/capistrano/node-deploy.rb

@@ -1,3 +1,4 @@
+require "digest/md5"
 require "railsless-deploy"
 require "multi_json"
 
@@ -13,7 +14,7 @@ respawn
 respawn limit 99 5
 
 script
-    exec su -c 'NODE_ENV=production {{node_binary}} {{current_path}}/{{app_command}}' deploy 2>&1 >> {{shared_path}}/{{application}}.log
+    exec sudo -u {{node_user}} NODE_ENV={{node_env}} {{node_binary}} {{current_path}}/{{app_command}} 2>> {{shared_path}}/{{node_env}}.err.log 1>> {{shared_path}}/{{node_env}}.out.log
 end script
 EOD
 
@@ -21,18 +22,37 @@ def remote_file_exists?(full_path)
   'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
 end
 
+def remote_file_content_same_as?(full_path, content)
+  Digest::MD5.hexdigest(content) == capture("md5sum #{full_path} | awk '{ print $1 }'").strip
+end
+
+def remote_file_differs?(full_path, content)
+  exists = remote_file_exists?(full_path)
+  !exists || exists && !remote_file_content_same_as?(full_path, content)
+end
+
+def generate_upstart_config
+  UPSTART_TEMPLATE.gsub(/\{\{(.*?)\}\}/) { eval($1) }
+end
+
 Capistrano::Configuration.instance(:must_exist).load do |configuration|
   before "deploy", "deploy:create_release_dir"
   before "deploy", "node:check_upstart_config"
-  after "deploy:create_symlink", "node:install_packages"
-  after "deploy:create_symlink", "node:restart"
+  after "deploy:finalize_update", "node:install_packages"
+  after "deploy:finalize_update", "node:restart"
   after "deploy:rollback", "node:restart"
 
   package_json = MultiJson.load(File.open("package.json").read) rescue {}
 
   set :application, package_json["name"] unless defined? application
   set :app_command, package_json["main"] || "index.js" unless defined? app_command
+
   set :node_binary, "/usr/bin/node" unless defined? node_binary
+  set :node_env, "production" unless defined? node_env
+  set :node_user, "deploy" unless defined? node_user
+
+  set :upstart_job_name, "#{application}-#{node_env}" unless defined? upstart_job_name
+  set :upstart_file_path, "/etc/init/#{upstart_job_name}.conf" unless defined? upstart_file_path
 
   namespace :node do
     desc "Check required packages and install if packages are not installed"
@@ -44,7 +64,7 @@ Capistrano::Configuration.instance(:must_exist).load do |configuration|
     end
 
     task :check_upstart_config do
-      create_upstart_config unless remote_file_exists?("/etc/init/#{application}.conf")
+      create_upstart_config if remote_file_differs?(upstart_file_path, generate_upstart_config)
     end
 
     desc "Create upstart script for this node app"
@@ -53,26 +73,26 @@ Capistrano::Configuration.instance(:must_exist).load do |configuration|
       temp_config_file_path = "#{shared_path}/#{application}.conf"
 
       # Generate and upload the upstart script
-      put UPSTART_TEMPLATE.gsub(/\{\{(.*?)\}\}/) { eval($1) }, temp_config_file_path
+      put generate_upstart_config, temp_config_file_path
 
       # Copy the script into place and make executable
-      sudo "cp #{temp_config_file_path} #{config_file_path}"
-      sudo "chmod +x #{config_file_path}"
+      sudo "cp #{temp_config_file_path} #{upstart_file_path}"
     end
 
     desc "Start the node application"
     task :start do
-      sudo "start #{application}"
+      sudo "start #{upstart_job_name}"
     end
 
     desc "Stop the node application"
     task :stop do
-      sudo "stop #{application}"
+      sudo "stop #{upstart_job_name}"
     end
 
     desc "Restart the node application"
     task :restart do
-      sudo "restart #{application} || sudo start #{application}"
+      sudo "stop #{upstart_job_name}"
+      sudo "start #{upstart_job_name}"
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-node-deploy
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 9
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-19 00:00:00 Z
+date: 2012-10-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement