fastlane-plugin-emerge 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2f8a9346a1287446245c5388083f6f4faf27082ae763b3387b80003b1210f34
-  data.tar.gz: 33f349c77e7c9b5a4eebec0501704db85d37c776f43d8bc6a94ed2d27a162248
+  metadata.gz: 06cb7ccc63c9a9b947b50d3e892d8f7a9d80ae52227b1eb2ec3686859e349d87
+  data.tar.gz: 1d78c2cfff077640ed1c7024596cbf115361392bb620edf9edc9fdd15c1da05f
 SHA512:
-  metadata.gz: b692e0d3a5816a835aa904faa496b5114492850942f43ede61fa4f79b769e8446d119da5810b5c3e72aca9ae940353943f563cfc301a5528d6d3df5cbc887d61
-  data.tar.gz: f0132eb0d9c8f98186fc2fbcbb3b54a89bc8f16e69beb2365831b1e107bb167f555ab38cda70e4368262a7ce4ab77a9147a6a8596351f45d4363fe9e5763c5df
+  metadata.gz: b219dda48c6c219179eec0691a6b21615eb68faf76e972e634ce15fb5c50c9d54c9a242224590409206a03177afbde4f50bbfaa2761c693832b03d108536e050
+  data.tar.gz: 655f1a31d098222c4e2248545c702a68680d58f2deffa9eaaeb7b0353c4e3c11a9ed1e530f41a56baec9c1494261a7d0a69f54aeb9e6f9c98394af5506a93c8a

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)
@@ -43,33 +52,49 @@ module Fastlane
             file_path = "#{absolute_path.dirname}/archive.xcarchive.zip"
             ZipAction.run(
               path: "#{d}/archive.xcarchive",
-              output_path: file_path)
+              output_path: file_path,
+              exclude: [],
+              include: [])
             UI.message("Archive generated at #{file_path}")
           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)
+            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
@@ -82,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)
@@ -136,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,
@@ -157,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/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Emerge
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Emerge Tools, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-16 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -150,8 +150,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.170.0
-description: 
-email: 
+description:
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -167,7 +167,7 @@ homepage: https://github.com/EmergeTools/fastlane-plugin-emerge
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,8 +182,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: []