rbi 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8a26f05eff609245be847ff291cfd456b86e0a11aa85c496bcdcbaf8c202b5b
-  data.tar.gz: f1eb34ff26a99f6b1b20edfaec281db99559cce730e3c0cdbf0d8c75a8e6ee91
+  metadata.gz: 77b85115608a47d4b914f860694efc7d177a0b59547ba1cd5cfa41b6493b04a0
+  data.tar.gz: 53d88137d9d3913ba70ef73130a32e8be5b16d79deaacd7df7153d018cf87b70
 SHA512:
-  metadata.gz: 9cbe3f72073f2813cef4744b57849d8725eab8ed19df9b14d7d7571f795dd90ca925645eed50f62ff86d8a387a5e845a516a7dfc097593788e9b27c6d6489edd
-  data.tar.gz: 72e11ed844915a8965f3a0db4f76b7cb3b6e22e6eb7848bcf2f5484a415bdf79fd7c552c811b279cb006121179c8ebc1cfa58bcbe3d95e2089fec02f1f8ab8a0
+  metadata.gz: 14f59a1f6ae13807f786ae7b927f3b8444f429f4aa777ea835bdb47c4387ac39374fb57e0194c56a346d4f3f63ce6ca2a4eac40bb0f602a8e404a36dabf03ce8
+  data.tar.gz: b5bbac789aff1fdc6c7b97326e4a76d5e2bd412919895571a3cf324ca2f6751d8b7f1286c6618853e5b327e0adc756b619c76b7aaf5db8c4c8c8deb3de12ed9b

data/README.md

@@ -54,10 +54,26 @@ end
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 This repo uses itself (`rbi`) to retrieve and generate gem RBIs. You can run `dev rbi` to update local gem RBIs with RBIs from the central repo.
 
+## Releasing
+
+### Bump the gem version
+
+- [ ] Locally, update the version number in [`version.rb`](https://github.com/Shopify/spoom/blob/main/lib/rbi/version.rb)
+- [ ] Run `bundle install` to update the version number in `Gemfile.lock`
+- [ ] Commit this change with the message `Bump version to vx.y.z`
+- [ ] Push this change directly to main or open a PR
+
+### Create a new tag
+
+- [ ] Locally, create a new tag with the new version number: `git tag vx.y.z`
+- [ ] Push this tag up to the remote `git push origin vx.y.z`
+
+### Release workflow will run automatically
+
+We have a [release workflow](https://github.com/Shopify/rbi/actions/workflows/release.yml) that will publish your new gem version to rubygems.org via [Trusted Publishing](https://guides.rubygems.org/trusted-publishing/). This workflow must be approved by a member of the Ruby and Rails Infrastructure team at Shopify before it will run. Once it is approved, it will automatically publish a new gem version to rubygems.org and create a new GitHub release.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Shopify/rbi. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/Shopify/rbi/blob/master/CODE_OF_CONDUCT.md).

data/lib/rbi/rewriters/merge_trees.rb

@@ -136,6 +136,17 @@ module RBI
                 make_conflict_scope(prev, node)
               end
               @scope_stack << prev
+            elsif prev
+              # prev exists but is not a Scope (e.g., a Const)
+              # This is a conflict between different node types
+              if @keep == Keep::LEFT
+                # do nothing, keep the existing non-scope
+              elsif @keep == Keep::RIGHT
+                prev.replace(node.dup)
+              else
+                make_conflict_tree(prev, node)
+              end
+              return # Don't visit children, the whole scope is in conflict
             else
               copy = node.dup_empty
               current_scope << copy
@@ -265,6 +276,8 @@ module RBI
               else
                 last_conflict_tree = node
               end
+            else
+              last_conflict_tree = nil
             end
 
             visit(node)

data/lib/rbi/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbi
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prism