coque 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 133e5322dad9101c4294013b52cabba3d1089565
-  data.tar.gz: e6bba14d02cad53d6d2129d69a9b318c4450d4e5
+  metadata.gz: 7f24fa9416a64dc742a217e43ef53cbb6d6fc3b0
+  data.tar.gz: 0bc4970fa99aeac4190fd30c4752a40a890ba96e
 SHA512:
-  metadata.gz: de7106b725db062ef1b61976d5107c38cceaa61cd2ffbec64b58819753504a1e77c64628c02ae520f49c600b6b1ff4a9f469ab78ca7f79fa2ecdb2727cdab3be
-  data.tar.gz: 1c965fd41cac24672ff20a63e5afe726f68727e342f257483e328520e47a3b0e3629b2765170e93a39856967ad7b64e4575ff94b2c19a093146d573768ce5f85
+  metadata.gz: e0029d5784e6afc64595e38461fbb44c7003d0782fe9bc78864c57289dda090a1e943dac0d134e26870f041274aad223563916bb0825cc3a8dfcee20e1c38fa6
+  data.tar.gz: 2c6f2e2d665b75341081ac6d1cf7a924a41dcab2088da3d3c2d95096c8bfcda37a44bc3be4388fe588cd341a87f062a13147de506e8e1ff67900faea18d9a7fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    coque (0.5.0)
+    coque (0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -33,7 +33,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.16)
+  bundler (~> 2.0)
   coque!
   minitest (~> 5.11)
   minitest-reporters
@@ -42,4 +42,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.2
+   2.0.1

data/README.md

