spoom 1.7.11 → 1.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd8a922c433ab7b03fd7d6a419205e983467d5437eed8a078e57835f2168eec
-  data.tar.gz: 2a74d166079aa6c1f7a2f95dca5de050f6d40b4a49eb43e2eaa7059df1275e7a
+  metadata.gz: 02432e9390507a5cc9072d83c3eaf7952d430fdb4329cf5e33e969513d21f58b
+  data.tar.gz: 693d74660c7aa1faad796f5a948bb06302c1b8d62dc3855665ea1125cb0ee1fd
 SHA512:
-  metadata.gz: b735c17851bebe3875bc1023e799060146de1965b5d3dca786e2868b68d5d27ff0e0e13324c2c6762581eb176d036b078d7168378e0f7b1637e69084e5e9a2ab
-  data.tar.gz: 9e4730cd210bdef36bed6f610e7b56815fd7d6cad3bf791c8b628f2c5db08e29111e9e7d6a414af8af3612d739d8431ea7461b1205fff6d339f05b4116cc3560
+  metadata.gz: 3f34e8b9207ed4b538ef2ca5450041aa62baede9429d295e4348b68008cfe3df43e7e0f626b6e41e872e808afebeabe34bcd33536c6e6520e053b5b9be43a76d
+  data.tar.gz: b4e28008f5529e134664d250bd17f2934ed978045861031d9f4b9e5d13a4e7fbde24b86d07fbeca9e0e4e114a1e6bc07bf599efa4c0e1a5ee7ccfa322c57ab3b

data/Gemfile

@@ -6,6 +6,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "minitest"
+gem "minitest-mock"
 
 group :development do
   gem "debug"

data/README.md

@@ -377,6 +377,24 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
+## Releasing
+
+### Bump the gem version
+
+- [ ] Locally, update the version number in [`version.rb`](https://github.com/Shopify/spoom/blob/main/lib/spoom/version.rb)
+- [ ] Run `bundle install` to update the version number in `Gemfile.lock`
+- [ ] Commit this change with the message `Bump version to vx.y.z`
+- [ ] Push this change directly to main or open a PR
+
+### Create a new tag
+
+- [ ] Locally, create a new tag with the new version number: `git tag vx.y.z`
+- [ ] Push this tag up to the remote `git push origin vx.y.z`
+
+### Release workflow will run automatically
+
+We have a [release workflow](https://github.com/Shopify/spoom/actions/workflows/release.yml) that will publish your new gem version to rubygems.org via [Trusted Publishing](https://guides.rubygems.org/trusted-publishing/). This workflow must be approved by a member of the Ruby and Rails Infrastructure team at Shopify before it will run. Once it is approved, it will automatically publish a new gem version to rubygems.org and create a new GitHub release.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/Shopify/spoom. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/spoom/bundler_helper.rb

@@ -3,8 +3,6 @@
 
 module Spoom
   module BundlerHelper
-    extend T::Sig
-
     class << self
       # Generate a gem requirement for the given gem name, using that gem's version in the "real" current bundle.
       #

data/lib/spoom/cli/srb/metrics.rb

@@ -59,7 +59,7 @@ module Spoom
             .select { |key, _value| key.start_with?("rbs_") }
             .sort_by { |_key, value| -value }
             .each do |key, value|
-            say(" * #{key}: `#{value}`")
+              say(" * #{key}: `#{value}`")
           end
         end
       end

data/lib/spoom/cli/srb/sigs.rb

@@ -149,6 +149,7 @@ module Spoom
 
             #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("rbs")}
             #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("tapioca")}
+            #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("sorbet-static-and-runtime")}
 
             gem "#{spec.name}", path: "#{copy_context.absolute_path}"
           GEMFILE

data/lib/spoom/coverage.rb

@@ -15,7 +15,7 @@ module Spoom
         config = context.sorbet_config
         config.allowed_extensions.push(".rb", ".rbi") if config.allowed_extensions.empty?
 
-        new_config = config.copy
+        new_config = config.dup
         new_config.allowed_extensions.reject! { |ext| !rbi && ext == ".rbi" }
         flags = [
           "--no-config",

data/lib/spoom/deadcode/plugins/ruby.rb

@@ -33,6 +33,12 @@ module Spoom
             if last_arg.is_a?(Prism::SymbolNode) || last_arg.is_a?(Prism::StringNode)
               @index.reference_method(last_arg.unescaped, send.location)
             end
+          when "dup"
+            @index.reference_method("initialize_dup", send.location)
+            @index.reference_method("initialize_copy", send.location)
+          when "clone"
+            @index.reference_method("initialize_clone", send.location)
+            @index.reference_method("initialize_copy", send.location)
           when "method"
             arg = send.args.first
             @index.reference_method(arg.unescaped, send.location) if arg.is_a?(Prism::SymbolNode)

data/lib/spoom/file_tree.rb

@@ -4,14 +4,14 @@
 module Spoom
   # Build a file hierarchy from a set of file paths.
   class FileTree
-    #: (?T::Enumerable[String] paths) -> void
+    #: (?Enumerable[String] paths) -> void
     def initialize(paths = [])
       @roots = {} #: Hash[String, Node]
       add_paths(paths)
     end
 
     # Add all `paths` to the tree
-    #: (T::Enumerable[String] paths) -> void
+    #: (Enumerable[String] paths) -> void
     def add_paths(paths)
       paths.each { |path| add_path(path) }
     end

data/lib/spoom/sorbet/config.rb

@@ -40,14 +40,12 @@ module Spoom
         @no_stdlib = false #: bool
       end
 
-      #: -> Config
-      def copy
-        new_config = Sorbet::Config.new
-        new_config.paths.concat(@paths)
-        new_config.ignore.concat(@ignore)
-        new_config.allowed_extensions.concat(@allowed_extensions)
-        new_config.no_stdlib = @no_stdlib
-        new_config
+      #: (Config source) -> void
+      def initialize_copy(source)
+        super
+        @paths = @paths.dup
+        @ignore = @ignore.dup
+        @allowed_extensions = @allowed_extensions.dup
       end
 
       # Returns self as a string of options that can be passed to Sorbet
@@ -107,8 +105,8 @@ module Spoom
             when /^--dir=/
               config.paths << parse_option(line)
               next
-            when /^--no-stdlib$/
-              config.no_stdlib = true
+            when /^--no-stdlib(=|$)/
+              config.no_stdlib = parse_bool_option(line)
               next
             when /^--.*=/
               next
@@ -143,6 +141,17 @@ module Spoom
         def parse_option(line)
           T.must(line.split("=").last).strip
         end
+
+        #: (String line) -> bool
+        def parse_bool_option(line)
+          return true unless line.include?("=") # `--foo` is equivalent to `--foo=true`
+
+          case parse_option(line)
+          when "true", "True", "t", "T", "1" then true
+          when "false", "False", "f", "F", "0" then false
+          else raise ArgumentError, "invalid boolean value: #{parse_option(line).inspect}"
+          end
+        end
       end
     end
   end

data/lib/spoom/sorbet/translate/rbs_comments_to_sorbet_sigs.rb

@@ -139,6 +139,12 @@ module Spoom
 
             apply_member_annotations(comments.method_annotations, sig)
 
+            # Sorbet runtime doesn't support `sig` on `method_added` or
+            # `singleton_method_added`, so we always use `without_runtime` for them.
+            if def_node.name == :method_added || def_node.name == :singleton_method_added
+              sig.without_runtime = true
+            end
+
             @rewriter << Source::Replace.new(
               signature.location.start_offset,
               signature.location.end_offset,
@@ -202,6 +208,9 @@ module Spoom
           signatures = comments.signatures
           if signatures.any?
             signatures.each do |signature|
+              # Only type param signatures (e.g. `#: [A, B]`) are valid on class/module nodes
+              next unless signature.string.start_with?("[")
+
               type_params = ::RBS::Parser.parse_type_params(signature.string)
               next if type_params.empty?
 

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.7.11"
+  VERSION = "1.7.13"
 end

data/rbi/spoom.rbi

@@ -2603,10 +2603,6 @@ class Spoom::Sorbet::Config
 
   def allowed_extensions; end
   def allowed_extensions=(_arg0); end
-
-  sig { returns(::Spoom::Sorbet::Config) }
-  def copy; end
-
   def ignore; end
   def ignore=(_arg0); end
 
@@ -2623,6 +2619,11 @@ class Spoom::Sorbet::Config
 
   def paths=(_arg0); end
 
+  private
+
+  sig { params(source: ::Spoom::Sorbet::Config).void }
+  def initialize_copy(source); end
+
   class << self
     sig { params(sorbet_config_path: ::String).returns(::Spoom::Sorbet::Config) }
     def parse_file(sorbet_config_path); end
@@ -2632,6 +2633,9 @@ class Spoom::Sorbet::Config
 
     private
 
+    sig { params(line: ::String).returns(T::Boolean) }
+    def parse_bool_option(line); end
+
     sig { params(line: ::String).returns(::String) }
     def parse_option(line); end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.13
 platform: ruby
 authors:
 - Alexandre Terrasa
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.3.0
+        version: 13.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.3.0
+        version: 13.4.2
 - !ruby/object:Gem::Dependency
   name: erubi
   requirement: !ruby/object:Gem::Requirement
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev.4
+        version: 4.0.0.dev.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.dev.4
+        version: 4.0.0.dev.5
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.
 test_files: []