ztk 1.6.6 → 1.6.7

data/lib/ztk/ssh/bootstrap.rb

@@ -29,17 +29,11 @@ module ZTK
           :use_sudo => true
         }.merge(options)
 
-        tempfile = Tempfile.new("bootstrap")
-
-        local_tempfile = Tempfile.new("tempfile-local").path
+        local_tempfile  = Tempfile.new("tempfile-local")
         remote_tempfile = ::File.join("", "tmp", ::File.basename(Tempfile.new("tempfile-remote").path))
 
-        ::File.open(local_tempfile, 'w') do |file|
-          file.puts(content)
-          file.respond_to?(:flush) and file.flush
-        end
-
-        self.upload(local_tempfile, remote_tempfile)
+        local_tempfile.puts(content)
+        local_tempfile.respond_to?(:flush) and local_tempfile.flush
 
         command = Array.new
         command << %(sudo) if (options[:use_sudo] == true)
@@ -47,7 +41,16 @@ module ZTK
         command << remote_tempfile
         command = command.join(' ')
 
-        result = self.exec(command, options)
+        result = nil
+
+        ZTK::RescueRetry.try(:tries => 3, :on_retry => method(:on_retry)) do
+          self.upload(local_tempfile, remote_tempfile)
+
+          result = self.exec(command, options)
+        end
+
+        local_tempfile.close!
+
         result
       end
 

data/lib/ztk/ssh/file.rb

@@ -27,7 +27,7 @@ module ZTK
         target.nil? and raise SSHError, "You must supply a target file!"
         !block_given? and raise SSHError, "You must supply a block!"
 
-        local_tempfile = Tempfile.new("tempfile-local").path
+        local_tempfile  = Tempfile.new("tempfile-local")
         remote_tempfile = ::File.join("", "tmp", ::File.basename(Tempfile.new("tempfile-remote").path))
 
         ::File.open(local_tempfile, 'w') do |file|
@@ -35,6 +35,9 @@ module ZTK
           file.respond_to?(:flush) and file.flush
         end
 
+        !block.nil? and block.call(local_tempfile)
+        local_tempfile.respond_to?(:flush) and local_tempfile.flush
+
         ZTK::RescueRetry.try(:tries => 3, :on_retry => method(:on_retry)) do
           self.upload(local_tempfile, remote_tempfile)
 
@@ -44,6 +47,8 @@ module ZTK
           chmod.nil? or self.exec(%(sudo chmod -v #{chmod} #{target}), :silence => true)
         end
 
+        local_tempfile.close!
+
         true
       end
 

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2795030245117698389
+      hash: 1194605774035367657
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2795030245117698389
+      hash: 1194605774035367657
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25