fastlane-plugin-appcenter 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3784671e2a8f06e8a2a65dfa66ee08bdc2b91b87f4c5d51b770ec3e429f21f89
-  data.tar.gz: a4159d408e9653d55627798245dda024b9f14122d50e11c95312bbabd6ad3367
+  metadata.gz: f94bfd3f235695b534b7ebb1ef47e7bf195cbae8e59abbb1d646e1d7b4790cda
+  data.tar.gz: 142eb6d82abeb7d4bfe3fffa8e8127b00edcab7b2d57e557e0bb81cbf35471ce
 SHA512:
-  metadata.gz: 32cc5d08c9d4112d7e2754c8f37af9184455de76ca5ace67fcb199e5b3b33ec7194d8221e5a9bfa03966632247687d405512e08328c5d1adbada892dca14f1bb
-  data.tar.gz: b063b6498cb08291aceaef424a34d3a9dbd42d5ca678f252a4e98d142581ccda6248781fa3a7eeca2a26250cc868668b5daeae193ae9aff012b34754e147eb42
+  metadata.gz: fbdd60b80dda9c2e43d1d42b97a3e982a40b8e6deef76e086bdbecf0f00372b28e6821fc215cbf692b4d64589dce63b51d6a815053d4f348b2f1c07ee7b0f4ae
+  data.tar.gz: 6207f85a258ca6ff2148172c36a5bb7a1de8aed26e13a2da3498d920a321f3846696d92e5244890c61b8b91e9fab57bf9e1d936856950470f4ea4a53b0ee7605

data/README.md

@@ -22,8 +22,8 @@ To get started, first, [obtain an API token](https://appcenter.ms/settings/apito
 ```ruby
 appcenter_upload(
   api_token: "<appcenter token>",
-  owner_name: "<your appcenter account name>",
-  app_name: "<your app name>",
+  owner_name: "<appcenter account name of the owner of the app (username or organization URL name)>",
+  app_name: "<appcenter app name>",
   apk: "<path to android build binary>",
   notify_testers: true # Set to false if you don't want to notify testers of your new release (default: `false`)
 )
@@ -32,6 +32,7 @@ appcenter_upload(
 The action parameters `api_token` and `owner_name` can also be omitted when their values are [set as environment variables](https://docs.fastlane.tools/advanced/#environment-variables). Below a list of all available environment variables:
 
 - `APPCENTER_API_TOKEN` - API Token for App Center
+- `APPCENTER_OWNER_TYPE` - Owner type - `user` or `organization` (default value is `user`)
 - `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

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

@@ -26,7 +26,7 @@ module Fastlane
           # we can use dsym parameter only if build file is ipa
           dsym_path = dsym if !file || File.extname(file) == '.ipa'
         else
-          # if dsym is note set, but build is ipa - check default path
+          # if dsym is not set, but build is ipa - check default path
           if file && File.exist?(file) && File.extname(file) == '.ipa'
             dsym_path = file.to_s.gsub('.ipa', '.dSYM.zip')
             UI.message("dSYM is found")
@@ -163,6 +163,7 @@ module Fastlane
       # checks app existance, if ther is no such - creates it
       def self.get_or_create_app(params)
         api_token = params[:api_token]
+        owner_type = params[:owner_type]
         owner_name = params[:owner_name]
         app_name = params[:app_name]
         app_display_name = params[:app_display_name]
@@ -189,7 +190,7 @@ module Fastlane
             (Helper.test? ? "Java" : UI.select("Select Platform", platforms[os])) :
             app_platform
 
-          Helper::AppcenterHelper.create_app(api_token, owner_name, app_name, app_display_name, os, platform)
+          Helper::AppcenterHelper.create_app(api_token, owner_type, owner_name, app_name, app_display_name, os, platform)
         else
           UI.error("Lane aborted")
           false
@@ -234,6 +235,17 @@ module Fastlane
                                 UI.user_error!("No API token for App Center given, pass using `api_token: 'token'`") unless value && !value.empty?
                               end),
 
+          FastlaneCore::ConfigItem.new(key: :owner_type,
+                                  env_name: "APPCENTER_OWNER_TYPE",
+                               description: "Owner type",
+                                  optional: true,
+                             default_value: "user",
+                                      type: String,
+                              verify_block: proc do |value|
+                                accepted_formats = ["user", "organization"]
+                                UI.user_error!("Only \"user\" and \"organization\" types are allowed, you provided \"#{File.extname(value)}\"") unless accepted_formats.include? value
+                              end),
+
           FastlaneCore::ConfigItem.new(key: :owner_name,
                                   env_name: "APPCENTER_OWNER_NAME",
                                description: "Owner name",
@@ -492,4 +504,4 @@ module Fastlane
       end
     end
   end
-end
+end

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

@@ -371,10 +371,12 @@ module Fastlane
       end
 
       # returns true if app exists, false in case of 404 and error otherwise
-      def self.create_app(api_token, owner_name, app_name, app_display_name, os, platform)
+      def self.create_app(api_token, owner_type, owner_name, app_name, app_display_name, os, platform)
         connection = self.connection
 
-        response = connection.post("v0.1/apps") do |req|
+        endpoint = owner_type == "user" ? "v0.1/apps" : "v0.1/orgs/#{owner_name}/apps"
+
+        response = connection.post(endpoint) do |req|
           req.headers['X-API-Token'] = api_token
           req.headers['internal-request-source'] = "fastlane"
           req.body = {
@@ -389,7 +391,7 @@ module Fastlane
         when 200...300
           created = response.body
           UI.message("DEBUG: #{JSON.pretty_generate(created)}") if ENV['DEBUG']
-          UI.success("Created #{os}/#{platform} app with name \"#{created['name']}\" and display name \"#{created['display_name']}\"")
+          UI.success("Created #{os}/#{platform} app with name \"#{created['name']}\" and display name \"#{created['display_name']}\" for #{owner_type} \"#{owner_name}\"")
           true
         else
           UI.error("Error creating app #{response.status}: #{response.body}")

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-appcenter
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler