tapioca 0.4.23 → 0.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe702a52ed1226bf7c94e4288d722665e8444e89066a7cb9fda8066a2bebc3a
-  data.tar.gz: 1bb7b3bd18bf1b136b6c01afe6f27a82a49c31558a5298ebe2fb045476f7ec0d
+  metadata.gz: 91440af4ff5a8cd586284d4d5a2cc35600ec803b825bdcd57492a3eb94b65bf3
+  data.tar.gz: d6db15fe94c5cd0e8100f8bf1fd8fb9a760123891cee3b079470011719dc55e0
 SHA512:
-  metadata.gz: 75ba6fe1ba52763c5c31f6f792f2bc766d8874fbd4814bd16137e3238926c1efb35bb4663bdc8ae423bed1d489425b5f3a569e41b2e75d8318ab7cad800f597c
-  data.tar.gz: e15284dee1f66fca6a032194b359f54523bbc2c3981423268ffd3402e74bdd66403a08239c712145b0455fa7b0c4d7c5600d9d5ae398d9dd2b88cf4ddc3376c7
+  metadata.gz: 536bcacea8d4b5848dc8075fc94f50d34d80c23f00b9ea331862f911be6eb58c3a62b30d529663ddfd60441f632aab62e6250d8dc1c7a1a8f32dbfc0d510ae18
+  data.tar.gz: 57942419606b3d054fb392b6c3c026bff5aa7f63cb3cfc58defb8dbc81e49e72902eb26a8ebb9713561f21d4822a644fd6b9a36c7f2c0a135461b3b4e1d9c267

data/lib/tapioca/compilers/symbol_table/symbol_generator.rb

@@ -17,7 +17,7 @@ module Tapioca
 
         attr_reader(:gem, :indent)
 
-        sig { params(gem: Gemfile::Gem, indent: Integer).void }
+        sig { params(gem: Gemfile::GemSpec, indent: Integer).void }
         def initialize(gem, indent = 0)
           @gem = gem
           @indent = indent

data/lib/tapioca/compilers/symbol_table_compiler.rb

@@ -8,7 +8,7 @@ module Tapioca
 
       sig do
         params(
-          gem: Gemfile::Gem,
+          gem: Gemfile::GemSpec,
           indent: Integer
         ).returns(String)
       end

data/lib/tapioca/gemfile.rb

@@ -20,7 +20,7 @@ module Tapioca
     sig { returns(Bundler::Definition) }
     attr_reader(:definition)
 
-    sig { returns(T::Array[Gem]) }
+    sig { returns(T::Array[GemSpec]) }
     attr_reader(:dependencies)
 
     sig { returns(T::Array[String]) }
@@ -32,18 +32,18 @@ module Tapioca
       @lockfile = T.let(File.new(Bundler.default_lockfile), File)
       @definition = T.let(Bundler::Dsl.evaluate(gemfile, lockfile, {}), Bundler::Definition)
       dependencies, missing_specs = load_dependencies
-      @dependencies = T.let(dependencies, T::Array[Gem])
+      @dependencies = T.let(dependencies, T::Array[GemSpec])
       @missing_specs = T.let(missing_specs, T::Array[String])
     end
 
-    sig { params(gem_name: String).returns(T.nilable(Gem)) }
+    sig { params(gem_name: String).returns(T.nilable(GemSpec)) }
     def gem(gem_name)
       dependencies.detect { |dep| dep.name == gem_name }
     end
 
     sig { void }
-    def require
-      T.unsafe(runtime).setup(*groups).require(*groups)
+    def require_bundle
+      T.unsafe(runtime).require(*groups)
     end
 
     private
@@ -51,23 +51,32 @@ module Tapioca
     sig { returns(File) }
     attr_reader(:gemfile, :lockfile)
 
-    sig { returns([T::Array[Gem], T::Array[String]]) }
+    sig { returns([T::Array[GemSpec], T::Array[String]]) }
     def load_dependencies
-      deps = definition.locked_gems.dependencies.values
-
-      missing_specs = T::Array[String].new
-
-      dependencies = definition
-        .resolve
-        .materialize(deps, missing_specs)
-        .map { |spec| Gem.new(spec) }
+      materialized_dependencies, missing_specs = materialize_deps
+      dependencies = materialized_dependencies
+        .map { |spec| GemSpec.new(spec) }
         .reject { |gem| gem.ignore?(dir) }
         .uniq(&:rbi_file_name)
         .sort_by(&:rbi_file_name)
-
       [dependencies, missing_specs]
     end
 
+    sig { returns([T::Array[::Gem::Specification], T::Array[String]]) }
+    def materialize_deps
+      deps = definition.locked_gems.dependencies.values
+      missing_specs = T::Array[String].new
+      materialized_dependencies = if definition.resolve.method(:materialize).arity == 1 # Support bundler >= v2.2.25
+        md = definition.resolve.materialize(deps)
+        missing_spec_names = md.missing_specs.map(&:name)
+        missing_specs = T.cast(md.missing_specs.map { |spec| "#{spec.name} (#{spec.version})" }, T::Array[String])
+        md.to_a.reject { |spec| missing_spec_names.include?(spec.name) }
+      else
+        definition.resolve.materialize(deps, missing_specs)
+      end
+      [materialized_dependencies, missing_specs]
+    end
+
     sig { returns(Bundler::Runtime) }
     def runtime
       Bundler::Runtime.new(File.dirname(gemfile.path), definition)
@@ -83,7 +92,7 @@ module Tapioca
       File.expand_path(gemfile.path + "/..")
     end
 
-    class Gem
+    class GemSpec
       extend(T::Sig)
 
       IGNORED_GEMS = T.let(%w{

data/lib/tapioca/generator.rb

@@ -260,7 +260,7 @@ module Tapioca
     def load_application(eager_load:)
       say("Loading Rails application... ")
 
-      loader.load_rails(
+      loader.load_rails_application(
         environment_load: true,
         eager_load: eager_load
       )
@@ -456,7 +456,7 @@ module Tapioca
 
     sig do
       params(gem_names: T::Array[String])
-        .returns(T::Array[Gemfile::Gem])
+        .returns(T::Array[Gemfile::GemSpec])
     end
     def gems_to_generate(gem_names)
       return bundle.dependencies if gem_names.empty?
@@ -486,7 +486,7 @@ module Tapioca
       [statement, sigil].compact.join("\n").strip.concat("\n\n")
     end
 
-    sig { params(gem: Gemfile::Gem).void }
+    sig { params(gem: Gemfile::GemSpec).void }
     def compile_gem_rbi(gem)
       compiler = Compilers::SymbolTableCompiler.new
       gem_name = set_color(gem.name, :yellow, :bold)

data/lib/tapioca/internal.rb

@@ -3,7 +3,6 @@
 
 require "tapioca"
 require "tapioca/loader"
-require "tapioca/constant_locator"
 require "tapioca/generic_type_registry"
 require "tapioca/sorbet_ext/generic_name_patch"
 require "tapioca/sorbet_ext/fixed_hash_patch"

data/lib/tapioca/loader.rb

@@ -14,10 +14,9 @@ module Tapioca
     def load_bundle(initialize_file, require_file)
       require_helper(initialize_file)
 
-      load_rails
-      load_rake
+      load_rails_application
 
-      require_bundle
+      gemfile.require_bundle
 
       require_helper(require_file)
 
@@ -25,14 +24,11 @@ module Tapioca
     end
 
     sig { params(environment_load: T::Boolean, eager_load: T::Boolean).void }
-    def load_rails(environment_load: false, eager_load: false)
+    def load_rails_application(environment_load: false, eager_load: false)
       return unless File.exist?("config/application.rb")
 
-      safe_require("rails")
-
       silence_deprecations
 
-      safe_require("rails/generators/test_case")
       if environment_load
         safe_require("./config/environment")
       else
@@ -56,11 +52,6 @@ module Tapioca
       require(file)
     end
 
-    sig { void }
-    def require_bundle
-      gemfile.require
-    end
-
     sig { returns(T::Array[T.untyped]) }
     def rails_engines
       engines = []
@@ -84,11 +75,6 @@ module Tapioca
       nil
     end
 
-    sig { void }
-    def load_rake
-      safe_require("rake")
-    end
-
     sig { void }
     def silence_deprecations
       # Stop any ActiveSupport Deprecations from being reported

data/lib/tapioca/rbi/rewriters/sort_nodes.rb

@@ -11,9 +11,11 @@ module Tapioca
         def visit(node)
           return unless node.is_a?(Tree)
           visit_all(node.nodes)
+          original_order = node.nodes.map.with_index.to_h
           node.nodes.sort! do |a, b|
             res = node_rank(a) <=> node_rank(b)
             res = node_name(a) <=> node_name(b) if res == 0
+            res = (original_order[a] || 0) <=> (original_order[b] || 0) if res == 0
             res || 0
           end
         end
@@ -23,27 +25,29 @@ module Tapioca
         sig { params(node: Node).returns(Integer) }
         def node_rank(node)
           case node
-          when Group                then kind_rank(node.kind)
-          when Include, Extend      then 0
-          when Helper               then 1
-          when TypeMember           then 2
-          when MixesInClassMethods  then 3
-          when TStructField         then 4
-          when TEnumBlock           then 5
+          when Group                then group_rank(node.kind)
+          when Include, Extend      then 10
+          when Helper               then 20
+          when TypeMember           then 30
+          when MixesInClassMethods  then 40
+          when TStructField         then 50
+          when TEnumBlock           then 60
           when Method
             if node.name == "initialize"
-              7
+              71
+            elsif !node.is_singleton
+              72
             else
-              8
+              73
             end
-          when Scope, Const then 9
+          when Scope, Const then 80
           else
-            10
+            100
           end
         end
 
         sig { params(kind: Group::Kind).returns(Integer) }
-        def kind_rank(kind)
+        def group_rank(kind)
           case kind
           when Group::Kind::Mixins              then 0
           when Group::Kind::Helpers             then 1

data/lib/tapioca/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Tapioca
-  VERSION = "0.4.23"
+  VERSION = "0.4.27"
 end

data/lib/tapioca.rb

@@ -17,5 +17,6 @@ module Tapioca
   class Error < StandardError; end
 end
 
+require "tapioca/constant_locator"
 require "tapioca/compilers/dsl/base"
 require "tapioca/version"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.27
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard