sensu-spawn 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c59ce912fa389d190c82e3b8503bcd40f075826
-  data.tar.gz: 268adebe9265c982e1511840163175d4c88d615e
+  metadata.gz: 933b1edd838b280c1c606e6a5fbdd4932e6e6582
+  data.tar.gz: 7944ef71e84a4e1fabcef50e8b4a590b10824612
 SHA512:
-  metadata.gz: 766cf5892f5a83704a43f12b91b91a9c650de1c5bb1c8f4106983d50b54d6cd637ca4f5ce8beddc5c1e072e07bcb68cbbc6654eb47600338073c58df30754365
-  data.tar.gz: 53893f509cec1de5ab94047f3259aaebd1aa2bdddb8f7c902898795d79917d8d34ada61b90812d60357dad5931a969b52e99e68dc2dbcb86c36e9a5c549e1521
+  metadata.gz: ec39a9080eee2e4f2f1e0e18df4481672b18964b589eb00137889b82c24a1670e87a43e2bec644fd64fbadbcc34777f00e2c9067f8b3c100b5f5af0da43f8bdf
+  data.tar.gz: 8d79c64a92832767ef052479dee5ba1847d71a7c28f9e2232a5e8e6f9b8cf2eab05b6e3ffb41e590729c8b99ae5fb1a93a8961bb67fdbcf67acaecf36fabc6e5

data/.travis.yml

@@ -1,16 +1,12 @@
 sudo: false
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
   - 2.2.3
-  - jruby-1.7.18
+  - 2.3.0
+  - jruby-9.0.5.0
 notifications:
   irc:
     - "irc.freenode.net#sensu"
-addons:
-  code_climate:
-    repo_token: 6e0d725a7d86b1565bc5a8cfa218cf9fb59811b8d4b030e62b6a4745da9f0f96

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 2.2.0 - 2016-05-26
+
+### Fixes
+
+Alternating between partial child process STDIN writes and STDOUT/ERR
+reads, fixing the large STDIN write deadlock.
+
+## 2.1.0 - 2016-05-26
+
+### Fixes
+
+Replaced ChildProcess poll_for_exit() with stdlib Timeout to fix large
+child output deadlock.
+
+## 2.0.0 - 2016-05-16
+
+### Features
+
+Configurable concurrent child process limit.
+
 ## 1.8.0 - 2016-03-16
 
 ### Fixes

data/lib/sensu/spawn.rb

@@ -58,8 +58,19 @@ module Sensu
       # the current platform. ChildProcess supports POSIX Spawn for
       # several platforms (OSs & architectures), however, Sensu only
       # enables the use of POSIX Spawn on a select few.
+      #
+      # @return [TrueClass, FalseClass]
       def posix_spawn?
-        @posix_spawn ||= POSIX_SPAWN_PLATFORMS.include?(ChildProcess.os)
+        return @posix_spawn unless @posix_spawn.nil?
+        @posix_spawn = POSIX_SPAWN_PLATFORMS.include?(ChildProcess.os)
+      end
+
+      # Determine if the current platform is Windows.
+      #
+      # @return [TrueClass, FalseClass]
+      def on_windows?
+        return @on_windows unless @on_windows.nil?
+        @on_windows = ChildProcess.windows?
       end
 
       # Build a child process attached to a pipe, in order to capture
@@ -71,8 +82,8 @@ module Sensu
       # @return [Array] child object, pipe reader, pipe writer.
       def build_child_process(command)
         reader, writer = IO.pipe
-        shell = case RUBY_PLATFORM
-        when /(ms|cyg|bcc)win|mingw|win32/
+        shell = case
+        when on_windows?
           ["cmd", "/c"]
         else
           ["sh", "-c"]
@@ -85,17 +96,31 @@ module Sensu
         [child, reader, writer]
       end
 
-      # Read a stream/file until end of file (EOF).
+      # Write data to a stream/file and read a stream/file
+      # until end of file (EOF).
       #
