danger-todoist 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40d67599877e38f3a1c049466dc30319a51e2c6cf4af6510382b145049acfc4f
-  data.tar.gz: 6c8e7ea8d40784801b56a9b96161f928088b9cc781febe75eb6205e91ca8ce99
+  metadata.gz: 4afb3ce622171a380007204479eedb0aefca4df4ef76b5ea8fb06d9892499db1
+  data.tar.gz: 32524a2b719ab4facc971623599f39213139a6dbd448ec1825b35097c67e640c
 SHA512:
-  metadata.gz: b5827657a3f8eae8810f81975d49a1a43e3531c9ffd3cab0125f3f48ed0373c8d68be8909d2b2907ce5d392cb58b1b2a8e0b34de66d6c7809d5e6fd8e1e21e37
-  data.tar.gz: 21888fa0872b48b3724db99131d678fb73adfefc8af69e51ba76482e5c60ded667c6aa439ef160ad4482e21e62daf32d41c8dd098e4b5f1577406540bfe07183
+  metadata.gz: 76900a481490c824961e518c5186035cf76508fed553145cfc999b20b6c9c9c061cbb35fea6859d67ff50c4b359b9f167ba4d494bf5c3769c1cec39bcc0d925f
+  data.tar.gz: aedc837ec910921a8cfd963539e340eeb8da2ee4b1bed364402c4077d9843118818655cf19b7a7dcc01d13e0a71b0929766f3172e726400808b0713a08a379cf

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## 2.0.1
+
+* fix bug where existing todos in a patch were identified - allewun
+
 ## 2.0.0
 
 * Drop rubies below 2.3.8 from support and require bundler 2 - hanneskaeufler

data/lib/todoist/diff_todo_finder.rb

@@ -5,13 +5,26 @@ module Danger
       @regexp = todo_regexp(keywords)
     end
 
+    # rubocop:disable Metrics/MethodLength
     def call(diffs)
       diffs
-        .map { |diff| MatchesInDiff.new(diff, diff.patch.scan(@regexp)) }
+        .map do |diff|
+          # Should only look for matches *within* the changed lines of a patch
+          # (lines that begin with "+"), not the entire patch.
+          # The current regexp doesn't enforce this correctly in some cases.
+          patch = MatchesInDiff::Patch.new(diff.patch)
+          matches = patch.changed_lines
+                         .map(&:content)
+                         .join
+                         .scan(@regexp)
+
+          MatchesInDiff.new(diff, matches)
+        end
         .select(&:todo_matches?)
         .map(&:all_todos)
         .flatten
     end
+    # rubocop:enable Metrics/MethodLength
 
     private
 

data/lib/todoist/gem_version.rb

@@ -1,3 +1,3 @@
 module Todoist
-  VERSION = "2.0.0".freeze
+  VERSION = "2.0.1".freeze
 end

data/spec/diff_todo_finder_spec.rb

@@ -140,6 +140,12 @@ PATCH
                    "I'd rather not have this here ... because it's probably "\
                    "just a bit of code that we can reimplement or steal"])
       end
+
+      it "ignores pre-existing todos found in the context lines of a patch" do
+        diff = sample_diff_fixture("preexisting_todo.diff")
+        todos = subject.call([diff])
+        expect(todos).to be_empty
+      end
     end
   end
   # rubocop:enable Metrics/BlockLength

data/spec/fixtures/preexisting_todo.diff

@@ -0,0 +1,16 @@
+diff --git a/lib/todoist/diff_todo_finder.rb b/lib/todoist/diff_todo_finder.rb
+index b58809b..1ecc4f0 100644
+--- a/lib/todoist/diff_todo_finder.rb
++++ b/lib/todoist/diff_todo_finder.rb
+@@ -54,9 +53,11 @@ def all_todos
+ 
+     def line_number(match)
+       _, todo_indicator = match
+       GitDiffParser::Patch.new(diff.patch).changed_lines.each do |line|
+         return line.number if line.content =~ /#{todo_indicator}/
+       end
++      # introducing a change with a newline right above a pre-existing TODO
++
+       # TODO: thats not gonna fly
+       -1
+     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-todoist
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Hannes Käufler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -207,6 +207,7 @@ files:
 - spec/diff_inline_todo_finder_spec.rb
 - spec/diff_todo_finder_spec.rb
 - spec/fixtures/multiline_todo_patch.diff
+- spec/fixtures/preexisting_todo.diff
 - spec/fixtures/sample_patch.diff
 - spec/matches_in_diff_spec.rb
 - spec/spec_helper.rb
@@ -230,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Marking something with a todo is very common during implementing a new feature.
@@ -239,6 +240,7 @@ test_files:
 - spec/diff_inline_todo_finder_spec.rb
 - spec/diff_todo_finder_spec.rb
 - spec/fixtures/multiline_todo_patch.diff
+- spec/fixtures/preexisting_todo.diff
 - spec/fixtures/sample_patch.diff
 - spec/matches_in_diff_spec.rb
 - spec/spec_helper.rb