capistrano-upstart 0.0.1 → 0.0.2

data/lib/capistrano-upstart/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Upstart
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/capistrano-upstart.rb

@@ -43,7 +43,9 @@ module Capistrano
           _cset(:upstart_start_on, { :runlevel => "[2345]" })
           _cset(:upstart_stop_on, { :runlevel => "[016]" })
           _cset(:upstart_env, {})
-          _cset(:upstart_export, [])
+          _cset(:upstart_export) {
+            upstart_env.keys
+          }
           _cset(:upstart_script) {
             abort("You must specify either :upstart_exec or :upstart_script.")
           }
@@ -52,10 +54,10 @@ module Capistrano
           _cset(:upstart_console, 'none')
           _cset(:upstart_respawn, true)
           _cset(:upstart_options) {{
-            "author" => fetch(:upstart_author, '').to_s.dump,
+            "author" => fetch(:upstart_author, 'unknown').to_s.dump,
             "chdir" => upstart_chdir,
             "console" => upstart_console,
-            "description" => fetch(:upstart_description, '').to_s.dump,
+            "description" => fetch(:upstart_description, application).to_s.dump,
             "respawn" => upstart_respawn,
           }}
 

data/lib/templates/upstart.conf.erb

@@ -1,61 +1,51 @@
 ## start on
-<% upstart_start_on.each do |key, val| %>
-start on <%= key %> <%= val %>
-<% end %>
+<%= upstart_start_on.map { |key, val| "start on #{key} #{val}" }.join("\n") %>
 
 ## stop on
-<% upstart_stop_on.each do |key, val| %>
-stop on <%= key %> <%= val %>
-<% end %>
+<%= upstart_stop_on.map { |key, val| "stop on #{key} #{val}" }.join("\n") %>
 
 ## env
-<% upstart_env.each do |key, val| %>
-env <%= "#{key}=#{val.to_s.dump}" %>
-<% end %>
+<%= upstart_env.map { |key, val| "env #{key}=#{val.to_s.dump}" }.join("\n") %>
 
 ## export
-<% upstart_export.each do |key| %>
-export <%= key %>
-<% end %>
+<%= upstart_export.map { |key| "export #{key}" }.join("\n") %>
 
 ## misc options
-<% upstart_options.each do |key, val| %>
-<%= val == true ? key : "#{key} #{val}" %>
-<% end %>
+<%= upstart_options.map { |key, val| val == true ? key : "#{key} #{val}" }.join("\n") %>
 
 ## pre-start
 <% if fetch(:upstart_pre_start_script, nil) %>
 pre-start script
-<%= upstart_pre_start_script %>
+<%= upstart_pre_start_script.chomp %>
 end script
 <% end %>
 
 ## script
 <% if fetch(:upstart_exec, nil) %>
-exec <%= upstart_exec %>
+exec <%= upstart_exec.chomp %>
 <% else %>
 script
-<%= upstart_script %>
+<%= upstart_script.chomp %>
 end script
 <% end %>
 
 ## post-start
 <% if fetch(:upstart_post_start_script, nil) %>
 post-start script
-<%= upstart_post_start_script %>
+<%= upstart_post_start_script.chomp %>
 end script
 <% end %>
 
 ## pre-stop
 <% if fetch(:upstart_pre_stop_script, nil) %>
 pre-stop script
-<%= upstart_pre_stop_script %>
+<%= upstart_pre_stop_script.chomp %>
 end script
 <% end %>
 
 ## post-stop
 <% if fetch(:upstart_post_stop_script, nil) %>
 post-stop script
-<%= upstart_post_stop_script %>
+<%= upstart_post_stop_script.chomp %>
 end script
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-upstart
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano