tapioca 0.11.8 → 0.11.9

data/lib/tapioca/commands/{dsl.rb → abstract_dsl.rb}

@@ -3,10 +3,12 @@
 
 module Tapioca
   module Commands
-    class Dsl < CommandWithoutTracker
+    class AbstractDsl < CommandWithoutTracker
       include SorbetHelper
       include RBIFilesHelper
 
+      abstract!
+
       sig do
         params(
           requested_constants: T::Array[String],
@@ -16,7 +18,6 @@ module Tapioca
           exclude: T::Array[String],
           file_header: T::Boolean,
           tapioca_path: String,
-          should_verify: T::Boolean,
           quiet: T::Boolean,
           verbose: T::Boolean,
           number_of_workers: T.nilable(Integer),
@@ -35,7 +36,6 @@ module Tapioca
         exclude:,
         file_header:,
         tapioca_path:,
-        should_verify: false,
         quiet: false,
         verbose: false,
         number_of_workers: nil,
@@ -52,7 +52,6 @@ module Tapioca
         @exclude = exclude
         @file_header = file_header
         @tapioca_path = tapioca_path
-        @should_verify = should_verify
         @quiet = quiet
         @verbose = verbose
         @number_of_workers = number_of_workers
@@ -65,58 +64,13 @@ module Tapioca
         super()
       end
 
-      sig { void }
-      def list_compilers
-        Loaders::Dsl.load_application(
-          tapioca_path: @tapioca_path,
-          eager_load: @requested_constants.empty? && @requested_paths.empty?,
-          app_root: @app_root,
-          halt_upon_load_error: @halt_upon_load_error,
-        )
-
-        pipeline = create_pipeline
-
-        say("")
-        say("Loaded DSL compiler classes:")
-        say("")
-
-        table = pipeline.compilers.map do |compiler|
-          status = if pipeline.active_compilers.include?(compiler)
-            set_color("enabled", :green)
-          else
-            set_color("disabled", :red)
-          end
-
-          [compiler.name, status]
-        end
-
-        print_table(table, { indent: 2 })
-      end
-
-      sig { override.void }
-      def execute
-        Loaders::Dsl.load_application(
-          tapioca_path: @tapioca_path,
-          eager_load: @requested_constants.empty? && @requested_paths.empty?,
-          app_root: @app_root,
-          halt_upon_load_error: @halt_upon_load_error,
-        )
-
-        if @should_verify
-          say("Checking for out-of-date RBIs...")
-        else
-          say("Compiling DSL RBI files...")
-        end
-        say("")
-
-        all_requested_constants = @requested_constants + constants_from_requested_paths
-
-        outpath = @should_verify ? Pathname.new(Dir.mktmpdir) : @outpath
-        rbi_files_to_purge = existing_rbi_filenames(all_requested_constants)
+      private
 
-        pipeline = create_pipeline
+      sig { params(outpath: Pathname, quiet: T::Boolean).returns(T::Set[Pathname]) }
+      def generate_dsl_rbi_files(outpath, quiet:)
+        existing_rbi_files = existing_rbi_filenames(all_requested_constants)
 
-        processed_files = pipeline.run do |constant, contents|
+        generated_files = pipeline.run do |constant, contents|
           constant_name = T.must(Tapioca::Runtime::Reflection.name_of(constant))
 
           if @verbose && !@quiet
@@ -127,37 +81,37 @@ module Tapioca
             constant_name,
             contents,
             outpath: outpath,
-            quiet: @should_verify || (@quiet && !@verbose),
+            quiet: quiet,
           )
-        end
+        end.compact
 
-        processed_files.each { |filename| rbi_files_to_purge.delete(T.must(filename)) }
+        files_to_purge = existing_rbi_files - generated_files
 
-        say("")
+        files_to_purge
+      end
 
-        if @should_verify
-          perform_dsl_verification(outpath)
-        else
-          purge_stale_dsl_rbi_files(rbi_files_to_purge)
-          say("Done", :green)
-
-          if @auto_strictness
-            say("")
-            validate_rbi_files(
-              command: default_command(:dsl, all_requested_constants.join(" ")),
-              gem_dir: @gem_dir,
-              dsl_dir: @outpath.to_s,
-              auto_strictness: @auto_strictness,
-              compilers: pipeline.active_compilers,
-            )
-          end
+      sig { returns(T::Array[String]) }
+      def all_requested_constants
+        @all_requested_constants ||= T.let(
+          @requested_constants + constants_from_requested_paths,
+          T.nilable(T::Array[String]),
+        )
+      end
 
-          say("All operations performed in working directory.", [:green, :bold])
-          say("Please review changes and commit them.", [:green, :bold])
-        end
+      sig { returns(Tapioca::Dsl::Pipeline) }
+      def pipeline
+        @pipeline ||= T.let(create_pipeline, T.nilable(Tapioca::Dsl::Pipeline))
       end
 
-      private
+      sig { void }
+      def load_application
+        Loaders::Dsl.load_application(
+          tapioca_path: @tapioca_path,
+          eager_load: @requested_constants.empty? && @requested_paths.empty?,
+          app_root: @app_root,
+          halt_upon_load_error: @halt_upon_load_error,
+        )
+      end
 
       sig { returns(Tapioca::Dsl::Pipeline) }
       def create_pipeline

data/lib/tapioca/commands/{gem.rb → abstract_gem.rb}

@@ -3,14 +3,17 @@
 
 module Tapioca
   module Commands
-    class Gem < Command
+    class AbstractGem < Command
       include SorbetHelper
       include RBIFilesHelper
 
