danger-todoist 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e9980c94b66c3424c2c4229d33003af8ac52e4
-  data.tar.gz: 59d1fb67dfdfdcf71d4fd6dafdc3650f09e8e686
+  metadata.gz: 6a9300d0182df857bcceb2f773095c36924e04dc
+  data.tar.gz: 89cb101a4effda323f9fa5e8937ee1d8c4809a4e
 SHA512:
-  metadata.gz: 3fc3677d54b4ea66ea5b34a3d07fe0dd619ec6883279a6db30b06a5f3b6aec96000fae6d3109e477184e418c789f4967923015ab16e3064f3c2d3fd600ce00c0
-  data.tar.gz: 17317745f04f1c8afc2747d2f2c671e6a5ce86d9614d973daba9a755bdd77d0f0d566dd8fddfb0123f99ee8625f8e872ad4c1cb7b7eb84315836771163d9b659
+  metadata.gz: 1135e1b4d7a58c5a49c8d071719f7a088a63c49bcd8da113558799e2af3b860e8fd97bc6504307076cef47f7c24ff6a97fdb61afc8ece63a44bde34de0559ebd
+  data.tar.gz: 558aac3afe414446e3730bdeb8229793b88612c1f2cc073f4ec8c7e0b34d68bf7b61891a2bc5aa7593258ef3859a45ebd1425c1b1003677ed83a86a59bf1a0c8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## master
 
+## 1.1.0
+
+* add support for multiline comments - hanneskaeufler
+
 ## 1.0.1
 
 * fix bug where `+ TODO` would be identified as todo - hanneskaeufler

data/Dangerfile

@@ -4,6 +4,11 @@ warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
 # Warn when there is a big PR
 warn("Big PR") if git.lines_of_code > 500
 
+# Reminder to add changelog entry
+unless git.modified_files.include?("CHANGELOG.md")
+  fail("Please include a CHANGELOG entry.", sticky: false)
+end
+
 # Identify leftover todos
 todoist.message = "There are still some things to do in this PR."
 todoist.warn_for_todos

data/lib/todoist/diff_todo_finder.rb

@@ -5,6 +5,7 @@ module Danger
       ^\+                 # we only look at additions, marked by + in diffs
       \s*                 # followed by optional space
       [^a-z0-9\+\s]+      # anything looking like a comment indicator
+      (\n\+)?             # allow multiline comment markers
       \s+                 # followed by at least one space
       (TODO|FIXME)        # our todo indicator
       [\s:]{1}            # followed by a space or colon

data/lib/todoist/gem_version.rb

@@ -1,3 +1,3 @@
 module Todoist
-  VERSION = "1.0.1".freeze
+  VERSION = "1.1.0".freeze
 end

data/spec/diff_todo_finder_spec.rb

@@ -7,15 +7,9 @@ module Danger
     describe "#find_diffs_containing_todos" do
       %w(TODO TODO: todo todo: FIXME fixme FIXME: fixme).each do |marker|
         it "identifies a new '#{marker}' as a todo" do
-          diffs = [
-            Git::Diff::DiffFile.new(
-              "base",
-              path:  "some/file.rb",
-              patch: "+ # #{marker} some todo"
-            )
-          ]
+          diff = sample_diff("+ # #{marker} some todo")
 
-          todos = subject.find_diffs_containing_todos(diffs)
+          todos = subject.find_diffs_containing_todos([diff])
 
           expect(todos).to_not be_empty
         end
@@ -24,30 +18,18 @@ module Danger
       # those comment indicators are ripped off https://github.com/pgilad/leasot
       %w(# {{ -- // /* <!-- <%# % / -# {{! {{!-- {# <%--).each do |comment|
         it "identifies todos in languages with '#{comment}' as comments" do
-          diffs = [
-            Git::Diff::DiffFile.new(
-              "base",
-              path:  "some/file.rb",
-              patch: "+ #{comment} TODO: some todo"
-            )
-          ]
+          diff = sample_diff("+ #{comment} TODO: some todo")
 
-          todos = subject.find_diffs_containing_todos(diffs)
+          todos = subject.find_diffs_containing_todos([diff])
 
           expect(todos).to_not be_empty
         end
       end
 
       it "does not identify removed todos as a todo" do
-        diffs = [
-          Git::Diff::DiffFile.new(
-            "base",
-            path:  "some/file.rb",
-            patch: "- TODO: some todo"
-          )
-        ]
+        diff = sample_diff("- TODO: some todo")
 
-        todos = subject.find_diffs_containing_todos(diffs)
+        todos = subject.find_diffs_containing_todos([diff])
 
         expect(todos).to be_empty
       end
@@ -66,30 +48,18 @@ module Danger
         "+   TODO: something"
       ].each do |patch|
         it "does not identify occurences in '#{patch}'" do
-          diffs = [
-            Git::Diff::DiffFile.new(
-              "base",
-              path:  "some/file.rb",
-              patch: patch
-            )
-          ]
+          diff = sample_diff("some/file.rb")
 
-          todos = subject.find_diffs_containing_todos(diffs)
+          todos = subject.find_diffs_containing_todos([diff])
 
           expect(todos).to be_empty
         end
       end
 
       it "identifies the todo text as well" do
-        diffs = [
-          Git::Diff::DiffFile.new(
-            "base",
-            path:  "some/file.rb",
-            patch: "+ # TODO: practice you must"
-          )
-        ]
+        diff = sample_diff("+ # TODO: practice you must")
 
-        todos = subject.find_diffs_containing_todos(diffs)
+        todos = subject.find_diffs_containing_todos([diff])
 
         expect(todos.first.text).to eql("practice you must")
       end
@@ -103,15 +73,9 @@ module Danger
 + # FIXME: with you the force is
 PATCH
 
-        diffs = [
-          Git::Diff::DiffFile.new(
-            "base",
-            path:  "some/file.rb",
-            patch: patch
-          )
-        ]
+        diff = sample_diff(patch)
 
-        todos = subject.find_diffs_containing_todos(diffs)
+        todos = subject.find_diffs_containing_todos([diff])
 
         expect(todos.map(&:text))
           .to eql(["practice you must", "with you the force is"])
@@ -122,19 +86,17 @@ PATCH
 + /*
 +  TODO: something
 + */
++ function bla() {};
++ /**
++  * TODO: another
++  */
 PATCH
 
-        diffs = [
-          Git::Diff::DiffFile.new(
-            "base",
-            path:  "some/file.rb",
-            patch: patch
-          )
-        ]
+        diff = sample_diff(patch)
 
-        todos = subject.find_diffs_containing_todos(diffs)
+        todos = subject.find_diffs_containing_todos([diff])
 
-        expect(todos.map(&:text)).to eql(["something"])
+        expect(todos.map(&:text)).to eql(%w(something another))
       end
     end
   end

data/spec/spec_helper.rb

@@ -54,7 +54,7 @@ end
 
 # A stubbed out Dangerfile for use in tests
 def testing_dangerfile
-  env = Danger::EnvironmentManager.new(testing_env)
+  env = Danger::EnvironmentManager.new(testing_env, testing_ui)
   Danger::Dangerfile.new(env, testing_ui)
 end
 
@@ -69,3 +69,11 @@ end
 def markdowns
   @dangerfile.status_report[:markdowns].map(&:message)
 end
+
+def sample_diff(patch)
+  Git::Diff::DiffFile.new(
+    "base",
+    path:  "some/file.rb",
+    patch: patch
+  )
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-todoist
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Hannes Käufler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api