libexec 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8705278823a3fe7c5edd0913befd194389f692ed9833396138a0a97d75b6f72b
-  data.tar.gz: 0eccd36d324534284495454e5116890c4620a63657d8fa44dca2fec36f837b49
+  metadata.gz: 39183dc74cb3558b5ba20133a73e3202c68b0ac9442c6ba1896779ec67e1e245
+  data.tar.gz: a081c654611d7e2cd45cb040404f47c8580ab4c3e0e645a7a0623b5b45290288
 SHA512:
-  metadata.gz: 8062c95b812bf5f3e5d7d491984bfdfd842a54a4e1446af536476832c720dd9f1d8807c9c4b70936163a8d14b282eb703f6cec072eabb33ba8e54fb836c62e91
-  data.tar.gz: 3bc5590a2d359db0d1efbea7ccef0f447ecb8ecbe74e9e20bebfce3ec049b7a33ef8ab5b994febac6fbfc276185e7b438ee6d7d71cc9814aa97a6c21e721bf7d
+  metadata.gz: 7b48aa89b8c5568786c17dd9b65f0e9acdc298f13bf38367dea47604edbd4d609def88dbdab5fc0e59bdfd76f73fef8fe8b57c09035bd5e593c9240470c2807d
+  data.tar.gz: a4e4cc5c5a2df4fccd72e770d1fac588cfe844e9f83f135b038a38a103d4e2c05950acbea844f1363dd439c3c4fc6ffba12dfdd6c9e09fb1a9f7ea89ebe7c28a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    libexec (0.2.1)
+    libexec (0.2.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/libexec/exec.rb

@@ -32,10 +32,15 @@ module Libexec
     #
     # @param  [Array] argv
     # @return [Array] line.chomp
-    def by_ls_1(*argv, **opts)
+    def by_ls_1(*argv, env: {}, mode: "r", **opts)
       arr = []
-      each_line("ls", "-1", argv, opts: opts) do |line|
-        arr.push line.chomp
+      argv.unshift("ls", "-1")
+      cmd = _js_style_cmd(argv)
+
+      IO.popen(env, cmd, mode, opts) do |pipe|
+        pipe.each_line do |line|
+          arr.push(line.chomp)
+        end
       end
       arr
     end
@@ -43,8 +48,13 @@ module Libexec
     # Operate each line result by yourself in `ls -1`
     #
     # @param [Array] argv
-    def each_ls_1(*argv, **opts, &block)
-      each_line("ls", "-1", argv, opts: opts, &block)
+    def each_ls_1(*argv, env: {}, mode: "r", **opts, &block)
+      argv.unshift("ls", "-1")
+      cmd = _js_style_cmd(argv)
+
+      IO.popen(env, cmd, mode, opts) do |pipe|
+        pipe.each_line(&block)
+      end
     end
 
     # wrapper for Process.spawn
@@ -52,34 +62,29 @@ module Libexec
     #
     # @return [Integer]
     def code(*argv, **opts)
-      catch_error = opts[:catch_error]
-      code = opts[:code]
+      opt_catch_error = opts[:catch_error]
+      opt_code = opts[:code]
 
-      if argv.size < 2
-        catch_error ||= false
-        code ||= 1
+      *args, last_arg = argv
 
-        cmd = _js_style_cmd(argv)
-      else
-        is_integer = argv.last.instance_of?(Integer)
+      is_integer = last_arg.instance_of?(Integer)
+      arg_catch_error = is_integer
+      arg_code = is_integer ? last_arg : false
 
-        catch_error ||= is_integer
-        code ||= (argv.last if is_integer) || 1
-
-        args = argv.clone
-        args.pop
-        cmd = is_integer ? _js_style_cmd(args) : _js_style_cmd(argv)
-      end
+      catch_error = arg_catch_error || opt_catch_error || false
+      code = arg_code || opt_code || 1
 
+      cmd = is_integer ? _js_style_cmd(args) : _js_style_cmd(argv)
       Process.spawn(cmd)
       Process.wait
 
-      result = $?.exitstatus.zero?
+      original_code = $?.exitstatus
+      result = original_code.zero?
 
       if catch_error && !result
         exit code
       else
-        $?.exitstatus
+        original_code
       end
     rescue Errno::ENOENT => _e
       127
@@ -110,19 +115,7 @@ module Libexec
     def _ruby_style_cmd(argv)
       cmd, *args = argv
 
-      unless args.empty?
-        arr = [cmd]
-        args.each do |arg|
-          # https://docs.ruby-lang.org/en/master/Kernel.html#method-i-class
-          if arg.instance_of?(Array)
-            arr.concat(arg)
-          elsif arg.instance_of?(String)
-            arr.push(arg)
-          end
-        end
-        cmd = arr
-      end
-      cmd
+      args.empty? ? cmd : argv.flatten
     end
 
     # in JS style, all arg connect with " " <br>
@@ -140,7 +133,7 @@ module Libexec
         args.each do |arg|
           if arg.instance_of?(Array)
             arr.push(%('#{arg.join(" ")}'))
-          elsif arg.instance_of?(String)
+          else
             arr.push(arg)
           end
         end

data/lib/libexec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Libexec
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libexec
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - initdc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies: []
 description: Wrapper for ruby exec shell command.
 email: