capistrano-haproxy 0.0.1 → 0.0.2

data/capistrano-haproxy.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-haproxy.rb

@@ -1,6 +1,7 @@
 require "capistrano-haproxy/version"
+require "capistrano/configuration/actions/file_transfer_ext"
+require "capistrano/configuration/resources/file_resources"
 require "erb"
-require "tempfile"
 require "uri"
 
 module Capistrano
@@ -78,7 +79,7 @@ module Capistrano
           # Do not run automatically during normal `deploy' to avoid slow down.
           # If you want to do so, add following line in your ./config/deploy.rb
           #
-          # after 'deploy:update', 'haproxy:update'
+          # after 'deploy:finalize_update', 'haproxy:update'
 
           task(:_update, :roles => :app, :except => { :no_release => true }) {
             configure
@@ -123,42 +124,12 @@ module Capistrano
             # TODO: setup (sysvinit|daemontools|upstart|runit|systemd) service of HAProxy
           }
 
-          def tempfile(name)
-            f = Tempfile.new(name)
-            path = f.path
-            f.close(true) # close and remove tempfile immediately
-            path
-          end
-
-          def template(file)
-            if File.file?(file)
-              File.read(file)
-            elsif File.file?("#{file}.erb")
-              ERB.new(File.read("#{file}.erb")).result(binding)
-            else
-              abort("No such template: #{file} or #{file}.erb")
-            end
-          end
-
           _cset(:haproxy_template_path, File.join(File.dirname(__FILE__), 'capistrano-haproxy', 'templates'))
           _cset(:haproxy_configure_files, %w(/etc/default/haproxy haproxy.cfg))
           task(:configure, :roles => :app, :except => { :no_release => true }) {
-            srcs = haproxy_configure_files.map { |file| File.join(haproxy_template_path, file) }
-            tmps = haproxy_configure_files.map { |file| tempfile('capistrano-haproxy') }
-            dsts = haproxy_configure_files.map { |file| File.expand_path(file) == file ? file : File.join(haproxy_path, file) }
-            begin
-              srcs.zip(tmps) do |src, tmp|
-                put(template(src), tmp)
-              end
-              execute = []
-              dirs = dsts.map { |path| File.dirname(path) }.uniq
-              execute << "#{sudo} mkdir -p #{dirs.map { |dir| dir.dump }.join(' ')}" unless dirs.empty?
-              tmps.zip(dsts) do |tmp, dst|
-                execute << "( diff -u #{dst.dump} #{tmp.dump} || #{sudo} mv -f #{tmp.dump} #{dst.dump} )"
-              end
-              run(execute.join(' && ')) unless execute.empty?
-            ensure
-              run("rm -f #{tmps.map { |t| t.dump }.join(' ')}") unless tmps.empty?
+            haproxy_configure_files.each do |f|
+              safe_put(template(f, :path => haproxy_template_path), ( File.expand_path(f) == f ? f : File.join(haproxy_path, f) ),
+                       :place => :if_modified, :sudo => true)
             end
           }
 

data/lib/capistrano-haproxy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-haproxy
 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-11-07 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 setup HAProxy.
 email:
 - yamashita@geishatokyo.com