Merge pull request #1013 from pocke/load-dependencies-from--r-option

Load dependencies on -r option also

Rakefile

@@ -60,11 +60,6 @@ task :validate => :compile do
 
   FileList["stdlib/*"].each do |path|
     lib = [File.basename(path).to_s]
-    if File.exist?("#{path}/0/manifest.yaml")
-      YAML.load_file("#{path}/0/manifest.yaml")["dependencies"].each do |dep|
-        lib << dep["name"]
-      end
-    end
 
     sh "#{ruby} #{rbs} #{lib.map {|l| "-r #{l}"}.join(" ")} validate --silent"
   end

lib/rbs/collection/config/lockfile_generator.rb

@@ -60,8 +60,7 @@ def generate
 
           upsert_gem specified, locked
           source = Sources.from_config_entry(locked['source'])
-          manifest = source.manifest_of(locked) or return
-          manifest['dependencies']&.each do |dep|
+          source.dependencies_of(locked)&.each do |dep|
             @gem_queue.push({ name: dep['name'], version: nil} )
           end
         end

lib/rbs/collection/sources.rb

@@ -1,3 +1,4 @@
+require_relative './sources/base'
 require_relative './sources/git'
 require_relative './sources/stdlib'
 require_relative './sources/rubygems'

lib/rbs/collection/sources/base.rb

@@ -0,0 +1,12 @@
+module RBS
+  module Collection
+    module Sources
+      module Base
+        def dependencies_of(config_entry)
+          manifest = manifest_of(config_entry) or return
+          manifest['dependencies']
+        end
+      end
+    end
+  end
+end

lib/rbs/collection/sources/git.rb

@@ -6,6 +6,7 @@ module RBS
   module Collection
     module Sources
       class Git
+        include Base
         METADATA_FILENAME = '.rbs_meta.yaml'
 
         class CommandError < StandardError; end

lib/rbs/collection/sources/rubygems.rb

@@ -5,6 +5,7 @@ module Collection
     module Sources
       # Signatures that are inclduded in gem package as sig/ directory.
       class Rubygems
+        include Base
         include Singleton
 
         def has?(config_entry)

lib/rbs/collection/sources/stdlib.rb

@@ -5,6 +5,7 @@ module Collection
     module Sources
       # signatures that are bundled in rbs gem under the stdlib/ directory
       class Stdlib
+        include Base
         include Singleton
 
         REPO = Repository.default

lib/rbs/environment_loader.rb

@@ -34,16 +34,32 @@ def initialize(core_root: DEFAULT_CORE_ROOT, repository: Repository.new)
       @core_root = core_root
       @repository = repository
 
-      @libs = []
+      @libs = Set.new
       @dirs = []
     end
 
-    def add(path: nil, library: nil, version: nil)
+    def add(path: nil, library: nil, version: nil, resolve_dependencies: true)
       case
       when path
         dirs << path
       when library
-        libs << Library.new(name: library, version: version)
+        if libs.add?(Library.new(name: library, version: version)) && resolve_dependencies
+          resolve_dependencies(library: library, version: version)
+        end
+      end
+    end
+
+    def resolve_dependencies(library:, version:)
+      [Collection::Sources::Rubygems.instance, Collection::Sources::Stdlib.instance].each do |source|
+        # @type var gem: { 'name' => String, 'version' => String? }
+        gem = { 'name' => library, 'version' => version }
+        next unless source.has?(gem)
+
+        gem['version'] ||= source.versions(gem).last
+        source.dependencies_of(gem)&.each do |dep|
+          add(library: dep['name'], version: nil)
+        end
+        return
       end
     end
 
@@ -53,7 +69,7 @@ def add_collection(collection_config)
       repository.add(collection_config.repo_path)
 
       collection_config.gems.each do |gem|
-        add(library: gem['name'], version: gem['version'])
+        add(library: gem['name'], version: gem['version'], resolve_dependencies: false)
       end
     end
 

sig/collection/sources.rbs

@@ -9,6 +9,7 @@ module RBS
         def install: (dest: Pathname, config_entry: Config::gem_entry, stdout: CLI::_IO) -> void
         def to_lockfile: () -> source_entry
         def manifest_of: (Config::gem_entry) -> manifest_entry?
+        def dependencies_of: (Config::gem_entry) -> Array[{"name" => String}]?
       end
 
       type source_entry = Git::source_entry
@@ -18,7 +19,13 @@ module RBS
         "dependencies" => Array[{"name" => String}]?,
       }
 
+      module Base : _Source
+        def dependencies_of: (Config::gem_entry config_entry) -> Array[{"name" => String}]?
+      end
+
       class Git
+        include Base
+
         METADATA_FILENAME: String
 
         type source_entry = {
@@ -77,8 +84,11 @@ module RBS
 
       # signatures that are bundled in rbs gem under the stdlib/ directory
       class Stdlib
+
         REPO: Repository
 
+        include Base
+
         type source_entry =  {
           'type' => 'stdlib',
         }
@@ -103,6 +113,8 @@ module RBS
 
       # sig/ directory
       class Rubygems
+        include Base
+
         type source_entry = {
           'type' => 'rubygems',
         }

sig/environment_loader.rbs

@@ -40,7 +40,7 @@ module RBS
     attr_reader core_root: Pathname?
     attr_reader repository: Repository
 
-    attr_reader libs: Array[Library]
+    attr_reader libs: Set[Library]
     attr_reader dirs: Array[Pathname]
 
     # The source where the RBS comes from.
@@ -76,7 +76,9 @@ module RBS
     # If RBS files cannot be found in the gem, it tries to load RBSs from repository.
     #
     def add: (path: Pathname) -> void
-           | (library: String, version: String?) -> void
+           | (library: String, version: String?, ?resolve_dependencies: boolish) -> void
+
+    def resolve_dependencies: (library: String, version: String?) -> void
 
     # Add repository path and libraries via rbs_collection.lock.yaml.
     def add_collection: (Collection::Config collection_config) -> void

test/rbs/environment_loader_test.rb

@@ -165,6 +165,20 @@ def test_loading_from_gem_without_rbs
     end
   end
 
+  def test_loading_dependencies
+    mktmpdir do |path|
+      loader = EnvironmentLoader.new
+      loader.add(library: "yaml")
+
+      env = Environment.new
+      loader.load(env: env)
+
+      assert_operator env.class_decls, :key?, TypeName("::YAML")
+      assert_operator env.class_decls, :key?, TypeName("::DBM")
+      assert_operator env.class_decls, :key?, TypeName("::PStore")
+    end
+  end
+
   def test_loading_from_rbs_collection
     mktmpdir do |path|
       lockfile_path = path.join('rbs_collection.lock.yaml')