bash-merge 1.0.1 → 1.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 97b443df140b5c7b84dd22c38b7bb7b541d63303f1e8be31628be7eefa7a02e2
4
- data.tar.gz: cdca3bca6ac55a7bd1ea8585bf6241bbabc804d306668cdd24d7d54a8decc088
3
+ metadata.gz: bf2cbd8a4823b24975b63a2366d700f7cbc61a72584bf08d4c90e998713df3bf
4
+ data.tar.gz: 172b697453ad5c0b647914036906f3068b49a4d18475c183471f2dd649081f21
5
5
  SHA512:
6
- metadata.gz: 847eb54d16c33e45b3e574569b437e6b12c9fc6f304395c2ef627cf7a8e4718ce9c71f2be1d8ee22eeb054b62dc59ce1fb4663a16ff6d9101b5166d8491c458a
7
- data.tar.gz: 3fb3ee4730f717bc8d5bd3a65d5702b661bb73c342c08c9b0156ae2b8c0d64545df44eef7ec1a9e7312a8185d691864e59e71c5f206ee1aad1a34d2f588dcb59
6
+ metadata.gz: 4bd8c9ff57b18df22ca30d2a7fd55868fbf101d1159f76b987bb39b92c592e044ab96856bbaf73dea137af9da4089f4eae9a43fd240694488e45f20608a79dfc
7
+ data.tar.gz: 87b6db769a1a8680a77380f6e1b0d0b6f842430687b314fbd5fa36c4097c87e984b7b974d2aea0d85fd2e2f9c10292d034a997257e601cbe92e1f65406f8aa20
checksums.yaml.gz.sig CHANGED
Binary file
data/CHANGELOG.md CHANGED
@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
30
30
 
31
31
  ### Security
32
32
 
33
+ ## [1.0.2] - 2026-01-02
34
+
35
+ - TAG: [v1.0.2][1.0.2t]
36
+ - COVERAGE: 100.00% -- 109/109 lines in 2 files
37
+ - BRANCH COVERAGE: 100.00% -- 28/28 branches in 2 files
38
+ - 96.46% documented
39
+
40
+ ### Removed
41
+
42
+ - **Load-time grammar registration** - TreeHaver's `parser_for` now handles grammar discovery
43
+ and registration automatically. Removed manual `GrammarFinder` calls and warnings from
44
+ `lib/bash/merge.rb`.
45
+
33
46
  ## [1.0.1] - 2026-01-01
34
47
 
35
48
  - TAG: [v1.0.1][1.0.1t]
@@ -61,7 +74,9 @@ Please file a bug if you notice a violation of semantic versioning.
61
74
 
62
75
  ### Security
63
76
 
64
- [Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v1.0.1...HEAD
77
+ [Unreleased]: https://github.com/kettle-rb/bash-merge/compare/v1.0.2...HEAD
78
+ [1.0.2]: https://github.com/kettle-rb/bash-merge/compare/v1.0.1...v1.0.2
79
+ [1.0.2t]: https://github.com/kettle-rb/bash-merge/releases/tag/v1.0.2
65
80
  [1.0.1]: https://github.com/kettle-rb/bash-merge/compare/v1.0.0...v1.0.1
66
81
  [1.0.1t]: https://github.com/kettle-rb/bash-merge/releases/tag/v1.0.1
67
82
  [1.0.0]: https://github.com/kettle-rb/bash-merge/compare/db525d5aedd0c895422a067629118f3fa9c3c22d...v1.0.0
@@ -5,7 +5,7 @@ module Bash
5
5
  # Version information for Bash::Merge
6
6
  module Version
7
7
  # Current version of the bash-merge gem
8
- VERSION = "1.0.1"
8
+ VERSION = "1.0.2"
9
9
  end
10
10
  VERSION = Version::VERSION # traditional location
11
11
  end
data/lib/bash/merge.rb CHANGED
@@ -1,9 +1,13 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- # External gems
4
- # TreeHaver provides a unified cross-Ruby interface to tree-sitter
5
- require "tree_haver"
3
+ # std libs
4
+ require "set"
6
5
 
6
+ # External gems
7
+ # TreeHaver provides a unified cross-Ruby interface to tree-sitter.
8
+ # It handles grammar discovery and backend selection automatically
9
+ # via parser_for(:bash). No manual registration needed.
10
+ #
7
11
  # BACKEND COMPATIBILITY for Bash:
8
12
  # - FFI: Most portable and reliable with bash grammar (recommended)
9
13
  # - MRI: Has ABI incompatibility with bash grammar
@@ -12,24 +16,9 @@ require "tree_haver"
12
16
  # Set TREE_HAVER_BACKEND=ffi (or mri/rust) to control backend selection.
13
17
  # When MRI loads a grammar first, FFI gets incompatible pointers (symbol conflict).
14
18
  # MRI statically links tree-sitter, FFI dynamically links libtree-sitter.so.
15
-
16
- # Register tree-sitter bash grammar
17
- bash_finder = TreeHaver::GrammarFinder.new(:bash)
18
- bash_available = bash_finder.available?
19
- bash_finder.register! if bash_available
20
-
21
- # Only warn if the grammar file is actually missing (not just runtime unavailable)
22
- # When the runtime isn't available, tree-sitter backends just won't be used,
23
- # which is expected behavior - no need to warn the user.
24
- unless bash_available
25
- grammar_path = bash_finder.find_library_path
26
- unless grammar_path
27
- warn "WARNING: Bash grammar not available. #{bash_finder.not_found_message}"
28
- end
29
- end
19
+ require "tree_haver"
30
20
 
31
21
  require "version_gem"
32
- require "set"
33
22
 
34
23
  # Shared merge infrastructure
35
24
  require "ast/merge"
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bash-merge
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter H. Boling
@@ -46,7 +46,7 @@ dependencies:
46
46
  version: '3.2'
47
47
  - - ">="
48
48
  - !ruby/object:Gem::Version
49
- version: 3.2.2
49
+ version: 3.2.3
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
56
56
  version: '3.2'
57
57
  - - ">="
58
58
  - !ruby/object:Gem::Version
59
- version: 3.2.2
59
+ version: 3.2.3
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: ast-merge
62
62
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  version: '2.0'
67
67
  - - ">="
68
68
  - !ruby/object:Gem::Version
69
- version: 2.0.8
69
+ version: 2.0.9
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '2.0'
77
77
  - - ">="
78
78
  - !ruby/object:Gem::Version
79
- version: 2.0.8
79
+ version: 2.0.9
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: version_gem
82
82
  requirement: !ruby/object:Gem::Requirement
@@ -315,10 +315,10 @@ licenses:
315
315
  - MIT
316
316
  metadata:
317
317
  homepage_uri: https://bash-merge.galtzo.com/
318
- source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v1.0.1
319
- changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v1.0.1/CHANGELOG.md
318
+ source_code_uri: https://github.com/kettle-rb/bash-merge/tree/v1.0.2
319
+ changelog_uri: https://github.com/kettle-rb/bash-merge/blob/v1.0.2/CHANGELOG.md
320
320
  bug_tracker_uri: https://github.com/kettle-rb/bash-merge/issues
321
- documentation_uri: https://www.rubydoc.info/gems/bash-merge/1.0.1
321
+ documentation_uri: https://www.rubydoc.info/gems/bash-merge/1.0.2
322
322
  funding_uri: https://github.com/sponsors/pboling
323
323
  wiki_uri: https://github.com/kettle-rb/bash-merge/wiki
324
324
  news_uri: https://www.railsbling.com/tags/bash-merge
metadata.gz.sig CHANGED
Binary file