tapioca 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8843a601bd4e5a685e116ee6c85e4045d1373efa827a74d0a81fdfbf010e81b5
-  data.tar.gz: 4692376ebaa71712f5979cf9dbdfe926556011ab49c237dde05c7ef59817da12
+  metadata.gz: 2940efd480d72f9450f46e91e6be68bb7f7a8fe84f22d090f7919a1b119a144e
+  data.tar.gz: c1820c41b279cd4691b610da32ec539e909578e4ea7c65314769ee128a72bf76
 SHA512:
-  metadata.gz: bdb00333afc55d6de709d6f211859dee1e1c6ed04c7b535b32f1860f1fc2717293c68d3cf542dbfe36a26fb62c406d7a63de6f7296b50cebf2579984d3b3af1a
-  data.tar.gz: d6199e46bf54ba1907186f27478449ba6431ec26b346028acff456dc54ea78ef58c18e6281901b9f6e1224e1cda0250ac7c66879b3286ff38cea407f6673475c
+  metadata.gz: 956798852b6962e0029ddcddb70e56595acb45f94d4d8d26b57635c90d175ed63fe77a3c5e223cadf9cc0ae780ceecb449163804771267db55f289c5e421e468
+  data.tar.gz: 663e38a25d3d0a6093c369fae234bc7daa49d17e618605db23328df4a2820d57245c040bcdb05b535c9abece857ce0e2ce6f6eb5710fb30f1c94643ad122e471

data/README.md

@@ -1,6 +1,6 @@
 # Tapioca
 
-[![Build Status](https://travis-ci.com/Shopify/tapioca.svg?token=AuiMGLmuYDrK2mb81pyq&branch=master)](https://travis-ci.com/Shopify/tapioca)
+[![Build Status](https://travis-ci.org/Shopify/tapioca.svg?branch=master)](https://travis-ci.org/Shopify/tapioca)
 
 Tapioca is a library used to generate RBI (Ruby interface) files for use with [Sorbet](https://sorbet.org). RBI files provide the structure (classes, modules, methods, parameters) of the gem/library to Sorbet to assist with typechecking. 
 
@@ -19,9 +19,9 @@ and do not forget to execute `tapioca` using `bundler`:
 ```shell
 $ bundle exec tapioca
 Commands:
-  tapioca bundle             # sync RBIs to Gemfile
   tapioca generate [gem...]  # generate RBIs from gems
   tapioca help [COMMAND]     # Describe available commands or one specific command
+  tapioca sync               # sync RBIs to Gemfile
 
 Options:
   --pre, -b, [--prerequire=file]              # A file to be required before Bundler.require is called
@@ -42,7 +42,7 @@ This will generate RBIs for the specified gems and place them in the RBI directo
 
 ### Generate for all gems in Gemfile
 
-Command: `tapioca bundle`
+Command: `tapioca sync`
 
 This will sync the RBIs with the gems in the Gemfile and will add, update, and remove RBIs as necessary.
 

data/lib/tapioca/cli.rb

@@ -36,8 +36,8 @@ module Tapioca
       end
     end
 
-    desc "bundle", "sync RBIs to Gemfile"
-    def bundle
+    desc "sync", "sync RBIs to Gemfile"
+    def sync
       Tapioca.silence_warnings do
         generator.sync_rbis_with_gemfile
       end

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

@@ -131,11 +131,7 @@ module Tapioca
         def type_name_of(value)
           klass = class_of(value)
 
-          type_name = public_module?(klass) && name_of(klass) || "T.untyped"
-          # Range needs to be processed separately to be put in the T::Range[] form
-          type_name = "T::Range[#{type_name_of(T.cast(value, T::Range[T.untyped]).first)}]" if klass == Range
-
-          type_name
+          public_module?(klass) && name_of(klass) || "T.untyped"
         end
 
         sig { params(name: String, constant: Module).returns(T.nilable(String)) }

data/lib/tapioca/gemfile.rb

@@ -7,7 +7,15 @@ module Tapioca
   class Gemfile
     extend(T::Sig)
 
-    Spec = T.type_alias(T.any(::Bundler::StubSpecification, ::Gem::Specification))
+    Spec = T.type_alias(
+      T.any(
+        T.all(
+          ::Bundler::StubSpecification,
+          ::Bundler::RemoteSpecification
+        ),
+        ::Gem::Specification
+      )
+    )
 
     sig { void }
     def initialize
@@ -37,17 +45,9 @@ module Tapioca
       dependencies.detect { |dep| dep.name == gem_name }
     end
 
-    sig { params(initialize_file: T.nilable(String), require_file: T.nilable(String)).void }
-    def require_bundle(initialize_file, require_file)
-      require(initialize_file) if initialize_file && File.exist?(initialize_file)
-
-      runtime = Bundler::Runtime.new(File.dirname(gemfile.path), definition)
-      groups = Bundler.definition.groups
-      runtime.setup(*groups).require(*groups)
-
-      require(require_file) if require_file && File.exist?(require_file)
-
-      load_rails_engines
+    sig { void }
+    def require
+      T.unsafe(runtime).setup(*groups).require(*groups)
     end
 
     private
@@ -55,14 +55,28 @@ module Tapioca
     sig { returns(File) }
     attr_reader(:gemfile, :lockfile)
 
+    sig { returns(Bundler::Runtime) }
+    def runtime
+      Bundler::Runtime.new(File.dirname(gemfile.path), definition)
+    end
+
+    sig { returns(T::Array[Symbol]) }
+    def groups
+      definition.groups
+    end
+
     sig { returns(Bundler::Definition) }
     def definition
       @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)
-      ["sorbet", "sorbet-static"].include?(spec.name) ||
+      IGNORED_GEMS.include?(spec.name) ||
         spec.full_gem_path.start_with?(gemfile_dir)
     end
 
@@ -71,45 +85,6 @@ module Tapioca
       File.expand_path(gemfile.path + "/..")
     end
 
-    sig { returns(T::Array[T.untyped]) }
-    def rails_engines
-      engines = []
-
-      return engines unless Object.const_defined?("Rails::Engine")
-
-      base = Object.const_get("Rails::Engine")
-      ObjectSpace.each_object(base.singleton_class) do |k|
-        k = T.cast(k, Class)
-        next if k.singleton_class?
-        engines.unshift(k) unless k == base
-      end
-
-      engines.reject(&:abstract_railtie?)
-    end
-
-    sig { void }
-    def load_rails_engines
-      rails_engines.each do |engine|
-        errored_files = []
-
-        engine.config.eager_load_paths.each do |load_path|
-          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-            require(file)
-          rescue LoadError, StandardError
-            errored_files << file
-          end
-        end
-
-        # Try files that have errored one more time
-        # It might have been a load order problem
-        errored_files.each do |file|
-          require(file)
-        rescue LoadError, StandardError
-          nil
-        end
-      end
-    end
-
     class Gem
       extend(T::Sig)
 

data/lib/tapioca/generator.rb

@@ -9,6 +9,11 @@ module Tapioca
     extend(T::Sig)
 
     DEFAULT_OUTDIR = "sorbet/rbi/gems"
+    DEFAULT_OVERRIDES = T.let({
+      # ActiveSupport overrides some core methods with different signatures
+      # so we generate a typed: false RBI for it to suppress errors
+      "activesupport" => "false",
+    }.freeze, T::Hash[String, String])
 
     sig { returns(Pathname) }
     attr_reader :outdir
@@ -37,6 +42,7 @@ module Tapioca
       @command = T.let(command || default_command, String)
       @typed_overrides = T.let(typed_overrides || {}, T::Hash[String, String])
       @bundle = T.let(nil, T.nilable(Gemfile))
+      @loader = T.let(nil, T.nilable(Loader))
       @compiler = T.let(nil, T.nilable(Compilers::SymbolTableCompiler))
       @existing_rbis = T.let(nil, T.nilable(T::Hash[String, String]))
       @expected_rbis = T.let(nil, T.nilable(T::Hash[String, String]))
@@ -91,6 +97,11 @@ module Tapioca
       @bundle ||= Gemfile.new
     end
 
+    sig { returns(Loader) }
+    def loader
+      @loader ||= Loader.new(bundle)
+    end
+
     sig { returns(Compilers::SymbolTableCompiler) }
     def compiler
       @compiler ||= Compilers::SymbolTableCompiler.new
@@ -99,7 +110,7 @@ module Tapioca
     sig { void }
     def require_gem_file
       say("Requiring all gems to prepare for compiling... ")
-      bundle.require_bundle(prerequire, postrequire)
+      loader.load_bundle(prerequire, postrequire)
       say(" Done", :green)
       puts
     end
@@ -267,7 +278,7 @@ module Tapioca
       gem_name = set_color(gem.name, :yellow, :bold)
       say("Compiling #{gem_name}, this may take a few seconds... ")
 
-      typed_sigil = typed_overrides.fetch(gem.name, "true")
+      typed_sigil = typed_overrides[gem.name] || DEFAULT_OVERRIDES[gem.name] || "true"
 
       content = compiler.compile(gem)
       content.prepend(rbi_header(command, typed_sigil))

data/lib/tapioca/loader.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+# typed: strict
+
+module Tapioca
+  class Loader
+    extend(T::Sig)
+
+    sig { params(gemfile: Tapioca::Gemfile).void }
+    def initialize(gemfile)
+      @gemfile = T.let(gemfile, Tapioca::Gemfile)
+    end
+
+    sig { params(initialize_file: T.nilable(String), require_file: T.nilable(String)).void }
+    def load_bundle(initialize_file, require_file)
+      require(initialize_file) if initialize_file && File.exist?(initialize_file)
+
+      load_rails
+      load_rake
+
+      require_bundle
+
+      require(require_file) if require_file && File.exist?(require_file)
+
+      load_rails_engines
+    end
+
+    private
+
+    sig { returns(Tapioca::Gemfile) }
+    attr_reader :gemfile
+
+    sig { void }
+    def require_bundle
+      gemfile.require
+    end
+
+    sig { returns(T::Array[T.untyped]) }
+    def rails_engines
+      engines = []
+
+      return engines unless Object.const_defined?("Rails::Engine")
+
+      base = Object.const_get("Rails::Engine")
+      ObjectSpace.each_object(base.singleton_class) do |k|
+        k = T.cast(k, Class)
+        next if k.singleton_class?
+        engines.unshift(k) unless k == base
+      end
+
+      engines.reject(&:abstract_railtie?)
+    end
+
+    sig { params(path: String).void }
+    def safe_require(path)
+      require path
+    rescue LoadError
+      nil
+    end
+
+    sig { void }
+    def load_rake
+      safe_require("rake")
+    end
+
+    sig { void }
+    def load_rails
+      return unless File.exist?("config/application.rb")
+
+      safe_require("rails")
+      safe_require("rails/generators/test_case")
+      safe_require("./config/application")
+    end
+
+    sig { void }
+    def load_rails_engines
+      rails_engines.each do |engine|
+        errored_files = []
+
+        engine.config.eager_load_paths.each do |load_path|
+          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+            require(file)
+          rescue LoadError, StandardError
+            errored_files << file
+          end
+        end
+
+        # Try files that have errored one more time
+        # It might have been a load order problem
+        errored_files.each do |file|
+          require(file)
+        rescue LoadError, StandardError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4371
+        version: 0.4.4471
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4371
+        version: 0.4.4471
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +187,7 @@ files:
 - lib/tapioca/constant_locator.rb
 - lib/tapioca/gemfile.rb
 - lib/tapioca/generator.rb
+- lib/tapioca/loader.rb
 - lib/tapioca/version.rb
 homepage: https://github.com/Shopify/tapioca
 licenses:
@@ -207,8 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Ruby Interface file generator for gems, core types and the Ruby standard