mini-cli 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e6c0c096fa96ac3c5687b159637ae5762c1dfa9d18201b0253476bfb96050ca
-  data.tar.gz: 21eb69f322117c7eb8cc2c810292b1b38a3a3f268356cdd9c5cd2f2d0d876a9b
+  metadata.gz: 86629e6e4c057eaa03c51483b6931c35517b9753ebdafa2f7b459e494be8b682
+  data.tar.gz: e16f2d52c65a4a84b7e9f631915b2d161c9e13c2d038695c0a7b764280f862c5
 SHA512:
-  metadata.gz: 5c975c9bff22c0841ac32ac6340d74ed908babb282f5791a7ed0951ad7f59fd0f4e9bcb3226a83f4dd1548ccfe340c2071072a94f4ac27e8937cae234fa584ac
-  data.tar.gz: c8544fba204f56ad6e2359d37ffe9e76ce9997ad34653270d1241d7c82d1153d8826e260f2f40d4840065dc70bd7133139d5cb835fbcee7394696245e825e512
+  metadata.gz: ef6755a1c1dfdca0313daac675704265c4b35a9a44cad752ef859435abbc69b71ff0350796b86963b1b1038aa03ee609fe85a3e2063ce4b3d1d2d72efc505aea
+  data.tar.gz: b5d68657a09c053b5311a4cf5427a779e374a483142df5ca0704ad4121c4138e506ef508be97261d1bc97bf90111a4abd876b457cf0d747e38cf178bc40b4045

data/lib/mini-cli.rb

@@ -25,8 +25,8 @@ module MiniCli
     exit(code)
   end
 
-  def parse_argv(argv = nil, &block)
-    return @__argv_converter = block if block
+  def parse_argv(argv = nil, &argv_converter)
+    return @__argv_converter = argv_converter if argv_converter
     argv ||= ARGV.dup
     exit(show_help) if argv.index('--help') || argv.index('-h')
     args = __argv_parser.parse(argv, method(:error).to_proc)
@@ -133,11 +133,11 @@ module MiniCli
         when /-([[:alnum:]]), --([[[:alnum:]]-]+) ([[:upper:]]+)\s+\S+/
           named_option(Regexp.last_match)
         when /--([[[:alnum:]]-]+) ([[:upper:]]+)\s+\S+/
-          named_option_short(Regexp.last_match)
+          named_short_option(Regexp.last_match)
         when /-([[:alnum:]]), --([[[:alnum:]]-]+)\s+\S+/
           option(Regexp.last_match)
         when /--([[[:alnum:]]-]+)\s+\S+/
-          option_short(Regexp.last_match)
+          short_option(Regexp.last_match)
         end
       end
     end
@@ -146,7 +146,7 @@ module MiniCli
       @options[match[1]] = @options[match[2]] = match[3]
     end
 
-    def named_option_short(match)
+    def named_short_option(match)
       @options[match[1]] = match[2]
     end
 
@@ -154,7 +154,7 @@ module MiniCli
       @options[match[1]] = @options[match[2]] = match[2]
     end
 
-    def option_short(match)
+    def short_option(match)
       @options[match[1]] = match[1]
     end
   end

data/lib/mini-cli/run.rb

@@ -1,32 +1,32 @@
 # frozen_string_literal: true
 
-require 'open3'
-
 module MiniCli
-  def run(*cmd)
-    opts = Hash === cmd.last ? __run_opt(cmd.last) : %i[stdout]
-    opts.delete(:stderr) ? __run3(opts, cmd) : __run2(opts, cmd)
-  rescue SystemCallError
+  def run(*cmd, stdin_data: nil, status: false, chdir: nil)
+    in_read, in_write = IO.pipe
+    opts = { err: %i[child out], in: in_read }
+    opts[:chdir] = chdir if chdir
+    ret = IO.popen(*cmd, opts, &__run_proc(stdin_data, in_write))
+    status ? [Process.last_status, ret] : ret
+  rescue Errno::ENOENT
     nil
+  ensure
+    in_read&.close
+    in_write&.close
   end
 
   private
 
-  def __run3(opts, cmd)
-    result = Open3.capture3(*cmd)
-    result.shift unless opts.first == :stdout
-    result.pop unless opts.last == :status
-    result.size == 1 ? result.first : result
-  end
-
-  def __run2(opts, cmd)
-    result = Open3.capture2e(*cmd)
-    return result.last.success? if opts.empty?
-    return result if opts.size == 2
-    opts.first == :status ? result.last : result.first
-  end
-
-  def __run_opt(opts)
-    %i[stdout stderr status].keep_if { |s| opts.delete(s) }
+  def __run_proc(stdin_data, in_write)
+    return :read unless stdin_data
+    proc do |out|
+      in_write.sync = true
+      if stdin_data.respond_to?(:readpartial)
+        IO.copy_stream(stdin_data, in_write)
+      else
+        in_write.write(stdin_data)
+      end
+      in_write.close
+      out.read
+    end
   end
 end

data/lib/mini-cli/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiniCli
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/test/mini-cli/run_test.rb

@@ -1,44 +1,47 @@
 require_relative '../helper'
 
 class RunTest < Test
-  def setup
-    super
-    @pwd = Dir.pwd + "\n"
+  def test_simple
+    result = subject.run('pwd')
+    assert_equal(Dir.pwd + "\n", result)
   end
 
-  def test_std_out_only
-    out = subject.run('pwd')
-    assert_equal(@pwd, out)
+  def test_simple_error
+    result = subject.run('ls /no-valid-dir')
+    assert_match(/No such file or directory/, result)
+  end
 
-    out = subject.run('pwd', stdout: true)
-    assert_equal(@pwd, out)
+  def test_chdir
+    home = Dir.home
+    refute(home == Dir.pwd)
+    result = subject.run('pwd', chdir: home)
+    assert_equal(home + "\n", result)
   end
 
   def test_status
-    result = subject.run('pwd', stdout: false)
-    assert_instance_of(TrueClass, result)
-
-    status = subject.run('pwd', status: true)
-    assert_instance_of(Process::Status, status)
-
-    out, status = subject.run('pwd', stdout: true, status: true)
-    assert_equal(@pwd, out)
+    status, result = subject.run('pwd', status: true)
     assert_instance_of(Process::Status, status)
     assert(status.success?)
+    assert_equal(Dir.pwd + "\n", result)
   end
 
-  def test_std_error
-    err = subject.run('ls /no-valid-dir', stderr: true)
-    assert_match(/No such file or directory/, err)
-
-    out, err = subject.run('ls /no-valid-dir', stdout: true, stderr: true)
-    assert_empty(out)
-    assert_match(/No such file or directory/, err)
-
-    err, status = subject.run('ls /no-valid-dir', stderr: true, status: true)
-    assert_match(/No such file or directory/, err)
+  def test_status_error
+    status, result = subject.run('ls /no-valid-dir', status: true)
     assert_instance_of(Process::Status, status)
     refute(status.success?)
+    assert_match(/No such file or directory/, result)
+  end
+
+  def test_stdin
+    string = 'Hello World'
+    result = subject.run('cat', stdin_data: string)
+    assert_equal(string, result)
+  end
+
+  def test_stdin_stream
+    stream = StringIO.new("Hello World")
+    result = subject.run('cat', stdin_data: stream)
+    assert_equal(stream.string, result)
   end
 
   def test_failure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Blumtritt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2020-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler