tapioca 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea7bddec4d5d00918ca3236afee754f7f8dd9481d78bf8e26819c0140b154ff
-  data.tar.gz: 681d5ed15d27c20833aa4df86dc1a61d721e0d5993a43073873f2406a254d806
+  metadata.gz: ef378ec3f3035d85d6aebfa4624896d216bcccd7d9332cbdc9d64be469b79b48
+  data.tar.gz: 2f34d64fadd075ed1653ec26d27c73a02bfff949440fc6d1fd8bf80116161b48
 SHA512:
-  metadata.gz: a2e885fa0010d90899b1f167e3a68c1d65f7cec21d7386a321a51d753fdf6e4deaf97d5c0866b7969cf90f42a5aa68af858e173237f8fc0a7c31bc08c3931185
-  data.tar.gz: a48f142ad8402b07c2b4724801b2dee912f1b95975bb9951feb97aef433a46c248e458527827be3a450336f2c62195714a5f5b476ed7704dad4ccefdb93aca98
+  metadata.gz: 78b6ce07ee08391457763a8e9069b0ff0efaa1be26cdeec7f334d2b45afa6ec12fd152d24c42d4c2b6834db25af77f74d6401bf577fd749ed446ef122dc01161
+  data.tar.gz: 0b1998a9a72153d24747838606ff636cf8718efc67aa98e0c9d3ff01849d677840cd73f0adb8f289cc8c6f7e07b20bd37594bbcd1aea1b91761132fd07a1a9db

data/Gemfile

@@ -10,6 +10,7 @@ gem("minitest-reporters")
 gem("pry-byebug")
 gem("rubocop-shopify", require: false)
 gem("rubocop-sorbet", ">= 0.4.1")
+gem("rubocop-rspec", require: false)
 gem("sorbet")
 
 group(:deployment, :development) do
@@ -25,8 +26,12 @@ group(:development, :test) do
   gem("activerecord-typedstore", require: false)
   gem("sqlite3")
   gem("identity_cache", require: false)
-  gem("cityhash", git: "https://github.com/csfrancis/cityhash.git",
-                  ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36", require: false)
+  gem(
+    "cityhash",
+    git: "https://github.com/csfrancis/cityhash.git",
+    ref: "3cfc7d01f333c01811d5e834f1495eaa29f87c36",
+    require: false
+  )
   gem("activeresource", require: false)
   gem("google-protobuf", require: false)
   gem("shopify-money", require: false)
@@ -36,6 +41,7 @@ group(:development, :test) do
   gem("aasm", require: false)
   gem("bcrypt", require: false)
   gem("xpath", require: false)
+  gem("rubocop-lsp", require: false)
 
   # net-smtp was removed from default gems in Ruby 3.1, but is used by the `mail` gem.
   # So we need to add it as a dependency until `mail` is fixed:

data/README.md

@@ -123,6 +123,12 @@ Options:
                                                               # Default: true
   -w, [--workers=N]                                           # EXPERIMENTAL: Number of parallel workers to use when generating RBIs
                                                               # Default: 1
+          [--auto-strictness], [--no-auto-strictness]         # Autocorrect strictness in gem RBIs in case of conflict with the DSL RBIs
+                                                              # Default: true
+  --dsl-dir, [--dsl-dir=directory]                            # The DSL directory used to correct gems strictnesses
+                                                              # Default: sorbet/rbi/dsl
+          [--rbi-max-line-length=N]                           # Set the max line length of generated RBIs. Signatures longer than the max line length will be wrapped
+                                                              # Default: 120
   -c, [--config=<config file path>]                           # Path to the Tapioca configuration file
                                                               # Default: sorbet/tapioca/config.yml
   -V, [--verbose], [--no-verbose]                             # Verbose output for debugging purposes
@@ -159,7 +165,7 @@ generate the list of unresolved constants
 
 Command: `tapioca dsl [constant...]`
 
-This will generate DSL RBIs for specified constants (or for all handled constants, if a constant name is not supplied). You can read about DSL RBI generators supplied by `tapioca` in [the manual](manual/generators.md).
+This will generate DSL RBIs for specified constants (or for all handled constants, if a constant name is not supplied). You can read about DSL RBI compilers supplied by `tapioca` in [the manual](manual/compilers.md).
 
 <!-- START_HELP_COMMAND_DSL -->
 ```shell
@@ -167,19 +173,21 @@ Usage:
   tapioca dsl [constant...]
 
 Options:
-  --out, -o, [--outdir=directory]                # The output directory for generated DSL RBI files
-                                                 # Default: sorbet/rbi/dsl
-          [--file-header], [--no-file-header]    # Add a "This file is generated" header on top of each generated RBI file
-                                                 # Default: true
-          [--only=generator [generator ...]]     # Only run supplied DSL generator(s)
-          [--exclude=generator [generator ...]]  # Exclude supplied DSL generator(s)
-          [--verify], [--no-verify]              # Verifies RBIs are up-to-date
-  -q, [--quiet], [--no-quiet]                    # Supresses file creation output
-  -w, [--workers=N]                              # EXPERIMENTAL: Number of parallel workers to use when generating RBIs
-                                                 # Default: 1
-  -c, [--config=<config file path>]              # Path to the Tapioca configuration file
-                                                 # Default: sorbet/tapioca/config.yml
-  -V, [--verbose], [--no-verbose]                # Verbose output for debugging purposes
+  --out, -o, [--outdir=directory]              # The output directory for generated DSL RBI files
+                                               # Default: sorbet/rbi/dsl
+          [--file-header], [--no-file-header]  # Add a "This file is generated" header on top of each generated RBI file
+                                               # Default: true
+          [--only=compiler [compiler ...]]     # Only run supplied DSL compiler(s)
+          [--exclude=compiler [compiler ...]]  # Exclude supplied DSL compiler(s)
+          [--verify], [--no-verify]            # Verifies RBIs are up-to-date
+  -q, [--quiet], [--no-quiet]                  # Supresses file creation output
+  -w, [--workers=N]                            # EXPERIMENTAL: Number of parallel workers to use when generating RBIs
+                                               # Default: 1
+          [--rbi-max-line-length=N]            # Set the max line length of generated RBIs. Signatures longer than the max line length will be wrapped
+                                               # Default: 120
+  -c, [--config=<config file path>]            # Path to the Tapioca configuration file
+                                               # Default: sorbet/tapioca/config.yml
+  -V, [--verbose], [--no-verbose]              # Verbose output for debugging purposes
 
 generate RBIs for dynamic methods
 ```
@@ -228,6 +236,7 @@ dsl:
   verify: false
   quiet: false
   workers: 1
+  rbi_max_line_length: 120
 gem:
   outdir: sorbet/rbi/gems
   file_header: true
@@ -241,7 +250,10 @@ gem:
   doc: false
   exported_gem_rbis: true
   workers: 1
-clean_shims:
+  auto_strictness: true
+  dsl_dir: sorbet/rbi/dsl
+  rbi_max_line_length: 120
+check_shims:
   gem_rbi_dir: sorbet/rbi/gems
   dsl_rbi_dir: sorbet/rbi/dsl
   shim_rbi_dir: sorbet/rbi/shims

data/Rakefile

@@ -1,22 +1,18 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
-require "rake/testtask"
 Dir["tasks/**/*.rake"].each { |t| load t }
 
-Rake.application.options.trace = false
+require "rubocop/rake_task"
+RuboCop::RakeTask.new
 
-Rake::TestTask.new do |t|
-  t.libs << "lib"
-  t.libs << "spec"
-  t.warning = false
-  t.test_files = FileList["spec/**/*_spec.rb"]
+desc "Run tests"
+task :test do
+  require "shellwords"
+  test = Array(ENV.fetch("TEST", []))
+  test_opts = Shellwords.split(ENV.fetch("TESTOPTS", ""))
+  success = system("bin/test", *test, *test_opts)
+  success || exit(false)
 end
 
-task(:spec) do
-  Rake::Task[:test].execute
-rescue RuntimeError
-  exit(1)
-end
-
-task(default: :spec)
+task(default: :test)

data/lib/tapioca/cli.rb

@@ -5,6 +5,7 @@ module Tapioca
   class Cli < Thor
     include CliHelper
     include ConfigHelper
+    include ShimsHelper
 
     FILE_HEADER_OPTION_DESC = "Add a \"This file is generated\" header on top of each generated RBI file"
 
@@ -22,25 +23,23 @@ module Tapioca
 
     desc "init", "initializes folder structure"
     def init
-      generator = Generators::Init.new(
+      command = Commands::Init.new(
         sorbet_config: SORBET_CONFIG_FILE,
         tapioca_config: TAPIOCA_CONFIG_FILE,
-        default_postrequire: DEFAULT_POSTREQUIRE_FILE,
-        default_command: DEFAULT_COMMAND
+        default_postrequire: DEFAULT_POSTREQUIRE_FILE
       )
-      generator.generate
+      command.execute
     end
 
     desc "require", "generate the list of files to be required by tapioca"
     option :postrequire, type: :string, default: DEFAULT_POSTREQUIRE_FILE
     def require
-      generator = Generators::Require.new(
+      command = Commands::Require.new(
         requires_path: options[:postrequire],
-        sorbet_config_path: SORBET_CONFIG_FILE,
-        default_command: DEFAULT_COMMAND
+        sorbet_config_path: SORBET_CONFIG_FILE
       )
       Tapioca.silence_warnings do
-        generator.generate
+        command.execute
       end
     end
 
@@ -54,13 +53,12 @@ module Tapioca
       desc: FILE_HEADER_OPTION_DESC,
       default: true
     def todo
-      generator = Generators::Todo.new(
+      command = Commands::Todo.new(
         todo_file: options[:todo_file],
-        file_header: options[:file_header],
-        default_command: DEFAULT_COMMAND
+        file_header: options[:file_header]
       )
       Tapioca.silence_warnings do
-        generator.generate
+        command.execute
       end
     end
 
@@ -76,13 +74,13 @@ module Tapioca
       default: true
     option :only,
       type: :array,
-      banner: "generator [generator ...]",
-      desc: "Only run supplied DSL generator(s)",
+      banner: "compiler [compiler ...]",
+      desc: "Only run supplied DSL compiler(s)",
       default: []
     option :exclude,
       type: :array,
-      banner: "generator [generator ...]",
-      desc: "Exclude supplied DSL generator(s)",
+      banner: "compiler [compiler ...]",
+      desc: "Exclude supplied DSL compiler(s)",
       default: []
     option :verify,
       type: :boolean,
@@ -98,20 +96,24 @@ module Tapioca
       type: :numeric,
       desc: "EXPERIMENTAL: Number of parallel workers to use when generating RBIs",
       default: 1
+    option :rbi_max_line_length,
+      type: :numeric,
+      desc: "Set the max line length of generated RBIs. Signatures longer than the max line length will be wrapped",
+      default: 120
     def dsl(*constants)
-      generator = Generators::Dsl.new(
+      command = Commands::Dsl.new(
         requested_constants: constants,
         outpath: Pathname.new(options[:outdir]),
         only: options[:only],
         exclude: options[:exclude],
         file_header: options[:file_header],
-        compiler_path: Tapioca::Compilers::Dsl::DSL_COMPILERS_DIR,
+        compiler_path: Tapioca::Dsl::Compilers::DIRECTORY,
         tapioca_path: TAPIOCA_DIR,
-        default_command: DEFAULT_COMMAND,
         should_verify: options[:verify],
         quiet: options[:quiet],
         verbose: options[:verbose],
-        number_of_workers: options[:workers]
+        number_of_workers: options[:workers],
+        rbi_formatter: rbi_formatter(options)
       )
 
       if options[:workers] != 1
@@ -122,7 +124,7 @@ module Tapioca
       end
 
       Tapioca.silence_warnings do
-        generator.generate
+        command.execute
       end
     end
 
@@ -179,23 +181,38 @@ module Tapioca
       type: :numeric,
       desc: "EXPERIMENTAL: Number of parallel workers to use when generating RBIs",
       default: 1
+    option :auto_strictness,
+      type: :boolean,
+      desc: "Autocorrect strictness in gem RBIs in case of conflict with the DSL RBIs",
+      default: true
+    option :dsl_dir,
+      aliases: ["--dsl-dir"],
+      banner: "directory",
+      desc: "The DSL directory used to correct gems strictnesses",
+      default: DEFAULT_DSL_DIR
+    option :rbi_max_line_length,
+      type: :numeric,
+      desc: "Set the max line length of generated RBIs. Signatures longer than the max line length will be wrapped",
+      default: 120
     def gem(*gems)
       Tapioca.silence_warnings do
         all = options[:all]
         verify = options[:verify]
 
-        generator = Generators::Gem.new(
+        command = Commands::Gem.new(
           gem_names: all ? [] : gems,
           exclude: options[:exclude],
           prerequire: options[:prerequire],
           postrequire: options[:postrequire],
           typed_overrides: options[:typed_overrides],
-          default_command: DEFAULT_COMMAND,
           outpath: Pathname.new(options[:outdir]),
           file_header: options[:file_header],
           doc: options[:doc],
           include_exported_rbis: options[:exported_gem_rbis],
-          number_of_workers: options[:workers]
+          number_of_workers: options[:workers],
+          auto_strictness: options[:auto_strictness],
+          dsl_dir: options[:dsl_dir],
+          rbi_formatter: rbi_formatter(options)
         )
 
         raise MalformattedArgumentError, "Options '--all' and '--verify' are mutually exclusive" if all && verify
@@ -213,80 +230,48 @@ module Tapioca
         end
 
         if gems.empty? && !all
-          generator.sync(should_verify: verify)
+          command.sync(should_verify: verify)
         else
-          generator.generate
+          command.execute
         end
       end
     end
+    map "gems" => :gem
 
-    desc "clean-shims", "clean duplicated definitions in shim RBIs"
+    desc "check-shims", "check duplicated definitions in shim RBIs"
     option :gem_rbi_dir, type: :string, desc: "Path to gem RBIs", default: DEFAULT_GEM_DIR
     option :dsl_rbi_dir, type: :string, desc: "Path to DSL RBIs", default: DEFAULT_DSL_DIR
     option :shim_rbi_dir, type: :string, desc: "Path to shim RBIs", default: DEFAULT_SHIM_DIR
-    def clean_shims(*files_to_clean)
+    def check_shims
       index = RBI::Index.new
 
-      # Index gem RBIs
-      gem_rbi_dir = options[:gem_rbi_dir]
-      say("Loading gem RBIs from #{gem_rbi_dir}... ")
-      gem_rbis_files = Dir.glob("#{gem_rbi_dir}/**/*.rbi").sort
-      gem_rbis_trees = RBI::Parser.parse_files(gem_rbis_files)
-      index.visit_all(gem_rbis_trees)
-      say(" Done", :green)
-
-      # Index dsl RBIs
-      dsl_rbi_dir = options[:dsl_rbi_dir]
-      say("Loading dsl RBIs from #{dsl_rbi_dir}... ")
-      dsl_rbis_files = Dir.glob("#{dsl_rbi_dir}/**/*.rbi").sort
-      dsl_rbis_trees = RBI::Parser.parse_files(dsl_rbis_files)
-      index.visit_all(dsl_rbis_trees)
-      say(" Done", :green)
-
-      # Clean shim RBIs
-      if files_to_clean.empty?
-        shim_rbi_dir = options[:shim_rbi_dir]
-        print("Cleaning shim RBIs from #{shim_rbi_dir}...")
-        files_to_clean = Dir.glob("#{shim_rbi_dir}/*.rbi")
-      else
-        print("Cleaning shim RBIs...")
+      shim_rbi_dir = options[:shim_rbi_dir]
+      if !Dir.exist?(shim_rbi_dir) || Dir.empty?(shim_rbi_dir)
+        say("No shim RBIs to check", :green)
+        exit(0)
       end
 
-      done_something = T.let(false, T::Boolean)
-      files_to_clean.sort.each do |path|
-        original = RBI::Parser.parse_file(path)
-        cleaned, operations = RBI::Rewriters::RemoveKnownDefinitions.remove(original, index)
+      index_rbis(index, "shim", shim_rbi_dir)
+      index_rbis(index, "gem", options[:gem_rbi_dir])
+      index_rbis(index, "dsl", options[:dsl_rbi_dir])
 
-        next if operations.empty?
-        done_something = true
-
-        operations.each do |operation|
-          print("\n  #{operation}")
-        end
-
-        if cleaned.empty?
-          print("\n  Deleted empty file #{path}")
-          FileUtils.rm(path)
-        else
-          File.write(path, cleaned.string)
+      duplicates = duplicated_nodes_from_index(index, shim_rbi_dir)
+      unless duplicates.empty?
+        duplicates.each do |key, nodes|
+          say_error("\nDuplicated RBI for #{key}:", :red)
+          nodes.each do |node|
+            say_error(" * #{node.loc}", :red)
+          end
         end
+        say_error("\nPlease remove the duplicated definitions from the #{shim_rbi_dir} directory.", :red)
+        exit(1)
       end
 
-      if done_something
-        say("\nDone", :green)
-      else
-        say(" Done ", :green)
-        say("(nothing to do)", :yellow)
-      end
-    rescue Errno::ENOENT => e
-      say_error("\nCan't read RBI: #{e}")
-      exit(1)
-    rescue RBI::ParseError => e
-      say_error("\nCan't parse RBI: #{e} (#{e.location})")
-      exit(1)
+      say("\nNo duplicates found in shim RBIs", :green)
+      exit(0)
     end
 
-    map T.unsafe(["--version", "-v"] => :__print_version)
+    map ["--version", "-v"] => :__print_version
 
     desc "--version, -v", "show version"
     def __print_version

data/lib/tapioca/{generators/base.rb → commands/command.rb}

@@ -2,8 +2,8 @@
 # frozen_string_literal: true
 
 module Tapioca
-  module Generators
-    class Base
+  module Commands
+    class Command
       extend T::Sig
       extend T::Helpers
 
@@ -16,17 +16,24 @@ module Tapioca
 
       abstract!
 
-      sig { params(default_command: String, file_writer: Thor::Actions).void }
-      def initialize(default_command:, file_writer: FileWriter.new)
-        @file_writer = file_writer
-        @default_command = default_command
+      sig { void }
+      def initialize
+        @file_writer = T.let(FileWriter.new, Thor::Actions)
       end
 
       sig { abstract.void }
-      def generate; end
+      def execute; end
 
       private
 
+      sig { params(command: Symbol, args: String).returns(String) }
+      def default_command(command, *args)
+        [Tapioca::BINARY_FILE, command.to_s, *args].join(" ")
+      end
+
+      sig { returns(Thor::Actions) }
+      attr_reader :file_writer
+
       sig do
         params(
           path: T.any(String, Pathname),
@@ -37,7 +44,7 @@ module Tapioca
         ).void
       end
       def create_file(path, content, force: true, skip: false, verbose: true)
-        @file_writer.create_file(path, force: force, skip: skip, verbose: verbose) { content }
+        file_writer.create_file(path, force: force, skip: skip, verbose: verbose) { content }
       end
 
       sig do
@@ -47,7 +54,7 @@ module Tapioca
         ).void
       end
       def remove_file(path, verbose: true)
-        @file_writer.remove_file(path, verbose: verbose)
+        file_writer.remove_file(path, verbose: verbose)
       end
     end
   end