tapioca 0.4.19 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f64e1f934bd0528e93322b0ba116383fc7c053d1a0c35a3378664ecc3e08e69
-  data.tar.gz: 609a1125626ba712e042e2fb3346df852508595bf22c0187e8ded67b3c66ecf2
+  metadata.gz: 567eff35f7ee24b52dafcd45ceb40ccaf042b6e0661c13cc5dcb87228c21c792
+  data.tar.gz: 0c5143d8407d5583ccd80edbb047fb0b7500b2de8bba1717723a92f97994c045
 SHA512:
-  metadata.gz: 0ffc0244e7bd3d86ead0c42eb2cf9e940c84d4d838143b96247e908ded022477829c92c1838f2b933294b590eae49c2cd667c57bad6219be9b983ba3c556ddff
-  data.tar.gz: 33f534d1521e209052a7edff35fe95979497c80e3fcf78b136c3bb13ea3471f8e1158db83cafff5f3aaf79f0cfa6a00129fb20fb2ce92a018883f94fe61e0264
+  metadata.gz: d82321ab3b2516a4410825a6dfe4b253d7cccf49abc8c62db0b2a8cdbe13f064aa43df759108685ba06c36073c7a59cfda4ff361cdad1bfc736d7e557ae3ada6
+  data.tar.gz: 0b9bd1ff91ca97cbbb1922e9915a8d046421ff40f3cd2774b4518c979f44635507b48fcce93a904770b1a65e7214a9897ce5444ce26ee6d532523a595e24ec96

data/lib/tapioca/cli/main.rb

@@ -66,9 +66,13 @@ module Tapioca
         type: :boolean,
         default: false,
         desc: "Verifies RBIs are up-to-date"
+      option :quiet,
+        aliases: ["-q"],
+        type: :boolean,
+        desc: "Supresses file creation output"
       def dsl(*constants)
         Tapioca.silence_warnings do
-          generator.build_dsl(constants, should_verify: options[:verify])
+          generator.build_dsl(constants, should_verify: options[:verify], quiet: options[:quiet])
         end
       end
 

data/lib/tapioca/generator.rb

@@ -120,9 +120,10 @@ module Tapioca
       params(
         requested_constants: T::Array[String],
         should_verify: T::Boolean,
+        quiet: T::Boolean
       ).void
     end
-    def build_dsl(requested_constants, should_verify: false)
+    def build_dsl(requested_constants, should_verify: false, quiet: false)
       load_application(eager_load: requested_constants.empty?)
       load_dsl_generators
 
@@ -133,7 +134,7 @@ module Tapioca
       end
       say("")
 
-      outpath = should_verify ? Dir.mktmpdir : config.outpath
+      outpath = should_verify ? Pathname.new(Dir.mktmpdir) : config.outpath
       rbi_files_to_purge = existing_rbi_filenames(requested_constants)
 
       compiler = Compilers::DslCompiler.new(
@@ -144,14 +145,27 @@ module Tapioca
         }
       )
 
+      constant_lookup = {}
+
       compiler.run do |constant, contents|
-        filename = compile_dsl_rbi(constant, contents, outpath: Pathname.new(outpath))
-        rbi_files_to_purge.delete(filename) if filename
+        constant_name = Module.instance_method(:name).bind(constant).call
+
+        filename = compile_dsl_rbi(
+          constant_name,
+          contents,
+          outpath: outpath,
+          quiet: should_verify || quiet
+        )
+
+        if filename
+          rbi_files_to_purge.delete(filename)
+          constant_lookup[filename.relative_path_from(outpath)] = constant_name
+        end
       end
       say("")
 
       if should_verify
-        perform_dsl_verification(outpath)
+        perform_dsl_verification(outpath, constant_lookup)
       else
         purge_stale_dsl_rbi_files(rbi_files_to_purge)
 
@@ -506,60 +520,102 @@ module Tapioca
       end
     end
 
-    sig { params(constant: Module, contents: String, outpath: Pathname).returns(T.nilable(Pathname)) }
-    def compile_dsl_rbi(constant, contents, outpath: config.outpath)
+    sig do
+      params(constant_name: String, contents: String, outpath: Pathname, quiet: T::Boolean)
+        .returns(T.nilable(Pathname))
+    end
+    def compile_dsl_rbi(constant_name, contents, outpath: config.outpath, quiet: false)
       return if contents.nil?
 
-      constant_name = Module.instance_method(:name).bind(constant).call
       rbi_name = constant_name.underscore + ".rbi"
       filename = outpath / rbi_name
 
       out = String.new
       out << rbi_header(
         "#{Config::DEFAULT_COMMAND} dsl #{constant_name}",
-        reason: "dynamic methods in `#{constant.name}`"
+        reason: "dynamic methods in `#{constant_name}`"
       )
       out << contents
 
       FileUtils.mkdir_p(File.dirname(filename))
       File.write(filename, out)
-      say("Wrote: ", [:green])
-      say(filename)
+
+      unless quiet
+        say("Wrote: ", [:green])
+        say(filename)
+      end
 
       filename
     end
 
-    sig { params(tmp_dir: Pathname).returns(T.nilable(String)) }
+    sig { params(tmp_dir: Pathname).returns(T::Hash[String, Symbol]) }
     def verify_dsl_rbi(tmp_dir:)
-      existing_rbis = existing_rbi_filenames([]).sort
-      new_rbis = existing_rbi_filenames([], path: tmp_dir).grep_v(/gem|shim/).sort
+      diff = {}
 
-      return "New file(s) introduced." if existing_rbis.length != new_rbis.length
+      existing_rbis = rbi_files_in(config.outpath)
+      new_rbis = rbi_files_in(tmp_dir)
 
-      desynced_files = []
+      added_files = (new_rbis - existing_rbis)
 
-      (0..existing_rbis.length - 1).each do |i|
-        desynced_files << new_rbis[i] unless FileUtils.identical?(existing_rbis[i], new_rbis[i])
+      added_files.each do |file|
+        diff[file] = :added
       end
 
-      unless desynced_files.empty?
-        filenames = desynced_files.map { |f| f.to_s.sub!(tmp_dir.to_s, "sorbet/rbi/dsl") }.join("\n  - ")
+      removed_files = (existing_rbis - new_rbis)
 
-        return "File(s) updated:\n  - #{filenames}"
+      removed_files.each do |file|
+        diff[file] = :removed
       end
 
-      nil
+      common_files = (existing_rbis & new_rbis)
+
+      changed_files = common_files.map do |filename|
+        filename unless FileUtils.identical?(config.outpath / filename, tmp_dir / filename)
+      end.compact
+
+      changed_files.each do |file|
+        diff[file] = :changed
+      end
+
+      diff
     end
 
-    sig { params(dir: String).void }
-    def perform_dsl_verification(dir)
-      if (error = verify_dsl_rbi(tmp_dir: Pathname.new(dir)))
-        say("RBI files are out-of-date, please run `#{Config::DEFAULT_COMMAND} dsl` to update.")
-        say("Reason: ", [:red])
-        say(error)
-        exit(1)
-      else
+    sig { params(cause: Symbol, files: T::Array[String]).returns(String) }
+    def build_error_for_files(cause, files)
+      filenames = files.map do |file|
+        config.outpath / file
+      end.join("\n  - ")
+
+      "  File(s) #{cause}:\n  - #{filenames}"
+    end
+
+    sig { params(path: Pathname).returns(T::Array[Pathname]) }
+    def rbi_files_in(path)
+      Pathname.glob(path / "**/*.rbi").map do |file|
+        file.relative_path_from(path)
+      end.sort
+    end
+
+    sig { params(dir: Pathname, constant_lookup: T::Hash[String, String]).void }
+    def perform_dsl_verification(dir, constant_lookup)
+      diff = verify_dsl_rbi(tmp_dir: dir)
+
+      if diff.empty?
         say("Nothing to do, all RBIs are up-to-date.")
+      else
+        constants = T.unsafe(constant_lookup).values_at(*diff.keys).join(" ")
+
+        say("RBI files are out-of-date, please run:")
+        say("  `#{Config::DEFAULT_COMMAND} dsl #{constants}`")
+
+        say("")
+
+        say("Reason:", [:red])
+        diff.group_by(&:last).sort.each do |cause, diff_for_cause|
+          say(build_error_for_files(cause, diff_for_cause.map(&:first)))
+        end
+
+        exit(1)
       end
     ensure
       FileUtils.remove_entry(dir)

data/lib/tapioca/generic_type_registry.rb

@@ -100,7 +100,7 @@ module Tapioca
           # the generic class `Foo[Bar]` is still a `Foo`. That is:
           # `Foo[Bar].new.is_a?(Foo)` should be true, which isn't the case
           # if we just clone the class. But subclassing works just fine.
-          Class.new(constant)
+          create_sealed_safe_subclass(constant)
         else
           # This can only be a module and it is fine to just clone modules
           # since they can't have instances and will not have `is_a?` relationships.
@@ -150,6 +150,32 @@ module Tapioca
         )
       end
 
+      sig { params(constant: Class).returns(Class) }
+      def create_sealed_safe_subclass(constant)
+        # If the constant is not sealed let's just bail early.
+        # We just return a subclass of the constant.
+        return Class.new(constant) unless T::Private::Sealed.sealed_module?(constant)
+
+        # Since sealed classes can normally not be subclassed, we need to trick
+        # sealed classes into thinking that the generic type we are
+        # creating by subclassing is actually safe for sealed types.
+        #
+        # Get the filename the sealed class was declared in
+        decl_file = constant.instance_variable_get(:@sorbet_sealed_module_decl_file)
+        begin
+          # Clear the current declaration filename on the class
+          constant.remove_instance_variable(:@sorbet_sealed_module_decl_file)
+          # Make this file be the declaration filename so that Sorbet runtime
+          # does not shout at us for an invalid subclassing.
+          T.cast(constant, T::Helpers).sealed!
+          # return a subclass
+          Class.new(constant)
+        ensure
+          # Reinstate the original declaration filename
+          constant.instance_variable_set(:@sorbet_sealed_module_decl_file, decl_file)
+        end
+      end
+
       sig { params(constant: Module).returns(T::Hash[Integer, String]) }
       def lookup_or_initialize_type_variables(constant)
         @type_variables[object_id_of(constant)] ||= {}

data/lib/tapioca/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapioca
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.20
 platform: ruby
 authors:
 - Ufuk Kayserilioglu
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler