scout-essentials 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db7f899334b87ac162e91f1f0f1f475729ef2581dcb4d855081c4f9434a72bf
-  data.tar.gz: bc2f73376b3fa616cc479a472e65489ef7224d3efe26934a1d104e225f53ca53
+  metadata.gz: 47e74859c0d59a6223fa7712841dedd25fab88e64fa106f56de75aacb53482a2
+  data.tar.gz: d3a60f92ef5ded228cee841b94e75c41a2bb4c2ab2c31c7326d183adaf8c9004
 SHA512:
-  metadata.gz: 4dc43a5f5b65066fe14f581ff0582eb2a6458df8e3ee04325243b4f3bc0e8b32bccd4083e5eee1f764aa2e8ad58102c45794aa69845bc62992a6a404910e7aa6
-  data.tar.gz: 5d5e331f5885d4ed33fceda7f4c58332342e49bb154776688466225dcfc043809390d65289ab7588dd5c528efab7b89843d7fbadad7aa2317ed6626469c1d260
+  metadata.gz: c9f6625a056a04da4759694239eb61fd0c4c198a023ddaad66efe3748322f844cc206cea6a1d10f4fb992b36a997a223c8b20d902d14a1bc9c74cfcdca1bc7d9
+  data.tar.gz: a55d298f3b81c5966e28a1785270b29ba29581c1e004135810c01648bc51c02b32e1d2588e92d8e26513acd1a860860064e474d62c21a3633f5f3908f14202f7

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/lib/scout/cmd.rb

@@ -202,8 +202,11 @@ module CMD
           Thread.current["name"] = "CMD in"
           while c = in_content.read(Open::BLOCK_SIZE)
             sin << c
+            break if in_content.closed?
           end
+
           sin.close  unless sin.closed?
+          sin.join if sin.respond_to? :join
 
           unless dont_close_in
             in_content.close unless in_content.closed?
@@ -232,13 +235,13 @@ module CMD
         err_thread = Thread.new do
           Thread.current["name"] = "Error log: [#{pid}] #{ cmd }"
           begin
-          while line = serr.gets
-            bar.process(line) if bar
-            sout.log = line
-            sout.std_err << line if save_stderr
-            Log.log "STDERR [#{pid}]: " +  line, stderr if log
-          end
-          serr.close
+            while line = serr.gets
+              bar.process(line) if bar
+              sout.log = line
+              sout.std_err << line if save_stderr
+              Log.log "STDERR [#{pid}]: " +  line, stderr if log
+            end
+            serr.close
           rescue
             Log.exception $!
             raise $!

data/lib/scout/concurrent_stream.rb

@@ -12,7 +12,9 @@ module ConcurrentStream
   attr_accessor :threads, :pids, :callback, :abort_callback, :filename, :joined, :aborted, :autojoin, :lock, :no_fail, :pair, :thread, :stream_exception, :log, :std_err, :next, :exit_status
 
   def self.setup(stream, options = {}, &block)
-    threads, pids, callback, abort_callback, filename, autojoin, lock, no_fail, pair, next_stream = IndiferentHash.process_options options, :threads, :pids, :callback, :abort_callback, :filename, :autojoin, :lock, :no_fail, :pair, :next
+    threads, pids, callback, abort_callback, filename, autojoin, lock, no_fail, pair, next_stream = IndiferentHash.process_options options,
+      :threads, :pids, :callback, :abort_callback, :filename, :autojoin, :lock, :no_fail, :pair, :next
+
     stream.extend ConcurrentStream unless ConcurrentStream === stream
 
     stream.threads ||= []

data/scout-essentials.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-essentials 1.8.1 ruby lib
+# stub: scout-essentials 1.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-essentials".freeze
-  s.version = "1.8.1".freeze
+  s.version = "1.8.2".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/scout/test_cmd.rb

@@ -29,6 +29,20 @@ class TestCmd < Test::Unit::TestCase
     assert_equal("test2\n", CMD.cmd("cut", "-f" => 2, "-d" => ' ', :in => "test1 test2", :pipe => true).read)
   end
 
+  def test_in_io
+    text =<<-EOF
+line1
+line2
+line3
+line4
+    EOF
+    TmpFile.with_file(text) do |file|
+      io = Open.open(file)
+      ConcurrentStream.setup(io)
+      CMD.cmd('wc -l', in: io)
+    end
+  end
+
   def test_error
     Log.with_severity 6 do
       assert_raise ProcessFailed do CMD.cmd('fake-command') end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-essentials
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Miguel Vazquez