开源软件构建与测试

_service:tar_scm:rubygem-rspec-support.spec Changed

@@ -1,5 +1,5 @@
 %global gem_name rspec-support
-%global mainver 3.12.0
+%global mainver 3.12.1
 %undefine prever
 %global mainrel 1
 %global prerpmver %(echo "%{?prever}" | sed -e 's|\\.||g')
@@ -7,14 +7,13 @@
 %undefine __brp_mangle_shebangs
 Name:           rubygem-%{gem_name}
 Version:        %{mainver}
-Release:        2
+Release:        1
 Summary:        Common functionality to Rspec series
 License:        MIT
 URL:            https://github.com/rspec/rspec-support
 Source0:        https://rubygems.org/gems/%{gem_name}-%{mainver}%{?prever}.gem
 Source1:        https://github.com/rspec/%{gem_name}/archive/v%{mainver}.tar.gz
 # tweak regex for search path
-Patch1:         0001-fix-thread-dead-lock-error.patch
 Patch100:       rubygem-rspec-support-3.2.1-callerfilter-searchpath-regex.patch
 BuildRequires:  rubygems-devel rubygem-simplecov rubygem(did_you_mean)
 %if 0%{?need_bootstrap_set} < 1
@@ -36,7 +35,6 @@
 %prep
 %setup -q -T -n %{gem_name}-%{version} -b 1
 gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-%patch1 -p1
 %patch100 -p1
 
 
@@ -80,6 +78,9 @@
 %doc    %{gem_docdir}
 
 %changelog
+* Wed Nov 15 2023 wangkai <13474090681@163.com> - 3.12.1-1
+- Update to 3.12.1
+
 * Wed Jan 18 2023 Ge Wang <wangge20@h-partners.com> - 3.12.0-2
 - Restore need_bootstrap_set flag after upgrade

_service:tar_scm:0001-fix-thread-dead-lock-error.patch Deleted

@@ -1,99 +0,0 @@
-From 947d86e4fb8deeb1b7e4ca11b367de38e2f40b7a Mon Sep 17 00:00:00 2001
-From: wang--ge <wang__ge@126.com>
-Date: Thu, 5 Jan 2023 18:01:18 +0800
-Subject: PATCH fix thread dead lock error
-
----
- lib/rspec/support/reentrant_mutex.rb       | 15 ++++---
- spec/rspec/support/reentrant_mutex_spec.rb | 46 +++++++++++-----------
- 2 files changed, 33 insertions(+), 28 deletions(-)
-
-diff --git a/lib/rspec/support/reentrant_mutex.rb b/lib/rspec/support/reentrant_mutex.rb
-index 55fbf89..2dc7427 100644
---- a/lib/rspec/support/reentrant_mutex.rb
-+++ b/lib/rspec/support/reentrant_mutex.rb
-@@ -31,16 +31,21 @@ module RSpec
-       # depends on `owned?` that was introduced in Ruby 2.0, so both should work for Ruby 2.x.
-       if RUBY_VERSION.to_f >= 3.0
-         def enter
--          @mutex.lock unless @mutex.owned?
-+          @mutex.lock if @owner != Thread.current
-+          @owner = Thread.current
-+          #@mutex.lock unless @mutex.owned?
-           @count += 1
-         end
- 
-         def exit
--          unless @mutex.owned?
--            raise ThreadError, "Attempt to unlock a mutex which is locked by another thread/fiber"
--          end
-+          #unless @mutex.owned?
-+          #  raise ThreadError, "Attempt to unlock a mutex which is locked by another thread/fiber"
-+          #end
-           @count -= 1
--          @mutex.unlock if @count == 0
-+          return unless @count == 0
-+          @owner = nil
-+          @mutex.unlock
-+          #@mutex.unlock if @count == 0
-         end
-       else
-         def enter
-diff --git a/spec/rspec/support/reentrant_mutex_spec.rb b/spec/rspec/support/reentrant_mutex_spec.rb
-index 9bef54e..7194d7b 100644
---- a/spec/rspec/support/reentrant_mutex_spec.rb
-+++ b/spec/rspec/support/reentrant_mutex_spec.rb
-@@ -28,27 +28,27 @@ RSpec.describe RSpec::Support::ReentrantMutex do
-     order.join_all
-   end
- 
--  if RUBY_VERSION >= '3.0'
--    it 'waits when trying to lock from another Fiber' do
--      mutex.synchronize do
--        ready = false
--        f = Fiber.new do
--          expect {
--            ready = true
--            mutex.send(:enter)
--            raise 'should reach here: mutex is already locked on different Fiber'
--          }.to raise_error(Exception, 'waited correctly')
--        end
--
--        main_thread = Thread.current
--
--        t = Thread.new do
--          Thread.pass until ready && main_thread.stop?
--          main_thread.raise Exception, 'waited correctly'
--        end
--        f.resume
--        t.join
--      end
--    end
--  end
-+  #if RUBY_VERSION >= '3.0'
-+  #  it 'waits when trying to lock from another Fiber' do
-+  #    mutex.synchronize do
-+  #      ready = false
-+  #      f = Fiber.new do
-+  #        expect {
-+  #          ready = true
-+  #          mutex.send(:enter)
-+  #          raise 'should reach here: mutex is already locked on different Fiber'
-+  #        }.to raise_error(Exception, 'waited correctly')
-+  #      end
-+
-+  #      main_thread = Thread.current
-+
-+  #      t = Thread.new do
-+  #        Thread.pass until ready && main_thread.stop?
-+  #        main_thread.raise Exception, 'waited correctly'
-+  #      end
-+  #      f.resume
-+  #      t.join
-+  #    end
-+  #  end
-+  #end
- end
--- 
-2.27.0
-

_service Changed

_service:tar_scm:rspec-support-3.12.0.gem/checksums.yaml.gz -> _service:tar_scm:rspec-support-3.12.1.gem/checksums.yaml.gz Changed

_service:tar_scm:rspec-support-3.12.0.gem/checksums.yaml.gz.sig -> _service:tar_scm:rspec-support-3.12.1.gem/checksums.yaml.gz.sig Changed

_service:tar_scm:rspec-support-3.12.0.gem/data.tar.gz.sig -> _service:tar_scm:rspec-support-3.12.1.gem/data.tar.gz.sig Changed

_service:tar_scm:rspec-support-3.12.0.gem/data/Changelog.md -> _service:tar_scm:rspec-support-3.12.1.gem/data/Changelog.md Changed

_service:tar_scm:rspec-support-3.12.0.gem/data/lib/rspec/support.rb -> _service:tar_scm:rspec-support-3.12.1.gem/data/lib/rspec/support.rb Changed

_service:tar_scm:rspec-support-3.12.0.gem/data/lib/rspec/support/spec/shell_out.rb -> _service:tar_scm:rspec-support-3.12.1.gem/data/lib/rspec/support/spec/shell_out.rb Changed

_service:tar_scm:rspec-support-3.12.0.gem/data/lib/rspec/support/version.rb -> _service:tar_scm:rspec-support-3.12.1.gem/data/lib/rspec/support/version.rb Changed

_service:tar_scm:rspec-support-3.12.0.gem/metadata.gz -> _service:tar_scm:rspec-support-3.12.1.gem/metadata.gz Changed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-support
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors:
 - David Chelimsky
@@ -10,7 +10,7 @@
 - Sam Phippen
 - Xaviery Shay
 - Bradley Schaefer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -48,7 +48,7 @@
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -125,11 +125,11 @@
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-support/issues
-  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.12.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-support/blob/v3.12.1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-support
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -145,8 +145,8 @@
     - !ruby/object:Gem::Version
       version: '0'
 requirements: 
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
-summary: rspec-support-3.12.0
+summary: rspec-support-3.12.1
 test_files:

_service:tar_scm:rspec-support-3.12.0.gem/metadata.gz.sig -> _service:tar_scm:rspec-support-3.12.1.gem/metadata.gz.sig Changed

_service:tar_scm:v3.12.0.tar.gz/.github/FUNDING.yml -> _service:tar_scm:v3.12.1.tar.gz/.github/FUNDING.yml Changed

_service:tar_scm:v3.12.1.tar.gz/.github/dependabot.yml Added

_service:tar_scm:v3.12.0.tar.gz/.github/workflows/ci.yml -> _service:tar_scm:v3.12.1.tar.gz/.github/workflows/ci.yml Changed

@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-08T12:42:05+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:08+01:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 name: RSpec CI
@@ -13,6 +13,9 @@
       - '*'
 permissions:
   contents: read
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 env:
   RSPEC_CI: true
   # This tells rspec-rails what branch to run in ci
@@ -38,6 +41,7 @@
     strategy:
       matrix:
         ruby:
+          - '3.2'
           - '3.1'
           - '3.0'
           - 2.7
@@ -46,7 +50,6 @@
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
         env:
           -
             DIFF_LCS_VERSION: "> 1.4.3"
@@ -57,11 +60,6 @@
           - ruby: jruby-9.2.13.0
             env:
               JRUBY_OPTS: "--dev"
-          - ruby: jruby-9.1.17.0
-            bundler: 1
-            os: ubuntu-18.04
-            env:
-              JRUBY_OPTS: "--dev"
           - ruby: 2.7
             name_extra: "with diff-lcs 1.3"
             env:
@@ -95,26 +93,32 @@
       fail-fast: false
       matrix:
         container:
+          - version: "2.1.9"
+            tag: ghcr.io/rspec/docker-ci:2.1.9
+            post: git config --global --add safe.directory `pwd`
           - version: "2.0"
-            tag: rspec/ci:2.0.0
+            tag: ghcr.io/rspec/docker-ci:2.0.0
           - version: "1.9.3"
-            tag: rspec/ci:1.9.3
+            tag: ghcr.io/rspec/docker-ci:1.9.3
           - version: "1.9.2"
-            tag: rspec/ci:1.9.2
+            tag: ghcr.io/rspec/docker-ci:1.9.2
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "1.8.7"
-            tag: rspec/ci:1.8.7
+            tag: ghcr.io/rspec/docker-ci:1.8.7
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "REE"
-            tag: rspec/ci:ree
+            tag: ghcr.io/rspec/docker-ci:ree
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
           - version: "JRuby 1.7"
-            tag: rspec/ci:jruby-1.7
+            tag: ghcr.io/rspec/docker-ci:jruby-1.7
           - version: "JRuby 1.7 1.8 mode"
-            tag: rspec/ci:jruby-1.7
+            tag: ghcr.io/rspec/docker-ci:jruby-1.7
             jruby_opts: '--dev --1.8'
             pre: gem uninstall jruby-openssl
             options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
+          - version: "JRuby 9.1.17.0"
+            tag: ghcr.io/rspec/docker-ci:jruby-9.1.17.0
+            options: "--add-host rubygems.org:151.101.129.227 --add-host api.rubygems.org:151.101.129.227"
     env:
       LEGACY_CI: true
       JRUBY_OPTS: ${{ matrix.container.jruby_opts || '--dev' }}
@@ -122,6 +126,7 @@
       - uses: actions/checkout@v3
       - run: ${{ matrix.container.pre }}
       - run: script/legacy_setup.sh
+      - run: ${{ matrix.container.post }}
       - run: bundle exec bin/rspec
       - run: bundle exec script/cucumber.sh
 
@@ -137,7 +142,6 @@
           - 2.4
           - 2.3
           - 2.2
-          - 2.1.9
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -146,5 +150,5 @@
           bundler: '2.2.22'
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - run: cinst ansicon
+      - run: choco install ansicon
       - run: bundle exec rspec --backtrace

_service:tar_scm:v3.12.0.tar.gz/.rubocop_rspec_base.yml -> _service:tar_scm:v3.12.1.tar.gz/.rubocop_rspec_base.yml Changed

_service:tar_scm:v3.12.0.tar.gz/BUILD_DETAIL.md -> _service:tar_scm:v3.12.1.tar.gz/BUILD_DETAIL.md Changed

_service:tar_scm:v3.12.0.tar.gz/CODE_OF_CONDUCT.md -> _service:tar_scm:v3.12.1.tar.gz/CODE_OF_CONDUCT.md Changed

_service:tar_scm:v3.12.0.tar.gz/CONTRIBUTING.md -> _service:tar_scm:v3.12.1.tar.gz/CONTRIBUTING.md Changed

@@ -1,5 +1,5 @@
 
 
@@ -13,7 +13,7 @@
   - by running RSpec HEAD to help us catch bugs before new releases
   - by reporting bugs you encounter(https://github.com/rspec/rspec-support/issues/new) with report template(#report-template)
   - by suggesting new features(https://github.com/rspec/rspec-support/issues/new)
-  - by improving RSpec's Relish(https://relishapp.com/rspec) or API(https://rspec.info/documentation/) documentation
+  - by improving RSpec's Feature or API documentation(https://rspec.info/documentation/)
   - by improving RSpec's website(https://rspec.info/) (source(https://github.com/rspec/rspec.github.io))
   - by taking part in feature and issue discussions(https://github.com/rspec/rspec-support/issues)
   - by adding a failing test for reproducible reported bugs(https://github.com/rspec/rspec-support/issues)

_service:tar_scm:v3.12.0.tar.gz/Changelog.md -> _service:tar_scm:v3.12.1.tar.gz/Changelog.md Changed

_service:tar_scm:v3.12.0.tar.gz/DEVELOPMENT.md -> _service:tar_scm:v3.12.1.tar.gz/DEVELOPMENT.md Changed

_service:tar_scm:v3.12.0.tar.gz/REPORT_TEMPLATE.md -> _service:tar_scm:v3.12.1.tar.gz/REPORT_TEMPLATE.md Changed

_service:tar_scm:v3.12.0.tar.gz/lib/rspec/support.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/support.rb Changed

_service:tar_scm:v3.12.0.tar.gz/lib/rspec/support/spec/shell_out.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/support/spec/shell_out.rb Changed

_service:tar_scm:v3.12.0.tar.gz/lib/rspec/support/version.rb -> _service:tar_scm:v3.12.1.tar.gz/lib/rspec/support/version.rb Changed

_service:tar_scm:v3.12.0.tar.gz/script/ci_functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/ci_functions.sh Changed

_service:tar_scm:v3.12.0.tar.gz/script/clone_all_rspec_repos -> _service:tar_scm:v3.12.1.tar.gz/script/clone_all_rspec_repos Changed

_service:tar_scm:v3.12.0.tar.gz/script/cucumber.sh -> _service:tar_scm:v3.12.1.tar.gz/script/cucumber.sh Changed

_service:tar_scm:v3.12.0.tar.gz/script/functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/functions.sh Changed

@@ -1,4 +1,4 @@
-# This file was generated on 2022-09-08T12:42:05+01:00 from the rspec-dev repo.
+# This file was generated on 2023-06-26T14:08:08+01:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE0}" )" && pwd )"
@@ -25,7 +25,7 @@
       BRANCH_TO_CLONE="$2";
     fi;
 
-    travis_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
+    ci_retry eval "git clone https://github.com/rspec/$1 --depth 1 --branch ${BRANCH_TO_CLONE?}"
   fi;
 }
 
@@ -89,16 +89,16 @@
       pushd ../$1
       unset BUNDLE_GEMFILE
       bundle_install_flags=`cat .github/workflows/ci.yml | grep "bundle install" | sed 's/.* bundle install//'`
-      travis_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
-      travis_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
+      ci_retry eval "(unset RUBYOPT; exec bundle install $bundle_install_flags)"
+      ci_retry eval "(unset RUBYOPT; exec bundle binstubs --all)"
       run_specs_and_record_done
       popd
     else
       echo ""
       echo "WARNING: The ../$1 directory does not exist. Usually the"
-      echo "travis build cds into that directory and run the specs to"
-      echo "ensure the specs still pass with your latest changes, but"
-      echo "we are going to skip that step."
+      echo "build cds into that directory and run the specs to ensure"
+      echo "the specs still pass with your latest changes, but we are"
+      echo "going to skip that step."
       echo ""
     fi;
   fi;

_service:tar_scm:v3.12.0.tar.gz/script/legacy_setup.sh -> _service:tar_scm:v3.12.1.tar.gz/script/legacy_setup.sh Changed

_service:tar_scm:v3.12.0.tar.gz/script/predicate_functions.sh -> _service:tar_scm:v3.12.1.tar.gz/script/predicate_functions.sh Changed

_service:tar_scm:v3.12.0.tar.gz/script/run_build -> _service:tar_scm:v3.12.1.tar.gz/script/run_build Changed

_service:tar_scm:v3.12.0.tar.gz/script/run_rubocop -> _service:tar_scm:v3.12.1.tar.gz/script/run_rubocop Changed

_service:tar_scm:v3.12.0.tar.gz/script/update_rubygems_and_install_bundler -> _service:tar_scm:v3.12.1.tar.gz/script/update_rubygems_and_install_bundler Changed

_service:tar_scm:v3.12.0.tar.gz/spec/rspec/support/reentrant_mutex_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/support/reentrant_mutex_spec.rb Changed

_service:tar_scm:v3.12.0.tar.gz/spec/rspec/support_spec.rb -> _service:tar_scm:v3.12.1.tar.gz/spec/rspec/support_spec.rb Changed

Changes of Revision 3