capistrano-upstart 0.0.2 → 0.0.3

data/README.md

@@ -1,4 +1,4 @@
-# Capistrano::Upstart
+# capistrano-upstart
 
 a capistrano recipe to manage upstart service.
 

data/capistrano-upstart.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency("capistrano")
+  gem.add_dependency("capistrano-file-resources", "~> 0.0.1")
+  gem.add_dependency("capistrano-file-transfer-ext", "~> 0.0.3")
 end

data/lib/capistrano-upstart/version.rb

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

data/lib/capistrano-upstart.rb

@@ -1,5 +1,7 @@
 require "capistrano-upstart/version"
-require 'erb'
+require "capistrano/configuration/actions/file_transfer_ext"
+require "capistrano/configuration/resources/file_resources"
+require "erb"
 
 module Capistrano
   module Upstart
@@ -27,9 +29,7 @@ module Capistrano
           _cset(:upstart_template_files) {
             [
               "#{upstart_service_name}.conf",
-              "#{upstart_service_name}.conf.erb",
               "upstart.conf",
-              "upstart.conf.erb",
             ]
           }
 
@@ -70,22 +70,11 @@ module Capistrano
           after 'deploy:setup', 'upstart:setup'
 
           task(:configure, :roles => :app, :except => { :no_release => true }) {
-            tempfile = '/tmp/upstart.conf'
-            begin
-              template = upstart_template_files.map { |f| File.join(upstart_template_source_path, f) }.find { |t| File.file?(t) }
-              unless template
-                abort("could not find template for upstart configuration file for `#{upstart_service_name}'.")
-              end
-              case File.extname(template)
-              when '.erb'
-                put(ERB.new(File.read(template)).result(binding), tempfile)
-              else
-                put(File.read(template), tempfile)
-              end
-              run("diff -u #{upstart_service_file} #{tempfile} || #{sudo} mv -f #{tempfile} #{upstart_service_file}")
-            ensure
-              run("rm -f #{tempfile}")
-            end
+            t = upstart_template_files.find { |f|
+              File.file?(File.join(upstart_template_source_path, "#{f}.erb")) or File.file?(File.join(upstart_template_source_path, f))
+            }
+            abort("could not find template for upstart configuration file for `#{upstart_service_name}'.") unless t
+            safe_put(template(t, :path => upstart_template_source_path), upstart_service_file, :place => :if_modified, :sudo => true)
           }
 
           desc("Start upstart service.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-upstart
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: capistrano-file-resources
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: capistrano-file-transfer-ext
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: a capistrano recipe to manage upstart serivce.
 email:
 - yamashita@geishatokyo.com