danger-todoist 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d941d9cf8a4d93953bd2fdd630461f6c40c6b900
-  data.tar.gz: f2b5c54ec7d8f496f72305e5d1aed1e12ff82b5e
+  metadata.gz: e5a33fddd5d6ffb7debff88c5442cebbde6b43c8
+  data.tar.gz: 9656c5631440b96e047f2ee8a6cb849a58994601
 SHA512:
-  metadata.gz: c48ca6ecb0f9cb8953314f1f8e80c2ba62b9e340ab7c513286849e26a17359b40e62eb681405f5b07bc9250450c8464fa5bc5f34746d5572571cc31270d31dc9
-  data.tar.gz: a93783d880b1e71d429e324490bed8b6e4fa1752ac9368a2fb9100c6ed0a3be3f137037999836fb00378382b64d662df05410ef9724ba0baa23f2bf7474282b7
+  metadata.gz: 7f773004d5e5af4b71485a829bfdfd61302b1cbcb874e4c1773f2dfe139b2d3fbba6138c5c2065c7b7a28613ea925fcb8b0bbf079c07b6f6b355b6b5d575e076
+  data.tar.gz: 4818dfaeb0f66de2bbaefded44b78ea26703ae090981c344fe5ccc95bce002582f7dc81e7ffcfcec52a1fa17b137e0733dd3090451627fc6fa317b0797dea1e3

data/.travis.yml

@@ -5,8 +5,13 @@ cache:
 
 rvm:
   - 2.0
-  - 2.1.3
-  - 2.3.1
+  - 2.1.10
+  - 2.3.3
+  - 2.4.0
+
+before_install:
+  - gem update --system
+  - gem install bundler
 
 before_script:
   - bundle exec danger

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 1.2.3
+
+* Update rubies to run in CI - hanneskaeufler
+* support multiline todo text - hanneskaeufler
+
 ## 1.2.2
 
 rescue from exception in git gem - hanneskaeufler

data/danger-todoist.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "danger-plugin-api", "~> 1.0"
 
@@ -27,7 +28,7 @@ Gem::Specification.new do |spec|
   # Testing support
   spec.add_development_dependency "rspec", "~> 3.4"
   spec.add_development_dependency "simplecov", "~> 0.12"
-  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0"
 
   # Linting code and docs
   spec.add_development_dependency "rubocop", "~> 0.41"

data/lib/todoist/diff_todo_finder.rb

@@ -13,7 +13,7 @@ module Danger
         next if matches.empty?
 
         matches.each do |match|
-          todos << Danger::Todo.new(diff.path, match.first.strip)
+          todos << Danger::Todo.new(diff.path, clean_todo_text(match))
         end
       end
       todos
@@ -21,17 +21,26 @@ module Danger
 
     private
 
+    def clean_todo_text(match)
+      comment_indicator, _, entire_todo = match
+      entire_todo.gsub(comment_indicator, "")
+                 .delete("\n")
+                 .strip
+    end
+
+    # this is quite a mess now ... I knew it would haunt me.
+    # to aid debugging, this online regexr can be
+    # used: http://rubular.com/r/DPkoE2ztpn
+    # the regexp uses backreferences to match the comment indicator multiple
+    # times if possible
     def todo_regexp
       /
-      ^\+                 # 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
-      (#{@keywords.join("|")})       # our todo indicator
-      [\s:]{1}            # followed by a space or colon
-      (?<text>.*)$        # matching any text until the end of the line
-    /ix
+      (?<comment_indicator>^\+\s*[^a-z0-9\+\s]+)
+      (\n\+)?\s+
+      (?<todo_indicator>#{@keywords.join("|")})[\s:]{1}
+      (?<entire_text>(?<text>[^\n]*)
+      (?<rest>\n\k<comment_indicator>\s*[\w .]*)*)
+      /ixm
     end
   end
 end

data/lib/todoist/gem_version.rb

@@ -1,3 +1,3 @@
 module Todoist
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.3".freeze
 end

data/spec/diff_todo_finder_spec.rb

@@ -1,5 +1,6 @@
 require File.expand_path("../spec_helper", __FILE__)
 
+# rubocop:disable Metrics/ModuleLength
 module Danger
   # rubocop:disable Metrics/BlockLength
   describe Danger::DiffTodoFinder do
@@ -94,9 +95,7 @@ module Danger
 + # FIXME: with you the force is
 PATCH
 
-        diff = sample_diff(patch)
-
-        todos = subject.find_diffs_containing_todos([diff])
+        todos = subject.find_diffs_containing_todos([sample_diff(patch)])
 
         expect(todos.map(&:text))
           .to eql(["practice you must", "with you the force is"])
@@ -113,12 +112,28 @@ PATCH
 +  */
 PATCH
 
-        diff = sample_diff(patch)
-
-        todos = subject.find_diffs_containing_todos([diff])
+        todos = subject.find_diffs_containing_todos([sample_diff(patch)])
 
         expect(todos.map(&:text)).to eql(%w(something another))
       end
+
+      it "can extract multiline todo text" do
+        patch = <<PATCH
++ /**
++  * TODO: this should be parsed as
++  * a single item.
++  */
++ # TODO: this is a
++ # multiline comment as well
++ function bla() {};
+PATCH
+
+        todos = subject.find_diffs_containing_todos([sample_diff(patch)])
+
+        expect(todos.map(&:text))
+          .to eql(["this should be parsed as a single item.",
+                   "this is a multiline comment as well"])
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-todoist
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Hannes Käufler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-05 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="