open3 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f598d530ced19be109f452253e266841b9c00d71e96687d31c2e5fa5db86957
-  data.tar.gz: be2ec8a86eeaa8e60907e9c95268d6b65ef3b477083051054a6adb1521a0fceb
+  metadata.gz: b3ab5dfcb825c74af61129ee82254609322af777421f454eb90053875bdbc851
+  data.tar.gz: fdf3f7c0783de3763390a6e62a7ec984f262d61ca5d8906e186ad7e7deeff5d2
 SHA512:
-  metadata.gz: c327ed7dd6b0769dd17809b7b155028ea6604364ce6a123b5f59d7f9a98ffe4e078e170f0268fb5eccdfc96a10bf9d284bdd85391052b104469906d410e010e9
-  data.tar.gz: b641d417656c67cd4199a0592ef71dc24d852fda7084cf31b89e4172eebf91e660f585a3213ab8257cfa942fa928be5ee7fc8dd2b693a76605b0f9acd38f1033
+  metadata.gz: 3e3508856456efd5c0700447c9e122163ea490b32a7bd4cc09d2d4fa79639b53baac5b8f45d983e5185dd439c93cfba2b546c302569e1dccf6d4086c0a3b0858
+  data.tar.gz: a79fd57d1a714b793ecc3849231cf3d58fd07bcc962ffad144b98ec7443d8da1642e97ab10e6f251c720cc9d0cfe72a809fb71c0c915226fcbed0b2a1c607839

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/test-jruby.yml

@@ -0,0 +1,21 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
+    strategy:
+      matrix:
+        ruby: [ 2.7, 2.6, head, jruby-9.3 ]
+        os: [ ubuntu-latest, macos-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run test
+      run: bundle exec rake test

data/.github/workflows/test.yml

@@ -7,18 +7,15 @@ jobs:
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ 2.7, 2.6, head ]
+        ruby: [ '3.0', 2.7, 2.6, head ]
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler --no-document
-        bundle install
+        bundler-cache: true # 'bundle install' and cache
     - name: Run test
-      run: rake test
+      run: bundle exec rake test

data/Rakefile

@@ -9,7 +9,7 @@ end
 
 task :sync_tool do
   require 'fileutils'
-  FileUtils.cp "../ruby/tool/lib/test/unit/core_assertions.rb", "./test/lib"
+  FileUtils.cp "../ruby/tool/lib/core_assertions.rb", "./test/lib"
   FileUtils.cp "../ruby/tool/lib/envutil.rb", "./test/lib"
   FileUtils.cp "../ruby/tool/lib/find_executable.rb", "./test/lib"
 end

data/lib/open3/jruby_windows.rb

