Run of fresh-releases for ruby-thread-order

Merge these changes:

git pull https://janitor.debian.net/git/ruby-thread-order fresh-releases/main
git pull https://janitor.debian.net/git/ruby-thread-order fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/ruby-thread-order fresh-releases/upstream

Summary

Merged new upstream version: 1.1.1 (was: 1.1.0).

Diff

Branch: main

Diff is too long (more than 200 lines). Download the raw diff.

Branch: pristine-tar

diff --git a/ruby-thread-order_1.1.1.orig.tar.gz.delta b/ruby-thread-order_1.1.1.orig.tar.gz.delta
new file mode 100644
index 0000000..e2a350c
Binary files /dev/null and b/ruby-thread-order_1.1.1.orig.tar.gz.delta differ
diff --git a/ruby-thread-order_1.1.1.orig.tar.gz.id b/ruby-thread-order_1.1.1.orig.tar.gz.id
new file mode 100644
index 0000000..8086488
--- /dev/null
+++ b/ruby-thread-order_1.1.1.orig.tar.gz.id
@@ -0,0 +1 @@
+135aaea3a6ef7e6384bbcb25795897f75da2a5fb

Branch: upstream

Tag: upstream/1.1.1
diff --git a/.travis.yml b/.travis.yml
index 84a0352..5710a3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 language: ruby
+before_install:
+  # jruby-head does not have bundler.
+  - which bundle || gem install bundler
 script: spec/run
 rvm:
   - 1.8.7
@@ -7,6 +10,10 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - 2.6.0
   - ruby-head
   - ree
   - jruby-18mode
@@ -17,4 +24,6 @@ matrix:
   include:
     - rvm: jruby
       env: JRUBY_OPTS='--2.0'
+  allow_failures:
+    - rvm: rbx
   fast_finish: true
diff --git a/Readme.md b/Readme.md
index c85b24a..5b865fc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -6,7 +6,7 @@ ThreadOrder
 A tool for testing threaded code.
 Its purpose is to enable reasoning about thread order.
 
-* Tested on 1.8.7 - 2.2, JRuby, Rbx
+* Tested on 1.8.7 - 2.6, JRuby, Rbx
 * It has no external dependencies
 * It does not depend on the stdlib.
 
diff --git a/lib/thread_order/version.rb b/lib/thread_order/version.rb
index 9296b8b..569e8fa 100644
--- a/lib/thread_order/version.rb
+++ b/lib/thread_order/version.rb
@@ -1,3 +1,3 @@
 class ThreadOrder
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index 46c6739..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,72 +0,0 @@
---- !ruby/object:Gem::Specification
-name: thread_order
-version: !ruby/object:Gem::Version
-  version: 1.1.0
-platform: ruby
-authors:
-- Josh Cheek
-autorequire: 
-bindir: bin
-cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-description: Test helper for ordering threaded code (does not depend on gems or stdlib,
-  tested on 1.8.7 - 2.2, rbx, jruby).
-email: josh.cheek@gmail.com
-executables: []
-extensions: []
-extra_rdoc_files: []
-files:
-- .gitignore
-- .travis.yml
-- Gemfile
-- License.txt
-- Readme.md
-- lib/thread_order.rb
-- lib/thread_order/mutex.rb
-- lib/thread_order/version.rb
-- spec/run
-- spec/thread_order_spec.rb
-- thread_order.gemspec
-homepage: https://github.com/JoshCheek/thread_order
-licenses:
-- MIT
-metadata: {}
-post_install_message: 
-rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.1
-signing_key: 
-specification_version: 4
-summary: Test helper for ordering threaded code
-test_files:
-- spec/run
-- spec/thread_order_spec.rb
-has_rdoc: 
diff --git a/spec/run b/spec/run
index 66075b3..663c154 100755
--- a/spec/run
+++ b/spec/run
@@ -34,7 +34,7 @@ get_gem "rspec-core"         "https://rubygems.org/downloads/rspec-core-3.2.1.ge
 get_gem "rspec-support"      "https://rubygems.org/downloads/rspec-support-3.2.2.gem" &&
 get_gem "rspec-expectations" "https://rubygems.org/downloads/rspec-expectations-3.2.0.gem" &&
 get_gem "rspec-mocks"        "https://rubygems.org/downloads/rspec-mocks-3.2.1.gem" &&
-get_gem "diff-lcs"           "https://rubygems.org/downloads/diff-lcs-1.2.5.gem" || exit 1
+get_gem "diff-lcs"           "https://rubygems.org/downloads/diff-lcs-1.3.gem" || exit 1
 
 
 # run specs
diff --git a/spec/thread_order_spec.rb b/spec/thread_order_spec.rb
index 4c0f69d..5ce271b 100644
--- a/spec/thread_order_spec.rb
+++ b/spec/thread_order_spec.rb
@@ -1,3 +1,5 @@
+initial_loaded_features = $LOADED_FEATURES.dup.freeze
+
 require 'thread_order'
 
 RSpec.describe ThreadOrder do
@@ -142,12 +144,20 @@ RSpec.describe ThreadOrder do
     expect(thread_names).to eq [:a, nil]
   end
 
-  it 'is implemented without depending on the stdlib' do
+  define_method :not_loaded! do |filename|
+    # newer versions of Ruby require thread.rb somewhere, so if it was required
+    # before any of our code was required, then don't bother with the assertion
+    # there's no obvious way to deal with it, and it wasn't us who required it
+    next if initial_loaded_features.include? filename
     loaded_filenames = $LOADED_FEATURES.map { |filepath| File.basename filepath }
+    expect(loaded_filenames).to_not include filename
+  end
+
+  it 'is implemented without depending on the stdlib' do
     begin
-      expect(loaded_filenames).to_not include 'monitor.rb'
-      expect(loaded_filenames).to_not include 'thread.rb'
-      expect(loaded_filenames).to_not include 'thread.bundle'
+      not_loaded! 'monitor.rb'
+      not_loaded! 'thread.rb'
+      not_loaded! 'thread.bundle'
     rescue RSpec::Expectations::ExpectationNotMetError
       pending if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby' # somehow this still gets loaded in some JRubies
       raise

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☑ proposals not currently being rate-limited for maintainer None
  • ☑ change set 1e1d988c-affc-41ea-b83c-9a91265ef97f is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-releases ruby-thread-order

Lintian Result

Full worker log Full build log