rbs 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b7971d4b64c169d220fe2c0895630a36ebc6505b68689fba0660be24bcd24c0
-  data.tar.gz: 2f6b8a68c5817d25c3ba179eb3965751f0b406c7dcf2d0812fe41d96bbac6e7c
+  metadata.gz: 3eecea95d764201e888ed754df209a3c948d8f703bc31453f53dcef86690ac35
+  data.tar.gz: 43d8c75f856ca9d9790b5ef451407dc9a9ea21c8dec48708cc425633f1faaa2a
 SHA512:
-  metadata.gz: 4647a2dce17379807dae65a355d0fb2174d18062dbeb98d51c0c06f125d19d665ff32e3528c7326925ba11abed838b0ffff35e3708a25931fa1c4ea8c25d5eae
-  data.tar.gz: 68e20554c2941971aa99015343ef59768a653ed23fc0d6b59eeb64223dff56e8c0aa61846402f28d5f8f9e5ce33763e116cdf08cb8ca9dcfb07177d1eeab9d68
+  metadata.gz: 7ae9f227f01d1ffe6ec4a8653eac72a83394300e8674d70694ee31abdc2bea71371d07652c9557e5721a352ecb7b063b9373b8589ab9caa2e1513a71809fb790
+  data.tar.gz: ae92f774b5f1f1992cb2f6f364205e10e6044e761e68fee7356f1836e352c4f5519d1039fe2ecdd14dc88e70d0f8a276da52775f171def6214f0db9e29a23541

data/CHANGELOG.md

@@ -2,33 +2,41 @@
 
 ## master
 
+## 3.1.3 (2023-07-31)
+
+### Library changes
+
+#### rbs collection
+
+* Generate gem specific sources in lockfile (Backport [#1402](https://github.com/ruby/rbs/pull/1402))
+
 ## 3.1.2 (2023-07-27)
 
 ⚠️ Note that this patch level release may report additional validation errors that is caused by fix of type name resolution ([#1373](https://github.com/ruby/rbs/pull/1373)).
 
 ### Library changes
 
-* Make `TypeNameResolver` more compatible with Ruby ([#1373](https://github.com/ruby/rbs/pull/1373))
-* Fix module alias normalizations ([#1393](https://github.com/ruby/rbs/pull/1393))
+* Make `TypeNameResolver` more compatible with Ruby (Backport [#1373](https://github.com/ruby/rbs/pull/1373))
+* Fix module alias normalizations (Backport [#1393](https://github.com/ruby/rbs/pull/1393))
 
 ## 3.1.1 (2023-07-18)
 
 ### Signature updates
 
-* Removed `GC.verify_transient_heap_internal_consistency` ([#1374](https://github.com/ruby/rbs/pull/1374))
+* Removed `GC.verify_transient_heap_internal_consistency` (Backport [#1374](https://github.com/ruby/rbs/pull/1374))
 
 ### Library changes
 
-* Relax rdoc version requirement in RDoc plugin ([#1333](https://github.com/ruby/rbs/pull/1333))
+* Relax rdoc version requirement in RDoc plugin (Backport [#1333](https://github.com/ruby/rbs/pull/1333))
 
 #### rbs collection
 
-* Spec may be missing when rbs_collection.yaml declares dependency ([#1378](https://github.com/ruby/rbs/pull/1378))
+* Spec may be missing when rbs_collection.yaml declares dependency (Backport [#1378](https://github.com/ruby/rbs/pull/1378))
 
 ### Miscellaneous
 
-* Handle connection error with Resolv_test.rb ([#1356](https://github.com/ruby/rbs/pull/1356))
-* Fix broken CI ([#1353](https://github.com/ruby/rbs/pull/1353))
+* Handle connection error with Resolv_test.rb (Backport [#1356](https://github.com/ruby/rbs/pull/1356))
+* Fix broken CI (Backport [#1353](https://github.com/ruby/rbs/pull/1353))
 
 ## 3.1.0 (2023-04-26)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.1.2)
+    rbs (3.1.3)
 
 PATH
   remote: test/assets/test-gem

data/lib/rbs/collection/config/lockfile_generator.rb

@@ -20,7 +20,7 @@ module RBS
           end
         end
 
-        attr_reader :config, :lockfile, :definition, :existing_lockfile, :gem_hash
+        attr_reader :config, :lockfile, :definition, :existing_lockfile, :gem_hash, :gem_entries
 
         def self.generate(config:, definition:, with_lockfile: true)
           generator = new(config: config, definition: definition, with_lockfile: with_lockfile)
@@ -31,6 +31,11 @@ module RBS
         def initialize(config:, definition:, with_lockfile:)
           @config = config
 
+          @gem_entries = config.gems.each.with_object({}) do |entry, hash| #$ Hash[String, gem_entry?]
+            name = entry["name"]
+            hash[name] = entry
+          end
+
           lockfile_path = Config.to_lockfile_path(config.config_path)
           lockfile_dir = lockfile_path.parent
 
@@ -58,15 +63,13 @@ module RBS
         end
 
         def generate
-          ignored_gems = config.gems.select {|gem| gem["ignore"] }.map {|gem| gem["name"] }.to_set
-
           config.gems.each do |gem|
             if Sources::Stdlib.instance.has?(gem["name"], nil) || gem.dig("source", "type") == "stdlib"
-              unless ignored_gems.include?(gem["name"])
+              unless gem.fetch("ignore", false)
                 assign_stdlib(name: gem["name"], from_gem: nil)
               end
             else
-              assign_gem(name: gem["name"], version: gem["version"], ignored_gems: ignored_gems, src_data: gem["source"])
+              assign_gem(name: gem["name"], version: gem["version"])
             end
           end
 
@@ -76,7 +79,7 @@ module RBS
             end
 
             if spec = gem_hash[dep.name]
-              assign_gem(name: dep.name, version: spec.version, ignored_gems: ignored_gems, src_data: nil, skip: dep.source.is_a?(Bundler::Source::Gemspec))
+              assign_gem(name: dep.name, version: spec.version, skip: dep.source.is_a?(Bundler::Source::Gemspec))
             end
           end
 
@@ -91,8 +94,12 @@ module RBS
           end
         end
 
-        private def assign_gem(name:, version:, src_data:, ignored_gems:, skip: false)
-          return if ignored_gems.include?(name)
+        private def assign_gem(name:, version:, skip: false)
+          entry = gem_entries[name]
+          src_data = entry&.fetch("source", nil)
+          ignored = entry&.fetch("ignore", false)
+
+          return if ignored
           return if lockfile.gems.key?(name)
 
           unless skip
@@ -136,7 +143,7 @@ module RBS
           if spec = gem_hash.fetch(name, nil)
             spec.dependencies.each do |dep|
               if dep_spec = gem_hash[dep.name]
-                assign_gem(name: dep.name, version: dep_spec.version, src_data: nil, ignored_gems: ignored_gems)
+                assign_gem(name: dep.name, version: dep_spec.version)
               end
             end
           else

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

data/sig/collection/config/lockfile_generator.rbs

@@ -22,6 +22,9 @@ module RBS
         # A hash table to look up a spec from name of the gem
         attr_reader gem_hash: Hash[String, Bundler::LazySpecification]
 
+        # A hash table to look up a gem entry in collection config from the name of the gem
+        attr_reader gem_entries: Hash[String, gem_entry?]
+
         def self.generate: (config: Config, definition: Bundler::Definition, ?with_lockfile: boolish) -> Lockfile
 
         def initialize: (config: Config, definition: Bundler::Definition, with_lockfile: boolish) -> void
@@ -38,7 +41,7 @@ module RBS
         #
         # * If `skip:` is true, it skips adding the gem, but adds it's dependencies.
         #
-        def assign_gem: (name: String, version: String?, src_data: Sources::source_entry?, ignored_gems: Set[String], ?skip: bool) -> void
+        def assign_gem: (name: String, version: String?, ?skip: bool) -> void
 
         def assign_stdlib: (name: String, from_gem: String?) -> void
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies: []
 description: RBS is the language for type signatures for Ruby and standard library
   definitions.