fastlane-plugin-emerge 0.10.4 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5af3be7b1a251da05592383703e74d646beeffe6ed7bc50cc4e139f662332d3c
-  data.tar.gz: ae2179ef90e77a6916a75f0a0265d94bfd2aec7205d90ad4187d891266aba756
+  metadata.gz: 6b3fdf2609746465c109005ada64d6fb3934e0930bd900e448b60551fcffbc4b
+  data.tar.gz: 55c71ed30681633f8a7e2736302f8b3c209c5f0a11387dcb96a967376507b2bd
 SHA512:
-  metadata.gz: 4feffe8f6cc285b4d634f8140b44432194308edf6a7c46e2e62fed0674527239a30ce814bd035763444b8fa3c3e81950ab08d700c01486762a61e0cb1c693509
-  data.tar.gz: 943719d58ae8a684fd3bfd31b6c74c693ffc28b18d7be7945f0ed9e15d68fe39bd127545ca6090fde9678dcd24bfeeeb5382744eda6a596a354e4a2025689237
+  metadata.gz: f101d6387c86c67b746a89ebc2cdeeb71777d7a8942031bc49f968423668131fa8a9f4a4b5cedcdd00fb55c9d1e7323a810f6f0fae739e00cd4ac3af05f5e972
+  data.tar.gz: d8a28c08d15a438b24e9c15a153897cec5749fc2bfab57e8966fe232ba804bb560f19c13743402e335f9e07b4f83a4b75aec06ebff7fda1825144dc55fd16e84

data/README.md

@@ -52,12 +52,13 @@ For a full list of available parameters run `fastlane action emerge_snapshot`.
 
 ## Git Configuration
 
-For build comparisons to work, Emerge needs the appropriate Git `sha` and `base_sha` values set on each build. Emerge will automatically compare a build at `sha` against the build we find matching the `base_sha` for a given application id. We also recommend setting `pr_number`, `branch`, and `repo_name` for the best experience.
+For build comparisons to work, Emerge needs the appropriate Git `sha` and `base_sha` values set on each build. Emerge will automatically compare a build at `sha` against the build we find matching the `base_sha` for a given application id. We also recommend setting `pr_number`, `branch`, `repo_name`, and `previous_sha` for the best experience.
 
 For example:
 
-- `sha`: `pr-branch-commit-1`
+- `sha`: `pr-branch-commit-2`
 - `base_sha`: `main-branch-commit-1`
+- `previous_sha`: `pr-branch-commit-1`
 - `pr_number`: `42`
 - `branch`: `my-awesome-feature`
 - `repo_name`: `EmergeTools/hackernews`

data/lib/fastlane/plugin/emerge/actions/emerge_action.rb

@@ -30,6 +30,7 @@ module Fastlane
         branch = params[:branch] || git_params.branch
         sha = params[:sha] || params[:build_id] || git_params.sha
         base_sha = params[:base_sha] || params[:base_build_id] || git_params.base_sha
+        previous_sha = params[:previous_sha] || git_params.previous_sha
         repo_name = params[:repo_name] || git_params.repo_name
         gitlab_project_id = params[:gitlab_project_id]
         tag = params[:tag]
@@ -105,6 +106,7 @@ module Fastlane
           branch: branch,
           sha: sha,
           baseSha: base_sha,
+          previousSha: previous_sha,
           repoName: repo_name,
           gitlabProjectId: gitlab_project_id,
           orderFileVersion: order_file_version,
@@ -172,6 +174,10 @@ module Fastlane
                                        description: "The git SHA of the base build",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :previous_sha,
+                                       description: "The git SHA of the commit right before this build's commit",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :build_id,
                                        description: "A string to identify this build",
                                        deprecated: "Replaced by `sha`",

data/lib/fastlane/plugin/emerge/actions/emerge_snapshot_action.rb

@@ -19,6 +19,7 @@ module Fastlane
         branch = params[:branch] || git_params.branch
         sha = params[:sha] || git_params.sha
         base_sha = params[:base_sha] || git_params.base_sha
+        previous_sha = params[:previous_sha] || git_params.previous_sha
         repo_name = params[:repo_name] || git_params.repo_name
         gitlab_project_id = params[:gitlab_project_id]
         tag = params[:tag]
@@ -54,6 +55,7 @@ module Fastlane
             branch: branch,
             sha: sha,
             baseSha: base_sha,
+            previousSha: previous_sha,
             repoName: repo_name,
             gitlabProjectId: gitlab_project_id,
             tag: tag || "default"
@@ -133,6 +135,10 @@ module Fastlane
                                        description: "The git SHA of the base build",
                                        optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :previous_sha,
+                                       description: "The git SHA of the commit right before this build's commit",
+                                       optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :repo_name,
                                        description: "Full name of the respository this upload was triggered from. For example: EmergeTools/Emerge",
                                        optional: true,

data/lib/fastlane/plugin/emerge/helper/emerge_helper.rb

@@ -5,12 +5,13 @@ module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
 
   class GitResult
-    attr_accessor :sha, :base_sha, :branch, :pr_number, :repo_name
+    attr_accessor :sha, :base_sha, :previous_sha, :branch, :pr_number, :repo_name
 
-    def initialize(sha:, base_sha:, branch:, pr_number: nil, repo_name: nil)
+    def initialize(sha:, base_sha:, previous_sha:, branch:, pr_number: nil, repo_name: nil)
       @pr_number = pr_number
       @sha = sha
       @base_sha = base_sha
+      @previous_sha = previous_sha
       @branch = branch
       @repo_name = repo_name
     end
@@ -36,6 +37,7 @@ module Fastlane
                        GitResult.new(
                          sha: Helper::Github.sha,
                          base_sha: Helper::Github.base_sha,
+                         previous_sha: Helper::Github.previous_sha,
                          branch: Helper::Github.branch,
                          pr_number: Helper::Github.pr_number,
                          repo_name: Helper::Github.repo_name
@@ -45,6 +47,7 @@ module Fastlane
                        GitResult.new(
                          sha: Helper::Git.sha,
                          base_sha: Helper::Git.base_sha,
+                         previous_sha: Helper::Git.previous_sha,
                          branch: Helper::Git.branch
                        )
                      end

data/lib/fastlane/plugin/emerge/helper/git.rb

@@ -60,6 +60,13 @@ module Fastlane
         stdout.strip == current_sha ? nil : stdout.strip
       end
 
+      def self.previous_sha
+        shell_command = "git rev-parse HEAD^"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        stdout.strip if status.success?
+      end
+
       def self.primary_remote
         remote = remote()
         return nil if remote.nil?

data/lib/fastlane/plugin/emerge/helper/github.rb

@@ -39,6 +39,12 @@ module Fastlane
         end
       end
 
+      def self.previous_sha
+        if is_push?
+          github_event_data.dig(:before)
+        end
+      end
+
       def self.pr_number
         is_pull_request? ? github_event_data.dig(:number) : nil
       end

data/lib/fastlane/plugin/emerge/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.10.4"
+    VERSION = "0.10.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.10.6
 platform: ruby
 authors:
 - Emerge Tools, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday