rubytree 2.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32db11d4bf364a3abad82c8b165293c44ac979a3ba4c5c80e73470558e1cd450
-  data.tar.gz: 298a2b4c37fec0b18f48267607f712debe73271e440ad77dc73bbb3ae43b24df
+  metadata.gz: 0f639a13afc57ffbe28198cec86928d2dc123fb5c4ecc0ed048d17a3c45d6192
+  data.tar.gz: 3fe121a4a22b4e924db7c85819361bedf582f07569bd0380b76c84b94b24acba
 SHA512:
-  metadata.gz: 9ed55c0a1915ff0d31405d32ec652351b061415c4b696bb044d4e9bf6f0dbaaa406df3d29a7b4236c46bb86467091454e6cccf75e9be5a6ace0651fdbf12610e
-  data.tar.gz: 8b215004ac680ca53db74700f1de3c5e08d6c383cbe2b1548281966a4b4a7113c21cd6c4f49b991e4e55fac5da1e0635672c2055bf8ddafa2d8cf50731fbdcc8
+  metadata.gz: 228560789b89fe1aeaace489ef73cde05f1bfa33021bbc6bbbe89eaab33590193bdbffb90c1d7bab2f1c8d50f58f05414775be399fb54fd39bc3da0f57a7d4d8
+  data.tar.gz: 132a627d6d8be134c73ab8b63cce4431d161333212121c3e033b0226bfacc3bb3ae7ae5790d268616f7d14c4a76c6dc7e0d18481c0f6999b5b01de6e8cd9029f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubytree (2.0.0)
+    rubytree (2.0.2)
       json (~> 2.0, > 2.3.1)
 
 GEM
@@ -9,6 +9,7 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.0)
+    docile (1.4.0)
     json (2.6.2)
     parallel (1.22.1)
     parser (3.1.2.0)
@@ -54,6 +55,13 @@ GEM
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.4)
     stringio (3.0.2)
     test-unit (3.5.3)
       power_assert
@@ -75,6 +83,8 @@ DEPENDENCIES
   rubocop-rake (~> 0.0)
   rubocop-rspec (~> 2.0)
   rubytree!
+  simplecov (~> 0.21)
+  simplecov-lcov (~> 0.8)
   test-unit (~> 3.0)
   yard (~> 0.0, >= 0.9.20)
 

data/LICENSE.md

@@ -1,36 +1,27 @@
-[RubyTree][]  is licensed under the [BSD][] license.
+[RubyTree][]  is licensed under the [BSD-2-clause][] license.
 
-Copyright (c) 2006-2022 Anupam Sengupta (<anupamsg@gmail.com>).
+Copyright (c) 2006-2023 Anupam Sengupta (<anupamsg@gmail.com>).
 
-All rights reserved.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-- Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-- Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-- Neither the name of the organization nor the names of its contributors may be
-  used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.
-
-IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-[BSD]:       http://opensource.org/licenses/bsd-license.php "BSD License"
-[RubyTree]:  http://rubytree.anupamsg.me/ "RubyTree Home Page"
+[BSD-2-clause]: https://opensource.org/license/bsd-2-clause/ "BSD License"
+[RubyTree]:     http://rubytree.anupamsg.me/ "RubyTree Home Page"

data/README.md

@@ -1,9 +1,17 @@
 # **RubyTree** #
 
 [![Gem Version](https://badge.fury.io/rb/rubytree.png)](http://badge.fury.io/rb/rubytree)
+![Build State](https://github.com/evolve75/rubytree/actions/workflows/ruby.yml/badge.svg)
 [![Code Climate](https://codeclimate.com/github/evolve75/RubyTree.png)](https://codeclimate.com/github/evolve75/RubyTree)
 [![Coverage Status](https://coveralls.io/repos/evolve75/RubyTree/badge.png)](https://coveralls.io/r/evolve75/RubyTree)
 
+        __       _           _
+       /__\_   _| |__  _   _| |_ _ __ ___  ___
+      / \// | | | '_ \| | | | __| '__/ _ \/ _ \
+     / _  \ |_| | |_) | |_| | |_| | |  __/  __/
+     \/ \_/\__,_|_.__/ \__, |\__|_|  \___|\___|
+                      |___/
+
 ## DESCRIPTION: ##
 
 **RubyTree** is a pure Ruby implementation of the generic
@@ -202,8 +210,7 @@ downloaded and installed automatically by [Bundler][].
 
 A big thanks to the following contributors for helping improve **RubyTree**:
 
-1. [Dirk Breuer](http://github.com/railsbros-dirk) for contributing the JSON
-   conversion code.
+1. Dirk Breuer for contributing the JSON conversion code.
 2. Vincenzo Farruggia for contributing the (sub)tree cloning code.
 3. [Eric Cline](https://github.com/escline) for the Rails JSON encoding fix.
 4. [Darren Oakley](https://github.com/dazoakley) for the tree merge methods.
@@ -230,19 +237,13 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 **RubyTree** is licensed under the terms of the [BSD][] license. See
 [LICENSE.md](./LICENSE.md) for details.
 
-        __       _           _
-       /__\_   _| |__  _   _| |_ _ __ ___  ___
-      / \// | | | '_ \| | | | __| '__/ _ \/ _ \
-     / _  \ |_| | |_) | |_| | |_| | |  __/  __/
-     \/ \_/\__,_|_.__/ \__, |\__|_|  \___|\___|
-                      |___/
 
 [BSD]:                  http://opensource.org/licenses/bsd-license.php "BSD License"
 [Binary tree]:          http://en.wikipedia.org/wiki/Binary_tree "Binary Tree Data Structure"
 [Bundler]:              http://bundler.io "Bundler"
-[Comparable]:           http://ruby-doc.org/core-2.4.2/Comparable.html "Comparable mix-in"
-[Enumerable]:           http://ruby-doc.org/core-2.4.2/Enumerable.html "Enumerable mix-in"
-[JSON]:                 http://flori.github.com/json "JSON"
+[Comparable]:           http://ruby-doc.org/core/Comparable.html "Comparable mix-in"
+[Enumerable]:           http://ruby-doc.org/core/Enumerable.html "Enumerable mix-in"
+[JSON]:                 https://rubygems.org/gems/json "JSON"
 [Rake]:                 https://rubygems.org/gems/rake "Rake"
 [Ruby]:                 http://www.ruby-lang.org "Ruby Programming Language"
 [SCM]:                  http://en.wikipedia.org/wiki/Source_Code_Management "Source Code Management"
@@ -250,7 +251,7 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 [breadth-first]:        http://en.wikipedia.org/wiki/Breadth-first_search "Breadth-first (level-first) Traversal"
 [git]:                  http://git-scm.com "Git SCM"
 [in-order]:             http://en.wikipedia.org/wiki/Tree_traversal#In-order "In-order (symmetric) Traversal"
-[marshaling]:           http://ruby-doc.org/core-2.4.2/Marshal.html "Marshaling in Ruby"
+[marshaling]:           http://ruby-doc.org/core/Marshal.html "Marshaling in Ruby"
 [post-order]:           http://en.wikipedia.org/wiki/Tree_traversal#Post-order "Post-ordered Traversal"
 [pre-order]:            http://en.wikipedia.org/wiki/Tree_traversal#Pre-order "Pre-ordered Traversal"
 [rt@github]:            http://github.com/evolve75/RubyTree "RubyTree Project Page on Github"
@@ -260,6 +261,6 @@ A big thanks to the following contributors for helping improve **RubyTree**:
 [rt_site]:              http://rubytree.anupamsg.me "RubyTree Site"
 [tree_data_structure]:  http://en.wikipedia.org/wiki/Tree_data_structure "Tree Data Structure"
 [RSpec]:                https://relishapp.com/rspec/
-[Rubocop]:              https://rubocop.org
+[Rubocop]:              https://rubocop.org/
 
 [TreeNode]:             rdoc-ref:Tree::TreeNode

data/Rakefile

@@ -139,18 +139,6 @@ namespace :test do
   task :coverage do
     ruby 'test/run_test.rb'
   end
-
-  begin
-    require 'rcov/rcovtask'
-    Rcov::RcovTask.new(:rcov) do |t|
-      t.libs << 'test'
-      t.test_files = FileList['test/**/test_*.rb']
-      t.verbose = true
-      t.rcov_opts << '--exclude /gems/,/Library/,/usr/,spec,lib/tasks'
-    end
-  rescue LoadError
-    # Oh well. Can't have everything.
-  end
 end
 
 # ................................ Emacs Tags

data/lib/tree/version.rb

@@ -4,7 +4,7 @@
 #
 # Author:: Anupam Sengupta (anupamsg@gmail.com)
 #
-# Copyright (c) 2012-2022 Anupam Sengupta. All rights reserved.
+# Copyright (c) 2012-2023 Anupam Sengupta. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,5 +35,5 @@
 
 module Tree
   # Rubytree Package Version
-  VERSION = '2.0.0'
+  VERSION = '2.0.2'
 end

data/rubytree.gemspec

@@ -3,16 +3,16 @@
 #
 # Author:: Anupam Sengupta (anupamsg@gmail.com)
 #
-# Copyright (c) 2012-2022 Anupam Sengupta. All rights reserved.
+# Copyright (c) 2012-2023 Anupam Sengupta. All rights reserved.
 #
 # frozen_string_literal: true
 
-require './lib/tree/version'
+require File.join(__dir__, '/lib/tree/version')
 
 Gem::Specification.new do |s|
   s.name                  = 'rubytree'
   s.version               = Tree::VERSION
-  s.license               = 'BSD-3-Clause-Clear'
+  s.license               = 'BSD-2-Clause'
   # NOTE: s.date should NOT be assigned. It is automatically set to pkg date.
   s.platform              = Gem::Platform::RUBY
   s.author                = 'Anupam Sengupta'
@@ -24,29 +24,23 @@ Gem::Specification.new do |s|
   s.summary               = 'A generic tree data structure for Ruby.'
 
   s.description           = <<-END_DESC
-    RubyTree is a pure Ruby implementation of the generic tree data
-    structure. It provides a node-based model to store named nodes in the tree,
-    and provides simple APIs to access, modify and traverse the structure.
 
-    The implementation is node-centric, where individual nodes in the tree are
-    the primary structural elements. All common tree-traversal methods
-    (pre-order, post-order, and breadth-first) are supported.
+    RubyTree is a Ruby implementation of the generic tree data structure. It
+    provides simple APIs to store named nodes, and to access, modify, and
+    traverse the tree.
 
-    The library mixes in the Enumerable and Comparable modules to allow access
-    to the tree as a standard collection (iteration, comparison, etc.).
+    The data model is node-centric, where nodes in the tree are the primary
+    structural elements. It supports all common tree-traversal methods (pre-order,
+    post-order, and breadth first).
 
-    A Binary tree is also provided, which provides the in-order traversal in
-    addition to the other methods.
+    RubyTree mixes in the Enumerable and Comparable modules and behaves like a
+    standard Ruby collection (iteration, comparison, etc.).
 
-    RubyTree supports importing from, and exporting to JSON, and also supports
-    the Ruby's standard object marshaling.
-
-    This is a BSD licensed open source project, and is hosted at
-    <https://github.com/evolve75/RubyTree>, and is available as a standard gem
-    from <https://rubygems.org/gems/rubytree>.
-
-    The home page for RubyTree is at <http://rubytree.anupamsg.me>.
+    RubyTree also includes a binary tree implementation, which provides in-order
+    node traversal besides the other methods.
 
+    RubyTree can import from and export to JSON, and supports Ruby’s object
+    marshaling.
   END_DESC
 
   s.metadata = {
@@ -64,8 +58,6 @@ Gem::Specification.new do |s|
 
   s.require_paths        = ['lib']
 
-  s.test_files           = Dir.glob('test/**/test_*.rb')
-
   s.extra_rdoc_files     = %w[README.md LICENSE.md API-CHANGES.md History.md]
   s.rdoc_options         = ['--title', "Rubytree Documentation: #{s.name}-#{s.version}",
                             '--main', 'README.md',
@@ -82,6 +74,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubocop', '~> 1.0'
   s.add_development_dependency 'rubocop-rake', '~> 0.0'
   s.add_development_dependency 'rubocop-rspec', '~> 2.0'
+  s.add_development_dependency 'simplecov', '~> 0.21'
+  s.add_development_dependency 'simplecov-lcov', '~> 0.8'
   s.add_development_dependency 'test-unit', '~> 3.0'
   s.add_development_dependency 'yard', '~> 0.0', '>= 0.9.20'
 

data/spec/spec_helper.rb

@@ -3,10 +3,40 @@
 # spec_helper.rb
 #
 # Author:  Anupam Sengupta
-# Time-stamp: <2022-06-19 22:38:14 anupam>
+# Time-stamp: <2022-06-22 13:54:00 anupam>
 #
 # Copyright (C) 2015, 2022 Anupam Sengupta <anupamsg@gmail.com>
 #
 # frozen_string_literal: true
 
 require 'tree'
+
+if ENV['COVERAGE']
+  begin
+    require 'simplecov'
+    require 'simplecov-lcov'
+
+    base_dir = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+    SimpleCov::Formatter::LcovFormatter.config do |cfg|
+      cfg.report_with_single_file = true
+      cfg.lcov_file_name = 'lcov.info'
+      cfg.single_report_path = "#{base_dir}/coverage/lcov.info"
+    end
+
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+      [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::LcovFormatter
+      ]
+    )
+
+    SimpleCov.start do
+      add_filter '/test'
+      add_filter '/spec'
+      enable_coverage :branch
+    end
+  rescue LoadError => e
+    puts "Could not load simplecov; continuing without code coverage #{e.cause}"
+  end
+end

data/spec/tree_spec.rb

@@ -3,7 +3,7 @@
 # tree_spec.rb
 #
 # Author:  Anupam Sengupta
-# Time-stamp: <2022-06-20 22:16:11 anupam>
+# Time-stamp: <2022-06-22 13:52:50 anupam>
 # Copyright (C) 2015-2022 Anupam Sengupta <anupamsg@gmail.com>
 #
 # frozen_string_literal: true

data/test/run_test.rb

@@ -3,7 +3,7 @@
 # run_test.rb:: Run all the tests from the Ruby command line.
 #
 # Author:  Anupam Sengupta
-# Time-stamp: <2022-06-19 22:44:56 anupam>
+# Time-stamp: <2022-06-22 13:54:25 anupam>
 # Copyright (C) 2014, 2022 Anupam Sengupta <anupamsg@gmail.com>
 #
 # Redistribution and use in source and binary forms, with or without modification,
@@ -42,14 +42,25 @@ $LOAD_PATH.unshift(lib_dir)
 if ENV['COVERAGE']
   begin
     require 'simplecov'
-    require 'coveralls'
+    require 'simplecov-lcov'
 
-    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+    SimpleCov::Formatter::LcovFormatter.config do |cfg|
+      cfg.report_with_single_file = true
+      cfg.lcov_file_name = 'lcov.info'
+      cfg.single_report_path = "#{base_dir}/coverage/lcov.info"
+    end
+
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+      [
+        SimpleCov::Formatter::HTMLFormatter,
+        SimpleCov::Formatter::LcovFormatter
+      ]
+    )
 
     SimpleCov.start do
-      add_filter '/test/'
-      add_group 'Core Classes', '/lib/.*tree.rb'
-      add_group 'Internal Utilities', '/lib/tree/utils/.*.rb'
+      add_filter '/test'
+      add_filter '/spec'
+      enable_coverage :branch
     end
   rescue LoadError => e
     puts "Could not load simplecov; continuing without code coverage #{e.cause}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubytree
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Anupam Sengupta
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-21 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -148,6 +148,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -182,30 +210,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.20
-description: |2+
-      RubyTree is a pure Ruby implementation of the generic tree data
-      structure. It provides a node-based model to store named nodes in the tree,
-      and provides simple APIs to access, modify and traverse the structure.
+description: |2
 
-      The implementation is node-centric, where individual nodes in the tree are
-      the primary structural elements. All common tree-traversal methods
-      (pre-order, post-order, and breadth-first) are supported.
+      RubyTree is a Ruby implementation of the generic tree data structure. It
+      provides simple APIs to store named nodes, and to access, modify, and
+      traverse the tree.
 
-      The library mixes in the Enumerable and Comparable modules to allow access
-      to the tree as a standard collection (iteration, comparison, etc.).
+      The data model is node-centric, where nodes in the tree are the primary
+      structural elements. It supports all common tree-traversal methods (pre-order,
+      post-order, and breadth first).
 
-      A Binary tree is also provided, which provides the in-order traversal in
-      addition to the other methods.
+      RubyTree mixes in the Enumerable and Comparable modules and behaves like a
+      standard Ruby collection (iteration, comparison, etc.).
 
-      RubyTree supports importing from, and exporting to JSON, and also supports
-      the Ruby's standard object marshaling.
-
-      This is a BSD licensed open source project, and is hosted at
-      <https://github.com/evolve75/RubyTree>, and is available as a standard gem
-      from <https://rubygems.org/gems/rubytree>.
-
-      The home page for RubyTree is at <http://rubytree.anupamsg.me>.
+      RubyTree also includes a binary tree implementation, which provides in-order
+      node traversal besides the other methods.
 
+      RubyTree can import from and export to JSON, and supports Ruby’s object
+      marshaling.
 email: anupamsg@gmail.com
 executables: []
 extensions: []
@@ -247,7 +269,7 @@ files:
 - test/test_tree.rb
 homepage: http://rubytree.anupamsg.me
 licenses:
-- BSD-3-Clause-Clear
+- BSD-2-Clause
 metadata:
   rubygems_mfa_required: 'true'
 post_install_message: |2
@@ -276,7 +298,7 @@ post_install_message: |2
       ========================================================================
 rdoc_options:
 - "--title"
-- 'Rubytree Documentation: rubytree-2.0.0'
+- 'Rubytree Documentation: rubytree-2.0.2'
 - "--main"
 - README.md
 - "--quiet"
@@ -297,9 +319,4 @@ rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A generic tree data structure for Ruby.
-test_files:
-- test/test_binarytree.rb
-- test/test_subclassed_node.rb
-- test/test_tree.rb
-- test/test_thread_and_fiber.rb
-- test/test_rubytree_require.rb
+test_files: []