fastlane-plugin-emerge 0.10.2 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4130fb5888b6a3bad42355185be1302fa84c2a76fdc659a377151d9bf695d40f
-  data.tar.gz: 9402f64c96f47fed1cdb28761a99efd64585528420ded928fff19cd231d57a77
+  metadata.gz: 5af3be7b1a251da05592383703e74d646beeffe6ed7bc50cc4e139f662332d3c
+  data.tar.gz: ae2179ef90e77a6916a75f0a0265d94bfd2aec7205d90ad4187d891266aba756
 SHA512:
-  metadata.gz: 31e479d302fa2b35d8fca1d4c7c83237409ea84fb84cd073a656b8b9ee54f6daa89d89864c79a4c2dfcf8ff8b89d5bff2c8fa50f782239e193534c7bd68be6e9
-  data.tar.gz: 1ab88a61d1ff490d271a6d0a206f108c9f117be4caefbff878fb42d401a8470105ef700855dd00c5f33dd02948092487f392fd7bd610fe42d0302983ccacf9f6
+  metadata.gz: 4feffe8f6cc285b4d634f8140b44432194308edf6a7c46e2e62fed0674527239a30ce814bd035763444b8fa3c3e81950ab08d700c01486762a61e0cb1c693509
+  data.tar.gz: 943719d58ae8a684fd3bfd31b6c74c693ffc28b18d7be7945f0ed9e15d68fe39bd127545ca6090fde9678dcd24bfeeeb5382744eda6a596a354e4a2025689237

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

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

@@ -13,11 +13,18 @@ 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
@@ -32,6 +39,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)
 
@@ -59,6 +68,7 @@ module Fastlane
             file_path = "#{absolute_path.dirname}/archive.xcarchive.zip"
             ZipAction.run(
               path: "#{d}/archive.xcarchive",
+              symlinks: true,
               output_path: file_path,
               exclude: [],
               include: []
@@ -77,6 +87,7 @@ module Fastlane
           Helper::EmergeHelper.copy_config(config_path, file_path)
           Actions::ZipAction.run(
             path: file_path,
+            symlinks: true,
             output_path: zip_path,
             exclude: [],
             include: []

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

@@ -42,6 +42,7 @@ module Fastlane
           zip_file_path = "#{temp_dir}/build/#{archive_name}.xcarchive.zip"
           ZipAction.run(
             path: archive_path,
+            symlinks: true,
             output_path: zip_file_path,
             exclude: [],
             include: []

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?

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

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

metadata

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