rubocop-packs 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b087fdd5a5ae2a9a51a04d24966313c19a2892153d656beac60bdb15e959726e
-  data.tar.gz: e4ff803bc9a2a37dd68867da260df1f68c7d8adc666a9cb141dcc95a6ac1e448
+  metadata.gz: e25f6b7faaf75d2877d830e784211d96ba5d6cb29b442c959552e1de28c5adbd
+  data.tar.gz: eff6ee7fe761edb2bb142f4cf543557b4d17a160990dccc364972bd87208ccd8
 SHA512:
-  metadata.gz: 234d22b504eb15892fd02bdab4783e475ab12ec0b6024f5d36519aca0efc1feaa5ac8616f8ba8f242086e5ac100d76edd282c282045136df26b5035954f6306d
-  data.tar.gz: 56056baf7a26ab3c2bc21038de1f34e418d01d2f0851fe1eb1234d7ec63e069a930505cf8e858fe6ac913ba5556b8ec230a024efbd7e97b0743756f3fac90c3f
+  metadata.gz: cd2ffeb81ef84b49be4ae73216d3318f45d1bf9ad70bcc77061509bbae0f848a1ff0a87ba12082c6091f32b00fef0a1a303d360dba7d07a8c2de60e255186888
+  data.tar.gz: 52163c30ba8037b43c0aaa1659bf42723e4dcd0b570b5b6e7d0f2e72e526a2e3fab6456ed3c9e934bad894b3aed9b9e3103b908dbe9d012be2081c5d42312022

data/lib/rubocop/packs/private.rb

@@ -148,20 +148,22 @@ module RuboCop
         errors
       end
 
-      sig { params(args: T.untyped).returns(String) }
+      sig { params(args: T.untyped).void }
       def self.execute_rubocop(args)
-        with_captured_stdout do
-          RuboCop::CLI.new.run(args)
-        end
+        RuboCop::CLI.new.run(args)
       end
 
       sig { params(paths: T::Array[String], cop_names: T::Array[String]).returns(T::Array[Offense]) }
       def self.offenses_for(paths:, cop_names:)
         cop_arguments = cop_names.join(',')
         # I think we can potentially use `RuboCop::CLI.new(args)` for this to avoid shelling out and starting another process that needs to reload the bundle
-        args = [*paths, "--only=#{cop_arguments}", '--format=json']
+        args = [*paths, "--only=#{cop_arguments}", '--format=json', '--out=tmp/rubocop-output']
+        FileUtils.mkdir_p('tmp')
         puts "Executing: bundle exec rubocop #{args.join(' ')}"
-        json = JSON.parse(Private.execute_rubocop(args))
+        Private.execute_rubocop(args)
+        output = Pathname.new('tmp/rubocop-output')
+        json = JSON.parse(Pathname.new('tmp/rubocop-output').read)
+        output.delete
         offenses = T.let([], T::Array[Offense])
         json['files'].each do |file_hash|
           filepath = file_hash['path']
@@ -175,16 +177,6 @@ module RuboCop
 
         offenses
       end
-
-      sig { params(block: T.untyped).returns(String) }
-      def self.with_captured_stdout(&block)
-        original_stdout = $stdout  # capture previous value of $stdout
-        $stdout = StringIO.new     # assign a string buffer to $stdout
-        yield                      # perform the body of the user code
-        $stdout.string             # return the contents of the string buffer
-      ensure
-        $stdout = original_stdout  # restore $stdout to its previous value
-      end
     end
 
     private_constant :Private

data/lib/rubocop/packs.rb

@@ -28,6 +28,12 @@ module RuboCop
     #
     sig { params(packs: T::Array[ParsePackwerk::Package], files: T::Array[String]).void }
     def self.regenerate_todo(packs: [], files: [])
+      # Delete the old pack-level rubocop todo files so that we can regenerate the new one from scratch
+      packs.each do |pack|
+        rubocop_todo_yml = pack.directory.join(PACK_LEVEL_RUBOCOP_TODO_YML)
+        rubocop_todo_yml.delete if rubocop_todo_yml.exist?
+      end
+
       paths = packs.empty? ? files : packs.map(&:name).reject { |name| name == ParsePackwerk::ROOT_PACKAGE_NAME }
       offenses = Private.offenses_for(
         paths: paths,
@@ -39,11 +45,7 @@ module RuboCop
         next if !pack.directory.join(PACK_LEVEL_RUBOCOP_YML).exist?
 
         rubocop_todo_yml = pack.directory.join(PACK_LEVEL_RUBOCOP_TODO_YML)
-        # If the user is passing in packs, then regenerate from scratch.
-        if packs.any? && rubocop_todo_yml.exist?
-          rubocop_todo_yml.delete
-          rubocop_todo = {}
-        elsif rubocop_todo_yml.exist?
+        if rubocop_todo_yml.exist?
           rubocop_todo = YAML.load_file(rubocop_todo_yml)
         else
           rubocop_todo = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-packs
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Gusto Engineers