@@ -99,6 +99,43 @@ Coque also includes a `Coque.source` helper for feeding Ruby enumerables into sh
 # => ["500"]
 ```
 
+#### Logging
+
+You can set a logger for Coque, which will be used to output messages when commands are executed:
+
+```rb
+Coque.logger = Logger.new(STDOUT)
+(Coque["echo", "hi"] | Coque["wc", "-c"]).run!
+```
+
+#### Named (Non-Operator) Method Alternatives
+
+The main piping and redirection methods also include named alternatives:
+
+* `|` is aliased to `pipe`
+* `>` is aliased to `out`
+* `>=` is aliased to `err`
+* `<` is aliased to `in`
+
+So these 2 invocations are equivalent:
+
+```rb
+(Coque["echo", "hi"] | Coque["wc", "-c"] > STDERR).run!
+# is the same as...
+Coque["echo", "hi"].pipe(Coque["wc", "-c"]).out(STDERR).run!
+```
+
+Will log:
+
+```
+I, [2019-02-20T20:31:00.325777 #16749]  INFO -- : Executing Coque Command: <Pipeline <Coque::Sh echo hi> | <Coque::Sh wc -c> >
+I, [2019-02-20T20:31:00.325971 #16749]  INFO -- : Executing Coque Command: <Coque::Sh echo hi>
+I, [2019-02-20T20:31:00.327719 #16749]  INFO -- : Coque Command: <Coque::Sh echo hi> finished in 0.001683 seconds.
+I, [2019-02-20T20:31:00.327771 #16749]  INFO -- : Executing Coque Command: <Coque::Sh wc -c>
+I, [2019-02-20T20:31:00.329586 #16749]  INFO -- : Coque Command: <Coque::Sh wc -c> finished in 0.001739 seconds.
+I, [2019-02-20T20:31:00.329725 #16749]  INFO -- : Coque Command: <Pipeline <Coque::Sh echo hi> | <Coque::Sh wc -c> > finished in 0.003796 seconds.
+```
+
 ### Streaming Performance
 
 Should be little overhead compared with the equivalent pipeline from a standard shell.

data/coque.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.11"
   spec.add_development_dependency "minitest-reporters"

data/lib/coque/cmd.rb

@@ -1,9 +1,10 @@
 module Coque
   class Cmd
     include Redirectable
+    include Runnable
     attr_reader :context
 
-    def |(other)
+    def pipe(other)
       case other
       when Cmd
         Pipeline.new([self.clone, other.clone])
@@ -12,6 +13,10 @@ module Coque
       end
     end
 
+    def |(other)
+      pipe(other)
+    end
+
     def clone
       raise "Not Implemented - Override"
     end

data/lib/coque/pipeline.rb

@@ -1,6 +1,7 @@
 module Coque
   class Pipeline
     include Redirectable
+    include Runnable
 
     attr_reader :commands
     def initialize(commands = [])
@@ -15,7 +16,7 @@ module Coque
       "<Pipeline #{commands.join(" | ")} >"
     end
 
-    def |(other)
+    def pipe(other)
       case other
       when Pipeline
         Pipeline.new(commands + other.commands)
@@ -24,6 +25,10 @@ module Coque
       end
     end
 
+    def |(other)
+      pipe(other)
+    end
+
     def stitch
       # Set head in
       if commands.first.stdin.nil?
@@ -52,7 +57,7 @@ module Coque
       end
     end
 
-    def run
+    def get_result
       stdout = stitch
       results = commands.map(&:run)
       Result.new(results.last.pid, stdout)

data/lib/coque/rb.rb

@@ -31,7 +31,7 @@ module Coque
       self
     end
 
-    def run
+    def get_result
       stdin, stdoutr, stdoutw = get_default_fds
 
       pid = fork do

data/lib/coque/redirectable.rb

@@ -4,24 +4,36 @@ module Coque
   module Redirectable
     attr_reader :stdin, :stdout, :stderr
 
-    def >(io)
+    def out(io)
       clone.tap do |c|
         c.stdout = io
       end
     end
 
-    def <(io)
+    def >(io)
+      out(io)
+    end
+
+    def in(io)
       clone.tap do |c|
         c.stdin = io
       end
     end
 
-    def >=(io)
+    def <(io)
+      self.in(io)
+    end
+
+    def err(io)
       clone.tap do |c|
         c.stderr = io
       end
     end
 
+    def >=(io)
+      err(io)
+    end
+
     def getio(io, mode = "r")
       case io
       when STDERR
@@ -53,20 +65,6 @@ module Coque
       @stdin = getio(s, "r")
     end
 
-    def to_a
-      run.to_a
-    end
-
-    def success?
-      run.success?
-    end
-
-    def run!
-      if !success?
-        raise "Coque Command Failed: #{self}"
-      end
-    end
-
     private
 
     def stdout_read

data/lib/coque/runnable.rb

@@ -0,0 +1,38 @@
+module Coque
+  module Runnable
+    def to_a
+      run.to_a
+    end
+
+    def success?
+      run.success?
+    end
+
+    def run!
+      if !success?
+        raise "Coque Command Failed: #{self}"
+      end
+    end
+
+    def run
+      log_start
+      start_time = Time.now
+      result = get_result
+      end_time = Time.now
+      log_end(end_time - start_time)
+      result
+    end
+
+    def log_end(seconds)
+      if Coque.logger
+        Coque.logger.info("Coque Command: #{self.to_s} finished in #{seconds} seconds.")
+      end
+    end
+
+    def log_start
+      if Coque.logger
+        Coque.logger.info("Executing Coque Command: #{self.to_s}")
+      end
+    end
+  end
+end

data/lib/coque/sh.rb

@@ -25,7 +25,7 @@ module Coque
       self.class.new(self.context, self.args + new_args)
     end
 
-    def run
+    def get_result
       stdin, stdoutr, stdoutw = get_default_fds
       opts = {in: stdin, stdin.fileno => stdin.fileno,
               out: stdoutw, stdoutw.fileno => stdoutw.fileno,

data/lib/coque/version.rb

@@ -1,3 +1,3 @@
 module Coque
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/coque.rb

@@ -1,4 +1,5 @@
 require "coque/redirectable"
+require "coque/runnable"
 require "coque/cmd"
 require "coque/sh"
 require "coque/rb"
@@ -9,6 +10,15 @@ require "coque/result"
 require "coque/version"
 
 module Coque
+  @@logger = nil
+  def self.logger=(logger)
+    @@logger = logger
+  end
+
+  def self.logger
+    @@logger
+  end
+
   def self.context(dir: Dir.pwd, env: {}, disinherits_env: false)
     Context.new(dir, env, disinherits_env)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coque
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Horace Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +112,6 @@ files:
 - bin/console
 - bin/setup
 - coque.gemspec
-- drake.rb
-- io.rb
 - lib/coque.rb
 - lib/coque/cmd.rb
 - lib/coque/context.rb
@@ -122,6 +120,7 @@ files:
 - lib/coque/rb.rb
 - lib/coque/redirectable.rb
 - lib/coque/result.rb
+- lib/coque/runnable.rb
 - lib/coque/sh.rb
 - lib/coque/version.rb
 - script.py
@@ -146,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Shell command utilities with easy integration with Ruby code.

data/drake.rb

@@ -1,113 +0,0 @@
-require "open3"
-require "pry"
-
-class Pipeline
-  attr_reader :commands
-  def initialize(commands = [])
-    @commands = commands
-  end
-
-  def to_s
-    "Pipeline of #{commands.join("|")}"
-  end
-
-  def |(other)
-    case other
-    when Pipeline
-      Pipeline.new(commands + other.commands)
-    when Cmd
-      Pipeline.new(commands + [other])
-    when Crb
-      Pipeline.new(commands + [other])
-    end
-  end
-
-  def run
-    commands = self.commands
-    pids = []
-
-    in_read, in_write = IO.pipe
-    out_read = nil
-    out_write = nil
-
-    while commands.any? do
-      in_write.close
-      out_read, out_write = IO.pipe
-
-      cmd = commands.shift
-      puts "Spawn command: #{cmd}"
-      pids << cmd.run(in_read, out_write)
-
-      in_read = out_read
-      in_write = out_write
-    end
-    out_write.close
-    [pids, out_read]
-  end
-end
-
-class Cmd
-  attr_reader :args
-  def initialize(args)
-    @args = args
-  end
-
-  def to_s
-    "Cmd to run: `#{args.inspect}`"
-  end
-
-  def self.[](*args)
-    puts args.inspect
-    Cmd.new(args)
-  end
-
-  def command
-    args.join(" ")
-  end
-
-  def run(stdin, stdout)
-    spawn(args.join(" "), in: stdin, stdin => stdin, out: stdout, stdout => stdout)
-  end
-
-  def |(other)
-    case other
-    when Cmd
-      Pipeline.new([self, other])
-    when Crb
-      Pipeline.new([self, other])
-    when Pipeline
-      Pipeline.new([self] + other.commands)
-    end
-  end
-end
-
-class Crb
-  def initialize(&block)
-    @block = block
-  end
-
-  def run(stdin, stdout)
-    fork do
-      STDOUT.reopen(stdout)
-      stdin.each_line(&@block)
-    end
-  end
-
-  def |(other)
-    case other
-    when Cmd
-      Pipeline.new([self, other])
-    when Crb
-      Pipeline.new([self, other])
-    when Pipeline
-      Pipeline.new([self] + other.commands)
-    end
-  end
-end
-
-
-c = Cmd['cat', '/usr/share/dict/words'] | Cmd['head'] | Crb.new { |line| puts "crb - #{line}" }
-puts "pipeline: #{c}"
-pids, out = c.run
-puts "Spawned pids: #{pids}"
-out.each_line { |l| puts l }

data/io.rb

@@ -1,215 +0,0 @@
-require 'open3'
-
-def banner(msg)
-  puts "******* #{msg} *******"
-end
-
-def read_from_spawned_pipe
-  banner("read_from_spawned_pipe")
-  pipe_me_in, pipe_peer_out = IO.pipe
-  pipe_peer_in, pipe_me_out = IO.pipe
-
-  pid = spawn('ls',
-              out: pipe_peer_out,
-              pipe_peer_out => pipe_peer_out,
-              in: pipe_peer_in,
-              pipe_peer_in => pipe_peer_in)
-  puts "Spawned #{pid}"
-
-  pipe_peer_out.close
-  puts pipe_me_in.read
-end
-
-def read_write_to_spawned
-  banner("read_write_to_spawned")
-  pipe_me_in, pipe_peer_out = IO.pipe
-  pipe_peer_in, pipe_me_out = IO.pipe
-
-  ['a', 'b', 'c', 'ab'].each { |l| pipe_me_out.puts(l) }
-
-  pid = spawn('grep a',
-              out: pipe_peer_out,
-              pipe_peer_out => pipe_peer_out,
-              in: pipe_peer_in,
-              pipe_peer_in => pipe_peer_in)
-  puts "Spawned #{pid}"
-  pipe_me_out.close
-
-  pipe_peer_out.close
-  puts pipe_me_in.read
-end
-
-def chain_two_native_processes
-  banner("chain_two_native_processes")
-  a_in_read, a_in_write = IO.pipe
-  a_out_read, a_out_write = IO.pipe
-
-  p1 = spawn('echo "a\nb\nc\nab\n"',
-             out: a_out_write,
-             a_out_write => a_out_write,
-             in: a_in_read,
-             a_in_read => a_in_read)
-
-  b_out_read, b_out_write = IO.pipe
-
-  p2 = spawn('grep a',
-             out: b_out_write,
-             b_out_write => b_out_write,
-             in: a_out_read,
-             a_out_read => a_out_read)
-
-  puts "Spawned a: #{p1}, b: #{p2}"
-  # Q: Why do we have to close these? do the spawned processes not close them?
-  b_out_write.close
-  a_out_write.close
-  puts b_out_read.read
-end
-
-def reading_large_output
-  banner("reading_large_output")
-  a_in_read, a_in_write = IO.pipe
-  a_out_read, a_out_write = IO.pipe
-
-  p1 = spawn('cat /usr/share/dict/words',
-             out: a_out_write,
-             a_out_write => a_out_write)
-
-  a_out_write.close
-  puts a_out_read.read
-end
-
-def pipe_to_forked_ruby
-  banner("pipe_to_forked_ruby")
-  a_in_read, a_in_write = IO.pipe
-  b_out_read, b_out_write = IO.pipe
-
-  ['a', 'b', 'c', 'ab'].each { |l| a_in_write.puts(l) }
-  a_in_write.flush
-  a_in_write.close
-
-  child = fork do
-    # change our stdin to be the read end of the pipe
-    STDOUT.puts "forked process to stdout (#{STDOUT.fileno})"
-    b_out_write.puts "******* forked process to pipe (#{b_out_write.fileno}) **********"
-
-    a_in_read.each_line { |l| b_out_write.puts "child - #{l}" }
-  end
-  puts "forked #{child}"
-
-  a_in_write.close
-  b_out_write.close
-
-  b_out_read.each_line { |l| puts "read from parent - #{l}" }
-end
-
-
-def native_process_to_ruby_block
-  banner("native_process_to_ruby_block")
-  # a_in_read, a_in_write = IO.pipe
-  a_out_read, a_out_write = IO.pipe
-  b_out_read, b_out_write = IO.pipe
-  puts "parent file descriptors"
-  puts "a read: #{a_out_read.fileno}"
-  puts "a write: #{a_out_write.fileno}"
-  puts "b read: #{b_out_read.fileno}"
-  puts "b write: #{b_out_write.fileno}"
-
-  # Receives copy of a_out_write; closes when done
-  p1 = spawn('echo "a\nb\nc\nab"', out: a_out_write)
-
-  # Receives copy of
-  # a_out_read - needs to read; closed automatically?
-  # a_out_write - doesn't need, close immediately
-  # b_out_read - doesn't need, close immediately
-  # b_out_write - needs to write; close when done
-  child = fork do
-    puts "child file descriptors:"
-    puts "a read: #{a_out_read.fileno}"
-    puts "a write: #{a_out_write.fileno}"
-    puts "b read: #{b_out_read.fileno}"
-    puts "b write: #{b_out_write.fileno}"
-    a_out_write.close
-    b_out_read.close
-
-    puts "******* IN FORK **********"
-
-    # while l = a_out_read.gets
-    #   puts "working #{l}"
-    #   b_out_write.puts "child - #{l}"
-    # end
-
-    a_out_read.each_line { |l| puts "working #{l}"; b_out_write.puts "child - #{l}" }
-    puts "child done - close writer"
-    a_out_read.close
-    b_out_write.close
-    puts "Fork work done"
-  end
-
-  puts "done forked"
-
-  a_out_write.close
-  b_out_write.close
-  a_out_read.close
-
-  puts "** Display child output:"
-  b_out_read.each_line { |l| puts "read from parent - #{l}" }
-  b_out_read.close
-  puts "done reading"
-end
-
-# read_from_spawned_pipe
-# read_write_to_spawned
-# pipe_to_forked_ruby
-# reading_large_output
-# chain_two_native_processes
-# native_process_to_ruby_block
-
-def run_fork(stdin, stdout, &block)
-  fork do
-    STDOUT.reopen(stdout)
-    stdin.each_line(&block)
-  end
-end
-
-def three_step
-  writers = []
-  banner("three step")
-  a_in_read, a_in_write = IO.pipe
-  a_out_read, a_out_write = IO.pipe
-
-  a_unused = [a_out_write]
-
-  p1 = spawn('echo "a\nb\nc\nab\n"',
-             out: a_out_write,
-             a_out_write => a_out_write,
-             in: a_in_read,
-             a_in_read => a_in_read)
-
-  b_out_read, b_out_write = IO.pipe
-  b_unused = [b_out_write]
-
-  a_unused.each(&:close)
-  run_fork(a_out_read, b_out_write) { |l| puts "~~ - #{l}" }
-
-  c_out_read, c_out_write = IO.pipe
-  c_unused = [c_out_write]
-
-  p2 = spawn('grep a',
-             out: c_out_write,
-             c_out_write => c_out_write,
-             in: b_out_read,
-             b_out_read => b_out_read)
-  b_unused.each(&:close)
-
-  # Q: Why do we have to close these? do the spawned processes not close them?
-  c_unused.each(&:close)
-  puts c_out_read.read
-end
-
-# three_step
-
-def stdin_redirect
-  stdin = File.open("/usr/share/dict/words", "r")
-  spawn("head", in: stdin, stdin => stdin)
-end
-stdin_redirect