fastlane-plugin-emerge 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86bc85e26613527f77ae725575824b2d4c2dd5dde9ab0814f716ab8efd4875c0
-  data.tar.gz: 3fcd9202ed9ca7d5ff16b221ad9c9d0e0e7af1cc2febbadb6e8f96cf8c498ca6
+  metadata.gz: f84892f800a40e25a4b867e178edb8619c24864a4b9ff9670470270ea227969c
+  data.tar.gz: b8749428f0e193bf816b8dae1dc9e3f10ace668eb86ab3e1e6992d61438995cc
 SHA512:
-  metadata.gz: 330252fc7c00bdba4a91bd9a206dad404886c8d99631a3cc3da5efe6ee1b55e46cc0e298441fa54f5807f881cb395baf3fe3400da63c983b13182f9c25d52e2b
-  data.tar.gz: abce90f5e848cad8c840f0d94130518ed318b776af6543d75bc73105dac295667fabf4aaff68aa06e72ae00a89956eec7f725ed54d06d460005fe396dfa3723f
+  metadata.gz: 93d799a5679ba33a333028db9f30217da3742ca2af4cc24c4c792a1c3c06122ee3bc2f79c79ff0f5f2306513a079ab280f586204618deeb5a50fa6953eae363b
+  data.tar.gz: 86718d6dc29e96ce1fbe78d6198dfcb5dde0fcdadadd63d6f87d1040672fa3d8f73c4171f059615afca40536a217b2f2b283f6cb8262aa68be07f73071538775

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

@@ -23,6 +23,8 @@ module Fastlane
         repo_name = params[:repo_name]
         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")
@@ -45,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)
@@ -66,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,
@@ -102,6 +106,9 @@ module Fastlane
         if gitlab_project_id
           params[:gitlabProjectId] = gitlab_project_id
         end
+        if order_file_version
+          params[:orderFileVersion] = order_file_version
+        end
         params[:buildType] = build_type || "development"
         FastlaneCore::PrintTable.print_values(
           config: params,
@@ -132,6 +139,13 @@ module Fastlane
         end
       end
 
+      def self.copy_config(config_path, tmp_dir)
+        if config_path != nil && File.exist?(config_path)
+          emerge_config_path = "#{tmp_dir}/emerge_config.yaml"
+          FileUtils.cp(config_path, emerge_config_path)
+        end
+      end
+
       def self.description
         "Fastlane plugin for Emerge"
       end
@@ -178,7 +192,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,
@@ -202,7 +216,15 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :build_type,
                                description: "String to identify the type of build such as release/development. Used to filter size graphs. Defaults to development",
                                   optional: true,
-                                      type: String)
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :order_file_version,
+                               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

@@ -7,7 +7,8 @@ module Fastlane
   module Actions
     class EmergeOrderFileAction < Action
       def self.run(params)
-        resp = Faraday.get("https://order-files-prod.emergetools.com/#{params[:app_id]}", nil, {'X-API-Token' => params[:api_token]})
+        puts "https://order-files-prod.emergetools.com/#{params[:app_id]}/#{params[:order_file_version]}"
+        resp = Faraday.get("https://order-files-prod.emergetools.com/#{params[:app_id]}/#{params[:order_file_version]}", nil, {'X-API-Token' => params[:api_token]})
         case resp.status
         when 200
           Tempfile.create do |f|
@@ -15,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
@@ -53,7 +61,11 @@ module Fastlane
           FastlaneCore::ConfigItem.new(key: :output_path,
                                    description: "Path to the order file",
                                       optional: false,
-                                          type: String)
+                                          type: String),
+          FastlaneCore::ConfigItem.new(key: :order_file_version,
+                               description: "Version of the order file to download",
+                                  optional: false,
+                                      type: String),
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

metadata

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