ztk 1.5.5 → 1.6.0

data/lib/ztk/command.rb

@@ -1,6 +1,5 @@
 require 'ostruct'
 require 'timeout'
-require 'childprocess'
 require 'socket'
 
 module ZTK
@@ -48,8 +47,6 @@ module ZTK
         :silence => false
       }.merge(configuration))
       config.ui.logger.debug { "config=#{config.send(:table).inspect}" }
-
-      ChildProcess.posix_spawn = false
     end
 
     # Execute Command
@@ -98,11 +95,19 @@ module ZTK
 
       start_time = Time.now.utc
 
-      proc = ChildProcess.build(*command)
-      proc.io.stdout = child_stdout_writer
-      proc.io.stderr = child_stderr_writer
-      proc.start
+      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
 
+        Kernel.exec(command)
+      end
       child_stdout_writer.close
       child_stderr_writer.close
 
@@ -110,14 +115,15 @@ module ZTK
       reader_writer_map = {parent_stdout_reader => options.ui.stdout, parent_stderr_reader => options.ui.stderr}
 
       direct_log(:info) { log_header("COMMAND") }
-      direct_log(:info) { "#{command}\n" }
+      direct_log(:info) { "#{command.inspect}\n" }
       direct_log(:info) { log_header("STARTED") }
 
       begin
         Timeout.timeout(options.timeout) do
           loop do
-            reader_writer_map.keys.each do |pipe|
-              data = (pipe.readpartial(1024) rescue nil)
+            pipes = IO.select(reader_writer_map.keys, [], reader_writer_map.keys).first
+            pipes.each do |pipe|
+              data = pipe.read
 
               if (data.nil? || data.empty?)
                 sleep(0.1)
@@ -148,17 +154,17 @@ module ZTK
 
               options.on_progress.nil? or options.on_progress.call
             end
+
             break if reader_writer_map.keys.all?{ |reader| reader.eof? }
           end
         end
       rescue Timeout::Error => e
         direct_log(:fatal) { log_header("TIMEOUT") }
         log_and_raise(CommandError, "Process timed out after #{options.timeout} seconds!")
-        proc.stop
       end
 
-      proc.wait
-      exit_code = proc.exit_code
+      Process.waitpid(pid)
+      exit_code = $?.exitstatus
       direct_log(:info) { log_header("STOPPED") }
 
       parent_stdout_reader.close

data/lib/ztk/parallel.rb

@@ -99,9 +99,17 @@ module ZTK
     # Default Maximum Number of Forks
     MAX_FORKS = case RUBY_PLATFORM
     when /darwin/ then
-      %x( sysctl hw.ncpu ).chomp.split(':').last.strip.to_i
+      %x( sysctl hw.ncpu ).strip.split(':').last.strip.to_i
     when /linux/ then
-      %x( grep -c processor /proc/cpuinfo ).chomp.strip.to_i
+      %x( grep -c processor /proc/cpuinfo ).strip.strip.to_i
+    end
+
+    # Platforms memory capacity in bytes
+    MAX_MEMORY = case RUBY_PLATFORM
+    when /darwin/ then
+      %x( sysctl hw.memsize ).strip.split[1].to_i
+    when /linux/ then
+      (%x( grep MemTotal /proc/meminfo ).strip.split[1].to_i * 1024)
     end
 
     # Result Set

data/lib/ztk/version.rb

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

data/ztk.gemspec

@@ -37,7 +37,6 @@ Gem::Specification.new do |spec|
   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")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ztk
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  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
@@ -281,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2248505364937990165
+      hash: -126748681246947343
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -290,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2248505364937990165
+      hash: -126748681246947343
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25