danger-dangermattic 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e85f01a1d938e27470bb45e542e181b976500f6ecd7753f02536e778af12b370
-  data.tar.gz: 79ec4d88e1bb27c40a72be9b19a70a2a3200aa2eb7a68a7433849550d31f11bf
+  metadata.gz: 71795650c10fd356f78fc2869d6b7bf2b00ccd7869e2d028f96d8544d08f36af
+  data.tar.gz: a977dc6bd64a8bc05c5c2ef5260ae38f72f89e4c982261676895ce1ce2bcc1ec
 SHA512:
-  metadata.gz: a681ba5b47937b6fe5ab6abd568954f8b5e26570e75385a9a3fa719ea6420c7bcd4dd216c90a9a431755270beec609183f161bd6a7ccf4f502af6d31793c1120
-  data.tar.gz: a3542e84de8347a75760d8501aeac783305e5ff3c665d1209a706100c889aeb0afa959f4b80e66d166fd9c4f881c373f24155333a0a6bf27817b84ecb6b1ceac
+  metadata.gz: 59c20e0c9156972b46ec07ce038805619fbd55f0772dd270820860ab221f4ef2f1e35fad58dd8f8e27e28d70e2b83eeff700983415a49b75337932b7f2923aa9
+  data.tar.gz: 432b33e4ad2e9ebc7ac7ad03476d4f07ded20456ea57ffb6554184d162d2acbfedcf0b703e50330de6629de33274b161e19c3d6006ae4cfad5dc0b6e47755d2e

data/.github/workflows/reusable-run-danger.yml

@@ -34,13 +34,13 @@ jobs:
       - name: "☢️ Danger PR Check"
         env:
           PR_URL: ${{ github.event.pull_request.html_url }}
-          RUNNING_ON_FORK: ${{ github.event.pull_request.head.repo.fork }}
+          READ_ONLY_MODE: ${{ github.event.pull_request.head.repo.fork || github.actor == 'dependabot[bot]' }}
           REMOVE_PREVIOUS_COMMENTS: ${{ inputs.remove-previous-comments }}
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.github-token }}
+          DANGER_GITHUB_API_TOKEN: ${{ secrets.github-token || secrets.GITHUB_TOKEN }}
         run: |
           echo "--- 🏃 Running Danger: PR Check"
 
-          if [ "$RUNNING_ON_FORK" = true ]; then
+          if [ "$READ_ONLY_MODE" = true ]; then
             danger_output=$(bundle exec danger pr "$PR_URL" --verbose)
 
             echo "$danger_output"

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ---
 
+## 1.0.2
+
+### Bug Fixes
+
+- Clean up and update dependencies. (#62)
+
+## 1.0.1
+
+### Bug Fixes
+
+- Fix `tracks_checker` plugin so that only additions / removals in a diff are considered in the check, therefore not including the context parts of the diff. (#58)
+
 ## 1.0.0
 
-After some time being developed and tested across a few repositories, this is our first stable release.
+- After some time being developed and tested across a few repositories, this is our first stable release.

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    danger-dangermattic (0.0.1)
+    danger-dangermattic (1.0.2)
       danger (~> 9.4)
-      danger-junit (~> 1.0)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.12)
-      danger-swiftlint (~> 0.35)
-      danger-xcode_summary (~> 1.0)
-      rubocop (~> 1.60)
+      rubocop (~> 1.61)
 
 GEM
   remote: https://rubygems.org/
@@ -39,21 +36,11 @@ GEM
       no_proxy_fix
       octokit (>= 4.0)
       terminal-table (>= 1, < 4)
-    danger-junit (1.0.2)
-      danger (> 2.0)
-      ox (~> 2.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
     danger-rubocop (0.12.0)
       danger
       rubocop (~> 1.0)
-    danger-swiftlint (0.35.0)
-      danger
-      rake (> 10)
-      thor (~> 1.0.0)
-    danger-xcode_summary (1.2.0)
-      danger-plugin-api (~> 1.0)
-      xcresult (~> 0.2)
     diff-lcs (1.5.1)
     faraday (2.9.0)
       faraday-net_http (>= 2.0, < 3.2)
@@ -86,7 +73,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.10)
@@ -104,7 +91,6 @@ GEM
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
-    ox (2.14.17)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
@@ -134,8 +120,8 @@ GEM
     rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.0)
-    rubocop (1.60.2)
+    rspec-support (3.13.1)
+    rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -146,15 +132,15 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.31.1)
+      parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.26.1)
+    rubocop-rspec (2.27.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -165,11 +151,10 @@ GEM
     shellany (0.0.1)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.0.1)
+    thor (1.3.1)
     unicode-display_width (2.5.0)
     uri (0.13.0)
-    xcresult (0.2.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   arm64-darwin-22

data/danger-dangermattic.gemspec

@@ -25,10 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'danger-plugin-api', '~> 1.0'
 
   # Danger plugins
-  spec.add_dependency 'danger-junit', '~> 1.0'
   spec.add_dependency 'danger-rubocop', '~> 0.12'
-  spec.add_dependency 'danger-swiftlint', '~> 0.35'
-  spec.add_dependency 'danger-xcode_summary', '~> 1.0'
 
   # General ruby development
   spec.add_development_dependency 'bundler', '~> 2.0'
@@ -38,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.4'
 
   # Linting code and docs
-  spec.add_dependency 'rubocop', '~> 1.60'
+  spec.add_dependency 'rubocop', '~> 1.61'
   spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'yard'

data/lib/dangermattic/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dangermattic
-  VERSION = '1.0.0'
+  VERSION = '1.0.2'
 end

data/lib/dangermattic/plugins/common/git_utils.rb

@@ -81,9 +81,11 @@ module Danger
     #
     # @param files [Array<String>] List of file names to check
     # @param line_matcher [Proc] A callable that takes a line and returns true if it matches the desired pattern
-    # @param change_type [Symbol, nil] Change type to filter lines (e.g., :added, :removed) or nil for no filter
+    # @param change_type [Symbol, Array<Symbol>, nil] Change type(s) to filter lines (e.g., `:added`, `:removed`,
+    #                    `:context`, `[:added, :removed]`, …), or nil for no filter
     # @return [Array<MatchedData>] Array of MatchedData objects representing matched lines in files
     def matching_lines_in_diff_files(files:, line_matcher:, change_type: nil)
+      change_types = Array(change_type).map(&:to_sym)
       matched_data = []
 
       files.each do |file|
@@ -92,7 +94,7 @@ module Danger
         diff = danger.git.diff_for_file(file)
 
         diff.patch.each_line do |line|
-          matched_lines << line if line_matcher.call(line) && (change_type.nil? || change_type(diff_line: line) == change_type)
+          matched_lines << line if line_matcher.call(line) && (change_type.nil? || change_types.include?(change_type(diff_line: line)))
         end
 
         matched_data << MatchedData.new(file, matched_lines) unless matched_lines.empty?

data/lib/dangermattic/plugins/tracks_checker.rb

@@ -63,7 +63,7 @@ module Danger
       matched_lines = git_utils.matching_lines_in_diff_files(
         files: git_utils.all_changed_files,
         line_matcher: ->(line) { tracks_usage_matchers.any? { |tracks_usage_match| line.match(tracks_usage_match) } },
-        change_type: nil
+        change_type: %i[added removed]
       )
 
       !matched_lines.empty?

data/spec/tracks_checker_spec.rb

@@ -68,7 +68,7 @@ module Danger
           it 'does nothing when there are no changes in Tracks-related files' do
             modified_files = ['MyClass.swift']
             allow(@plugin.git_utils).to receive(:all_changed_files).and_return(modified_files)
-            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: nil).and_return([])
+            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: %i[added removed]).and_return([])
 
             @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: nil)
 
@@ -83,12 +83,7 @@ module Danger
             modified_files = ['MyClass.kt']
             allow(@plugin.git_utils).to receive(:all_changed_files).and_return(modified_files)
 
-            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: nil) do |args|
-              analytics_call_in_diff = '-                AnalyticsTracker.track("myEvent1")'
-              expect(args[:line_matcher].call(analytics_call_in_diff)).to be true
-
-              [analytics_call_in_diff]
-            end
+            allow_diff_match(modified_files: modified_files, diff_line: '-      AnalyticsTracker.track("myEvent1")', expect_match: true)
 
             @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: tracks_label)
 
@@ -99,12 +94,7 @@ module Danger
             modified_files = ['MyClass.kt']
             allow(@plugin.git_utils).to receive(:all_changed_files).and_return(modified_files)
 
-            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: nil) do |args|
-              analytics_call_in_diff = '-                AnalyticsTracker.track("evento")'
-              expect(args[:line_matcher].call(analytics_call_in_diff)).to be true
-
-              [analytics_call_in_diff]
-            end
+            allow_diff_match(modified_files: modified_files, diff_line: '+      AnalyticsTracker.track("evento")', expect_match: true)
 
             @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: nil)
 
@@ -116,12 +106,7 @@ module Danger
             modified_files = ['MyClass.kt']
             allow(@plugin.git_utils).to receive(:all_changed_files).and_return(modified_files)
 
-            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: nil) do |args|
-              analytics_call_in_diff = '-                AnalyticsTracker.track("myEvent1")'
-              expect(args[:line_matcher].call(analytics_call_in_diff)).to be true
-
-              [analytics_call_in_diff]
-            end
+            allow_diff_match(modified_files: modified_files, diff_line: '-      AnalyticsTracker.track("evento")', expect_match: true)
 
             tracks_label = 'TRACKS PR'
             @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: tracks_label)
@@ -133,12 +118,34 @@ module Danger
             modified_files = ['MyClass.kt']
             allow(@plugin.git_utils).to receive(:all_changed_files).and_return(modified_files)
 
-            allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: nil) do |args|
-              analytics_call_in_diff = '+                AnalyticsHelper.log("event_1")'
-              expect(args[:line_matcher].call(analytics_call_in_diff)).to be false
+            allow_diff_match(modified_files: modified_files, diff_line: '-      AnalyticsHelper.log("event_1")', expect_match: false)
+
+            @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: nil)
+
+            expect(@dangerfile).to not_report
+          end
+
+          it 'does nothing when there are matching changes but in the context parts of the diff' do
+            modified_file = 'MyClass.kt'
+            allow(@plugin.git_utils).to receive(:all_changed_files).and_return([modified_file])
+
+            tracks_diff = <<~STRINGS
+              diff --git a/MyClass.kt b/MyClass.kt
+              index 5794d472..772e2b99 100644
+              - a/MyClass
+              + b/MyClass
+              @@ -1,3 +1,6 @@
+                AnalyticsTracker.track("myMagicEvent1")
+                // call magic
+              +  AnalyticsHelper.log("event_1")
+              +  AnalyticsHelper.log("event_2")
+              +  AnotherUtil.callMagic()
+                AnalyticsTracker.track("myMagicEvent2")
+            STRINGS
 
-              []
-            end
+            diff = GitDiffStruct.new('modified', modified_file, tracks_diff)
+
+            allow(@plugin.git).to receive(:diff_for_file).with(modified_file).and_return(diff)
 
             @plugin.check_tracks_changes(tracks_files: track_files, tracks_usage_matchers: tracks_matchers, tracks_label: nil)
 
@@ -147,6 +154,17 @@ module Danger
         end
       end
 
+      def allow_diff_match(modified_files:, diff_line:, expect_match:)
+        allow(@plugin.git_utils).to receive(:matching_lines_in_diff_files).with(files: modified_files, line_matcher: kind_of(Proc), change_type: %i[added removed]) do |args|
+          expect(args[:line_matcher].call(diff_line)).to be expect_match
+
+          result = []
+          result.append(diff_line) if expect_match
+
+          result
+        end
+      end
+
       def expect_label_checks(tracks_label)
         expect(@dangerfile.status_report[:messages]).to eq [TracksChecker::TRACKS_PR_INSTRUCTIONS + format(TracksChecker::TRACKS_NO_LABEL_INSTRUCTION_FORMAT, tracks_label)]
         expect(@dangerfile.status_report[:errors]).to eq [format(TracksChecker::TRACKS_NO_LABEL_MESSAGE_FORMAT, tracks_label)]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-dangermattic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: danger-junit
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: danger-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
-- !ruby/object:Gem::Dependency
-  name: danger-swiftlint
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.35'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.35'
-- !ruby/object:Gem::Dependency
-  name: danger-xcode_summary
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.60'
+        version: '1.61'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.60'
+        version: '1.61'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement