open3 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 627e2ba8abf0e5093f8e5188915236d4bc2becb3041a8356025ab9872d4038e1
-  data.tar.gz: dc4e1a4027f17bd9a4fbb1e7d7c85521679553af87127561ff2f72a02a4fdd30
+  metadata.gz: '0428b6beebc524086f81a7c67d9102fd5074e802a1b89b835dacbe676eea2450'
+  data.tar.gz: 65c65d180f3a714850a3df02e90fc9ee99f5cdcffac1c0900f60e4a2d5d711e7
 SHA512:
-  metadata.gz: 5cff7891c4d3edb418dd973c2dff88cd2ca8e69708658dbecef260c5133081ed4e4cd6ed499f05b0b38ee0430fadecafd71ee7e4f71f6af87f63ff64b30a4a15
-  data.tar.gz: 0f3db4c91d7d1fb56fa4ae6d0a2ee83a7d298350378bf9e218f15ed7cb112a7db4ce9993a6f41e304ae5b7f867714bc1d6119b3b9e50a1db2e81ae5ccca2e2df
+  metadata.gz: e39d951ead49eb48da4072b028245dce57417eeb074c90dd398639dd971277705149b0f21467ae4045aa9560c07fc57d1d39b1acbbbeac076cfa23e3a561c1a5
+  data.tar.gz: 8daaa229ed746d37b4312f026aa83cf491f900f6fdc17d8803c3f81c2bc996110d4bda013f7c40b05eccd8f8788960555d0c5c3216d81adbde4e17e5e68ae0a5

data/.document

@@ -0,0 +1,3 @@
+LICENSE.txt
+README.md
+lib/

data/.github/release.yml

@@ -0,0 +1,4 @@
+changelog:
+  exclude:
+    labels:
+      - dependencies # Added by Dependabot

data/.github/workflows/push_gem.yml

@@ -0,0 +1,46 @@
+name: Publish gem to rubygems.org
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'ruby/open3'
+    runs-on: ubuntu-latest
+
+    environment:
+      name: rubygems.org
+      url: https://rubygems.org/gems/open3
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@e14015d583714f6e62063499dc959a02595150a1 # v2.21.1
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - name: Publish to RubyGems
+        uses: rubygems/release-gem@7f9650160c1a4e7989fdc9855807bdbd421d8b6b # v1.4.1
+
+      - name: Create GitHub release
+        run: |
+          tag_name="$(git describe --tags --abbrev=0)"
+          gh release create "${tag_name}" --verify-tag --generate-notes
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/sync-ruby.yml

@@ -0,0 +1,33 @@
+name: Sync ruby
+on:
+  push:
+    branches: [master]
+jobs:
+  sync:
+    name: Sync ruby
+    runs-on: ubuntu-latest
+    if: ${{ github.repository_owner == 'ruby' }}
+    steps:
+      - uses: actions/checkout@v7
+
+      - name: Create GitHub App token
+        id: app-token
+        uses: actions/create-github-app-token@v3
+        with:
+          app-id: 2060836
+          private-key: ${{ secrets.RUBY_SYNC_DEFAULT_GEMS_PRIVATE_KEY }}
+          owner: ruby
+          repositories: ruby
+
+      - name: Sync to ruby/ruby
+        uses: convictional/trigger-workflow-and-wait@v1.6.5
+        with:
+          owner: ruby
+          repo: ruby
+          workflow_file_name: sync_default_gems.yml
+          github_token: ${{ steps.app-token.outputs.token }}
+          ref: master
+          client_payload: |
+            {"gem":"${{ github.event.repository.name }}","before":"${{ github.event.before }}","after":"${{ github.event.after }}"}
+          propagate_failure: true
+          wait_interval: 10

data/.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
   ruby-versions:
     uses: ruby/actions/.github/workflows/ruby_versions.yml@master
     with:
-      engine: cruby
+      engine: cruby-jruby
       min_version: 2.6
 
   test:
@@ -15,10 +15,18 @@ jobs:
     strategy:
       matrix:
         ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        include:
+          - ruby: mswin
+            os: windows-latest
+        exclude:
+          - ruby: jruby
+            os: windows-latest
+          - ruby: jruby-head
+            os: windows-latest
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/lib/open3/jruby_windows.rb

@@ -20,15 +20,15 @@ module Open3
   end
   module_function :popen3
 
-  IO_3 = proc do |process|
+  IO_3 = proc do |process| # :nodoc:
     [process.getOutputStream.to_io, process.getInputStream.to_io, process.getErrorStream.to_io]
   end
 
-  BUILD_2 = proc do |builder|
+  BUILD_2 = proc do |builder| # :nodoc:
     builder.redirectError(ProcessBuilder::Redirect::INHERIT)
   end
 
-  IO_2 = proc do |process|
+  IO_2 = proc do |process| # :nodoc:
     [process.getOutputStream.to_io, process.getInputStream.to_io]
   end
 
@@ -42,7 +42,7 @@ module Open3
   end
   module_function :popen2
 
-  BUILD_2E = proc do |builder|
+  BUILD_2E = proc do |builder| # :nodoc:
     builder.redirectErrorStream(true)
   end
 
@@ -56,7 +56,7 @@ module Open3
   end
   module_function :popen2e
 
-  def processbuilder_run(cmd, opts, build: nil, io:)
+  def processbuilder_run(cmd, opts, build: nil, io:) # :nodoc:
     opts.each do |k, v|
       if Integer === k
         if IO == v || !(String === v || v.respond_to?(:to_path))
@@ -113,7 +113,7 @@ module Open3
     private :processbuilder_run
   end
 
-  class DetachThread < Thread
+  class DetachThread < Thread # :nodoc:
     attr_reader :pid
 
     def initialize(pid)

data/lib/open3/version.rb

@@ -1,3 +1,4 @@
 module Open3
-  VERSION = "0.2.1"
+  # The version string
+  VERSION = "0.3.0"
 end

data/lib/open3.rb

@@ -520,13 +520,6 @@ module Open3
     opts[[:out, :err]] = out_w
 
     popen_run(cmd, opts, [in_r, out_w], [in_w, out_r], &block)
-  ensure
-    if block
-      in_r.close
-      in_w.close
-      out_r.close
-      out_w.close
-    end
   end
   module_function :popen2e
 
@@ -534,16 +527,23 @@ module Open3
     pid = spawn(*cmd, opts)
     wait_thr = Process.detach(pid)
     child_io.each(&:close)
+    child_io = nil
     result = [*parent_io, wait_thr]
     if defined? yield
-      begin
-        return yield(*result)
-      ensure
+      yield(*result)
+    else
+      result
+    end
+  ensure
+    if result
+      if defined? yield
         parent_io.each(&:close)
         wait_thr.join
       end
+    else
+      child_io&.each(&:close)
+      parent_io.each(&:close)
     end
-    result
   end
   module_function :popen_run
   class << self
@@ -1354,7 +1354,7 @@ module Open3
     opts_base.delete :out
 
     wait_thrs = []
-    r = nil
+    r = r2 = w2 = nil
     cmds.each_with_index {|cmd, i|
       cmd_opts = opts_base.dup
       if String === cmd
@@ -1387,17 +1387,25 @@ module Open3
       w2&.close
       r = r2
     }
-    result = parent_io + [wait_thrs]
     child_io.each(&:close)
+    child_io = nil
+    result = parent_io + [wait_thrs]
     if defined? yield
-      begin
-        return yield(*result)
-      ensure
+      yield(*result)
+    else
+      result
+    end
+  ensure
+    if result
+      if defined? yield
         parent_io.each(&:close)
         wait_thrs.each(&:join)
       end
+    else
+      [r, r2, w2, *child_io, *parent_io].each do |io|
+        io&.close
+      end
     end
-    result
   end
   module_function :pipeline_run
   class << self

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: open3
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Yukihiro Matsumoto
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Popen, but with stderr, too
 email:
@@ -17,8 +16,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".document"
 - ".github/dependabot.yml"
-- ".github/workflows/test-jruby.yml"
+- ".github/release.yml"
+- ".github/workflows/push_gem.yml"
+- ".github/workflows/sync-ruby.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - Gemfile
@@ -38,7 +40,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/open3
   source_code_uri: https://github.com/ruby/open3
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -53,8 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Popen, but with stderr, too
 test_files: []

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

@@ -1,21 +0,0 @@
-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@v4
-    - 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