standard 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b24b683942b6c6f3b13c8708e2c22a2d788a27c7674b33990d6a1fad43de33e
-  data.tar.gz: ee990f979a9b601b56647a0d18f510f7999bb4654a9c2a8cf3d1b1c82a5a3e75
+  metadata.gz: 3817c9b959b345aab28f7811195b4e685e6b7753008e6b87b7baead24913fdc9
+  data.tar.gz: 67f0e62b1076826b09b1078e9e60dd7da184a4f4f285e20f1a15aad59cafa3c2
 SHA512:
-  metadata.gz: 74c5858a47301a05a52d3edce69c411005470fb0c12634f967f38e91f45b2c4ff75a151a452a2df6e9aa18054b205abf01870215ab79d74ed54b5e93d1c4045c
-  data.tar.gz: 287af69ea38002e20c05c184862d6313756427db6fbd03538bb4309c40c8926fc5ea7b3a5c71828058afad2c5e05b9b30f7e72d72230573c293e1a0235b106f9
+  metadata.gz: '0206790883999325864cbbb28341c846c63809eb85cf0cdab2b6427f7d97d8df147f80b092f5691a387c79fedeea3a8ba127b46d4ed55f30b9c364e0e763423d'
+  data.tar.gz: 56638828bd4ba34031949d85cb114b632f0167cfccb8d33edeb3b84ed3c2f1e3ca208a42604cf3cc2901d12b9db142457e8c11739187fc7bdb1426417ddbee99

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.7
+
+* Fix an issue with nested generated todos being ignored
+[#311](https://github.com/testdouble/standard/pull/311)
+
 ## 1.1.6
 
 * Update rubocop from 1.18.3 to [1.18.4](https://github.com/rubocop-hq/rubocop/releases/tag/v1.18.4)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    standard (1.1.6)
+    standard (1.1.7)
       rubocop (= 1.18.4)
       rubocop-performance (= 1.11.4)
 

data/lib/standard/loads_yaml_config.rb

@@ -32,7 +32,7 @@ module Standard
         default_ignores: standard_yaml.key?("default_ignores") ? !!standard_yaml["default_ignores"] : true,
         config_root: yaml_path ? Pathname.new(yaml_path).dirname.to_s : nil,
         todo_file: todo_path,
-        todo_ignore_files: todo_yaml["ignore"] || []
+        todo_ignore_files: (todo_yaml["ignore"] || []).map { |f| Hash === f ? f.keys.first : f }
       }
     end
 

data/lib/standard/runners/genignore.rb

@@ -10,26 +10,21 @@ module Standard
         temp_file = Tempfile.new("excluded.txt")
         begin
           # Run Rubocop to generate the files with errors into the temp file.
-          config.rubocop_options[:formatters] = [["files", temp_file.path]]
-          config.rubocop_options[:format] = "files"
+          config.rubocop_options[:formatters] = [["json", temp_file.path]]
           config.rubocop_options[:out] = temp_file.path
           exit_code = Runners::Rubocop.new.call(config)
 
-          # Read in the files with errors.  It will have the absolute paths
-          # of the files but we only want the relative path.
-          files_with_errors = temp_file.readlines.map(&:chomp)
-          files_with_errors.map! do |file|
-            # Get the relative file path.  Don't use the
-            # relative_path_from method as it will raise an
-            # error in Ruby 2.4.1 and possibly other versions.
-            #
-            # https://bugs.ruby-lang.org/issues/10011
-            #
-            file.sub(Dir.pwd + File::SEPARATOR, "")
-          end
+          result = JSON.parse(temp_file.read)
+          ignore = result["files"].select { |file|
+            file["offenses"].size > 0
+          }.map { |file|
+            {
+              file["path"] => file["offenses"].map { |o| o["cop_name"] }.uniq
+            }
+          }
 
           # Read the files with errors from the temp file.
-          yaml_format_errors = {"ignore" => files_with_errors}
+          yaml_format_errors = {"ignore" => ignore}
 
           # Regenerate the todo file.
           File.open(".standard_todo.yml", "w") do |file|

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.1.6")
+  VERSION = Gem::Version.new("1.1.7")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop