coque 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 344cd271557b02f3d3b01fc25a524fe44a2ecf4a
-  data.tar.gz: 74a4a0f32297f6c2e7368fab1c89a3317e52168d
+  metadata.gz: c69c98fb67e7afee6ad27390978968a86ebc9bb8
+  data.tar.gz: 09d45720d414295f7c1b4f887702b5439a3cbfb7
 SHA512:
-  metadata.gz: 4561c894a43b60ef8baaa903e1ac732473927deff5dc9fc9d3c8ce7c3bdba1aa361d783830f20762546574e82baeb252c0d5d8139ed569ffe84b8fa839e32068
-  data.tar.gz: e3a6a90e1a67e085a4aab4c5261340599ac9941bdd86da01c645830cb051d2c85fac54fc038308eaba8598cb5b061e9f79de84b9c808561ae39a08774dd4bea9
+  metadata.gz: bd2afeb39c8afe1e1681a4fc7934d6116afdcc9616861c9abfe60ebbe86be469bd47af231568a4fc38c2e382cacf3ce0c6402fe5ab8ef232f804b1cbad699539
+  data.tar.gz: 7ee2833b41ecae0a0b9f7deb06d2a678bd2cb0eea1197a9aba826b2b5c2ea0ba5d38d57ec373e3dbe57d27c1ed53d212dc035f3646f2a2c11ee4f7acbac31540

data/README.md

@@ -39,7 +39,7 @@ pipeline.run.to_a
 
 Coque can also create "Rb" commands, which integrate Ruby code with streaming, line-wise processing of other commands:
 
-```
+```rb
 c1 = Coque["printf", '"a\nb\nc\n"']
 c2 = Coque.rb { |line| puts line.upcase }
 (c1 | c2).run.to_a
@@ -48,7 +48,7 @@ c2 = Coque.rb { |line| puts line.upcase }
 
 Rb commands can also take "pre" and "post" blocks
 
-```
+```rb
 dict = Coque["cat", "/usr/share/dict/words"]
 rb_wc = Coque.rb { @lines += 1 }.pre { @lines = 0 }.post { puts @lines }
 
@@ -71,7 +71,7 @@ File.read("/tmp/error.txt")
 # => "cat: /doesntexist.txt: No such file or directory\n"
 ```
 
-Coque commands can also be derived from a `Coque::Context`:
+Coque commands can also be derived from a `Coque::Context`, which enables changing directory, setting environment variables, and unsetting child env:
 
 ```rb
 c = Coque.context
@@ -83,6 +83,20 @@ Coque.context.chdir("/tmp")["pwd"].run.to_a
 
 Coque.context.setenv("my_key": "pizza")["echo", "$my_key"].run.to_a
 # => ["pizza"]
+
+ENV["my_key"] = "pizza"
+Coque["echo", "$my_key"].run.to_a
+# => ["pizza"]
+
+Coque.context.disinherit_env["echo", "$my_key"].to_a
+# => [""]
+```
+
+Coque also includes a `Coque.source` helper for feeding Ruby enumerables into shell pipelines:
+
+```rb
+(Coque.source(1..500) | Coque["wc", "-l"]).run.to_a
+# => ["500"]
 ```
 
 ### Streaming Performance

data/lib/coque/cmd.rb

@@ -4,12 +4,11 @@ module Coque
     attr_reader :context
 
     def |(other)
-      verify_redirectable(other)
       case other
       when Cmd
-        Pipeline.new([self, other])
+        Pipeline.new([self.clone, other.clone])
       when Pipeline
-        Pipeline.new([self] + other.commands)
+        Pipeline.new([self.clone] + other.commands)
       end
     end
 
@@ -17,19 +16,22 @@ module Coque
       raise "Not Implemented - Override"
     end
 
-    def ensure_default_fds
-      if self.stdin.nil?
-        inr, inw = IO.pipe
-        inw.close
-        self.stdin = inr
-      end
+    def get_default_fds
+      stdin = if self.stdin
+                self.stdin
+              else
+                inr, inw = IO.pipe
+                inw.close
+                inr
+              end
 
-      if self.stdout.nil?
-        outr, outw = IO.pipe
-        self.stdout = outw
-        # only used for Result if this is the last command in a pipe
-        @stdout_read = outr
-      end
+      stdoutr, stdoutw = if self.stdout
+                           [self.stdout, self.stdout]
+                         else
+                           IO.pipe
+                         end
+
+      [stdin, stdoutr, stdoutw]
     end
   end
 end

data/lib/coque/pipeline.rb

@@ -16,12 +16,11 @@ module Coque
     end
 
     def |(other)
-      verify_redirectable(other)
       case other
       when Pipeline
         Pipeline.new(commands + other.commands)
       when Cmd
-        Pipeline.new(commands + [other])
+        Pipeline.new(commands + [other.clone])
       end
     end
 

data/lib/coque/rb.rb

@@ -32,10 +32,10 @@ module Coque
     end
 
     def run
-      ensure_default_fds
+      stdin, stdoutr, stdoutw = get_default_fds
 
       pid = fork do
-        STDOUT.reopen(stdout)
+        STDOUT.reopen(stdoutw)
         Dir.chdir(context.dir)
         if context.disinherits_env?
           ENV.clear
@@ -47,8 +47,8 @@ module Coque
         stdin.each_line(&@block)
         @post_block.call if @post_block
       end
-      stdout.close
-      Result.new(pid, stdout_read)
+      stdoutw.close
+      Result.new(pid, stdoutr)
     end
   end
 end

data/lib/coque/redirectable.rb

@@ -37,50 +37,20 @@ module Coque
       end
     end
 
-    def stdin_redirected?
-      defined? @stdin
-    end
-
-    def stdout_redirected?
-      defined? @stdout
-    end
-
-    def stderr_redirected?
-      defined? @stderr
-    end
-
     def stderr=(s)
-      if stderr_redirected?
-        raise RedirectionError.new("Can't set stderr of #{self} to #{s}, is already set to #{stderr}")
-      else
-        @stderr = getio(s, "w")
-      end
+      @stderr = getio(s, "w")
     end
 
     def stdout=(s)
-      if stdout_redirected?
-        raise RedirectionError.new("Can't set stdout of #{self} to #{s}, is already set to #{stdout}")
-      else
-        @stdout = getio(s, "w")
-      end
+      @stdout = getio(s, "w")
     end
 
     def stdin=(s)
-      if stdin_redirected?
-        raise RedirectionError.new("Can't set stdin of #{self} to #{s}, is already set to #{stdin}")
-      else
-        @stdin = getio(s, "r")
-      end
+      @stdin = getio(s, "r")
     end
 
-    def verify_redirectable(other)
-      if self.stdout_redirected?
-        raise RedirectionError.new("Can't pipe #{self} into #{other} -- #{self}'s STDIN is already redirected")
-      end
-
-      if other.stdin_redirected?
-        raise RedirectionError.new("Can't pipe #{self} into #{other} -- #{other}'s STDIN is already redirected")
-      end
+    def to_a
+      run.to_a
     end
 
     private

data/lib/coque/sh.rb

@@ -1,13 +1,16 @@
 module Coque
   class Sh < Cmd
     attr_reader :args, :context
-    def initialize(context, args)
+    def initialize(context, args, stdin = nil, stdout = nil, stderr = nil)
       @context = context
       @args = args
+      self.stdin = stdin if stdin
+      self.stdout = stdout if stdout
+      self.stderr = stderr if stderr
     end
 
     def clone
-      self.class.new(context, args)
+      self.class.new(context, args, stdin, stdout, stderr)
     end
 
     def to_s
@@ -23,9 +26,9 @@ module Coque
     end
 
     def run
-      ensure_default_fds
+      stdin, stdoutr, stdoutw = get_default_fds
       opts = {in: stdin, stdin.fileno => stdin.fileno,
-              out: stdout, stdout.fileno => stdout.fileno,
+              out: stdoutw, stdoutw.fileno => stdoutw.fileno,
               chdir: context.dir, unsetenv_others: context.disinherits_env?}
 
       # Redirect err to out: (e.g. for 2>&1)
@@ -38,8 +41,8 @@ module Coque
 
       pid = spawn(context.env, args.join(" "), opts.merge(err_opts))
 
-      stdout.close
-      Result.new(pid, stdout_read)
+      stdoutw.close
+      Result.new(pid, stdoutr)
     end
   end
 end

data/lib/coque/version.rb

@@ -1,3 +1,3 @@
 module Coque
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/coque.rb

@@ -24,4 +24,8 @@ module Coque
   def self.pipeline(*commands)
     commands.reduce(:|)
   end
+
+  def self.source(enumerable)
+    Coque.rb.post { enumerable.each { |e| puts e} }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coque
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Horace Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler