ruby-changes:51084
From: eregon <ko1@a...>
Date: Sun, 29 Apr 2018 04:49:29 +0900 (JST)
Subject: [ruby-changes:51084] eregon:r63291 (trunk): Update to ruby/mspec@b5b13de
eregon 2018-04-29 04:49:24 +0900 (Sun, 29 Apr 2018) New Revision: 63291 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63291 Log: Update to ruby/mspec@b5b13de Modified files: trunk/spec/mspec/.travis.yml trunk/spec/mspec/Gemfile.lock trunk/spec/mspec/README.md trunk/spec/mspec/lib/mspec/matchers/block_caller.rb trunk/spec/mspec/lib/mspec/utils/script.rb trunk/spec/mspec/tool/remove_old_guards.rb Index: spec/mspec/README.md =================================================================== --- spec/mspec/README.md (revision 63290) +++ spec/mspec/README.md (revision 63291) @@ -35,7 +35,7 @@ specs in a manner compatible with multip https://github.com/ruby/ruby/blob/trunk/spec/mspec/README.md#L35 ## Requirements -MSpec requires Ruby 2.2 or more recent. +MSpec requires Ruby 2.3 or more recent. ## Bundler Index: spec/mspec/tool/remove_old_guards.rb =================================================================== --- spec/mspec/tool/remove_old_guards.rb (revision 63290) +++ spec/mspec/tool/remove_old_guards.rb (revision 63291) @@ -36,6 +36,6 @@ def remove_guards(guard, keep) https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/remove_old_guards.rb#L36 end end -version = (ARGV[0] || "2.2") +version = (ARGV[0] || "2.3") remove_guards(/ruby_version_is ["']#{version}["'] do/, true) remove_guards(/ruby_version_is ["'][0-9.]*["']...["']#{version}["'] do/, false) Index: spec/mspec/Gemfile.lock =================================================================== --- spec/mspec/Gemfile.lock (revision 63290) +++ spec/mspec/Gemfile.lock (revision 63291) @@ -1,8 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/Gemfile.lock#L1 GEM remote: https://rubygems.org/ specs: - diff-lcs (1.2.5) - rake (10.4.2) + diff-lcs (1.3) + rake (10.5.0) rspec (2.14.1) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) @@ -21,4 +21,4 @@ DEPENDENCIES https://github.com/ruby/ruby/blob/trunk/spec/mspec/Gemfile.lock#L21 rspec (~> 2.14.1) BUNDLED WITH - 1.14.5 + 1.16.1 Index: spec/mspec/.travis.yml =================================================================== --- spec/mspec/.travis.yml (revision 63290) +++ spec/mspec/.travis.yml (revision 63291) @@ -7,17 +7,22 @@ script: https://github.com/ruby/ruby/blob/trunk/spec/mspec/.travis.yml#L7 - bundle exec rspec matrix: include: - - rvm: 2.2.9 - - rvm: 2.3.6 - - rvm: 2.4.3 - - rvm: 2.5.0 + - rvm: 2.3.7 + - rvm: 2.4.4 before_install: # https://github.com/travis-ci/travis-ci/issues/8978 - gem update --system + - gem install bundler + - rvm: 2.5.1 + before_install: + # https://github.com/travis-ci/travis-ci/issues/8978 + - gem update --system + - gem install bundler - rvm: ruby-head before_install: # https://github.com/travis-ci/travis-ci/issues/8978 - gem update --system + - gem install bundler - jdk: oraclejdk8 install: - curl -L https://github.com/oracle/truffleruby/releases/download/vm-enterprise-0.28/truffleruby-testing-0.28.tar.gz | tar xz Index: spec/mspec/lib/mspec/utils/script.rb =================================================================== --- spec/mspec/lib/mspec/utils/script.rb (revision 63290) +++ spec/mspec/lib/mspec/utils/script.rb (revision 63291) @@ -39,8 +39,8 @@ class MSpecScript https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/utils/script.rb#L39 end def initialize - ruby_version_is ""..."2.2" do - abort "MSpec needs Ruby 2.2 or more recent" + ruby_version_is ""..."2.3" do + abort "MSpec needs Ruby 2.3 or more recent" end config[:formatter] = nil Index: spec/mspec/lib/mspec/matchers/block_caller.rb =================================================================== --- spec/mspec/lib/mspec/matchers/block_caller.rb (revision 63290) +++ spec/mspec/lib/mspec/matchers/block_caller.rb (revision 63291) @@ -10,7 +10,11 @@ class BlockingMatcher https://github.com/ruby/ruby/blob/trunk/spec/mspec/lib/mspec/matchers/block_caller.rb#L10 blocking = false end - while !started and status = thread.status and status != "sleep" + Thread.pass while !started + + # Wait until the Thread status is "sleep" (then it's blocking) + # or nil (the Thread finished execution, it did not block) + while status = thread.status and status != "sleep" Thread.pass end thread.kill -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/