tapioca 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7c988252d754c4998199fe7dd9fabf6bbab76ef10ad61a5b12ca2e750a7c7c
-  data.tar.gz: 8016c921c68a4d68cfab4d40f8580f165ef8fa991135509aeb3a29cad2947c9f
+  metadata.gz: 2a3d27cc18a2cc1afcfd1f9c9cb1e833078ea06b1c4a4900e76614b2b54478b7
+  data.tar.gz: 9b8e0b109fbdc3a7d6393a67df9f53031c8e29aa1479eb0a1fb644783998bc36
 SHA512:
-  metadata.gz: 031c9feaadf13e2a667b8f8483419f71719788e7f043189032889fd799ae846b55bba0d827a654851ecec2bb2e0114ef7794312facb9eb8e97530e42f581240c
-  data.tar.gz: d630b843d4cdeaba2c2ce34f2766c5be473a8edac4cbcc28b9d3724ac5a0a8d9392a108e2ebad79cd297756a6e010e44c5875410ee011e67210555ddaf121de0
+  metadata.gz: 5601255b31b7cec6eb03ec8553f03450148de320ef48ab3370f278797d7189c020d1a7a2c04b6ab5b2e509321df4df0fbb022dd9e0ae9477aceaca4a195b620a
+  data.tar.gz: 1b3fcf4e9c997f60199e60e9206d2113e3d1292334d38db0d670ba0e3d5f4f0e8f348c88e74b8c1f8df0524bc9f40c59c1f214273b76259db5d88246610ccc55

data/README.md

@@ -85,8 +85,8 @@ This will sync the RBIs with the gems in the Gemfile and will add, update, and r
 - `--prerequire [file]`: A file to be required before `Bundler.require` is called.
 - `--postrequire [file]`: A file to be required after `Bundler.require` is called.
 - `--out [directory]`: The output directory for generated RBI files, default to `sorbet/rbi/gems`.
-- `--generate_command [command]`: The command to run to regenerate RBI files (used in header comment of the RBI files), defaults to the current command.
-- `--typed_overrides [gem:level]`: Overrides typed sigils for generated gem RBIs for gem `gem` to level `level` (`level` can be one of `ignore`, `false`, `true`, `strict`, or `strong`, see [the Sorbet docs](https://sorbet.org/docs/static#file-level-granularity-strictness-levels) for more details).
+- `--generate-command [command]`: The command to run to regenerate RBI files (used in header comment of the RBI files), defaults to the current command.
+- `--typed-overrides [gem:level]`: Overrides typed sigils for generated gem RBIs for gem `gem` to level `level` (`level` can be one of `ignore`, `false`, `true`, `strict`, or `strong`, see [the Sorbet docs](https://sorbet.org/docs/static#file-level-granularity-strictness-levels) for more details).
 
 ## Contributing
 

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

@@ -74,14 +74,18 @@ module Tapioca
           compile(symbol, constant)
         end
 
-        sig { params(symbol: String).returns(BasicObject) }
+        sig { params(symbol: String).returns(BasicObject).checked(:never) }
         def resolve_constant(symbol)
           Object.const_get(symbol, false)
         rescue NameError, LoadError, RuntimeError, ArgumentError, TypeError
           nil
         end
 
-        sig { params(name: T.nilable(String), constant: BasicObject).returns(T.nilable(String)) }
+        sig do
+          params(name: T.nilable(String), constant: BasicObject)
+            .returns(T.nilable(String))
+            .checked(:never)
+        end
         def compile(name, constant)
           return unless constant
           return unless name
@@ -96,7 +100,11 @@ module Tapioca
           compile_constant(name, constant)
         end
 
-        sig { params(name: String, constant: BasicObject).returns(T.nilable(String)) }
+        sig do
+          params(name: String, constant: BasicObject)
+            .returns(T.nilable(String))
+            .checked(:never)
+        end
         def compile_constant(name, constant)
           case constant
           when Module
@@ -122,12 +130,17 @@ module Tapioca
           indented("#{name} = #{constant_name}")
         end
 
-        sig { params(name: String, value: BasicObject).returns(T.nilable(String)) }
+        sig do
+          params(name: String, value: BasicObject)
+            .returns(T.nilable(String))
+            .checked(:never)
+        end
         def compile_object(name, value)
+          return if symbol_ignored?(name)
           indented("#{name} = T.let(T.unsafe(nil), #{type_name_of(value)})")
         end
 
-        sig { params(value: BasicObject).returns(String) }
+        sig { params(value: BasicObject).returns(String).checked(:never) }
         def type_name_of(value)
           klass = class_of(value)
 
@@ -528,7 +541,7 @@ module Tapioca
           end
         end
 
-        sig { params(constant: BasicObject).returns(Class) }
+        sig { params(constant: BasicObject).returns(Class).checked(:never) }
         def class_of(constant)
           Kernel.instance_method(:class).bind(constant).call
         end
@@ -543,7 +556,7 @@ module Tapioca
           Module.instance_method(:name).bind(constant).call
         end
 
-        sig { params(constant: BasicObject).returns(Class) }
+        sig { params(constant: BasicObject).returns(Class).checked(:never) }
         def singleton_class_of(constant)
           Object.instance_method(:singleton_class).bind(constant).call
         end
@@ -578,8 +591,12 @@ module Tapioca
         def qualified_name_of(constant)
           name = name_of(constant)
           return if name.nil?
-          name.prepend("::") unless name.start_with?("::")
-          name
+
+          if name.start_with?("::")
+            name
+          else
+            "::#{name}"
+          end
         end
 
         sig { params(constant: Class).returns(T.nilable(Class)) }
@@ -587,7 +604,7 @@ module Tapioca
           Class.instance_method(:superclass).bind(constant).call
         end
 
-        sig { params(constant: Module, other: BasicObject).returns(T::Boolean) }
+        sig { params(constant: Module, other: BasicObject).returns(T::Boolean).checked(:never) }
         def are_equal?(constant, other)
           BasicObject.instance_method(:equal?).bind(constant).call(other)
         end

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

@@ -21,6 +21,7 @@ module Tapioca
           end
 
           def ignore_symbol?(symbol)
+            symbol = symbol[2..-1] if symbol.start_with?("::")
             ignored_symbols.include?(symbol)
           end
 

data/lib/tapioca/gemfile.rb

@@ -7,7 +7,7 @@ module Tapioca
   class Gemfile
     extend(T::Sig)
 
-    Spec = T.type_alias(
+    Spec = T.type_alias do
       T.any(
         T.all(
           ::Bundler::StubSpecification,
@@ -15,7 +15,7 @@ module Tapioca
         ),
         ::Gem::Specification
       )
-    )
+    end
 
     sig { void }
     def initialize
@@ -33,8 +33,8 @@ module Tapioca
         definition
           .resolve
           .materialize(specs)
-          .reject { |spec| ignore_gem_spec?(spec) }
           .map { |spec| Gem.new(spec) }
+          .reject { |gem| gem.ignore?(dir) }
           .uniq(&:rbi_file_name)
           .sort_by(&:rbi_file_name)
       end
@@ -70,32 +70,30 @@ module Tapioca
       @definition ||= Bundler::Dsl.evaluate(gemfile, lockfile, {})
     end
 
-    IGNORED_GEMS = T.let(%w{
-      sorbet sorbet-static sorbet-runtime tapioca
-    }.freeze, T::Array[String])
-
-    sig { params(spec: Spec).returns(T::Boolean) }
-    def ignore_gem_spec?(spec)
-      IGNORED_GEMS.include?(spec.name) ||
-        spec.full_gem_path.start_with?(gemfile_dir)
-    end
-
     sig { returns(String) }
-    def gemfile_dir
+    def dir
       File.expand_path(gemfile.path + "/..")
     end
 
     class Gem
       extend(T::Sig)
 
+      IGNORED_GEMS = T.let(%w{
+        sorbet sorbet-static sorbet-runtime tapioca
+      }.freeze, T::Array[String])
+
+      sig { returns(String) }
+      attr_reader :full_gem_path
+
       sig { params(spec: Spec).void }
       def initialize(spec)
         @spec = T.let(spec, Tapioca::Gemfile::Spec)
+        @full_gem_path = T.let(@spec.full_gem_path.to_s, String)
       end
 
-      sig { returns(String) }
-      def full_gem_path
-        @spec.full_gem_path.to_s
+      sig { params(gemfile_dir: String).returns(T::Boolean) }
+      def ignore?(gemfile_dir)
+        gem_ignored? || gem_in_app_dir?(gemfile_dir)
       end
 
       sig { returns(T::Array[Pathname]) }
@@ -119,6 +117,23 @@ module Tapioca
       def rbi_file_name
         "#{name}@#{version}.rbi"
       end
+
+      private
+
+      sig { returns(T::Boolean) }
+      def gem_ignored?
+        IGNORED_GEMS.include?(name)
+      end
+
+      sig { params(gemfile_dir: String).returns(T::Boolean) }
+      def gem_in_app_dir?(gemfile_dir)
+        !gem_in_bundle_path? && full_gem_path.start_with?(gemfile_dir)
+      end
+
+      sig { returns(T::Boolean) }
+      def gem_in_bundle_path?
+        full_gem_path.start_with?(Bundler.bundle_path.to_s)
+      end
     end
   end
 end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry