danger-regexp 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212c7bce2b6f3ed6630e2ffa5e6f11ef22483ded3844bb8fba123a908b04123d
-  data.tar.gz: 84c84c27b3000c23ae19dffca994c40d1970441cbdf6ea30c91d53620175bec2
+  metadata.gz: 28c69a790103ef6f30a1ca82b3a3f936cf5ac67a85aa46440ccbccf11e203eef
+  data.tar.gz: 8580783631028c35c43b30046e75524f5badf1e50302c8d480cd68b77a6c4287
 SHA512:
-  metadata.gz: d212cee9266266aebbe765cee47d26d2797a7c474729216312f423b58dc68501f1d9cb9cca7add810007bebba04af53b3092238852dc89a3d631148f43f9119d
-  data.tar.gz: e00ebb1859d89c41dbbf9e1b3e13cef934b31014cf0b88e199a3bfbe57eefb772fd9c7139afb1e8eab7d6f371bf6a5bfcebaafe4870d71dbbadf115f91665613
+  metadata.gz: b84e8f189db4bb9ada2a25a83db16d20326676762a6f5fd10681fab1bc9ee7c564c0bd428ad73a5a1c85ed91f63f678baa9705d196a6c8a97952dbf9f927833f
+  data.tar.gz: b0e7485459e079091c94ec3454dfbc654aa301cf5ddf651d2d79b2b6487dd812f8a77476021ad169a2239f8e0449e0665311292384a77f20980d7100839f8279

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 1.1.0
+
+- Post only first comment
+- Add file option
+
 ## 1.0.1
 
 - Escape regexp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-regexp (1.0.1)
+    danger-regexp (1.1.0)
       danger
       git_diff_parser (~> 3.1)
 
@@ -20,7 +20,7 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.3.1)
+    danger (8.4.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -34,7 +34,7 @@ GEM
       octokit (~> 4.7)
       terminal-table (>= 1, < 4)
     diff-lcs (1.4.4)
-    faraday (1.5.1)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -42,6 +42,7 @@ GEM
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -53,6 +54,7 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     git (1.9.1)
       rchardet (~> 1.8)
     git_diff_parser (3.2.0)
@@ -95,9 +97,9 @@ GEM
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
-    terminal-table (3.0.1)
+    terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ```ruby
 regexp.lint to
-  match(/hello world/, <<~MESSAGE)
+  match(/hello world/, <<~MESSAGE, file: /README\.md/)
     Don't use hello world, just use hello instead.
   MESSAGE
 end

data/devfile.yaml

@@ -0,0 +1,18 @@
+apiVersion: 1.0.0
+metadata:
+  generateName: danger-
+projects:
+  - name: danger-regexp
+    source:
+      location: "https://github.com/mtsmfm/danger-regexp.git"
+      type: github
+components:
+  - id: esbenp/prettier-vscode/latest
+    type: chePlugin
+  - mountSources: true
+    memoryLimit: 4Gi
+    type: dockerimage
+    alias: ruby
+    image: "ghcr.io/mtsmfm/devfiles/ruby:3.0"
+  - id: redhat/vscode-yaml/latest
+    type: chePlugin

data/lib/danger/regexp/version.rb

@@ -1,5 +1,5 @@
 module Danger
   module Regexp
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/lib/danger_plugin.rb

@@ -2,40 +2,41 @@ require 'git_diff_parser'
 
 module Danger
   class DangerRegexp < Plugin
-    MAX_COMMENT_COUNT = 5
+    MAX_COMMENT_COUNT = 1
 
     ChangedLine = Struct.new(:file, :number, :content, keyword_init: true)
+    MatchArgs = Struct.new(:regexps, :message, :file, keyword_init: true)
 
     def lint(&block)
-      @map = {}
+      @data = []
 
       instance_eval(&block)
 
-      @map.each do |regexp, message|
+      @data.each do |match_args|
         count = 0
 
-        target_lines = changed_lines.select do |line|
-          line.content.match?(regexp)
-        end
+        match_args.regexps.each do |regexp|
+          target_lines = changed_lines.select do |line|
+            (match_args.file ? line.file.match?(match_args.file) : true) && line.content.match?(regexp)
+          end
 
-        target_lines.first(MAX_COMMENT_COUNT).each do |line|
-          markdown(message, file: line.file, line: line.number)
-        end
+          target_lines.first(MAX_COMMENT_COUNT).each do |line|
+            markdown(match_args.message, file: line.file, line: line.number)
+          end
 
-        if target_lines.size > MAX_COMMENT_COUNT
-          warn <<~MSG
-            Regexp `#{regexp.inspect}` matched too many lines (#{target_lines.size} lines). Only first #{MAX_COMMENT_COUNT} comments are posted.
-          MSG
+          if target_lines.size > MAX_COMMENT_COUNT
+            warn <<~MSG
+              Regexp `#{regexp.inspect}` matched too many lines (#{target_lines.size} lines). Only first comment is posted.
+            MSG
+          end
         end
       end
     end
 
     private
 
-    def match(*regexps, message)
-      regexps.each do |regexp|
-        @map[regexp] = message
-      end
+    def match(*regexps, message, file: nil)
+      @data << MatchArgs.new(regexps: regexps, message: message, file: file)
     end
 
     def changed_lines

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-regexp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Fumiaki MATSUSHIMA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2021-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git_diff_parser
@@ -82,7 +82,6 @@ files:
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -93,6 +92,7 @@ files:
 - bin/console
 - bin/setup
 - danger-regexp.gemspec
+- devfile.yaml
 - lib/danger/regexp.rb
 - lib/danger/regexp/version.rb
 - lib/danger_plugin.rb

data/.travis.yml

@@ -1,7 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.3