capistrano-node-deploy 1.2.1 → 1.2.2

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/capistrano-node-deploy.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "capistrano-node-deploy"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Smith"]
-  s.date = "2012-12-31"
+  s.date = "2013-02-27"
   s.description = "Capistrano recipes for deploying node apps"
   s.email = "james@loopj.com"
   s.extra_rdoc_files = [

data/lib/capistrano/node-deploy.rb

@@ -2,22 +2,6 @@ require "digest/md5"
 require "railsless-deploy"
 require "multi_json"
 
-UPSTART_TEMPLATE = <<EOD
-#!upstart
-description "{{application}} node app"
-author      "capistrano"
-
-start on (filesystem and net-device-up IFACE=lo)
-stop on shutdown
-
-respawn
-respawn limit 99 5
-
-script
-    cd {{current_path}} && 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
-
 def remote_file_exists?(full_path)
   'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
 end
@@ -31,10 +15,6 @@ def remote_file_differs?(full_path, content)
   !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"
@@ -43,37 +23,54 @@ Capistrano::Configuration.instance(:must_exist).load do |configuration|
 
   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
+  _cset :application, package_json["name"] 
+  _cset :app_command, package_json["main"] || "index.js"
+  _cset :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
+  _cset :node_binary, "/usr/bin/node"
+  _cset :node_env, "production"
+  _cset :node_user, "deploy"
+
+  _cset(:upstart_job_name) { "#{application}-#{node_env}" }
+  _cset(:upstart_file_path) { "/etc/init/#{upstart_job_name}.conf" }
+  _cset(:upstart_file_contents) {
+<<EOD
+#!upstart
+description "#{application} node app"
+author      "capistrano"
+
+start on (filesystem and net-device-up IFACE=lo)
+stop on shutdown
+
+respawn
+respawn limit 99 5
+
+script
+    cd #{current_path} && 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
+  }
 
-  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 #{release_path}/package.json #{shared_path}"
-      run "cd #{shared_path} && npm install #{(node_env == 'production') ? '--production' : ''}"
+      run "cd #{shared_path} && npm install #{(node_env == 'production') ? '--production' : ''} --loglevel warn"
       run "ln -s #{shared_path}/node_modules #{release_path}/node_modules"
     end
 
     task :check_upstart_config do
-      create_upstart_config if remote_file_differs?(upstart_file_path, generate_upstart_config)
+      create_upstart_config if remote_file_differs?(upstart_file_path, upstart_file_contents)
     end
 
     desc "Create upstart script for this node app"
     task :create_upstart_config do
-      config_file_path = "/etc/init/#{application}.conf"
       temp_config_file_path = "#{shared_path}/#{application}.conf"
 
       # Generate and upload the upstart script
-      put generate_upstart_config, temp_config_file_path
+      put upstart_file_contents, temp_config_file_path
 
       # Copy the script into place and make executable
       sudo "cp #{temp_config_file_path} #{upstart_file_path}"
@@ -103,4 +100,4 @@ Capistrano::Configuration.instance(:must_exist).load do |configuration|
       run mkdir_commands.unshift(mkdir_releases).join(" && ")
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capistrano-node-deploy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-31 00:00:00 Z
+date: 2013-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -29,10 +29,10 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
+  type: :runtime
   version_requirements: *id001
   name: railsless-deploy
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +45,10 @@ dependencies:
         - 3
         - 6
         version: 1.3.6
+  type: :runtime
   version_requirements: *id002
   name: multi_json
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,10 +59,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
   version_requirements: *id003
   name: shoulda
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,10 +74,10 @@ dependencies:
         - 3
         - 12
         version: "3.12"
+  type: :development
   version_requirements: *id004
   name: rdoc
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -89,10 +89,10 @@ dependencies:
         - 1
         - 1
         version: "1.1"
+  type: :development
   version_requirements: *id005
   name: bundler
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -105,10 +105,10 @@ dependencies:
         - 8
         - 3
         version: 1.8.3
+  type: :development
   version_requirements: *id006
   name: jeweler
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -119,10 +119,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :development
   version_requirements: *id007
   name: rcov
   prerelease: false
-  type: :development
 description: Capistrano recipes for deploying node apps
 email: james@loopj.com
 executables: []