danger-spm_version_updates 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61b370bdf3ace482bdb37078ee355f35ee039c4ba8cf713d9d1d4f205f27fdcc
-  data.tar.gz: dd50d0ce76d7c4f3978c5c3a2a1a9b3fdb72174846a9da9e900f82a072f3fa6b
+  metadata.gz: 25b82d43a6e19f0dcc05f3b6fdb697dec94ae732b5c43c00da69f6adb4a03f5a
+  data.tar.gz: f4ff132e689b413207c75788550ab58a198aa9a9c7604b541b2ecfc3f415defe
 SHA512:
-  metadata.gz: 3363cb64593cbc9d94c154fc85383c3ec336cd776c97ed2e32175fd2861e60e586832d056eaaed4bc7be50aa396bf434362801b8fa7f9041ffbaa72a6f487e94
-  data.tar.gz: a57ff261b848a382f0677b963c5cd712c01729a6cfb54b8976f3cb0e765d49fb9cfb20a25bbdd7d45d456672ba754006f3c84a3e1ee193dc1f69398306d751c5
+  metadata.gz: 80234fa9b99f8390a69ec6fabdf8d5d668044b75df4ee379b55e8b805f73641f1e9bfa4cf1990f825ee4c5d4fa47d1a0be7884b659e8cd7925fc2fcabd82722c
+  data.tar.gz: 94dc6ba3f345a3e3cf248455c8b1a9f7092f65d72011ee7d7cc4fe7d67db910021afecd522afc27b1982461031120f6389a02432c09dbc89adf36be72f66ae22

data/danger-spm_version_updates.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.add_runtime_dependency("danger-plugin-api", "~> 1.0")
-  spec.add_runtime_dependency("spm_version_updates", "~> #{SpmVersionUpdates::VERSION}")
-  spec.add_runtime_dependency("xcodeproj", "~> 1.24")
+  spec.add_dependency("danger-plugin-api", "~> 1.0")
+  spec.add_dependency("spm_version_updates", "~> #{SpmVersionUpdates::VERSION}")
+  spec.add_dependency("xcodeproj", "~> 1.24")
 end

data/lib/spm_version_updates/plugin.rb

@@ -75,8 +75,8 @@ module Danger
 
     def run_checker
       checker = build_checker
-      yield(checker)
-      emit_checker_warnings(checker)
+      result = yield(checker)
+      emit_checker_warnings(result)
     end
 
     def build_checker
@@ -97,9 +97,9 @@ module Danger
       checker.ignore_repos = Array(ignore_repos)
     end
 
-    def emit_checker_warnings(checker)
-      checker.warning_details.each { |detail| warn(render_warning(detail)) }
-      checker.parse_warnings.each { |record| warn(render_parse_warning(record)) }
+    def emit_checker_warnings(result)
+      result.updates.each { |detail| warn(render_warning(detail)) }
+      result.parse_warnings.each { |record| warn(render_parse_warning(record)) }
     end
 
     # Builds the Danger warning markdown for a `.package(...)` declaration the
@@ -113,22 +113,22 @@ module Danger
     # originating manifest. Uses <br> rather than newlines because Danger
     # renders warnings inside a markdown table.
     def render_warning(detail)
-      message = detail[:message]
+      message = detail["message"]
       links = warning_links(detail)
       message = "#{message} (#{links})" if links
 
-      source = detail[:source]
+      source = detail["source"]
       message = "#{message}<br>Source: `#{source}`" if source
 
-      command = detail[:suggested_command]
+      command = detail["suggested_command"]
       command ? "#{message}<br>Update: `#{command}`" : message
     end
 
     def warning_links(detail)
-      link = RepositoryLink.from(detail[:repository_url])
+      link = RepositoryLink.from(detail["repository_url"])
       return unless link
 
-      current, available = detail.values_at(:current_version, :available_version)
+      current, available = detail.values_at("current_version", "available_version")
       return unless current && available
 
       link.markdown_links([{ current:, available: }], separator: " · ")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger-spm_version_updates
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Harold Martin
@@ -29,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
@@ -64,10 +64,7 @@ files:
 - danger-spm_version_updates.gemspec
 - lib/danger_plugin.rb
 - lib/danger_spm_version_updates.rb
-- lib/spm_version_updates/gem_version.rb
-- lib/spm_version_updates/git.rb
 - lib/spm_version_updates/plugin.rb
-- lib/spm_version_updates/xcode.rb
 homepage: https://github.com/hbmartin/danger-spm_version_updates
 licenses:
 - MIT

data/lib/spm_version_updates/gem_version.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-# Compatibility shim: the version constant now lives in the spm_version_updates
-# core gem. Existing `require "spm_version_updates/gem_version"` callers keep
-# working through this file.
-require "spm_version_updates/version"

data/lib/spm_version_updates/git.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-require "spm_version_updates/git_operations"
-require "spm_version_updates/semver"
-
-# Legacy git helper used by the Danger plugin API. Delegates to GitOperations,
-# so lookups gain its retry behavior and raise GitOperations::LsRemoteError
-# instead of masking failures as empty results.
-# @deprecated Use {GitOperations} from the +spm_version_updates+ core gem
-#   instead. This shim exists only for backward compatibility with Dangerfiles
-#   written against +v0.2.0+.
-module Git
-  ALLOWED_PROTOCOLS = GitOperations::ALLOWED_PROTOCOLS
-
-  # Removes protocol and trailing .git from a repo URL
-  # @param   [String] repo_url
-  #          The URL of the repository
-  # @return [String]
-  def self.trim_repo_url(repo_url)
-    GitOperations.trim_repo_url(repo_url)
-  end
-
-  # Extract a readable name for the repo given the url, generally org/repo
-  # @return [String]
-  def self.repo_name(repo_url)
-    GitOperations.repo_name(repo_url)
-  end
-
-  # Call git to list tags
-  # @param   [String] repo_url
-  #          The URL of the dependency's repository
-  # @raise [GitOperations::LsRemoteError] if the lookup fails after retries
-  # @return [Array<SpmVersionUpdates::Semver>]
-  def self.version_tags(repo_url)
-    GitOperations.version_tags(repo_url)
-  end
-
-  # Call git to find the last commit on a branch
-  # @param   [String] repo_url
-  #          The URL of the dependency's repository
-  # @param   [String] branch_name
-  #          The name of the branch on which to find the last commit
-  # @raise [GitOperations::LsRemoteError] if the lookup fails after retries
-  # @return [String, nil]
-  def self.branch_last_commit(repo_url, branch_name)
-    GitOperations.branch_last_commit(repo_url, branch_name)
-  end
-end

data/lib/spm_version_updates/xcode.rb

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require "spm_version_updates/package_resolved"
-require "spm_version_updates/xcode_parser"
-require "spm_version_updates/xcode_project_package_reader"
-require "xcodeproj"
-
-# Legacy Xcode project parser used by the Danger plugin API.
-# @deprecated Use {XcodeProjectPackageReader} and {XcodeParser} from the
-#   +spm_version_updates+ core gem instead. This shim exists only for backward
-#   compatibility with Dangerfiles written against +v0.2.0+.
-module Xcode
-  # Find the configured SPM dependencies in the xcodeproj
-  # @param   [String] xcodeproj_path
-  #          The path of the Xcode project
-  # @return [Hash<String, Hash>]
-  def self.get_packages(xcodeproj_path)
-    raise(XcodeprojPathMustBeSet) if xcodeproj_path.nil? || xcodeproj_path.empty?
-
-    XcodeProjectPackageReader.package_references(xcodeproj_path).to_h { |package|
-      repository_url = package.repository_url
-      [Git.trim_repo_url(repository_url), package.requirement]
-    }
-  end
-
-  # Extracts resolved versions from Package.resolved relative to an Xcode project.
-  # When a block is given, malformed resolved files are reported to it as
-  # `(resolved_path, error)` and skipped; without a block the error is raised.
-  # @param   [String] xcodeproj_path
-  #          The path to your Xcode project
-  # @raise [CouldNotFindResolvedFile] if no Package.resolved files were found
-  # @raise [PackageResolved::MalformedFileError] if a resolved file is invalid JSON and no block is given
-  # @return [Hash<String, String>]
-  def self.get_resolved_versions(xcodeproj_path)
-    resolved_paths = find_packages_resolved_file(xcodeproj_path)
-    raise(CouldNotFindResolvedFile) if resolved_paths.empty?
-
-    resolved_paths.each_with_object({}) { |resolved_path, pins|
-      begin
-        pins.merge!(PackageResolved.versions_from(resolved_path))
-      rescue PackageResolved::MalformedFileError => error
-        raise unless block_given?
-
-        yield(resolved_path, error)
-      end
-    }
-  end
-
-  # Find the Packages.resolved file
-  # @return [Array<String>]
-  def self.find_packages_resolved_file(xcodeproj_path)
-    checked = XcodeProjectPackageReader.package_resolved_candidate_paths(xcodeproj_path)
-    locations = checked.select { |path| File.exist?(path) }
-
-    Kernel.warn("Checked Package.resolved paths: #{checked}")
-    Kernel.warn("Found Package.resolved paths: #{locations}")
-    locations
-  end
-
-  private_class_method :find_packages_resolved_file
-
-  # Raised when Danger plugin Xcode mode is invoked without a project path.
-  # Aliased to the core parser's class so plugin callers rescuing the legacy
-  # name keep working now that the plugin delegates to SpmChecker/XcodeParser.
-  XcodeprojPathMustBeSet = XcodeParser::XcodeprojPathMustBeSet
-
-  # Raised when a Danger plugin Xcode project has no Package.resolved file.
-  CouldNotFindResolvedFile = XcodeParser::CouldNotFindResolvedFile
-end