fastlane-plugin-emerge 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a1d1b9e1ea3e38708c95820afb2f51fadfffb6818e50486824cb746a7a17d5f
-  data.tar.gz: 2e1460681ef3295e3fa891d3f4cf81210a858f6eaffe2e33cbc5dde96e6a0dd4
+  metadata.gz: 47c07cc0fbda1c835f0ae0f3b1719aea68de191a28d614d4d2552835a611c90c
+  data.tar.gz: 13b5463f6997f22e1ed988929b3a3a7c40913ee6f91725a7bef0dbafd2cc03fe
 SHA512:
-  metadata.gz: 5afd725d1f5da3bae74dd12e8411eab77c8121d50052dd4a883bd9b850ce35380e08106c3c4fc437061ecb1b1ea13da81392d8a06728a9d5d1ee995ff653c69b
-  data.tar.gz: 25730e82e8b5756d5bd929dc8a2bb026dd27250bb8c5f7147e2daae5bcd5c0b49051b557bd2560e865600aae4de5396833b6c12b8bb2dd5632db408f56c472bb
+  metadata.gz: 37f44ee6483d12df8a2e0a7493f3955cce64852aa0aad5465a3036c9c3deb7784c2e171359ccebe2d249e0911c542cfa05ff96ef246228ea18afe965b63cc251
+  data.tar.gz: fd22b473450105e6e8e736f4f5d4db31fbcb3b71c64ace912f99b7b929f26d18fad1230cff744461afcdf52e8c36c501ca79388329c8dc4fd512dd8dfdf69122

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
@@ -37,41 +39,46 @@ module Fastlane
             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
+            copy_dsyms("#{absolute_path.dirname}/*.dsym", dsym_folder)
+            copy_dsyms("#{absolute_path.dirname}/*/*.dsym", dsym_folder)
             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)
+              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"
           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'
           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 base_build_id
-          params[:baseBuildId] = base_build_id
+        if sha
+          params[:sha] = sha
+        end
+        if base_sha
+          params[:baseSha] = base_sha
         end
         if repo_name
           params[:repoName] = repo_name
@@ -84,7 +91,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)
@@ -102,6 +109,13 @@ module Fastlane
         end
       end
 
+      def self.copy_dsyms(from, to)
+        Dir.glob(from) do |filename|
+          UI.message("Found dSYM: #{Pathname.new(filename).basename}")
+          FileUtils.cp_r(filename, to)
+        end
+      end
+
       def self.description
         "Fastlane plugin for Emerge"
       end
@@ -135,12 +149,26 @@ module Fastlane
                                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,
@@ -152,7 +180,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.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-emerge
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Emerge Tools, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-09-15 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