@@ -0,0 +1,127 @@
+#
+# Custom implementation of Open3.popen{3,2,2e} that uses java.lang.ProcessBuilder rather than pipes and spawns.
+#
+
+require 'jruby' # need access to runtime for RubyStatus construction
+
+module Open3
+
+  java_import java.lang.ProcessBuilder
+  java_import org.jruby.RubyProcess
+  java_import org.jruby.util.ShellLauncher
+
+  def popen3(*cmd, &block)
+    if cmd.size > 0 && Hash === cmd[-1]
+      opts = cmd.pop
+    else
+      opts = {}
+    end
+    processbuilder_run(cmd, opts, io: IO_3, &block)
+  end
+  module_function :popen3
+
+  IO_3 = proc do |process|
+    [process.getOutputStream.to_io, process.getInputStream.to_io, process.getErrorStream.to_io]
+  end
+
+  BUILD_2 = proc do |builder|
+    builder.redirectError(ProcessBuilder::Redirect::INHERIT)
+  end
+
+  IO_2 = proc do |process|
+    [process.getOutputStream.to_io, process.getInputStream.to_io]
+  end
+
+  def popen2(*cmd, &block)
+    if cmd.size > 0 && Hash === cmd[-1]
+      opts = cmd.pop
+    else
+      opts = {}
+    end
+    processbuilder_run(cmd, opts, build: BUILD_2, io: IO_2, &block)
+  end
+  module_function :popen2
+
+  BUILD_2E = proc do |builder|
+    builder.redirectErrorStream(true)
+  end
+
+  def popen2e(*cmd, &block)
+    if cmd.size > 0 && Hash === cmd[-1]
+      opts = cmd.pop
+    else
+      opts = {}
+    end
+    processbuilder_run(cmd, opts, build: BUILD_2E, io: IO_2, &block)
+  end
+  module_function :popen2e
+
+  def processbuilder_run(cmd, opts, build: nil, io:)
+    opts.each do |k, v|
+      if Integer === k
+        if IO == v || !(String === v || v.respond_to?(:to_path))
+          # target is an open IO or a non-pathable object, bail out
+          raise NotImplementedError.new("redirect to an open IO is not implemented on this platform")
+        end
+      end
+    end
+
+    if Hash === cmd[0]
+      env = cmd.shift;
+    else
+      env = {}
+    end
+
+    if cmd.size == 1 && (cmd[0] =~ / / || ShellLauncher.shouldUseShell(cmd[0]))
+      cmd = [RbConfig::CONFIG['SHELL'], JRuby::Util::ON_WINDOWS ? '/c' : '-c', cmd[0]]
+    end
+
+    builder = ProcessBuilder.new(cmd.to_java(:string))
+
+    builder.directory(java.io.File.new(opts[:chdir] || Dir.pwd))
+
+    environment = builder.environment
+    env.each { |k, v| v.nil? ? environment.remove(k) : environment.put(k, v) }
+
+    build.call(builder) if build
+
+    process = builder.start
+
+    pid = org.jruby.util.ShellLauncher.getPidFromProcess(process)
+
+    parent_io = io.call(process)
+
+    parent_io.each {|i| i.sync = true}
+
+    wait_thr = DetachThread.new(pid) { RubyProcess::RubyStatus.newProcessStatus(JRuby.runtime, process.waitFor << 8, pid) }
+
+    result = [*parent_io, wait_thr]
+
+    if defined? yield
+      begin
+        return yield(*result)
+      ensure
+        parent_io.each(&:close)
+        wait_thr.join
+      end
+    end
+
+    result
+  end
+  module_function :processbuilder_run
+  class << self
+    private :processbuilder_run
+  end
+
+  class DetachThread < Thread
+    attr_reader :pid
+
+    def initialize(pid)
+      super
+
+      @pid = pid
+      self[:pid] = pid
+    end
+  end
+
+end

data/lib/open3/version.rb

@@ -0,0 +1,3 @@
+module Open3
+  VERSION = "0.1.2"
+end

data/lib/open3.rb

@@ -29,8 +29,9 @@
 # - Open3.pipeline : run a pipeline and wait for its completion
 #
 
+require 'open3/version'
+
 module Open3
-  VERSION = "0.1.1"
 
   # Open stdin, stdout, and stderr streams and start external executable.
   # In addition, a thread to wait for the started process is created.
@@ -758,3 +759,6 @@ module Open3
   end
 
 end
+
+# JRuby uses different popen logic on Windows, require it here to reuse wrapper methods above.
+require 'open3/jruby_windows' if RUBY_ENGINE == 'jruby' && JRuby::Util::ON_WINDOWS

data/open3.gemspec

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 name = File.basename(__FILE__, ".gemspec")
-version = ["lib", Array.new(name.count("-"), "..").join("/")].find do |dir|
-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}/version.rb")) do |line|
     /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
   end rescue nil
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open3
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yukihiro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-22 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Popen, but with stderr, too
 email:
@@ -17,6 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test-jruby.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
@@ -26,6 +28,8 @@ files:
 - bin/console
 - bin/setup
 - lib/open3.rb
+- lib/open3/jruby_windows.rb
+- lib/open3/version.rb
 - open3.gemspec
 homepage: https://github.com/ruby/open3
 licenses:
@@ -49,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.2
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Popen, but with stderr, too