sorted_set 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e56f60064165312509fe6eba771c978f17b1ec0a9e7fa48ca9507e5e8859d8cf
-  data.tar.gz: 8d04402fb56428ea45bf43255112b7b4ddfab075a923efc9933c882cabc9812c
+  metadata.gz: b608cd727ba5db1ff4a6075bf8019f08df9b33e84ec81bb92a86f2370f91a690
+  data.tar.gz: 80812b5f265029471600b44cea9b390ae2a2b92a596e01f39c09e50f4609d7fd
 SHA512:
-  metadata.gz: 815254e15bf0889c57f831795792761a1d14c8f8c6420b88c8c967fbf6e60dae9938f450ecb00d9daa201729eb173f3631b2fb8531d289d900dc91d9010850e0
-  data.tar.gz: 9a7e2c54b2c414d0bcffa55059304813af6da28f607fbabaad07967211af529df94d4f56036d5d4a60895acb51bfa1fcae8fa90810ae7dbb6ee49751899cdf38
+  metadata.gz: a3a85b5e9b0db2771b549f50662b808cb3a3addd3acd94e0cff379ee5bfa54f24fe2d81b80930f01dc7fc4d441ef0806a37c92538b09167f8e395b27951209e1
+  data.tar.gz: df4069209e5532650a3ec58da2149e9490a30c270d8dbcc6edc6aa8546dc6b896578b3b9fdc9eacb0a1588fdcb7b414e3eb2f7cd518245c1f8a4066c534879de

data/CHANGELOG.md

@@ -1,8 +1,13 @@
 # SortedSet Changelog
 
+## 1.0.1 (2020-12-22)
+
+* Enhancements
+  * Be a no-op library for JRuby, as it has its own version of Set and SortedSet.
+
 ## 1.0.0 (2020-12-22)
 
 This is the first release of sorted_set as a gem.  Here lists the changes since the version bundled with Ruby 2.7.
 
 * Breaking Changes
-  * The pure-ruby fallback implementation has been removed.  It now requires an RBTree library (rbtree for CRuby, rbtree-jruby for JRuby) to install and run.
+  * The pure-ruby fallback implementation has been removed.  It now requires an RBTree library (rbtree) to install and run.

data/README.md

@@ -8,6 +8,9 @@ Every element in SortedSet must be *mutually comparable* to every
 other: comparison with `<=>` must not return nil for any pair of
 elements.  Otherwise ArgumentError will be raised.
 
+Currently this library does nothing for JRuby, as it has its own
+version of Set and SortedSet.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/sorted_set.rb

@@ -1,8 +1,26 @@
 # :markup: markdown
 
 require 'set'
+
+return if defined?(JRUBY_VERSION)
+
 require 'rbtree'
 
+Object.instance_exec do
+  # Undefine SortedSet for two reasons.
+  #
+  # 1. We should wipe out an existing implementation if Ruby 2.x loads
+  #    this library after loading the standard set library which
+  #    defines SortedSet.
+  #
+  # 2. Ruby >=3.0 (set >=1.0.0) sets autoload on SortedSet, and we
+  #    shouldn't let the following reference to SortedSet fire it
+  #    because it would end up requiring this library, leading to
+  #    circular require.
+  #
+  remove_const :SortedSet if const_defined?(:SortedSet)
+end
+
 ##
 # SortedSet implements a Set whose elements are sorted in ascending
 # order (according to the return values of their `<=>` methods) when
@@ -31,27 +49,9 @@ require 'rbtree'
 # ```
 
 class SortedSet < Set
-  # Remove the existing implementation in case Ruby 2.x loads this
-  # library after loading the standard set library which defines
-  # SortedSet.
-  if class_variable_defined?(:@@setup)
-    # a hack to shut up warning
-    alias_method :old_init, :initialize
-
-    instance_methods(false).each { |m| remove_method(m) }
-  end
-
   # Creates a SortedSet.  See Set.new for details.
   def initialize(*args)
     @hash = RBTree.new
     super
   end
-
-  if class_variable_defined?(:@@setup)
-    remove_class_variable(:@@setup)
-    remove_class_variable(:@@mutex) if class_variable_defined?(:@@mutex)
-
-    # a hack to shut up warning
-    remove_method :old_init
-  end
 end

data/sorted_set.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sorted_set"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["Akinori MUSHA"]
   spec.email         = ["knu@idaemons.org"]
 
@@ -22,11 +22,9 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.add_runtime_dependency "set", "~> 1.0"
-  if defined?(JRUBY_VERSION)
-    spec.platform = 'java'
-    spec.add_runtime_dependency "rbtree-jruby"
-  else
+
+  unless defined?(JRUBY_VERSION)
+    spec.add_runtime_dependency "set", "~> 1.0"
     spec.add_runtime_dependency "rbtree"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorted_set
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Akinori MUSHA
@@ -62,7 +62,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/knu/sorted_set
   source_code_uri: https://github.com/knu/sorted_set
-  changelog_uri: https://github.com/knu/sorted_set/blob/v1.0.0/CHANGELOG.md
+  changelog_uri: https://github.com/knu/sorted_set/blob/v1.0.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: