fastlane-plugin-emerge 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4d089c7870b5c71f07b01d99df92996471d9050ab6fd4b0f6c3290648dcd404
-  data.tar.gz: a98f1c7796d0e21d0a2d7dcbadc20e11d3e2de626e1441da4947610e8433d468
+  metadata.gz: e170856bceb03b9747e72d074ce9a96d124dfe6519e5bc9f47becffb39b1acea
+  data.tar.gz: 71d34166a5fa640ac3af5ec2763a8b373052e3da358c0dc68dce5ed4bb46bd32
 SHA512:
-  metadata.gz: 7afe4c7adc02c46fa4193dbed344afc716877d26ca00849f6dce44bdd73e7da8458221aa875e9b9290aeec36c2e08fa2036e71d08581af4de74cb848779fdffe
-  data.tar.gz: 3fb17574090d31c7088b5afb3e0f9161e627ba777de779887b7d34ee45ea6094d3439bde09851087035d3c2face7be1caf173fb5228e5b81496f412b80d27aa0
+  metadata.gz: '07929884d01b7ce42b2863dc9973768b2bb033da495e6d63c6dd09a66e63d6613e55c41a0845eff819afcd8689897d5c32c6099028e0059e2f12df9aed1470af'
+  data.tar.gz: a971a076cb1724adec271841883b49a0ecfac4fe245884076b64cc655f1fabf930af60830f76cf7dbd46005d6e28c5a16d01d716a6ae63133df8a7cf6a013f56

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

@@ -1,6 +1,8 @@
 require 'fastlane/action'
 require 'fastlane_core/print_table'
 require_relative '../helper/emerge_helper'
+require_relative '../helper/git'
+require_relative '../helper/github'
 require 'pathname'
 require 'tmpdir'
 require 'json'
@@ -16,11 +18,12 @@ module Fastlane
         if file_path.nil?
           file_path = Dir.glob("#{lane_context[SharedValues::SCAN_DERIVED_DATA_PATH]}/Build/Products/Debug-iphonesimulator/*.app").first
         end
-        pr_number = params[:pr_number]
-        branch = params[:branch]
-        sha = params[:sha] || params[:build_id]
-        base_sha = params[:base_sha] || params[:base_build_id]
-        repo_name = params[:repo_name]
+        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
+        repo_name = params[:repo_name] || git_params.repo_name
         gitlab_project_id = params[:gitlab_project_id]
         tag = params[:tag]
         order_file_version = params[:order_file_version]
@@ -172,11 +175,10 @@ module Fastlane
       end
 
       def self.return_value
-        # If your method provides a return value, you can describe here what it does
+        "If successful, returns the upload id of the generated build"
       end
 
       def self.details
-        # Optional:
         ""
       end
 
@@ -246,10 +248,6 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        # Adjust this if your plugin only works for a particular platform (iOS vs. Android, for example)
-        # See: https://docs.fastlane.tools/advanced/#control-configuration-by-lane-and-by-platform
-        #
-        # [:ios, :mac, :android].include?(platform)
         platform == :ios
       end
     end

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

@@ -4,24 +4,58 @@ require 'faraday'
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
 
+  class GitResult
+    attr_accessor :sha, :base_sha, :branch, :pr_number, :repo_name
+
+    def initialize(sha:, base_sha:, branch:, pr_number: nil, repo_name: nil)
+      @pr_number = pr_number
+      @sha = sha
+      @base_sha = base_sha
+      @branch = branch
+      @repo_name = repo_name
+    end
+  end
+
   module Helper
     class EmergeHelper
       def self.perform_upload(upload_url, upload_id, file_path)
         UI.message("Starting upload")
         response = Faraday.put(upload_url) do |req|
           req.headers['Content-Type'] = 'application/zip'
-          req.headers['Content-Length'] = "#{File.size(file_path)}"
+          req.headers['Content-Length'] = File.size(file_path).to_s
           req.body = Faraday::UploadIO.new(file_path, 'application/zip')
         end
         case response.status
         when 200
-          UI.success("Your app is processing, you can find the results at https://emergetools.com/build/#{upload_id}")
+          UI.success("🎉 Your app is processing, you can find the results at https://emergetools.com/build/#{upload_id}")
           return upload_id
         else
           UI.error("Upload failed")
         end
         return nil
       end
+
+      def self.make_git_params
+        git_result = if Helper::Github.is_supported_github_event?
+                       UI.message("Fetching Git info from Github event")
+                       GitResult.new(
+                         sha: Helper::Github.sha,
+                         base_sha: Helper::Github.base_sha,
+                         branch: Helper::Github.branch,
+                         pr_number: Helper::Github.pr_number,
+                         repo_name: Helper::Github.repo_name
+                       )
+                     else
+                       UI.message("Fetching Git info from system Git")
+                       GitResult.new(
+                         sha: Helper::Git.sha,
+                         base_sha: Helper::Git.base_sha,
+                         branch: Helper::Git.branch
+                       )
+                     end
+        UI.message("Got git result #{git_result.inspect}")
+        git_result
+      end
     end
   end
 end

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

@@ -0,0 +1,66 @@
+require 'fastlane_core/print_table'
+require 'open3'
+
+module Fastlane
+  module Helper
+    module Git
+      def self.branch
+        shell_command = "git rev-parse --abbrev-ref HEAD"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        stdout.strip if status.success?
+      end
+
+      def self.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.base_sha
+        shell_command = "git merge-base #{remote_head_branch} #{branch}"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        return nil if stdout.strip.empty? || !status.success?
+        current_sha = sha
+        stdout.strip == current_sha ? nil : stdout.strip
+      end
+
+      def self.primary_remote
+        remote = remote()
+        return nil if remote.nil?
+        remote.include?("origin") ? "origin" : remote.first
+      end
+
+      def self.remote_head_branch(remote = primary_remote)
+        return nil if remote.nil?
+        shell_command = "git remote show #{remote}"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        return nil if stdout.nil? || !status.success?
+        stdout
+          .split("\n")
+          .map(&:strip)
+          .find { |line| line.start_with?("HEAD branch: ") }
+          &.split(' ')
+          &.last
+      end
+
+      def self.remote_url(remote = primary_remote)
+        return nil if remote.nil?
+        shell_command = "git config --get remote.#{remote}.url"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        stdout if status.success?
+      end
+
+      def self.remote
+        shell_command = "git remote"
+        UI.command(shell_command)
+        stdout, _, status = Open3.capture3(shell_command)
+        stdout.split("\n") if status.success?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+require 'json'
+require 'fastlane_core/print_table'
+require_relative 'git'
+
+module Fastlane
+  module Helper
+    module Github
+      GITHUB_EVENT_PR = "pull_request".freeze
+      GITHUB_EVENT_PUSH = "push".freeze
+
+      def self.event_name
+        ENV['GITHUB_EVENT_NAME']
+      end
+
+      def self.is_supported_github_event?
+        UI.message("GitHub event name: #{event_name}")
+        is_pull_request? || is_push?
+      end
+
+      def self.is_pull_request?
+        event_name == GITHUB_EVENT_PR
+      end
+
+      def self.is_push?
+        event_name == GITHUB_EVENT_PUSH
+      end
+
+      def self.sha
+        if is_push?
+          ENV['GITHUB_SHA']
+        elsif is_pull_request?
+          github_event_data.dig(:pull_request, :head, :sha)
+        end
+      end
+
+      def self.base_sha
+        if is_pull_request?
+          github_event_data.dig(:pull_request, :base, :sha)
+        end
+      end
+
+      def self.pr_number
+        is_pull_request? ? github_event_data.dig(:number) : nil
+      end
+
+      def self.branch
+        is_pull_request? ? github_event_data.dig(:pull_request, :head, :ref) : Git.branch
+      end
+
+      def self.repo_owner
+        github_event_data.dig(:repository, :owner, :login)
+      end
+
+      def self.repo_name
+        github_event_data.dig(:repository, :full_name)
+      end
+
+      private_class_method
+
+      def self.github_event_data
+        github_event_path = ENV['GITHUB_EVENT_PATH']
+        UI.error!("GITHUB_EVENT_PATH is not set") if github_event_path.nil?
+
+        unless File.exist?(github_event_path)
+          UI.error!("File #{github_event_path} doesn't exist")
+        end
+
+        file_content = File.read(github_event_path)
+        file_json = JSON.parse(file_content, symbolize_names: true)
+        if ENV['DEBUG']
+          UI.message("Parsed GitHub event data: #{file_json.inspect}")
+        end
+        file_json
+      end
+    end
+  end
+end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Emerge Tools, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -163,6 +163,8 @@ files:
 - lib/fastlane/plugin/emerge/actions/emerge_comment_action.rb
 - lib/fastlane/plugin/emerge/actions/emerge_order_file_action.rb
 - lib/fastlane/plugin/emerge/helper/emerge_helper.rb
+- lib/fastlane/plugin/emerge/helper/git.rb
+- lib/fastlane/plugin/emerge/helper/github.rb
 - lib/fastlane/plugin/emerge/version.rb
 homepage: https://github.com/EmergeTools/fastlane-plugin-emerge
 licenses: