fastlane-plugin-appcenter 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94bfd3f235695b534b7ebb1ef47e7bf195cbae8e59abbb1d646e1d7b4790cda
-  data.tar.gz: 142eb6d82abeb7d4bfe3fffa8e8127b00edcab7b2d57e557e0bb81cbf35471ce
+  metadata.gz: f420746739b204f6bfd6e9e5dd23f841028009e63ed49adf45107b053eeb24ac
+  data.tar.gz: '07896d07c221682028e2c59166c8d248a2ede8d953a3da408f734509eb10ae3a'
 SHA512:
-  metadata.gz: fbdd60b80dda9c2e43d1d42b97a3e982a40b8e6deef76e086bdbecf0f00372b28e6821fc215cbf692b4d64589dce63b51d6a815053d4f348b2f1c07ee7b0f4ae
-  data.tar.gz: 6207f85a258ca6ff2148172c36a5bb7a1de8aed26e13a2da3498d920a321f3846696d92e5244890c61b8b91e9fab57bf9e1d936856950470f4ea4a53b0ee7605
+  metadata.gz: 71b84cb05df74504d82d8aaf83626c999f69fdc06481fc072baada8aa29d24fd9e13652359f84a8cca5417b64f3457b5f33dd12d1a769e388e9aa430b0befb7e
+  data.tar.gz: 6e85fa4da98dfbba7a4147aad34aed090dc1e69224495be770587149dd0efb27747ac5b4ed4b7d1570b24656a610477dab359edbaaedcd6a05fde8d5ef50a452

data/README.md

@@ -36,11 +36,11 @@ The action parameters `api_token` and `owner_name` can also be omitted when thei
 - `APPCENTER_OWNER_NAME` - Owner name
 - `APPCENTER_APP_NAME` - App name. If there is no app with such name, you will be prompted to create one
 - `APPCENTER_DISTRIBUTE_APK` - Build release path for android build
-- `APPCENTER_DISTRIBUTE_AAB` - Build release path for android app bundle build (preview)
+- `APPCENTER_DISTRIBUTE_AAB` - Build release path for android app bundle build
 - `APPCENTER_DISTRIBUTE_IPA` - Build release path for ios build
-- `APPCENTER_DISTRIBUTE_DSYM` - Path to your symbols (app.dSYM.zip) file 
+- `APPCENTER_DISTRIBUTE_DSYM` - Path to your symbols (app.dSYM.zip) file
 - `APPCENTER_DISTRIBUTE_UPLOAD_DSYM_ONLY` - Flag to upload only the dSYM file to App Center
-- `APPCENTER_DISTRIBUTE_ANDROID_MAPPING` - Path to your Android mapping.txt file 
+- `APPCENTER_DISTRIBUTE_ANDROID_MAPPING` - Path to your Android mapping.txt file
 - `APPCENTER_DISTRIBUTE_UPLOAD_ANDROID_MAPPING_ONLY` - Flag to upload only the mapping file to App Center
 - `APPCENTER_DISTRIBUTE_DESTINATIONS` - Comma separated list of destination names. Both distribution groups and stores are supported. All names are required to be of the same destination type. Default is `Collaborators`.
 - `APPCENTER_DISTRIBUTE_DESTINATION_TYPE` - Destination type of distribution destination. `group` and `store` are supported. Default is `group`

data/lib/fastlane/plugin/appcenter/actions/appcenter_upload_action.rb

@@ -44,7 +44,7 @@ module Fastlane
           values[:dsym_path] = dsym_path
 
           UI.message("Starting dSYM upload...")
-          
+
           # TODO: this should eventually be removed once we have warned of deprecation for long enough
           if File.extname(dsym_path) == ".txt"
             file_name = File.basename(dsym_path)
@@ -103,6 +103,8 @@ module Fastlane
         should_clip = params[:should_clip]
         release_notes_link = params[:release_notes_link]
         timeout = params[:timeout]
+        build_number = params[:build_number]
+        version = params[:version]
 
         if release_notes.length >= Constants::MAX_RELEASE_NOTES_LENGTH
           unless should_clip
@@ -119,13 +121,42 @@ module Fastlane
         file = [
           params[:ipa],
           params[:apk],
-          params[:aab]
+          params[:aab],
+          params[:file]
         ].detect { |e| !e.to_s.empty? }
 
         UI.user_error!("Couldn't find build file at path '#{file}'") unless file && File.exist?(file)
 
+        file_ext = Helper::AppcenterHelper.file_extname_full(file)
+        if destination_type == "group"
+          UI.user_error!("Can't distribute #{file_ext} to groups, please use `destination_type: 'store'`") if %w(.aab).include? file_ext
+        else
+          UI.user_error!("Can't distribute #{file_ext} to stores, please use `destination_type: 'group'`") if %w(.app .app.zip .dmg .pkg).include? file_ext
+        end
+
+        unless params[:file].to_s.empty?
+          if %w[.dmg .pkg].include? file_ext
+            UI.user_error!("Fields `version` and `build_number` must be specified to upload a #{file_ext} file") if build_number.to_s.empty? || version.to_s.empty?
+            release_upload_body = { build_version: version, build_number: build_number }
+          else
+            UI.message("Fields `version` and `build_number` are not required for files of type #{file_ext}, ignored") unless build_number.to_s.empty? && version.to_s.empty?
+          end
+        end
+
+        if file_ext == ".app" && File.directory?(file)
+          UI.message("App path is a directory, zipping it before upload")
+          zip_file = file + ".zip"
+          if File.exists? zip_file
+            override = UI.interactive? ? UI.confirm("File '#{zip_file}' already exists, do you want to override it?") : true
+            UI.abort_with_message!("Not overriding, aborting publishing operation") unless override
+            UI.message("Deleting zip file: #{zip_file}")
+            File.delete zip_file
+          end
+          file = Actions::ZipAction.run(path: file, output_path: zip_file)
+        end
+
         UI.message("Starting release upload...")
-        upload_details = Helper::AppcenterHelper.create_release_upload(api_token, owner_name, app_name)
+        upload_details = Helper::AppcenterHelper.create_release_upload(api_token, owner_name, app_name, release_upload_body)
         if upload_details
           upload_id = upload_details['upload_id']
           upload_url = upload_details['upload_url']
@@ -154,7 +185,7 @@ module Fastlane
                 UI.error("#{destination_type} '#{destination_name}' was not found")
               end
             end
-          else 
+          else
             UI.user_error!("Failed to upload release")
           end
         end
@@ -171,8 +202,9 @@ module Fastlane
         app_platform = params[:app_platform]
 
         platforms = {
-          "Android" => ['Java', 'React-Native', 'Xamarin'],
-          "iOS" => ['Objective-C-Swift', 'React-Native', 'Xamarin']
+          Android: %w[Java React-Native Xamarin],
+          iOS: %w[Objective-C-Swift React-Native Xamarin],
+          macOS: %w[Objective-C-Swift]
         }
 
         if Helper::AppcenterHelper.get_app(api_token, owner_name, app_name)
@@ -180,15 +212,14 @@ module Fastlane
         end
 
         should_create_app = !app_display_name.to_s.empty? || !app_os.to_s.empty? || !app_platform.to_s.empty?
-        
+
         if Helper.test? || should_create_app || UI.confirm("App with name #{app_name} not found, create one?")
           app_display_name = app_name if app_display_name.to_s.empty?
-          os = app_os.to_s.empty? ?
-            (Helper.test? ? "Android" : UI.select("Select OS", ["Android", "iOS"])) :
-            app_os
-          platform = app_platform.to_s.empty? ?
-            (Helper.test? ? "Java" : UI.select("Select Platform", platforms[os])) :
-            app_platform
+          os = app_os.to_s.empty? && (Helper.test? ? "Android" : UI.select("Select OS", platforms.keys)) || app_os.to_s
+          platform = app_platform.to_s.empty? && (Helper.test? ? "Java" : app_platform.to_s) || app_platform.to_s
+          if platform.to_s.empty?
+            platform = platforms[os].length == 1 ? platforms[os][0] : UI.select("Select Platform", platforms[os])
+          end
 
           Helper::AppcenterHelper.create_app(api_token, owner_type, owner_name, app_name, app_display_name, os, platform)
         else
@@ -288,22 +319,23 @@ module Fastlane
                              default_value: Actions.lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH],
                                   optional: true,
                                       type: String,
-                       conflicting_options: [:ipa, :aab],
+                       conflicting_options: [:ipa, :aab, :file],
                             conflict_block: proc do |value|
                               UI.user_error!("You can't use 'apk' and '#{value.key}' options in one run")
                             end,
                               verify_block: proc do |value|
                                 accepted_formats = [".apk"]
-                                UI.user_error!("Only \".apk\" formats are allowed, you provided \"#{File.extname(value)}\"") unless accepted_formats.include? File.extname(value)
+                                file_extname_full = Helper::AppcenterHelper.file_extname_full(value)
+                                UI.user_error!("Only \".apk\" formats are allowed, you provided \"#{file_extname_full}\"") unless accepted_formats.include? file_extname_full
                               end),
 
           FastlaneCore::ConfigItem.new(key: :aab,
                                   env_name: "APPCENTER_DISTRIBUTE_AAB",
-                               description: "Build release path for android app bundle build (preview)",
+                               description: "Build release path for android app bundle build",
                              default_value: Actions.lane_context[SharedValues::GRADLE_AAB_OUTPUT_PATH],
                                   optional: true,
                                       type: String,
-                       conflicting_options: [:ipa, :apk],
+                       conflicting_options: [:ipa, :apk, :file],
                             conflict_block: proc do |value|
                               UI.user_error!("You can't use 'aab' and '#{value.key}' options in one run")
                             end,
@@ -314,11 +346,11 @@ module Fastlane
 
           FastlaneCore::ConfigItem.new(key: :ipa,
                                   env_name: "APPCENTER_DISTRIBUTE_IPA",
-                               description: "Build release path for ios build",
+                               description: "Build release path for iOS builds",
                              default_value: Actions.lane_context[SharedValues::IPA_OUTPUT_PATH],
                                   optional: true,
                                       type: String,
-                       conflicting_options: [:apk, :aab],
+                       conflicting_options: [:apk, :aab, :file],
                             conflict_block: proc do |value|
                               UI.user_error!("You can't use 'ipa' and '#{value.key}' options in one run")
                             end,
@@ -327,6 +359,21 @@ module Fastlane
                                 UI.user_error!("Only \".ipa\" formats are allowed, you provided \"#{File.extname(value)}\"") unless accepted_formats.include? File.extname(value)
                               end),
 
+          FastlaneCore::ConfigItem.new(key: :file,
+                                  env_name: "APPCENTER_DISTRIBUTE_FILE",
+                               description: "Build release path for generic builds (.aab, .app, .app.zip, .apk, .dmg, .ipa, .pkg)",
+                                  optional: true,
+                                      type: String,
+                       conflicting_options: [:apk, :aab, :ipa],
+                            conflict_block: proc do |value|
+                              UI.user_error!("You can't use 'file' and '#{value.key}' options in one run")
+                            end,
+                              verify_block: proc do |value|
+                                accepted_formats = %w(.aab .app .app.zip .apk .dmg .ipa .pkg)
+                                file_ext = Helper::AppcenterHelper.file_extname_full(value)
+                                UI.user_error!("Only #{accepted_formats.to_s} formats are allowed, you provided \"#{file_ext}\"") unless accepted_formats.include? file_ext
+                              end),
+
           FastlaneCore::ConfigItem.new(key: :dsym,
                                   env_name: "APPCENTER_DISTRIBUTE_DSYM",
                                description: "Path to your symbols file. For iOS provide path to app.dSYM.zip",
@@ -432,13 +479,13 @@ module Fastlane
 
           FastlaneCore::ConfigItem.new(key: :build_number,
                                        env_name: "APPCENTER_DISTRIBUTE_BUILD_NUMBER",
-                                       description: "The build number. Used (and required) for uploading Android ProGuard mapping file",
+                                       description: "The build number, required for Android ProGuard mapping files, as well as macOS .pkg and .dmg builds",
                                        optional: true,
                                        type: String),
 
           FastlaneCore::ConfigItem.new(key: :version,
                                        env_name: "APPCENTER_DISTRIBUTE_VERSION",
-                                       description: "The version number. Used (and required) for uploading Android ProGuard mapping file",
+                                       description: "The build version, required for Android ProGuard mapping files, as well as macOS .pkg and .dmg builds",
                                        optional: true,
                                        type: String),
 

data/lib/fastlane/plugin/appcenter/helper/appcenter_helper.rb

@@ -2,6 +2,19 @@ module Fastlane
   module Helper
     class AppcenterHelper
 
+      # basic utility method to check file types that App Center will accept,
+      # accounting for file types that can and should be zip-compressed
+      # before they are uploaded
+      def self.file_extname_full(path)
+        is_zip = File.extname(path) == ".zip"
+
+        # if file is not .zip'ed, these do not change basename and extname
+        unzip_basename = File.basename(path, ".zip")
+        unzip_extname = File.extname(unzip_basename)
+
+        is_zip ? unzip_extname + ".zip" : unzip_extname
+      end
+
       # create request
       def self.connection(upload_url = false, dsym = false)
         require 'faraday'
@@ -28,13 +41,13 @@ module Fastlane
       # returns:
       # upload_id
       # upload_url
-      def self.create_release_upload(api_token, owner_name, app_name)
+      def self.create_release_upload(api_token, owner_name, app_name, body)
         connection = self.connection
 
         response = connection.post("v0.1/apps/#{owner_name}/#{app_name}/release_uploads") do |req|
           req.headers['X-API-Token'] = api_token
           req.headers['internal-request-source'] = "fastlane"
-          req.body = {}
+          req.body = body.nil? && {} || body
         end
 
         case response.status

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Appcenter
-    VERSION = "1.3.0"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appcenter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Fastlane plugin for App Center