sorted_set 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '081898341e9841dc1003f668d4ca625f40927bc9f8833cd6a6bfcb06f5bcfc7a'
-  data.tar.gz: d473ca555544efb5a22774b1c2d38ac0813825264510851b41db04b1dbbea471
+  metadata.gz: 591941e2df94bac0072186aaa04f342c2633c593d58cba73d9a4aded808d422d
+  data.tar.gz: 3aacb139a64c8f1e28523f629f687d1a77764ee7eed9ae24eb1773fd82b51447
 SHA512:
-  metadata.gz: b03e842ed2ecc92e2e71a0182573f1dedbf7179c9146a1be3acb91e8b60e89c30ba7b8edb09a3f3f67e9399297f88d5148491743b6b1b9dd363e48be846471a5
-  data.tar.gz: 852398e0e8803f42c833a98f3e4ca809f792c6fcdb2c3e798ba4e143f064da9fe714fa8a33f14b014a5a9a369ff105e6b16e349e18a1edf8c471f4adba5cfaa2
+  metadata.gz: a7c40ae79da17d29f3ebbc87e16369ca334546e116014b912ea8fa4d54beca59fad36629bd56bca4ea3c77bc64f77c623e0d143b5c1a216ab09b87231bc36f77
+  data.tar.gz: ecd3b585a76e33bda7e79528258c5b308aca2c5b617b8981454c00d0d1f40161bbc58e234c9d2222ccdd3d884c85d5f631bd73fce57968a16919f1ea61d92677

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,11 @@ 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"
+    spec.platform = "java"
   else
+    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: java
 authors:
 - Akinori MUSHA
@@ -9,35 +9,7 @@ autorequire:
 bindir: exe
 cert_chain: []
 date: 2020-12-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  name: set
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  name: rbtree-jruby
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 description: Implements a variant of Set whose elements are sorted in ascending order
 email:
 - knu@idaemons.org
@@ -62,7 +34,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: