sensu-spawn 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a5ddfaf5cb5f4c364d433a3ba8916b571060d8
-  data.tar.gz: e9a0cfb1692724f8e67969160812dc6218f986fd
+  metadata.gz: 8c59ce912fa389d190c82e3b8503bcd40f075826
+  data.tar.gz: 268adebe9265c982e1511840163175d4c88d615e
 SHA512:
-  metadata.gz: 9b71c329d9cb7a936a326775ff298269bf725c112e49db42900846475516e3d4bdc437da87501130636aedbf9d527040d60a457b023e697eacedb322ef7c7ad0
-  data.tar.gz: e49eace6222275956d35456253b7f1ed4e9c06545a1ce2cb8ea48541c9b71ebfbe421b3cd81632edc1037c72057d4e39c932ed7672b0386bee2634b7ac99b12f
+  metadata.gz: 766cf5892f5a83704a43f12b91b91a9c650de1c5bb1c8f4106983d50b54d6cd637ca4f5ce8beddc5c1e072e07bcb68cbbc6654eb47600338073c58df30754365
+  data.tar.gz: 53893f509cec1de5ab94047f3259aaebd1aa2bdddb8f7c902898795d79917d8d34ada61b90812d60357dad5931a969b52e99e68dc2dbcb86c36e9a5c549e1521

data/README.md

@@ -2,9 +2,6 @@
 
 [![Build Status](https://travis-ci.org/sensu/sensu-spawn.svg?branch=master)](https://travis-ci.org/sensu/sensu-spawn)
 
-[![Code Climate](https://codeclimate.com/github/sensu/sensu-spawn.png)](https://codeclimate.com/github/sensu/sensu-spawn)
-[![Code Climate Coverage](https://codeclimate.com/github/sensu/sensu-spawn/coverage.png)](https://codeclimate.com/github/sensu/sensu-spawn)
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/sensu/spawn.rb

@@ -5,6 +5,7 @@ require "eventmachine"
 require "em/worker"
 require "childprocess"
 require "rbconfig"
+require "timeout"
 
 # Attempt an upfront loading of FFI and POSIX spawn libraries. These
 # libraries may fail to load on certain platforms, load errors are
@@ -105,9 +106,9 @@ module Sensu
       # so a mutex is used to allow safe execution on Ruby runtimes
       # with real threads (JRuby).
       #
-      # The child process timeout functionality needs to be re-worked,
-      # as it currenty allows for a deadlock, when the child output is
-      # greater than the OS max buffer size.
+      # Using stdlib's Timeout instead of child.poll_for_exit to
+      # avoid a deadlock, when the child output is greater than
+      # the OS max buffer size.
       #
       # @param [String] command to run.
       # @param [Hash] options to create a child process with.
@@ -126,8 +127,10 @@ module Sensu
           child.io.stdin.close
         end
         if options[:timeout]
-          child.poll_for_exit(options[:timeout])
-          output = read_until_eof(reader)
+          output = Timeout::timeout(options[:timeout], ChildProcess::TimeoutError) do
+            read_until_eof(reader)
+          end
+          child.wait
         else
           output = read_until_eof(reader)
           child.wait

data/sensu-spawn.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "sensu-spawn"
-  spec.version       = "2.0.0"
+  spec.version       = "2.1.0"
   spec.authors       = ["Sean Porter"]
   spec.email         = ["portertech@gmail.com"]
   spec.summary       = "The Sensu spawn process library"
@@ -22,5 +22,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "10.5.0"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "codeclimate-test-reporter" unless RUBY_VERSION < "1.9"
 end

data/spec/helpers.rb

@@ -1,11 +1,6 @@
 require "rspec"
 require "eventmachine"
 
-unless RUBY_VERSION < "1.9" || RUBY_PLATFORM =~ /java/
-  require "codeclimate-test-reporter"
-  CodeClimate::TestReporter.start
-end
-
 module Helpers
   def timer(delay, &callback)
     periodic_timer = EM::PeriodicTimer.new(delay) do

data/spec/spawn_spec.rb

@@ -30,6 +30,17 @@ describe "Sensu::Spawn" do
     end
   end
 
+  it "can spawn a process with output greater than 64KB with a timeout" do |output, status|
+    output_asset = "spec/assets/output_1MB"
+    expected_output = IO.read(output_asset)
+    async_wrapper do
+      Sensu::Spawn.process("cat #{output_asset}", :timeout => 10) do |output, status|
+        expect(output).to eq(expected_output)
+        expect(status).to eq(0)
+        async_done
+      end
+    end
+  end
 
   it "can spawn a process with a non-zero exit status" do
     async_wrapper do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-spawn
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-17 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: The Sensu spawn process library
 email:
 - portertech@gmail.com