fastlane-plugin-emerge 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f542abe602fdc9595e71d1b8a4b8e8bf9bee55a54331a51c33e8636fd1eef71
-  data.tar.gz: 10a41705f7a6d28043adb141731da2b7a9ec4a6da1bc45923a07fcbb4f7c7ac5
+  metadata.gz: 147f6fba27728c230b0cda85c93253b75eeff200722eeb8bfad811ed4f5dc8ba
+  data.tar.gz: 4d0cdd42690b1b140506467d2957e7a080a207cab05ebfd1dd8973e17085d7b2
 SHA512:
-  metadata.gz: 0e0f04590f3dc09a384e5368f76beb7e4841e14996536d49bdd1730bf4c20bf8e9d852f308a2f93df51ef729a3f90561e91169868a64ef6648f0d00544434f57
-  data.tar.gz: f98a707293e57a51b5a85bef78cbfa737320e4d1fb051f1bac04014225ebea807e8bad5cf2018e6f30b8e89805e6a71663dd18807d860a5f8c771d3479ff4aa0
+  metadata.gz: 1e3975113c2415dd8e4cc29bb107a5b65537ab5cc48962c7d96ad10b1ca545be7dae93ee5bf9c042e32e83f8116ecc9c843f86bef89ecef55b43251737e362c6
+  data.tar.gz: 81f4b386e95a063e5dfdc046e3370d1ae4679be4cded0d81fd2f5dbade302104c908ae60353298f71c42bc47a9682aeab3a8e9d688932b839c9df1cb30f7c6fe

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

@@ -1,19 +1,59 @@
 require 'fastlane/action'
 require 'fastlane_core/print_table'
 require_relative '../helper/emerge_helper'
+require 'pathname'
+require 'tmpdir'
+require 'fileutils'
 
 module Fastlane
   module Actions
     class EmergeAction < Action
       def self.run(params)
         api_token = params[:api_token]
-        file_path = params[:file_path]
+        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
         pr_number = params[:pr_number]
         build_id = params[:build_id]
         base_build_id = params[:base_build_id]
         repo_name = params[:repo_name]
         build_type = params[:build_type]
-        if !File.exist?(file_path) || !File.extname(file_path) == '.zip'
+
+        if !File.exist?(file_path)
+          UI.error("Invalid input file")
+          return
+        end
+
+        # If the user provided a .app we will look for dsyms and package it into a zipped xcarchive
+        if File.extname(file_path) == '.app'
+          absolute_path = Pathname.new(File.expand_path(file_path))
+          UI.message("A .app was provided, dSYMs will be looked for in #{absolute_path.dirname}")
+          Dir.mktmpdir do |d|
+            application_folder = "#{d}/archive.xcarchive/Products/Applications/"
+            dsym_folder = "#{d}/archive.xcarchive/dSYMs/"
+            FileUtils.mkdir_p application_folder
+            FileUtils.mkdir_p dsym_folder
+            FileUtils.cp_r(file_path, application_folder)
+            Dir.glob("#{absolute_path.dirname}/*/*.dsym") do |filename|
+              UI.message("Found dSYM: #{Pathname.new(filename).basename}")
+              FileUtils.cp_r(filename, dsym_folder)
+            end
+            Xcodeproj::Plist.write_to_path({"NAME" => "Emerge Upload"}, "#{d}/archive.xcarchive/Info.plist")
+            file_path = "#{absolute_path.dirname}/archive.xcarchive.zip"
+            ZipAction.run(
+              path: "#{d}/archive.xcarchive",
+              output_path: file_path)
+            UI.message("Archive generated at #{file_path}")
+          end
+        elsif File.extname(file_path) == '.xcarchive'
+          zip_path = file_path + ".zip"
+          Actions::ZipAction.run(
+            path: file_path,
+            output_path: zip_path)
+          file_path = zip_path
+        elsif !File.extname(file_path) == '.zip'
           UI.error("Invalid input file")
           return
         end
@@ -85,7 +125,7 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :file_path,
                                   env_name: "EMERGE_FILE_PATH",
                                description: "Path to the zipped xcarchive or app to upload",
-                                  optional: false,
+                                  optional: true,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :pr_number,
                                description: "The PR number that triggered this upload",

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Emerge Tools, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday