fastlane-plugin-emerge 0.10.3 → 0.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1161add2ba3f228582fda18fc0b5168ccfd3e81272774546d490eaf17a508659
-  data.tar.gz: eef51649fc4f5ce59c3df1992b0164af8bd80d3d3ea85f2babb146f9d25aead3
+  metadata.gz: de3ddd9edc7ad6cc0251439995927fd37c46d1e9905a570f611e54e9d682853e
+  data.tar.gz: e834409e7a58ce89ea2baa3438e2f504255d76cc882b0bf445fecca5e766483a
 SHA512:
-  metadata.gz: 896b6b3360371b91cb02ed7d6a3d978afd0fff505ed0c53a8eb5afc3ba725a64c3e209ffeef42e24d046f7d343efbbd309a209abf14fd48cc0ccbb13ebdfa1a5
-  data.tar.gz: 81bcd3b3df28794e127ad26c4002c2da9e2c62cc687f48747bbdae6126ab05ddf9def2743ac85df85c122a22945c5961e256a1ee4b4b2d01cfd0c227669e63a8
+  metadata.gz: b701d70f959737afc5b20801ac85a2ab6d3fd089d062c953c11bd55afa745cedb062f7f21dc96fba0c82c27711c783d1014e2d60f6155c5f0c3fcbbb6ecc5bf0
+  data.tar.gz: 48afc9f1263e92a106b2b9607fc0abc7cffb7912ae94820c55354ff6f7319c886935b272e93a2ec8b453edc6cd5eaa68917dc2eb129c52d0fad8b41387086040

data/README.md

@@ -22,14 +22,17 @@ To get started, first obtain an [API token](https://docs.emergetools.com/docs/up
 
 ```ruby
 platform :ios do
-  lane :app_size do
-    # Make a signed release build via gym() and other tools
-    # and then call our `emerge()` action to upload the artifact to our API
-    emerge()
+  lane :emerge_upload do
+    # Tip: group builds in our dashboard via the `tag` parameter
+    emerge(tag: 'pr_build')
   end
 end
 ```
 
+1. Produce a build using `gym()`, `run_tests()`, or other Fastlane actions
+2. When you are ready to upload to Emerge, simply call the `emerge()` action
+    - a. We will automatically detect the most recently built app to upload, or you can manually pass in a `file_path` parameter
+
 For a full list of available parameters run `fastlane action emerge`.
 
 ### Snapshot Testing
@@ -49,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

@@ -13,16 +13,24 @@ module Fastlane
     class EmergeAction < Action
       def self.run(params)
         api_token = params[:api_token]
-        file_path = params[:file_path] || lane_context[SharedValues::XCODEBUILD_ARCHIVE]
 
-        if file_path.nil?
-          file_path = Dir.glob("#{lane_context[SharedValues::SCAN_DERIVED_DATA_PATH]}/Build/Products/Debug-iphonesimulator/*.app").first
-        end
+        file_path = if params[:file_path]
+                      UI.message("Using input file_path: #{file_path}")
+                      params[:file_path]
+                    elsif lane_context[SharedValues::XCODEBUILD_ARCHIVE]
+                      UI.message("Using XCODEBUILD_ARCHIVE path")
+                      lane_context[SharedValues::XCODEBUILD_ARCHIVE]
+                    else
+                      UI.message("Falling back to searching SCAN_DERIVED_DATA_PATH")
+                      Dir.glob("#{lane_context[SharedValues::SCAN_DERIVED_DATA_PATH]}/Build/Products/Debug-iphonesimulator/*.app").first
+                    end
+
         git_params = Helper::EmergeHelper.make_git_params
         pr_number = params[:pr_number] || git_params.pr_number
         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]
@@ -32,6 +40,8 @@ module Fastlane
         if file_path.nil? || !File.exist?(file_path)
           UI.error("Invalid input file")
           return false
+        else
+          UI.message("Using file_path: #{file_path}")
         end
         extension = File.extname(file_path)
 
@@ -96,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,
@@ -163,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

@@ -8,7 +8,36 @@ module Fastlane
         shell_command = "git rev-parse --abbrev-ref HEAD"
         UI.command(shell_command)
         stdout, _, status = Open3.capture3(shell_command)
-        stdout.strip if status.success?
+        unless status.success?
+          UI.error("Failed to get the current branch name")
+          return nil
+        end
+
+        branch_name = stdout.strip
+        if branch_name == "HEAD"
+          # We're in a detached HEAD state
+          # Find all branches that contains the current HEAD commit
+          #
+          # Example output:
+          # * (HEAD detached at dec13a5)
+          # telkins/detached-test
+          # remotes/origin/telkins/detached-test
+          #
+          # So far I've seen this output be fairly stable
+          # If the input is invalid for whatever reason, sed/awk will return an empty string
+          shell_command = "git branch -a --contains HEAD | sed -n 2p | awk '{ printf $1 }'"
+          UI.command(shell_command)
+          head_stdout, _, head_status = Open3.capture3(shell_command)
+
+          unless head_status.success?
+            UI.error("Failed to get the current branch name for detached HEAD")
+            return nil
+          end
+
+          branch_name = head_stdout.strip
+        end
+
+        branch_name == "HEAD" ? nil : branch_name
       end
 
       def self.sha
@@ -19,7 +48,11 @@ module Fastlane
       end
 
       def self.base_sha
-        shell_command = "git merge-base #{remote_head_branch} #{branch}"
+        current_branch = branch
+        remote_head = remote_head_branch
+        return nil if current_branch.nil? || remote_head.nil?
+
+        shell_command = "git merge-base #{remote_head} #{current_branch}"
         UI.command(shell_command)
         stdout, _, status = Open3.capture3(shell_command)
         return nil if stdout.strip.empty? || !status.success?
@@ -27,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,17 @@ module Fastlane
         end
       end
 
+      def self.previous_sha
+        if is_push?
+          github_event_data.dig(:before)
+        else
+          shell_command = "git rev-parse HEAD^"
+          UI.command(shell_command)
+          stdout, _, status = Open3.capture3(shell_command)
+          stdout.strip if status.success?
+        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.3"
+    VERSION = "0.10.5"
   end
 end

metadata

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