fastlane-plugin-emerge 0.3.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc17f46cfc65d4e32951d958932fbbfed3d8c5e535545e65f4b94a3a1810fe3c
-  data.tar.gz: 007d7e6bf3ae00ac20eafea8a661bdd634adb37ad130c757ed3ff14db17c18cd
+  metadata.gz: 86bc85e26613527f77ae725575824b2d4c2dd5dde9ab0814f716ab8efd4875c0
+  data.tar.gz: 3fcd9202ed9ca7d5ff16b221ad9c9d0e0e7af1cc2febbadb6e8f96cf8c498ca6
 SHA512:
-  metadata.gz: c273d5faa4ad923ee625b0d132691ed2859a71722ce52ba96750c076b872bb055e31884dec53b12ec7d043750f5d9c7673015b15cef262e0c5a4d4b8ca7390bf
-  data.tar.gz: 0a16f5257de169978011cdc472dec9d1f7e3d0af27a419c2b9130a77c2b480b68b03521895edcbb2ae8003835036df1874f53b7f8f7473ed1ac013f140c4f0ab
+  metadata.gz: 330252fc7c00bdba4a91bd9a206dad404886c8d99631a3cc3da5efe6ee1b55e46cc0e298441fa54f5807f881cb395baf3fe3400da63c983b13182f9c25d52e2b
+  data.tar.gz: abce90f5e848cad8c840f0d94130518ed318b776af6543d75bc73105dac295667fabf4aaff68aa06e72ae00a89956eec7f725ed54d06d460005fe396dfa3723f

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

@@ -3,6 +3,7 @@ require 'fastlane_core/print_table'
 require_relative '../helper/emerge_helper'
 require 'pathname'
 require 'tmpdir'
+require 'json'
 require 'fileutils'
 
 module Fastlane
@@ -16,13 +17,14 @@ module Fastlane
           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]
+        branch = params[:branch]
+        sha = params[:sha] || params[:build_id]
+        base_sha = params[:base_sha] || params[:base_build_id]
         repo_name = params[:repo_name]
         gitlab_project_id = params[:gitlab_project_id]
         build_type = params[:build_type]
 
-        if !File.exist?(file_path)
+        if file_path == nil || !File.exist?(file_path)
           UI.error("Invalid input file")
           return
         end
@@ -36,6 +38,13 @@ module Fastlane
             dsym_folder = "#{d}/archive.xcarchive/dSYMs/"
             FileUtils.mkdir_p application_folder
             FileUtils.mkdir_p dsym_folder
+            if params[:linkmaps] && params[:linkmaps].length > 0
+              linkmap_folder = "#{d}/archive.xcarchive/Linkmaps/"
+              FileUtils.mkdir_p(linkmap_folder)
+              params[:linkmaps].each do |l|
+                FileUtils.cp(l, linkmap_folder)
+              end
+            end
             FileUtils.cp_r(file_path, application_folder)
             copy_dsyms("#{absolute_path.dirname}/*.dsym", dsym_folder)
             copy_dsyms("#{absolute_path.dirname}/*/*.dsym", dsym_folder)
@@ -50,30 +59,42 @@ module Fastlane
           end
         elsif File.extname(file_path) == '.xcarchive'
           zip_path = file_path + ".zip"
+          if params[:linkmaps] && params[:linkmaps].length > 0
+            linkmap_folder = "#{file_path}/Linkmaps/"
+            FileUtils.mkdir_p(linkmap_folder)
+            params[:linkmaps].each do |l|
+              FileUtils.cp(l, linkmap_folder)
+            end
+          end
           Actions::ZipAction.run(
             path: file_path,
             output_path: zip_path,
             exclude: [],
             include: [])
           file_path = zip_path
+        elsif File.extname(file_path) == '.zip' && params[:linkmaps] && params[:linkmaps].length > 0
+          UI.error("Provided zipped archive and linkmaps, linkmaps will not be added to zip.")
         elsif !File.extname(file_path) == '.zip'
           UI.error("Invalid input file")
           return
         end
 
-        fileName = File.basename(file_path)
-        url = 'https://api.emergetools.com/getUpload'
+        filename = File.basename(file_path)
+        url = 'https://api.emergetools.com/upload'
         params = {
-          fileName: fileName,
+          filename: filename,
         }
         if pr_number
           params[:prNumber] = pr_number
         end
