sord 5.1.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f101fdc3b63cf69bc59fd766ced5222c3e6b02f70f913fcc39085459e32c89de
-  data.tar.gz: ea8df6949fdef290b13cf082c364138a17224deb127e069fd8a55d8e86de29c4
+  metadata.gz: 54bd59da2188e5392c6946e2cbd77ce55e1113abc40a2cf880671afe3c22efac
+  data.tar.gz: 9671e16277cba3b800d8dc4dcae525384064efd1138575eef441719624ebf45d
 SHA512:
-  metadata.gz: 9bed3f4e28d753ccf493a63d552f0560267d5a4841ca6208691e557fa84ba719e1c906be765c4ba45d62ad84cbe167766b8b286202727400bcf62bf8e0748a84
-  data.tar.gz: c51d9041a3de3dd66faf35173c38ce74e89e5dc4054e9cc675c54a871dc35c84a33139e1a18674265d951f759365a66f272badca1306d89c3b7fa7997f87bb3e
+  metadata.gz: f9c0ca7bc3d427367fe069cc415e37a0250ad7c3010ebbfa119dbdd97f98b474da0a7092277f2f45810d376654545b930b3c59a7a537f4132a23ad68352f913d
+  data.tar.gz: 8b6ced8d20985ee9faaae5b672ebd90bd4ef00d396938e7db1e6fecf350d817b143db55eca1231782bf2c0bd5605394eac825d8fa612ff7e093fc0f3ce27e14c

data/CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [6.0.0] - 2023-05-02
+### Changed
+- **Breaking change**: Now targets RBS 3.0
+
 ## [5.1.0] - 2023-05-22
 ### Added
 - Add support for a single `@overload` tag, typically used to describe methods defined outside of

data/lib/sord/resolver.rb

@@ -22,13 +22,13 @@ module Sord
     end
 
     def self.load_gem_objects(hash)
-      all_decls = []
+      env = RBS::Environment.new
       begin
-        RBS::CLI::LibraryOptions.new.loader.load(env: all_decls)
+        RBS::CLI::LibraryOptions.new.loader.load(env: env)
       rescue RBS::Collection::Config::CollectionNotAvailable
         Sord::Logging.warn("Could not load RBS collection - run rbs collection install for dependencies")
       end
-      add_rbs_objects_to_paths(all_decls, hash)
+      add_rbs_objects_to_paths(env, hash)
 
       gem_paths = Bundler.load.specs.map(&:full_gem_path)
       gem_paths.each do |path|
@@ -41,13 +41,22 @@ module Sord
       end
     end
 
-    def self.add_rbs_objects_to_paths(all_decls, names_to_paths, path=[])
+    def self.add_rbs_objects_to_paths(env, names_to_paths, path=[])
+      case env
+      when RBS::Environment
+        declarations = env.declarations
+      when Array
+        declarations = env
+      else
+        raise TypeError, "env"
+      end
+
       klasses = [
         RBS::AST::Declarations::Module,
         RBS::AST::Declarations::Class,
         RBS::AST::Declarations::Constant
       ]
-      all_decls.each do |decl|
+      declarations.each do |decl|
         next unless klasses.include?(decl.class)
         name = decl.name.to_s
         new_path = path + [name]

data/lib/sord/version.rb

@@ -1,4 +1,4 @@
 # typed: strong
 module Sord
-  VERSION = '5.1.0'
+  VERSION = '6.0.0'
 end

data/sord.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sorbet-runtime'
   spec.add_dependency 'commander', '~> 4.5'
   spec.add_dependency 'parlour', '~> 5.0'
-  spec.add_dependency 'rbs', '~> 2.0'
+  spec.add_dependency 'rbs', '~> 3.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sord
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Aaron Christiansen
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement