spoom 1.7.9 → 1.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24a0283b0a0b16cef6e3547725768b9d3d63673efec428dee7859e6bb398add0
-  data.tar.gz: 2e3037e4cf693ac776412e9817d2a1309a39b50bc58bff639dccce5fc9790a9e
+  metadata.gz: dcd8a922c433ab7b03fd7d6a419205e983467d5437eed8a078e57835f2168eec
+  data.tar.gz: 2a74d166079aa6c1f7a2f95dca5de050f6d40b4a49eb43e2eaa7059df1275e7a
 SHA512:
-  metadata.gz: 1168d181aa2f2d7512dfae7f01b8845a247bfecc5b8ea85441c9377a7bd33e51ab288d4078f3b86bbceef129c81721ba68a386095dd8feb215d0afea93bb1788
-  data.tar.gz: f9e7e65da944d81186ca772535b84befff429ce4c0cb9406ce2d0f6b9f0b5b46ba2efc67ab942782e635dd339139f9d902e71092a86c1ea28f221a0e219af0be
+  metadata.gz: b735c17851bebe3875bc1023e799060146de1965b5d3dca786e2868b68d5d27ff0e0e13324c2c6762581eb176d036b078d7168378e0f7b1637e69084e5e9a2ab
+  data.tar.gz: 9e4730cd210bdef36bed6f610e7b56815fd7d6cad3bf791c8b628f2c5db08e29111e9e7d6a414af8af3612d739d8431ea7461b1205fff6d339f05b4116cc3560

data/README.md

@@ -375,7 +375,7 @@ $ spoom deadcode remove path/to/file.rb:42:18-47:23
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bin/test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment. Don't forget to run `bin/sanity` before pushing your changes.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 

data/lib/spoom/bundler_helper.rb

@@ -0,0 +1,33 @@
+# typed: strict
+# frozen_string_literal: true
+
+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.
+      #
+      # This ensures that any child Spoom::Contexts use predictable gem versions,
+      # without having to manually specify them and bump them to stay in sync with Spoom's real Gemfile.
+      #
+      # Given `"foo"`, returns a string like 'gem "foo", "= 1.2.3"', suitable for inserting into a Gemfile.
+      #: (String) -> String
+      def gem_requirement_from_real_bundle(gem_name)
+        specs = Bundler.load.gems[gem_name]
+
+        if specs.nil? || specs.empty?
+          raise "Did not find gem #{gem_name.inspect} in the current bundle"
+        elsif specs.count > 1
+          raise <<~MSG
+            Found multiple versions of #{gem_name.inspect} in the current bundle:
+            #{specs.sort_by(&:version).map { |spec| "  - #{spec.name} #{spec.version}" }.join("\n")}
+          MSG
+        else
+          spec = specs.first
+          %(gem "#{spec.name}", "= #{spec.version}")
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 # typed: true
 # frozen_string_literal: true
 
+require "spoom/bundler_helper"
+
 module Spoom
   module Cli
     module Srb
@@ -142,12 +144,14 @@ module Spoom
           # Now we create a new context to import our modified gem and run tapioca
           say("Running Tapioca...")
           tapioca_context = Spoom::Context.mktmp!
-          tapioca_context.write!("Gemfile", <<~RB)
+          tapioca_context.write_gemfile!(<<~GEMFILE)
             source "https://rubygems.org"
 
-            gem "tapioca"
+            #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("rbs")}
+            #{Spoom::BundlerHelper.gem_requirement_from_real_bundle("tapioca")}
+
             gem "#{spec.name}", path: "#{copy_context.absolute_path}"
-          RB
+          GEMFILE
           exec(tapioca_context, "bundle install")
           exec(tapioca_context, "bundle exec tapioca gem #{spec.name} --no-doc --no-loc --no-file-header")
 

data/lib/spoom/context/bundle.rb

@@ -48,7 +48,7 @@ module Spoom
         return {} unless file?("Gemfile.lock")
 
         parser = Bundler::LockfileParser.new(read_gemfile_lock)
-        parser.specs.map { |spec| [spec.name, spec] }.to_h
+        parser.specs.to_h { |spec| [spec.name, spec] }
       end
 
       # Get `gem` version from the `Gemfile.lock` content

data/lib/spoom/context/exec.rb

@@ -1,6 +1,8 @@
 # typed: strict
 # frozen_string_literal: true
 
+require "shellwords"
+
 module Spoom
   class ExecResult < T::Struct
     const :out, String
@@ -30,11 +32,21 @@ module Spoom
         Bundler.with_unbundled_env do
           opts = { chdir: absolute_path } #: Hash[Symbol, untyped]
 
+          # When Ruby is wrapped in another dev environment (e.g. Nix), that environment might set
+          # env variables that cause Sorbet (or other tools) to link to incorrect versions of
+          # dependencies.
+          #
+          # In the case of Sorbet, this can lead to corrupted JSON output.
+          #
+          # Executing the command directly through the shell bypasses any Ruby wrappers and
+          # ensures that we are using the versions of tools that are default on the system.
+          command_with_shell = "/bin/sh -c #{command.shellescape}"
+
           if capture_err
-            out, err, status = Open3.capture3(command, opts)
+            out, err, status = Open3.capture3(command_with_shell, opts)
             ExecResult.new(out: out, err: err, status: T.must(status.success?), exit_code: T.must(status.exitstatus))
           else
-            out, status = Open3.capture2(command, opts)
+            out, status = Open3.capture2(command_with_shell, opts)
             ExecResult.new(out: out, err: nil, status: T.must(status.success?), exit_code: T.must(status.exitstatus))
           end
         end

data/lib/spoom/poset.rb

@@ -119,7 +119,7 @@ module Spoom
             dot << "  \"#{value}\" -> \"#{to}\";\n"
           end
         end
-        if transitive # rubocop:disable Style/Next
+        if transitive
           element.ancestors.each do |ancestor|
             dot << "  \"#{value}\" -> \"#{ancestor}\" [style=dotted];\n"
           end

data/lib/spoom/version.rb

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

data/rbi/spoom.rbi

@@ -11,6 +11,13 @@ module Spoom
   end
 end
 
+module Spoom::BundlerHelper
+  class << self
+    sig { params(gem_name: ::String).returns(::String) }
+    def gem_requirement_from_real_bundle(gem_name); end
+  end
+end
+
 module Spoom::Cli; end
 
 class Spoom::Cli::Deadcode < ::Thor

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.11
 platform: ruby
 authors:
 - Alexandre Terrasa
@@ -162,6 +162,7 @@ files:
 - exe/spoom
 - lib/spoom.rb
 - lib/spoom/backtrace_filter/minitest.rb
+- lib/spoom/bundler_helper.rb
 - lib/spoom/cli.rb
 - lib/spoom/cli/config.rb
 - lib/spoom/cli/deadcode.rb
@@ -274,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.
 test_files: []