-        if build_id
-          params[:buildId] = build_id
+        if branch
+          params[:branch] = branch
+        end
+        if sha
+          params[:sha] = sha
         end
-        if base_build_id
-          params[:baseBuildId] = base_build_id
+        if base_sha
+          params[:baseSha] = base_sha
         end
         if repo_name
           params[:repoName] = repo_name
@@ -86,7 +107,7 @@ module Fastlane
           config: params,
           hide_keys: [],
           title: "Summary for Emerge #{Fastlane::Emerge::VERSION}")
-        resp = Faraday.get(url, params, {'X-API-Token' => api_token})
+        resp = Faraday.post(url, params.to_json, {'Content-Type' => 'application/json', 'X-API-Token' => api_token})
         case resp.status
         when 200
           json = JSON.parse(resp.body)
@@ -140,16 +161,34 @@ module Fastlane
                                description: "Path to the zipped xcarchive or app to upload",
                                   optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :linkmaps,
+                                   description: "List of paths to linkmaps",
+                                      optional: true,
+                                          type: Array),
           FastlaneCore::ConfigItem.new(key: :pr_number,
                                description: "The PR number that triggered this upload",
                                   optional: true,
                                       type: String),
+          FastlaneCore::ConfigItem.new(key: :branch,
+                              description: "The current git branch",
+                                optional: true,
+                                    type: String),
+          FastlaneCore::ConfigItem.new(key: :sha,
+                              description: "The git SHA that triggered this build",
+                                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",
+                                  optional: true,
+                                      type: String),
           FastlaneCore::ConfigItem.new(key: :build_id,
                                description: "A string to identify this build",
+                                deprecated: "Replaced by `sha`",
                                   optional: true,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :base_build_id,
                                description: "Id of the build to compare with this upload",
+                                deprecated: "Replaced by `base_sha`",
                                   optional: true,
                                       type: String),
           FastlaneCore::ConfigItem.new(key: :repo_name,
@@ -161,7 +200,7 @@ module Fastlane
                                   optional: true,
                                       type: Integer),
           FastlaneCore::ConfigItem.new(key: :build_type,
-                               description: "Type of build, either release or development. Defaults to development",
+                               description: "String to identify the type of build such as release/development. Used to filter size graphs. Defaults to development",
                                   optional: true,
                                       type: String)
         ]

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

@@ -0,0 +1,65 @@
+require 'fastlane/action'
+require 'tmpdir'
+require 'tempfile'
+require 'fileutils'
+
+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]})
+        case resp.status
+        when 200
+          Tempfile.create do |f|
+            f.write(resp.body)
+            decompressed = IO.popen(['gunzip', '-c', f.path]).read
+            IO.write(params[:output_path], decompressed)
+          end
+        when 401
+          UI.error("Unauthorized")
+        else
+          UI.error("Failed to download order file code: #{resp.status}")
+        end
+
+      end
+      def self.description
+        "Fastlane plugin to download order files"
+      end
+
+      def self.authors
+        ["Emerge Tools"]
+      end
+
+      def self.return_value
+        # If your method provides a return value, you can describe here what it does
+      end
+
+      def self.details
+        # Optional:
+        ""
+      end
+
+      def self.available_options
+        [
+          FastlaneCore::ConfigItem.new(key: :api_token,
+                                  env_name: "EMERGE_API_TOKEN",
+                               description: "An API token for Emerge",
+                                  optional: false,
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :app_id,
+                               description: "Id of the app being built with the order file",
+                                  optional: false,
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :output_path,
+                                   description: "Path to the order file",
+                                      optional: false,
+                                          type: String)
+        ]
+      end
+
+      def self.is_supported?(platform)
+        platform == :ios
+      end
+    end
+  end
+end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Emerge Tools, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.170.0
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -161,13 +161,14 @@ files:
 - lib/fastlane/plugin/emerge.rb
 - lib/fastlane/plugin/emerge/actions/emerge_action.rb
 - 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/version.rb
 homepage: https://github.com/EmergeTools/fastlane-plugin-emerge
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Fastlane plugin for Emerge
 test_files: []