fastlane-plugin-emerge 0.5.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 498e4fcfd1dfcae9df9fddd6b7eeee5225d031ed4ec49a79ddbb1fbb45c9599c
-  data.tar.gz: 878861b1e1d4569bee5171f598e97a4dbcfa7b0ef5518c64a89446a6d66befa0
+  metadata.gz: 1e1447dca3b388a05160397929cd49bd402f82c97cce36e3118b5fc8a91dc0b8
+  data.tar.gz: 94f2deab73ca67cb4520c7b2958a003106b07b16c32abd614613c0f0d1b6c13c
 SHA512:
-  metadata.gz: a41d64017cd4a2fce676ccd04928f704c65aa62852213ac5675f93a6dd88fe49cf5f3221956dd15fb8b392c57ccbd007723787475c85883c811055bb11383260
-  data.tar.gz: d132f4dd65ee4ee6695d232b6b069fa78e27db9ca96df239fed0a2e762b0cb89ea748821ddeaecb0637720a2d367a7dd9883fa9dc36d5e30a537eb781f712589
+  metadata.gz: e747d8c426f8d873e7a89dc30dce0c03e24a8dbf9e697aab6f7a3b66d0de7aeef0308518a67427e0a91ac7a8d7192385e7404449607bcbf7d77d9b58f76d5260
+  data.tar.gz: dd5874a90ad2edfdf97a99eda6736ad9e442a75fdc9e204c7ef2e116db68801175dbe32d7bf98c00f8e401b1381012131ee2133bd3775c1703551843ef77eed4

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

@@ -24,6 +24,7 @@ module Fastlane
         gitlab_project_id = params[:gitlab_project_id]
         build_type = params[:build_type]
         order_file_version = params[:order_file_version]
+        config_path = params[:config_path]
 
         if file_path == nil || !File.exist?(file_path)
           UI.error("Invalid input file")
@@ -46,6 +47,7 @@ module Fastlane
                 FileUtils.cp(l, linkmap_folder)
               end
             end
+            copy_config(config_path, "#{d}/archive.xcarchive")
             FileUtils.cp_r(file_path, application_folder)
             copy_dsyms("#{absolute_path.dirname}/*.dsym", dsym_folder)
             copy_dsyms("#{absolute_path.dirname}/*/*.dsym", dsym_folder)
@@ -67,6 +69,7 @@ module Fastlane
               FileUtils.cp(l, linkmap_folder)
             end
           end
+          copy_config(config_path, file_path)
           Actions::ZipAction.run(
             path: file_path,
             output_path: zip_path,
@@ -136,6 +139,19 @@ module Fastlane
         end
       end
 
+      def self.copy_config(config_path, tmp_dir)
+        return unless config_path != nil
+
+        expanded_path = File.expand_path(config_path)
+        if not File.exist?(expanded_path)
+          UI.error("No config file found at path '#{expanded_path}'.\nUploading without config file")
+          return
+        end
+
+        emerge_config_path = "#{tmp_dir}/emerge_config.yaml"
+        FileUtils.cp(expanded_path, emerge_config_path)
+      end
+
       def self.description
         "Fastlane plugin for Emerge"
       end
@@ -182,7 +198,7 @@ module Fastlane
                                 optional: true,
                                     type: String),
           FastlaneCore::ConfigItem.new(key: :base_sha,
-                               description: "The git SHA of the base build. This parameter does not need to be set if you’re using the Github integration",
+                               description: "The git SHA of the base build",
                                   optional: true,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :build_id,
@@ -211,6 +227,10 @@ module Fastlane
                                description: "Version of the order file to download",
                                   optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :config_path,
+                               description: "Path to Emerge config path",
+                                  optional: true,
+                                      type: String),
         ]
       end
 

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

@@ -16,13 +16,20 @@ module Fastlane
             decompressed = IO.popen(['gunzip', '-c', f.path]).read
             IO.write(params[:output_path], decompressed)
           end
+          return 200
         when 401
           UI.error("Unauthorized")
+        when 403
+          UI.message("No order file found, this is expected for the first build of an app_id/version.")
+          # The API will return a 403 when no order file is found, but we change that to a 200 for the
+          # fastlane plugin because this is an expected state for a CI integraion.
+          return 200
         else
           UI.error("Failed to download order file code: #{resp.status}")
         end
-
+        resp.status
       end
+
       def self.description
         "Fastlane plugin to download order files"
       end

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.5.1"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Emerge Tools, Inc
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2023-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday