♻️ Refactor to use RSpec dependency tags from tree_haver

- update minimum coverage

Author: pboling

.envrc

@@ -33,8 +33,8 @@ export K_SOUP_COV_COMMAND_NAME="Test Coverage"
 # Available formats are html, xml, rcov, lcov, json, tty
 
 export K_SOUP_COV_FORMATTERS="html,xml,rcov,lcov,json,tty"
-export K_SOUP_COV_MIN_BRANCH=82 # Means you want to enforce X% branch coverage
-export K_SOUP_COV_MIN_LINE=100 # Means you want to enforce X% line coverage
+export K_SOUP_COV_MIN_BRANCH=65 # Means you want to enforce X% branch coverage
+export K_SOUP_COV_MIN_LINE=89 # Means you want to enforce X% line coverage
 export K_SOUP_COV_MIN_HARD=true # Means you want the build to fail if the coverage thresholds are not met
 export K_SOUP_COV_MULTI_FORMATTERS=true
 export K_SOUP_COV_OPEN_BIN= # Means don't try to open coverage results in browser

.github/workflows/coverage.yml

@@ -6,8 +6,8 @@ permissions:
   id-token: write
 
 env:
-  K_SOUP_COV_MIN_BRANCH: 82
-  K_SOUP_COV_MIN_LINE: 100
+  K_SOUP_COV_MIN_BRANCH: 65
+  K_SOUP_COV_MIN_LINE: 89
   K_SOUP_COV_MIN_HARD: true
   K_SOUP_COV_FORMATTERS: "xml,rcov,lcov,tty"
   K_SOUP_COV_DO: true

.github/workflows/locked_deps.yml

@@ -25,8 +25,8 @@ env:
   #   because it would be redundant with the coverage workflow.
   # Also we can validate all output formats without breaking CodeCov,
   #   since we aren't submitting these reports anywhere.
-  K_SOUP_COV_MIN_BRANCH: 80
-  K_SOUP_COV_MIN_LINE: 90
+  K_SOUP_COV_MIN_BRANCH: 60
+  K_SOUP_COV_MIN_LINE: 80
   K_SOUP_COV_MIN_HARD: false
   K_SOUP_COV_FORMATTERS: "html,xml,rcov,lcov,json,tty"
   K_SOUP_COV_DO: true

.gitlab-ci.yml

@@ -22,8 +22,8 @@ variables:
   K_SOUP_COV_DEBUG: true
   K_SOUP_COV_DO: true
   K_SOUP_COV_HARD: true
-  K_SOUP_COV_MIN_BRANCH: 80
-  K_SOUP_COV_MIN_LINE: 90
+  K_SOUP_COV_MIN_BRANCH: 60
+  K_SOUP_COV_MIN_LINE: 80
   K_SOUP_COV_VERBOSE: true
   K_SOUP_COV_FORMATTERS: "tty"
   K_SOUP_COV_MULTI_FORMATTERS: true

Gemfile.lock

@@ -1,3 +1,13 @@
+GIT
+  remote: https://github.com/pboling/ruby-tree-sitter.git
+  revision: c36cff9cbf55ca1512cc49d8739e4efc2ff0a962
+  branch: tree_haver
+  specs:
+    ruby_tree_sitter (2.0.0)
+      oppen (~> 1.0)
+      sorbet-runtime
+      zeitwerk
+
 GIT
   remote: https://github.com/pboling/yard-junk.git
   revision: 54ccebabbfa9a9cd44d0b991687ebbfd22c32b55
@@ -10,70 +20,10 @@ GIT
       rainbow
       yard
 
-PATH
-  remote: ../..
-  specs:
-    ast-merge (4.0.6)
-      tree_haver (~> 5.0, >= 5.0.5)
-      version_gem (~> 1.1, >= 1.1.9)
-
-PATH
-  remote: ../kettle-dev
-  specs:
-    kettle-dev (1.2.5)
-
-PATH
-  remote: ../kettle-soup-cover
-  specs:
-    kettle-soup-cover (1.1.1)
-      simplecov (~> 0.22)
-      simplecov-cobertura (~> 3.0)
-      simplecov-console (~> 0.9, >= 0.9.3)
-      simplecov-html (~> 0.13, >= 0.13.1)
-      simplecov-lcov (~> 0.8)
-      simplecov-rcov (~> 0.3, >= 0.3.7)
-      simplecov_json_formatter (~> 0.1, >= 0.1.4)
-      version_gem (~> 1.1, >= 1.1.9)
-
-PATH
-  remote: ../kettle-test
-  specs:
-    kettle-test (1.0.10)
-      appraisal2 (~> 3.0, >= 3.0.2)
-      backports (~> 3.0)
-      rspec (~> 3.0)
-      rspec-block_is_expected (~> 1.0, >= 1.0.6)
-      rspec-pending_for (~> 0.1, >= 0.1.19)
-      rspec-stubbed_env (~> 1.0, >= 1.0.4)
-      rspec_junit_formatter (~> 0.6)
-      silent_stream (~> 1.0, >= 1.0.12)
-      timecop-rspec (~> 1.0, >= 1.0.3)
-      version_gem (~> 1.1, >= 1.1.9)
-
-PATH
-  remote: ../ruby-tree-sitter
-  specs:
-    ruby_tree_sitter (2.0.0)
-      oppen (~> 1.0)
-      sorbet-runtime
-      zeitwerk
-
-PATH
-  remote: ../tree_haver
-  specs:
-    tree_haver (5.0.5)
-      version_gem (~> 1.1, >= 1.1.9)
-
-PATH
-  remote: ../tree_stump
-  specs:
-    tree_stump (0.1.0)
-      rb_sys (~> 0.9.124)
-
 PATH
   remote: .
   specs:
-    toml-merge (2.0.0)
+    toml-merge (2.0.1)
       ast-merge (~> 4.0, >= 4.0.6)
       tree_haver (~> 5.0, >= 5.0.5)
       version_gem (~> 1.1, >= 1.1.9)
@@ -89,6 +39,9 @@ GEM
       rake (>= 10)
       thor (>= 0.14)
     ast (2.4.3)
+    ast-merge (4.0.6)
+      tree_haver (~> 5.0, >= 5.0.5)
+      version_gem (~> 1.1, >= 1.1.9)
     backports (3.25.3)
     benchmark (0.5.0)
     bigdecimal (3.3.1)
@@ -155,6 +108,27 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     json (2.18.1)
+    kettle-dev (1.2.4)
+    kettle-soup-cover (1.1.1)
+      simplecov (~> 0.22)
+      simplecov-cobertura (~> 3.0)
+      simplecov-console (~> 0.9, >= 0.9.3)
+      simplecov-html (~> 0.13, >= 0.13.1)
+      simplecov-lcov (~> 0.8)
+      simplecov-rcov (~> 0.3, >= 0.3.7)
+      simplecov_json_formatter (~> 0.1, >= 0.1.4)
+      version_gem (~> 1.1, >= 1.1.9)
+    kettle-test (1.0.10)
+      appraisal2 (~> 3.0, >= 3.0.2)
+      backports (~> 3.0)
+      rspec (~> 3.0)
+      rspec-block_is_expected (~> 1.0, >= 1.0.6)
+      rspec-pending_for (~> 0.1, >= 0.1.19)
+      rspec-stubbed_env (~> 1.0, >= 1.0.4)
+      rspec_junit_formatter (~> 0.6)
+      silent_stream (~> 1.0, >= 1.0.12)
+      timecop-rspec (~> 1.0, >= 1.0.3)
+      version_gem (~> 1.1, >= 1.1.9)
     kramdown (2.5.2)
       rexml (>= 3.4.4)
     kramdown-parser-gfm (1.1.0)
@@ -362,6 +336,10 @@ GEM
     toml-rb (4.1.0)
       citrus (~> 3.0, > 3.0)
       racc (~> 1.7)
+    tree_haver (5.0.5)
+      version_gem (~> 1.1, >= 1.1.9)
+    tree_stump (0.2.0)
+      rb_sys (~> 0.9.119)
     tsort (0.2.0)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
@@ -400,7 +378,6 @@ PLATFORMS
 DEPENDENCIES
   addressable (>= 2.8, < 3)
   appraisal2 (~> 3.0.6, ~> 3.0)
-  ast-merge!
   benchmark (~> 0.5, >= 0.5.0)
   bundler-audit (~> 0.9.2)
   citrus (~> 3.0, >= 3.0.2)
@@ -410,9 +387,9 @@ DEPENDENCIES
   gem_bench (~> 2.0, >= 2.0.5)
   gitmoji-regex (~> 1.0, >= 1.0.3)
   irb (~> 1.15, >= 1.15.2)
-  kettle-dev (~> 1.1, >= 0)!
-  kettle-soup-cover!
-  kettle-test (~> 1.0, >= 1.0.10, >= 0)!
+  kettle-dev (~> 1.1)
+  kettle-soup-cover (~> 1.0, >= 1.0.10)
+  kettle-test (~> 1.0, >= 1.0.10)
   kramdown (~> 2.5, >= 2.5.1)
   kramdown-parser-gfm (~> 1.1)
   mutex_m (~> 0.2)
@@ -434,8 +411,7 @@ DEPENDENCIES
   toml (~> 0.3, >= 0.3.0)
   toml-merge!
   toml-rb (~> 4.1, >= 4.1.0)
-  tree_haver!
-  tree_stump!
+  tree_stump (~> 0.2)
   yaml-converter (~> 0.1)
   yard (~> 0.9, >= 0.9.37)
   yard-fence (~> 0.8)
@@ -448,7 +424,7 @@ CHECKSUMS
   ansi (1.5.0) sha256=5408253274e33d9d27d4a98c46d2998266fd51cba58a7eb9d08f50e57ed23592
   appraisal2 (3.0.6) sha256=09387896b6c8c8c0ff0749af691ddff5e3168de2f06b591a80d8fd8b6394d147
   ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
-  ast-merge (4.0.6)
+  ast-merge (4.0.6) sha256=c81803510cfda098ea42802427b0c83a47b06bb9bd9f6257aeeee793dbb89abd
   backports (3.25.3) sha256=94298d32dc3c40ca15633b54e282780b49e2db0c045f602ea1907e4f63a17235
   benchmark (0.5.0) sha256=465df122341aedcb81a2a24b4d3bd19b6c67c1530713fd533f3ff034e419236c
   bigdecimal (3.3.1) sha256=eaa01e228be54c4f9f53bf3cc34fe3d5e845c31963e7fcc5bedb05a4e7d52218
@@ -482,9 +458,9 @@ CHECKSUMS
   io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
   irb (1.17.0) sha256=168c4ddb93d8a361a045c41d92b2952c7a118fa73f23fe14e55609eb7a863aae
   json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
-  kettle-dev (1.2.5)
-  kettle-soup-cover (1.1.1)
-  kettle-test (1.0.10)
+  kettle-dev (1.2.4) sha256=71373c67fe7eb0a9656e70dfd10cf226a15083b6d1be18dafcb5360f21ee98b6
+  kettle-soup-cover (1.1.1) sha256=2303885a9d8485d8d43cb250bcf73570f6b6fb997526beeaef3ef54e3501d445
+  kettle-test (1.0.10) sha256=ddefc5d54b290ee6dbe5a3983128f6948fa63f624ca676c1e6cfffc9b6878179
   kramdown (2.5.2) sha256=1ba542204c66b6f9111ff00dcc26075b95b220b07f2905d8261740c82f7f02fa
   kramdown-parser-gfm (1.1.0) sha256=fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729
   language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
@@ -570,10 +546,10 @@ CHECKSUMS
   timecop (0.9.10) sha256=12ba45ce57cdcf6b1043cb6cdffa6381fd89ce10d369c28a7f6f04dc1b0cd8eb
   timecop-rspec (1.0.3) sha256=005f14841bb606dcaefb060e321b5388e2e59537742bee8b3a9a9a40e598fab9
   toml (0.3.0) sha256=0a91d0f76a9036e84e44f95693b12f58d358c1df3ac8e3b5271f2056ecc6e4b9
-  toml-merge (2.0.0)
+  toml-merge (2.0.1)
   toml-rb (4.1.0) sha256=14456ec4549e4703881bf04b83a56f3264ef99884880092d83c98a2058d95846
-  tree_haver (5.0.5)
-  tree_stump (0.1.0)
+  tree_haver (5.0.5) sha256=727717dd13b628f3c48d0ad8cabb7ceaa0a33476ff7f7a61234b855c75ece3a3
+  tree_stump (0.2.0) sha256=760ca5dd50280232b4446ed800d0d3c1f3301ffb7194e024f598f097ad6e3f11
   tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
   ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca
   unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42

lib/toml/merge/version.rb

@@ -5,7 +5,7 @@ module Merge
     # Version information for Toml::Merge
     module Version
       # Current version of the toml-merge gem
-      VERSION = "2.0.0"
+      VERSION = "2.0.1"
     end
     VERSION = Version::VERSION # traditional location
   end

spec/toml/merge/table_match_refiner_spec.rb

@@ -20,13 +20,9 @@
     end
   end
 
-  describe "#extract_table_name" do
+  describe "#extract_table_name", :toml_grammar do
     subject(:refiner) { described_class.new }
 
-    before do
-      skip "Requires tree-sitter TOML parser" unless tree_sitter_available?
-    end
-
     it "extracts name from table node" do
       toml = "[server]\nport = 8080"
       node = parse_toml(toml, node_type: "table")