danger-l10nlint 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9142a128b36dbe7407575b67434effc13be1068cb61b2c84844ccba1b14cc0e0
-  data.tar.gz: 0d81b32a7419607b41b6e3047727245d317d565104049d5f9e6cf3945f2125eb
+  metadata.gz: 972c6ce86946856a582a1dd5c2bc907dcaf4f177b58ed8542641866067d5fabb
+  data.tar.gz: 90ea8057794672accdc8a6f3c8e940757e03b0021ac1b84464d17c4cf0ccbae2
 SHA512:
-  metadata.gz: eb80eb32cd908e39be175b88e9d58017809dbe720bf5c514cdc7ebecd00f25f894b1e40ad5590c8257748af90225b23da4c8e8002d459fe005114887cc2b4228
-  data.tar.gz: b5462b11890746f4a5217ce015a88ce75da89267964eab27d00c7ab4c3293384f2fef70ddacbfad255394692f6d735ec056fb05658d279bb49b9fb6307a45023
+  metadata.gz: 232564cbe6508cc0328235dfd3cb6802f6d9c65d32b8663c729f8ae4d0a3e6ad83267c9ecd345e1edde7c42948b7654dc16a9911c4a81f266999bd1ddca7d380
+  data.tar.gz: 71e1ea789467ea10f88a8979d9d990fcd4485ca109fb6c251b7a9041cd16ec531b0ca9d357f2fb7f501509fd4f95d1b71bdc310360af28c97798d4f4a4a8728a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-l10nlint (0.0.7)
+    danger-l10nlint (0.0.9)
       danger-plugin-api (~> 1.0)
 
 GEM
@@ -43,7 +43,7 @@ GEM
     faraday-net_http (3.0.2)
     ffi (1.15.5)
     formatador (1.1.0)
-    git (1.13.2)
+    git (1.18.0)
       addressable (~> 2.8)
       rchardet (~> 1.8)
     guard (2.18.0)

data/lib/danger_plugin.rb

@@ -23,29 +23,41 @@ module Danger
   #
   class DangerL10nlint < Plugin
     # The path to L10nLint's execution
+    # @return [String] binary_path
     attr_accessor :binary_path
 
     # The path to L10nLint's configuration file
+    # @return [String] config_file
     attr_accessor :config_file
 
     # Maximum number of issues to be reported.
+    # @return [Integer] max_num_violations
     attr_accessor :max_num_violations
 
     # Provides additional logging diagnostic information.
+    # @return [Boolean] verbose
     attr_accessor :verbose
 
     # Whether we should fail on warnings
+    # @return [Boolean] strict
     attr_accessor :strict
 
     # Warnings found
+    # @return [Array<Hash>] warnings
     attr_accessor :warnings
 
     # Errors found
+    # @return [Array<Hash>] errors
     attr_accessor :errors
 
     # All issues found
+    # @return [Array<Hash>] issues
     attr_accessor :issues
 
+    # Rules for not wanting to make inline comments
+    # @return [Array<String>] rule identifiers
+    attr_accessor :inline_except_rules
+
     # Lints Localizable.strings
     # @return [void]
     #
@@ -76,17 +88,35 @@ module Danger
         other_issues_count = issues.count - @max_num_violations if issues.count > @max_num_violations
         issues = issues.take(@max_num_violations)
       end
-      log "Received from L10nLint: #{issues}"
+
+      log "Received issues from L10nLint: #{issues.count}"
 
       # Filter warnings and errors
       @warnings = issues.select { |issue| issue['severity'] == 'warning' }
       @errors = issues.select { |issue| issue['severity'] == 'error' }
 
       if inline_mode
+        # Separate each warnings and errors by inline_except_rules
+        if inline_except_rules
+          markdown_warnings = warnings.select { |issue| inline_except_rules.include?(issue['ruleIdentifier']) }
+          inline_warnings = warnings - markdown_warnings
+          markdown_errors = @errors.select { |issue| inline_except_rules.include?(issue['ruleIdentifier']) }
+          inline_errors = @errors - markdown_errors
+        end
+
         # Report with inline comment
-        send_inline_comment(warnings, strict ? :fail : :warn)
-        send_inline_comment(errors, (fail_on_error || strict) ? :fail : :warn)
+        send_inline_comment(inline_warnings, strict ? :fail : :warn)
+        send_inline_comment(inline_errors, (fail_on_error || strict) ? :fail : :warn)
+
+        if markdown_warnings.count > 0 || markdown_errors.count > 0
+          message = "### L10nLint found issues\n\n".dup
+          message << markdown_issues(markdown_warnings, 'Warnings') unless markdown_warnings.empty?
+          message << markdown_issues(markdown_errors, 'Errors') unless markdown_errors.empty?
+          markdown message
+        end
+
         warn other_issues_message(other_issues_count) if other_issues_count > 0
+
       elsif warnings.count > 0 || errors.count > 0
         # Report if any warning or error
         message = "### L10nLint found issues\n\n".dup
@@ -138,8 +168,6 @@ module Danger
       message << "| --- | ----- | ----- |\n"
 
       results.each do |r|
-        puts r
-
         filename = r['location']['file'].split('/').last(2).join("/")
         line = r['location']['line']
         reason = r['reason']
@@ -166,7 +194,7 @@ module Danger
         message << "`#{r['ruleIdentifier']}`"
         message << " `#{filename}:#{r['location']['line']}`" # file:line for pasting into Xcode Quick Open
 
-        send(method, message, file: github_filename, line: r['line'])
+        send(method, message, file: github_filename, line: r['location']['line'])
       end
     end
 

data/lib/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module DangerL10nLint
-  VERSION = '0.0.7'
-  L10NLINT_VERSION = '0.0.5'
+  VERSION = '0.0.9'
+  L10NLINT_VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-l10nlint
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Kazumasa Shimomura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-07 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-plugin-api