-      # @param [Object] reader to read contents of until EOF.
-      # @return [String] the stream/file contents.
-      def read_until_eof(reader)
+      # @param writer [Object] to write data to (optional).
+      # @param reader [Object] to read contents of until EOF.
+      # @param data [String] to be written to writer.
+      # @return [String] the reader stream/file contents.
+      def write_and_read(writer, reader, data)
+        buffer = (data || "").dup
         output = ""
-        begin
-          loop { output << reader.readpartial(8192) }
-        rescue EOFError
+        loop do
+          unless buffer.empty?
+            writer.write(buffer.slice!(0, 8191))
+            writer.close if buffer.empty?
+          end
+          begin
+            readable, _ = IO.select([reader], nil, nil, 0)
+            if readable || buffer.empty?
+              output << reader.readpartial(8192)
+            end
+          rescue EOFError
+            reader.close
+            break
+          end
         end
-        reader.close
         output
       end
 
@@ -122,17 +147,14 @@ module Sensu
           child.start
         end
         writer.close
-        if options[:data]
-          child.io.stdin.write(options[:data])
-          child.io.stdin.close
-        end
+        output = ""
         if options[:timeout]
-          output = Timeout::timeout(options[:timeout], ChildProcess::TimeoutError) do
-            read_until_eof(reader)
+          Timeout::timeout(options[:timeout], ChildProcess::TimeoutError) do
+            output = write_and_read(child.io.stdin, reader, options[:data])
+            child.wait
           end
-          child.wait
         else
-          output = read_until_eof(reader)
+          output = write_and_read(child.io.stdin, reader, options[:data])
           child.wait
         end
         [output, child.exit_code]

data/sensu-spawn.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-spawn"
-  spec.version       = "2.1.0"
+  spec.version       = "2.2.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu spawn process library"

data/spec/spawn_spec.rb

@@ -19,7 +19,7 @@ describe "Sensu::Spawn" do
   end
 
   it "can spawn a process with output greater than 64KB" do |output, status|
-    output_asset = "spec/assets/output_1MB"
+    output_asset = "spec/assets/1MB"
     expected_output = IO.read(output_asset)
     async_wrapper do
       Sensu::Spawn.process("cat #{output_asset}") do |output, status|
@@ -31,7 +31,7 @@ describe "Sensu::Spawn" do
   end
 
   it "can spawn a process with output greater than 64KB with a timeout" do |output, status|
-    output_asset = "spec/assets/output_1MB"
+    output_asset = "spec/assets/1MB"
     expected_output = IO.read(output_asset)
     async_wrapper do
       Sensu::Spawn.process("cat #{output_asset}", :timeout => 10) do |output, status|
@@ -81,4 +81,26 @@ describe "Sensu::Spawn" do
       end
     end
   end
+
+  it "can spawn a process that reads input greater than 64KB from STDIN" do |output, status|
+    input_asset = IO.read("spec/assets/1MB")
+    async_wrapper do
+      Sensu::Spawn.process("cat", :data => input_asset) do |output, status|
+        expect(output).to eq(input_asset)
+        expect(status).to eq(0)
+        async_done
+      end
+    end
+  end
+
+  it "can spawn a process that reads from STDIN and does not output to STDOUT" do
+    input_asset = IO.read("spec/assets/1MB")
+    async_wrapper do
+      Sensu::Spawn.process("cat > /tmp/sensu-spawn-test", :data => input_asset) do |output, status|
+        expect(output).to eq("")
+        expect(status).to eq(0)
+        async_done
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-spawn
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -110,7 +110,7 @@ files:
 - Rakefile
 - lib/sensu/spawn.rb
 - sensu-spawn.gemspec
-- spec/assets/output_1MB
+- spec/assets/1MB
 - spec/helpers.rb
 - spec/spawn_spec.rb
 homepage: https://github.com/sensu/sensu-spawn
@@ -138,6 +138,6 @@ signing_key:
 specification_version: 4
 summary: The Sensu spawn process library
 test_files:
-- spec/assets/output_1MB
+- spec/assets/1MB
 - spec/helpers.rb
 - spec/spawn_spec.rb