lib/dangermattic/plugins/manifest_pr_checker.rb in danger-dangermattic-1.1.2 vs lib/dangermattic/plugins/manifest_pr_checker.rb in danger-dangermattic-1.2.0

@@ -27,10 +27,11 @@
   # @see Automattic/dangermattic
   # @tags ios, android
   #
   class ManifestPRChecker < Plugin
     MESSAGE = '`%s` was changed without updating its corresponding `%s`. %s.'
+    SWIFT_INSTRUCTION = 'Please resolve the Swift packages as appropriate to your project setup (e.g. in Xcode or by running `swift package resolve`)'
 
     # Performs all the checks, asserting that changes on `Gemfile`, `Podfile` and `Package.swift` must have corresponding
     # lock file changes.
     #
     # @param report_type [Symbol] (optional) The type of report for the message. Types: :error, :warning (default), :message.
@@ -44,11 +45,10 @@
 
     # Check if the `Gemfile` file was modified without a corresponding `Gemfile.lock` update
     #
     # @param report_type [Symbol] (optional) The type of report for the message. Types: :error, :warning (default), :message.
     #
-    #
     # @return [void]
     def check_gemfile_lock_updated(report_type: :warning)
       check_manifest_lock_updated(
         file_name: 'Gemfile',
         lock_file_name: 'Gemfile.lock',
@@ -59,11 +59,10 @@
 
     # Check if the `Podfile` file was modified without a corresponding `Podfile.lock` update
     #
     # @param report_type [Symbol] (optional) The type of report for the message. Types: :error, :warning (default), :message.
     #
-    #
     # @return [void]
     def check_podfile_lock_updated(report_type: :warning)
       check_manifest_lock_updated(
         file_name: 'Podfile',
         lock_file_name: 'Podfile.lock',
@@ -74,33 +73,58 @@
 
     # Check if the `Package.swift` file was modified without a corresponding `Package.resolved` update
     #
     # @param report_type [Symbol] (optional) The type of report for the message. Types: :error, :warning (default), :message.
     #
-    #
     # @return [void]
     def check_swift_package_resolved_updated(report_type: :warning)
       check_manifest_lock_updated(
         file_name: 'Package.swift',
         lock_file_name: 'Package.resolved',
-        instruction: 'Please resolve the Swift packages in Xcode',
+        instruction: SWIFT_INSTRUCTION,
         report_type: report_type
       )
     end
 
+    # Check if the `Package.swift` file was modified without a corresponding `Package.resolved` update,
+    # checking for exact path matches
+    #
+    # @param report_type [Symbol] (optional) The type of report for the message. Types: :error, :warning (default), :message.
+    #
+    # @return [void]
+    def check_swift_package_resolved_updated_strict(manifest_path:, manifest_lock_path:, report_type: :warning)
+      check_manifest_lock_updated_strict(
+        manifest_path: manifest_path,
+        manifest_lock_path: manifest_lock_path,
+        instruction: SWIFT_INSTRUCTION,
+        report_type: report_type
+      )
+    end
+
     private
 
     def check_manifest_lock_updated(file_name:, lock_file_name:, instruction:, report_type: :warning)
       # Find all the modified manifest files
-      manifest_modified_files = git.modified_files.select { |f| File.basename(f) == file_name }
+      manifest_modified_files = git_utils.all_changed_files.select { |f| File.basename(f) == file_name }
 
       # For each manifest file, check if the corresponding lockfile (in the same dir) was also modified
       manifest_modified_files.each do |manifest_file|
-        lockfile_modified = git.modified_files.any? { |f| File.dirname(f) == File.dirname(manifest_file) && File.basename(f) == lock_file_name }
+        lockfile_modified = git_utils.all_changed_files.any? { |f| File.dirname(f) == File.dirname(manifest_file) && File.basename(f) == lock_file_name }
         next if lockfile_modified
 
         message = format(MESSAGE, manifest_file, lock_file_name, instruction)
         reporter.report(message: message, type: report_type)
       end
+    end
+
+    def check_manifest_lock_updated_strict(manifest_path:, manifest_lock_path:, instruction:, report_type: :warning)
+      manifest_modified = git_utils.all_changed_files.include?(manifest_path)
+      return unless manifest_modified
+
+      lockfile_modified = git_utils.all_changed_files.include?(manifest_lock_path)
+      return if lockfile_modified
+
+      message = format(MESSAGE, manifest_path, File.basename(manifest_lock_path), instruction)
+      reporter.report(message: message, type: report_type)
     end
   end
 end