ztk 1.6.0 → 1.6.1

data/lib/ztk/ssh/bootstrap.rb

@@ -19,13 +19,20 @@ module ZTK
       #
       # @param [String] content What to render out to the bootstrap file we will
       #   execute.
-      # @param [Boolean] use_sudo Whether or not we should prefix *sudo*
-      #   on our command.
-      def bootstrap(content, use_sudo=true)
+      # @param [Hash] options The options hash.  This will also accept options
+      #   for #exec in order to better control the bootstrapping execution.
+      # @option options [String] :use_sudo True if we should execute the
+      #   bootstrap via sudo; False to execute it as the defined user.
+      def bootstrap(content, options={})
+        options = {
+          :silence => true,
+          :use_sudo => true
+        }.merge(options)
+
         tempfile = Tempfile.new("bootstrap")
 
         local_tempfile = tempfile.path
-        remote_tempfile = ::File.join("/tmp", ::File.basename(local_tempfile))
+        remote_tempfile = ::File.join("/", "tmp", ::File.basename(local_tempfile))
 
         ::File.open(local_tempfile, 'w') do |file|
           file.puts(content)
@@ -35,12 +42,13 @@ module ZTK
         self.upload(local_tempfile, remote_tempfile)
 
         command = Array.new
-        command << %(sudo) if (use_sudo == true)
+        command << %(sudo) if (options[:use_sudo] == true)
         command << %(/bin/bash)
         command << remote_tempfile
         command = command.join(' ')
 
-        self.exec(command, :silence => true)
+        result = self.exec(command, options)
+        result
       end
 
     end

data/lib/ztk/ssh/file.rb

@@ -30,19 +30,20 @@ module ZTK
         tempfile = Tempfile.new("tempfile")
 
         local_tempfile = tempfile.path
-        remote_tempfile = ::File.join("/tmp", ::File.basename(local_tempfile))
+        remote_tempfile = ::File.join("/", "tmp", ::File.basename(local_tempfile))
 
         ::File.open(local_tempfile, 'w') do |file|
           yield(file)
+          file.respond_to?(:flush) and file.flush
         end
 
-        ZTK::RescueRetry.try(:tries => 2, :on_retry => method(:on_retry)) do
-          upload(local_tempfile, remote_tempfile)
+        ZTK::RescueRetry.try(:tries => 3, :on_retry => method(:on_retry)) do
+          self.upload(local_tempfile, remote_tempfile)
 
-          exec(%(sudo mv -v #{remote_tempfile} #{target}), :silence => true)
+          self.exec(%(sudo mv -fv #{remote_tempfile} #{target}), :silence => true)
 
-          exec(%(sudo chown -v #{chown} #{target}), :silence => true) if !chown.nil?
-          exec(%(sudo chmod -v #{chmod} #{target}), :silence => true) if !chmod.nil?
+          chown.nil? or self.exec(%(sudo chown -v #{chown} #{target}), :silence => true)
+          chmod.nil? or self.exec(%(sudo chmod -v #{chmod} #{target}), :silence => true)
         end
 
         true

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -263,18 +263,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -126748681246947343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -126748681246947343
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25