capistrano-node-deploy 1.1.0 → 1.2.0

data/README.md

@@ -20,7 +20,7 @@ First install the gem:
 
 or add it to your `Gemfile` if you have one:
 
-    gem "capistrano-rails-deploy", "~> 1.0.0"
+    gem "capistrano-rails-deploy"
 
 Now add the following to your `Capfile`
 
@@ -44,11 +44,20 @@ Full Capfile Example
 Overriding Default Settings
 ---------------------------
 
-    # Override your node binary path
-    set :node_binary, "/usr/bin/coffee"
+    # Set app command to run (defaults to index.js, or your `main` file from `package.json`)
+    set :app_command, "my_server.coffee"
 
-    # Override your app command
-    set :app_command, "index.coffee --environment production"
+    # Set node binary to run (defaults to /usr/bin/node)
+    set :node_binary, "/usr/bin/coffee"
+    
+    # Set node environment (defaults to production)
+    set :node_env, "staging"
+    
+    # Set the user to run node as (defaults to deploy)
+    set :node_user, "james"
+
+    # Set the name of the upstart command (defaults to #{application}-#{node_env})
+    set :upstart_job_name, "myserver"
 
 
 Contributing to capistrano-node-deploy

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/capistrano-node-deploy.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-node-deploy"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]

data/lib/capistrano/node-deploy.rb

@@ -14,7 +14,7 @@ respawn
 respawn limit 99 5
 
 script
-    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
+    exec sudo -u {{node_user}} NODE_ENV={{node_env}} {{app_environment}} {{node_binary}} {{current_path}}/{{app_command}} 2>> {{shared_path}}/{{node_env}}.err.log 1>> {{shared_path}}/{{node_env}}.out.log
 end script
 EOD
 
@@ -38,29 +38,29 @@ end
 Capistrano::Configuration.instance(:must_exist).load do |configuration|
   before "deploy", "deploy:create_release_dir"
   before "deploy", "node:check_upstart_config"
-  after "deploy:finalize_update", "node:install_packages"
-  after "deploy:finalize_update", "node:restart"
+  after "deploy:update", "node:install_packages", "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 :app_environment, "" unless defined? app_environment
 
   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
+  set :upstart_job_name, lambda { "#{application}-#{node_env}" } unless defined? upstart_job_name
+  set :upstart_file_path, lambda { "/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"
     task :install_packages do
       run "mkdir -p #{shared_path}/node_modules"
-      run "cp #{current_path}/package.json #{shared_path}"
+      run "cp #{release_path}/package.json #{shared_path}"
       run "cd #{shared_path} && npm install"
-      run "ln -s #{shared_path}/node_modules #{current_path}/node_modules"
+      run "ln -s #{shared_path}/node_modules #{release_path}/node_modules"
     end
 
     task :check_upstart_config do
@@ -91,7 +91,7 @@ Capistrano::Configuration.instance(:must_exist).load do |configuration|
 
     desc "Restart the node application"
     task :restart do
-      sudo "stop #{upstart_job_name}"
+      sudo "stop #{upstart_job_name}; true"
       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: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - James Smith