justrun 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e66d6b5814c68eb5fc90d70aafb51bd5448937a6
-  data.tar.gz: d9da91e425e876f3f6c80f017b68b7905c99be35
+  metadata.gz: d05de7ed05646f8d9f0d48d01fa813f2eed91f90
+  data.tar.gz: a5c0fc3dba2c3f5d5f376add56935f5542f0d452
 SHA512:
-  metadata.gz: 85a0d8372e61fb234d6afb1d4579e543ec1b28c25ac7127f45418720c4a4edf71c3003e58722a0ed6f9ca0d4a55f042c8ca71645f36368edf44fff22cde8a6d7
-  data.tar.gz: f51d8c54df13a74149c09e372fcbe93bdc9d50f2b7a7a661b19ed211b38a6bd9d7dbdd62246622466542620593bce0a8784ccca4638027c7c55a59d78ab6ca9e
+  metadata.gz: 5ac33ff8029a8781beeb087242bc9fbea2c904a8433720e7da85d52cc3f7ecc772d38d8f2c75bdd36cb68e5c4a51dedf5056aef3894ecc1e4a274ed27230198a
+  data.tar.gz: 806ace9c477e2a83cfa35dfb6a39a39b31b7afa2a274547e1368813cc326b867d7e7760f718cfead837294da126cc44e4a38f8b8b38dbdcacd74cf0d8f6f3158

data/lib/justrun.rb

@@ -3,12 +3,29 @@ require 'open3'
 #TODO: Run multiple commands at the same time
 
 class JustRun
-  def self.command(command, block_size: 4096*4, init: ->(writer) {}, env: ENV, &block)
+  def self.command(command, block_size: 4096*4, buffer_output: false, init: ->(writer) {}, env: ENV, &block)
     ret_code = -1
+
+    buffers = {
+        stdout: [],
+        stderr: [],
+        all: []
+    }
+
     Open3.popen3 env, command do |stdin, stdout, stderr, wait_thr|
       writer = JustRun::Writer.new stdin
       init.call writer
 
+      line_handler = -> line, name {
+        if buffer_output
+          buffers[name].push line
+          buffers[:all].push line
+        end
+        if block
+          block.call line, name, writer
+        end
+      }
+
       fileno_lines = {}
       begin
         files = [stdout, stderr]
@@ -25,6 +42,7 @@ class JustRun
               fileno_lines[fileno] ||= []
               lines = fileno_lines[fileno]
               name = fileno2name[fileno]
+
               begin
                 data = f.read_nonblock block_size
                 lines_new = data.lines
@@ -33,7 +51,8 @@ class JustRun
                 end
                 lines.push(*lines_new)
                 while lines[0] =~ /\n\r?/
-                  block.call lines.shift.chomp, name, writer
+                  line = lines.shift.chomp
+                  line_handler.call line, name
                 end
               rescue EOFError => e
                 # expected
@@ -48,7 +67,7 @@ class JustRun
         fileno_lines.each do |fileno, lines|
           name = fileno2name[fileno]
           if lines.length > 0
-            block.call lines.shift.chomp, name, writer
+            line_handler.call lines.shift.chomp, name
           end
         end
       rescue IOError => e
@@ -56,7 +75,17 @@ class JustRun
       end
       ret_code = wait_thr.value
     end
-    ret_code.exitstatus
+
+    if buffer_output
+      {
+        code: ret_code.exitstatus,
+        stderr: buffers[:stderr],
+        stdout: buffers[:stdout],
+        all: buffers[:all]
+      }
+    else
+      ret_code.exitstatus
+    end
   end
 
   private
@@ -75,7 +104,7 @@ class JustRun
     end
 
     def write str
-      @buffer << str;
+      @buffer << str
       process
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: justrun
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Damian Kaczmarek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-15 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Run command and get live line by line callbacks