ztk 1.4.22 → 1.5.0

data/lib/ztk/command.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'timeout'
+require 'childprocess'
 
 module ZTK
 
@@ -46,6 +47,8 @@ module ZTK
         :silence => false
       }.merge(configuration))
       config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
+
+      ChildProcess.posix_spawn = false
     end
 
     # Execute Command
@@ -94,19 +97,11 @@ module ZTK
 
       start_time = Time.now.utc
 
-      pid = Process.fork do
-        parent_stdout_reader.close
-        parent_stderr_reader.close
-
-        STDOUT.reopen(child_stdout_writer)
-        STDERR.reopen(child_stderr_writer)
-        STDIN.reopen("/dev/null")
-
-        child_stdout_writer.close
-        child_stderr_writer.close
+      proc = ChildProcess.build(*command)
+      proc.io.stdout = child_stdout_writer
+      proc.io.stderr = child_stderr_writer
+      proc.start
 
-        Kernel.exec(command)
-      end
       child_stdout_writer.close
       child_stderr_writer.close
 
@@ -153,10 +148,11 @@ module ZTK
       rescue Timeout::Error => e
         direct_log(:fatal) { log_header("TIMEOUT") }
         log_and_raise(CommandError, "Process timed out after #{options.timeout} seconds!")
+        proc.stop
       end
 
-      Process.waitpid(pid)
-      exit_code = $?.exitstatus
+      proc.wait
+      exit_code = proc.exit_code
       direct_log(:info) { log_header("STOPPED") }
 
       parent_stdout_reader.close

data/lib/ztk/version.rb

@@ -1,6 +1,6 @@
 module ZTK
 
   # ZTK Version String
-  VERSION = "1.4.22"
+  VERSION = "1.5.0"
 
 end

data/ztk.gemspec

@@ -36,10 +36,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency("activesupport")
+  spec.add_dependency("childprocess", "0.3.6")
   spec.add_dependency("erubis")
   spec.add_dependency("net-ssh")
   spec.add_dependency("net-sftp")
-  spec.add_dependency("activesupport")
 
   spec.add_development_dependency("pry")
   spec.add_development_dependency("rake")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.4.22
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: erubis
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-sftp
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -265,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3810276298240369576
+      hash: -3936130905649481277
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -274,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3810276298240369576
+      hash: -3936130905649481277
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25