justrun 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ba0830fb9aa41d2dc2f4e73e5f574a798bdaecb
-  data.tar.gz: a21c4123f097bb74ac3f89dafca0ad7f34cd94b9
+  metadata.gz: ec7679a78b2e88636c92105d18866774991c8ce8
+  data.tar.gz: 948d3b2b1d3f45e2b43146a15b72791fe37a7917
 SHA512:
-  metadata.gz: 66b2bd7010a8bccc8a9784a5243c8a6861c07a9cad70f2ff8c8b33da2fc414f6f21f5fb4e775997cf0891e8c76ed3161393feba3144d51b322f665c18bd76212
-  data.tar.gz: ec6c0fd746e9d0fa96e447c15f9f7c8b7b61d8b0c94b52de56f3d81cf0436f971e9191ff5b5061b02b15f72ef019dc1ffec485403df3b9922cb82bcc8be5d0ab
+  metadata.gz: e48401fce9c94d5377633ad2159ee6029bd2cafefc96d3453d31f5b898cead16ca2c8354fa805699f3dee97dba7881fab78d2434e518a12272665544b28fb097
+  data.tar.gz: c175d9e49ec3ac95fbf0a6da508f25920de60480d35dc8a3f806d05d26a6d9bf5cb555e53495f1bf8084860241955711208297ba6abd9f4f2d42d7ee8217bc53

data/lib/justrun.rb

@@ -1,14 +1,14 @@
 require 'open3'
 
-class JustRun
-
+#TODO: Run multiple commands at the same time
 
-  def self.command(command, init: lambda { |stdin|
-    stdin.close_write
-  }, &block)
+class JustRun
+  def self.command(command, block_size: 4096*4, init: ->(writer) {}, &block)
     ret_code = -1
     Open3.popen3 command do |stdin, stdout, stderr, wait_thr|
-      init.call stdin
+      writer = JustRun::Writer.new stdin
+      init.call writer
+
       fileno_lines = {}
       begin
         files = [stdout, stderr]
@@ -17,7 +17,7 @@ class JustRun
             stderr.fileno => :stderr
         }
         until all_eof files do
-          ready = IO.select files
+          ready = IO.select files, stdin.closed? ? [] : [stdin], [], 0.1
           if ready
             readable = ready[0]
             readable.each do |f|
@@ -26,25 +26,29 @@ class JustRun
               lines = fileno_lines[fileno]
               name = fileno2name[fileno]
               begin
-                data = f.read_nonblock BLOCK_SIZE
+                data = f.read_nonblock block_size
                 lines_new = data.lines
                 if lines.length > 0 and lines[-1] !~ /\n\r?$/
                   lines[-1] = lines[-1] + lines_new.shift
                 end
                 lines.push(*lines_new)
                 while lines[0] =~ /\n\r?/
-                  block.call lines.shift.chomp, name, stdin
+                  block.call lines.shift.chomp, name, writer
                 end
               rescue EOFError => e
                 # expected
               end
+              writable = ready[1]
+              writable.each do |stdin|
+                writer.process
+              end
             end
           end
         end
         fileno_lines.each do |fileno, lines|
           name = fileno2name[fileno]
           if lines.length > 0
-            block.call lines.shift.chomp, name, stdin
+            block.call lines.shift.chomp, name, writer
           end
         end
       rescue IOError => e
@@ -59,6 +63,51 @@ class JustRun
   def self.all_eof(files)
     files.find { |f| !f.eof }.nil?
   end
-  BLOCK_SIZE = 4096*4
 
+  class Writer
+    def initialize stdin
+      @buffer = ''
+      @stdin = stdin
+    end
+
+    def puts str
+      write "#{str}\n"
+    end
+
+    def write str
+      @buffer << str;
+      process
+    end
+
+    def on_empty callback
+      @on_empty = callback
+    end
+
+    def end str = ''
+      if str.length > 0
+        write str
+      end
+      if @buffer.length > 0
+        on_empty -> {
+          self.end
+        }
+      else
+        @stdin.close_write
+      end
+    end
+
+    def process
+      return unless @buffer.length > 0
+      loop do
+        written = @stdin.write_nonblock @buffer
+        @buffer = @buffer[written..-1]
+        if @buffer.length == 0 and @on_empty
+          @on_empty.call
+          return
+        end
+        break if written == 0
+      end
+    rescue IO::WaitWritable, Errno::EINTR
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: justrun
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Damian Kaczmarek
@@ -53,7 +53,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.2
 description: Wraps popen3 in a nice interface that allows to just run a command and
-  get line by line output
+  get live stdout and stderr on line by line basis using a callback. Additionally
+  a live chat with a command can be implemented with a buffered non-blocking writer
+  that's working out of the box.
 email: rush@virtkick.com
 executables: []
 extensions: []
@@ -83,5 +85,5 @@ rubyforge_project:
 rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Run command and get live line by line callback
+summary: Run command and get live line by line callbacks
 test_files: []