+      abstract!
+
       sig do
         params(
           gem_names: T::Array[String],
           exclude: T::Array[String],
+          include_dependencies: T::Boolean,
           prerequire: T.nilable(String),
           postrequire: String,
           typed_overrides: T::Hash[String, String],
@@ -29,6 +32,7 @@ module Tapioca
       def initialize(
         gem_names:,
         exclude:,
+        include_dependencies:,
         prerequire:,
         postrequire:,
         typed_overrides:,
@@ -45,6 +49,7 @@ module Tapioca
       )
         @gem_names = gem_names
         @exclude = exclude
+        @include_dependencies = include_dependencies
         @prerequire = prerequire
         @postrequire = postrequire
         @typed_overrides = typed_overrides
@@ -66,91 +71,38 @@ module Tapioca
         @halt_upon_load_error = halt_upon_load_error
       end
 
-      sig { override.void }
-      def execute
-        Loaders::Gem.load_application(
-          bundle: @bundle,
-          prerequire: @prerequire,
-          postrequire: @postrequire,
-          default_command: default_command(:require),
-          halt_upon_load_error: @halt_upon_load_error,
-        )
-
-        gem_queue = gems_to_generate(@gem_names).reject { |gem| @exclude.include?(gem.name) }
-        anything_done = [
-          perform_removals,
-          gem_queue.any?,
-        ].any?
-
-        Executor.new(gem_queue, number_of_workers: @number_of_workers).run_in_parallel do |gem|
-          shell.indent do
-            compile_gem_rbi(gem)
-            puts
-          end
-        end
-
-        if anything_done
-          validate_rbi_files(
-            command: default_command(:gem, @gem_names.join(" ")),
-            gem_dir: @outpath.to_s,
-            dsl_dir: @dsl_dir,
-            auto_strictness: @auto_strictness,
-            gems: @bundle.dependencies,
-          )
-
-          say("All operations performed in working directory.", [:green, :bold])
-          say("Please review changes and commit them.", [:green, :bold])
-        else
-          say("No operations performed, all RBIs are up-to-date.", [:green, :bold])
-        end
-      end
-
-      sig { params(should_verify: T::Boolean, exclude: T::Array[String]).void }
-      def sync(should_verify: false, exclude: [])
-        if should_verify
-          say("Checking for out-of-date RBIs...")
-          say("")
-          perform_sync_verification(exclude: exclude)
-          return
-        end
-
-        anything_done = [
-          perform_removals,
-          perform_additions,
-        ].any?
-
-        if anything_done
-          validate_rbi_files(
-            command: default_command(:gem),
-            gem_dir: @outpath.to_s,
-            dsl_dir: @dsl_dir,
-            auto_strictness: @auto_strictness,
-            gems: @bundle.dependencies,
-          )
-
-          say("All operations performed in working directory.", [:green, :bold])
-          say("Please review changes and commit them.", [:green, :bold])
-        else
-          say("No operations performed, all RBIs are up-to-date.", [:green, :bold])
-        end
-
-        puts
-      end
-
       private
 
       sig { params(gem_names: T::Array[String]).returns(T::Array[Gemfile::GemSpec]) }
       def gems_to_generate(gem_names)
         return @bundle.dependencies if gem_names.empty?
 
-        gem_names.map do |gem_name|
+        gem_names.each_with_object([]) do |gem_name, gems|
           gem = @bundle.gem(gem_name)
 
           if gem.nil?
             raise Thor::Error, set_color("Error: Cannot find gem '#{gem_name}'", :red)
           end
 
-          gem
+          gems.concat(gem_dependencies(gem)) if @include_dependencies
+          gems << gem
+        end
+      end
+
+      sig do
+        params(
+          gem: Gemfile::GemSpec,
+          dependencies: T::Array[Gemfile::GemSpec],
+        ).returns(T::Array[Gemfile::GemSpec])
+      end
+      def gem_dependencies(gem, dependencies = [])
+        direct_dependencies = gem.dependencies.filter_map { |dependency| @bundle.gem(dependency.name) }
+        gems = dependencies | direct_dependencies
+
+        if direct_dependencies.empty?
+          gems
+        else
+          direct_dependencies.reduce(gems) { |result, gem| gem_dependencies(gem, result) }
         end
       end
 
@@ -185,25 +137,6 @@ module Tapioca
         end
       end
 
-      sig { params(exclude: T::Array[String]).void }
-      def perform_sync_verification(exclude: [])
-        diff = {}
-
-        removed_rbis.each do |gem_name|
-          next if exclude.include?(gem_name)
-
-          filename = existing_rbi(gem_name)
-          diff[filename] = :removed
-        end
-
-        added_rbis.each do |gem_name|
-          filename = expected_rbi(gem_name)
-          diff[filename] = gem_rbi_exists?(gem_name) ? :changed : :added
-        end
-
-        report_diff_and_exit_if_out_of_date(diff, :gem)
-      end
-
       sig { void }
       def perform_removals
         say("Removing RBI files of gems that have been removed:", [:blue, :bold])

data/lib/tapioca/commands/annotations.rb

@@ -23,6 +23,7 @@ module Tapioca
         typed_overrides: {}
       )
         super()
+        @outpath = T.let(Pathname.new(DEFAULT_ANNOTATIONS_DIR), Pathname)
         @central_repo_root_uris = central_repo_root_uris
         @auth = auth
         @netrc_file = netrc_file
@@ -32,16 +33,19 @@ module Tapioca
         @typed_overrides = typed_overrides
       end
 
+      private
+
       sig { override.void }
       def execute
         @indexes = fetch_indexes
         project_gems = list_gemfile_gems
+
         remove_expired_annotations(project_gems)
         fetch_annotations(project_gems)
+      ensure
+        GitAttributes.create_vendored_attribute_file(@outpath)
       end
 
-      private
-
       sig { returns(T::Array[String]) }
       def list_gemfile_gems
         say("Listing gems from Gemfile.lock... ", [:blue, :bold])
@@ -56,7 +60,7 @@ module Tapioca
       def remove_expired_annotations(project_gems)
         say("Removing annotations for gems that have been removed... ", [:blue, :bold])
 
-        annotations = Pathname.glob("#{DEFAULT_ANNOTATIONS_DIR}/*.rbi").map { |f| f.basename(".*").to_s }
+        annotations = Pathname.glob(@outpath.join("*.rbi")).map { |f| f.basename(".*").to_s }
         expired = annotations - project_gems
 
         if expired.empty?
@@ -67,7 +71,7 @@ module Tapioca
         say("\n")
         expired.each do |gem_name|
           say("\n")
-          path = "#{DEFAULT_ANNOTATIONS_DIR}/#{gem_name}.rbi"
+          path = @outpath.join("#{gem_name}.rbi")
           remove_file(path)
         end
         say("\nDone\n\n", :green)
@@ -140,10 +144,8 @@ module Tapioca
         content = apply_typed_override(gem_name, content)
         content = add_header(gem_name, content)
 
-        dir = DEFAULT_ANNOTATIONS_DIR
-        FileUtils.mkdir_p(dir)
         say("\n  Fetched #{set_color(gem_name, :yellow, :bold)}", :green)
-        create_file("#{dir}/#{gem_name}.rbi", content)
+        create_file(@outpath.join("#{gem_name}.rbi"), content)
       end
 
       sig { params(repo_uri: String, path: String).returns(T.nilable(String)) }

data/lib/tapioca/commands/check_shims.rb

@@ -38,6 +38,8 @@ module Tapioca
         @number_of_workers = number_of_workers
       end
 
+      private
+
       sig { override.void }
       def execute
         index = RBI::Index.new

data/lib/tapioca/commands/command.rb

@@ -21,11 +21,18 @@ module Tapioca
         @file_writer = T.let(FileWriter.new, Thor::Actions)
       end
 
-      sig { abstract.void }
-      def execute; end
+      sig(:final) { void }
+      def run
+        Tapioca.silence_warnings do
+          execute
+        end
+      end
 
       private
 
+      sig { abstract.void }
+      def execute; end
+
       sig { params(command: Symbol, args: String).returns(String) }
       def default_command(command, *args)
         [Tapioca::BINARY_FILE, command.to_s, *args].join(" ")

data/lib/tapioca/commands/configure.rb

@@ -26,6 +26,8 @@ module Tapioca
         @spec = T.let(nil, T.nilable(Bundler::StubSpecification))
       end
 
+      private
+
       sig { override.void }
       def execute
         create_sorbet_config
@@ -34,8 +36,6 @@ module Tapioca
         create_binstub
       end
 
-      private
-
       sig { void }
       def create_sorbet_config
         create_file(@sorbet_config, <<~CONTENT, skip: true, force: false)

data/lib/tapioca/commands/dsl_compiler_list.rb

@@ -0,0 +1,31 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class DslCompilerList < AbstractDsl
+      private
+
+      sig { override.void }
+      def execute
+        load_application
+
+        say("")
+        say("Loaded DSL compiler classes:")
+        say("")
+
+        table = pipeline.compilers.map do |compiler|
+          status = if pipeline.active_compilers.include?(compiler)
+            set_color("enabled", :green)
+          else
+            set_color("disabled", :red)
+          end
+
+          [compiler.name, status]
+        end
+
+        print_table(table, { indent: 2 })
+      end
+    end
+  end
+end

data/lib/tapioca/commands/dsl_generate.rb

@@ -0,0 +1,40 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class DslGenerate < AbstractDsl
+      private
+
+      sig { override.void }
+      def execute
+        load_application
+
+        say("Compiling DSL RBI files...")
+        say("")
+
+        rbi_files_to_purge = generate_dsl_rbi_files(@outpath, quiet: @quiet && !@verbose)
+        say("")
+
+        purge_stale_dsl_rbi_files(rbi_files_to_purge)
+        say("Done", :green)
+
+        if @auto_strictness
+          say("")
+          validate_rbi_files(
+            command: default_command(:dsl, all_requested_constants.join(" ")),
+            gem_dir: @gem_dir,
+            dsl_dir: @outpath.to_s,
+            auto_strictness: @auto_strictness,
+            compilers: pipeline.active_compilers,
+          )
+        end
+
+        say("All operations performed in working directory.", [:green, :bold])
+        say("Please review changes and commit them.", [:green, :bold])
+      ensure
+        GitAttributes.create_generated_attribute_file(@outpath)
+      end
+    end
+  end
+end

data/lib/tapioca/commands/dsl_verify.rb

@@ -0,0 +1,25 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class DslVerify < AbstractDsl
+      private
+
+      sig { override.void }
+      def execute
+        load_application
+
+        say("Checking for out-of-date RBIs...")
+        say("")
+
+        outpath = Pathname.new(Dir.mktmpdir)
+
+        generate_dsl_rbi_files(outpath, quiet: true)
+        say("")
+
+        perform_dsl_verification(outpath)
+      end
+    end
+  end
+end

data/lib/tapioca/commands/gem_generate.rb

@@ -0,0 +1,51 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class GemGenerate < AbstractGem
+      private
+
+      sig { override.void }
+      def execute
+        Loaders::Gem.load_application(
+          bundle: @bundle,
+          prerequire: @prerequire,
+          postrequire: @postrequire,
+          default_command: default_command(:require),
+          halt_upon_load_error: @halt_upon_load_error,
+        )
+
+        gem_queue = gems_to_generate(@gem_names).reject { |gem| @exclude.include?(gem.name) }
+        anything_done = [
+          perform_removals,
+          gem_queue.any?,
+        ].any?
+
+        Executor.new(gem_queue, number_of_workers: @number_of_workers).run_in_parallel do |gem|
+          shell.indent do
+            compile_gem_rbi(gem)
+            puts
+          end
+        end
+
+        if anything_done
+          validate_rbi_files(
+            command: default_command(:gem, @gem_names.join(" ")),
+            gem_dir: @outpath.to_s,
+            dsl_dir: @dsl_dir,
+            auto_strictness: @auto_strictness,
+            gems: @bundle.dependencies,
+          )
+
+          say("All operations performed in working directory.", [:green, :bold])
+          say("Please review changes and commit them.", [:green, :bold])
+        else
+          say("No operations performed, all RBIs are up-to-date.", [:green, :bold])
+        end
+      ensure
+        GitAttributes.create_generated_attribute_file(@outpath)
+      end
+    end
+  end
+end

data/lib/tapioca/commands/gem_sync.rb

@@ -0,0 +1,37 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class GemSync < AbstractGem
+      private
+
+      sig { override.void }
+      def execute
+        anything_done = [
+          perform_removals,
+          perform_additions,
+        ].any?
+
+        if anything_done
+          validate_rbi_files(
+            command: default_command(:gem),
+            gem_dir: @outpath.to_s,
+            dsl_dir: @dsl_dir,
+            auto_strictness: @auto_strictness,
+            gems: @bundle.dependencies,
+          )
+
+          say("All operations performed in working directory.", [:green, :bold])
+          say("Please review changes and commit them.", [:green, :bold])
+        else
+          say("No operations performed, all RBIs are up-to-date.", [:green, :bold])
+        end
+
+        puts
+      ensure
+        GitAttributes.create_generated_attribute_file(@outpath)
+      end
+    end
+  end
+end

data/lib/tapioca/commands/gem_verify.rb

@@ -0,0 +1,36 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Tapioca
+  module Commands
+    class GemVerify < AbstractGem
+      private
+
+      sig { override.void }
+      def execute
+        say("Checking for out-of-date RBIs...")
+        say("")
+        perform_sync_verification
+      end
+
+      sig { void }
+      def perform_sync_verification
+        diff = {}
+
+        removed_rbis.each do |gem_name|
+          next if @exclude.include?(gem_name)
+
+          filename = existing_rbi(gem_name)
+          diff[filename] = :removed
+        end
+
+        added_rbis.each do |gem_name|
+          filename = expected_rbi(gem_name)
+          diff[filename] = gem_rbi_exists?(gem_name) ? :changed : :added
+        end
+
+        report_diff_and_exit_if_out_of_date(diff, :gem)
+      end
+    end
+  end
+end

data/lib/tapioca/commands/require.rb

@@ -17,6 +17,8 @@ module Tapioca
         super()
       end
 
+      private
+
       sig { override.void }
       def execute
         compiler = Static::RequiresCompiler.new(@sorbet_config_path)