proclib 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6212650eff9983728f4fb27e15da5f0d1ecd0b9
-  data.tar.gz: da2f686f9549288c78a92f8a0c9797006398e00d
+  metadata.gz: ee04281f5c38f3ceddc62dbe3b808ac54bd351bc
+  data.tar.gz: 3ac72aa351dca2b23e726c8fc632243b04691205
 SHA512:
-  metadata.gz: ec307361563e72615dff68ff55ebd5ad12a160331e08ff54d5a612541f943fedcf2d0ed32c9395f93bdb0474ad2a720d281038a02892f56aed901b72dea082f5
-  data.tar.gz: 5441bea3cc830c74e9ee62eaf7201c59b7114a46f66d1440b32142264a9a81f4e54024b7e9fed8c7d937a52b1ea5497162c56ef5c1f2e11e906eea2690cd56ed
+  metadata.gz: cc1ab51247d14584cca686d7695d09cb6c1942fb7bf134c10e909cc242936972b63291ae0d4789c33c28fa61860acabaab68963810ba6e1484ca47e9ed808fc0
+  data.tar.gz: 460f4341cdcddeaf9873b075725672ca764093f65ab1566fe17813a9cc57b8ffe917ebe08075015b8564ce936f994624190e1fa389dfce37dda32ceb15d28e9d

data/lib/proclib.rb

@@ -8,6 +8,7 @@ module Proclib
     log_to_console: false,
     capture_output: true,
     env: {},
+    stdin: nil,
     on_output: nil,
     cwd: nil,
     ssh: nil
@@ -16,6 +17,7 @@ module Proclib
       tag: tag,
       env: env,
       cwd: cwd,
+      stdin: stdin,
       ssh: ssh)
 
     executor = Executor.new(inv.commands,

data/lib/proclib/commands/base.rb

@@ -8,13 +8,16 @@ module Proclib
       NotYetRunning = Class.new(Error)
       NotYetTerminated = Class.new(Error)
 
-      attr_reader :tag, :cmdline, :env, :run_dir
+      STDIN_BUF_SIZE = 1024 * 1024
 
-      def initialize(tag: nil, cmdline:, env: {} , run_dir: nil)
+      attr_reader :tag, :cmdline, :env, :run_dir, :stdin
+
+      def initialize(tag: nil, cmdline:, env: {}, run_dir: nil, stdin: nil)
         @env = env.map {|k,v| [k.to_s, v.to_s]}.to_h
         @cmdline = cmdline
         @tag = tag || cmdline[0..20]
         @run_dir = run_dir
+        @stdin = stdin
       end
 
       def pipes

data/lib/proclib/commands/local.rb

@@ -14,6 +14,16 @@ module Proclib
         else
           spawn.call
         end
+
+        unless stdin.nil?
+          until stdin.eof?
+            pipes.stdin.write(stdin.read(STDIN_BUF_SIZE))
+          end
+
+          stdin.close
+        end
+
+        pipes.stdin.close
       end
 
       def wait

data/lib/proclib/commands/ssh.rb

@@ -15,9 +15,16 @@ module Proclib
       def spawn
         write_pipes
 
-        open_channel do |ch|
-          ch.exec(cmdline) do |_, success|
+        open_channel do |channel|
+          channel.exec(cmdline) do |_, success|
             raise SSHError, "Command Failed" unless success
+
+            if !stdin.nil?
+              while msg = stdin.read(STDIN_BUF_SIZE)
+                channel.send_data(msg)
+              end
+              channel.eof!
+            end
           end
         end
       end
@@ -53,6 +60,7 @@ module Proclib
             @result = data.read_long
           end
 
+
           yield channel
         end
       end

data/lib/proclib/invocation.rb

@@ -15,6 +15,7 @@ module Proclib
       tag: nil,
       env: {},
       cwd: nil,
+      stdin: nil,
       ssh: nil
     )
       @cmd = cmd
@@ -22,6 +23,7 @@ module Proclib
       @env = env
       @cwd = cwd
       @ssh = ssh
+      @stdin = stdin
     end
 
     def commands
@@ -45,6 +47,7 @@ module Proclib
         tag: @tag,
         env: validated_env,
         run_dir: validated_cwd,
+        stdin: validated_stdin,
         cmdline: validated_cmd
       }.tap do |args|
         args[:ssh_session] = validated_ssh if !validated_ssh.nil?
@@ -117,5 +120,19 @@ module Proclib
         @cmd
       end
     end
+
+    def validated_stdin
+      @validated_stdin ||= begin
+        return nil if @stdin.nil?
+
+        if %i(eof? read close).none? {|m| @stdin.respond_to?(m) }
+          raise Invalid, "Expected stdin to to be IO."
+        elsif !@cmd.kind_of?(String)
+          raise Invalid, "Stdin can not be given when running simultaneous commands."
+        end
+
+        @stdin
+      end
+    end
   end
 end

data/lib/proclib/ssh_session.rb

@@ -13,6 +13,7 @@ module Proclib
       env: {},
       on_output: nil,
       cwd: nil,
+      stdin: nil,
       ssh: nil
     )
 
@@ -20,6 +21,7 @@ module Proclib
         tag: tag,
         env: env,
         ssh: session,
+        stdin: stdin,
         cwd: cwd)
 
       executor = Executor.new(inv.commands,

data/lib/proclib/version.rb

@@ -1,3 +1,3 @@
 module Proclib
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: proclib
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Jack Forrest