fastlane 2.52.0.beta.20170809010003 → 2.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84dfac521c24a7dc35841c4d194e9a31ae8db07a
-  data.tar.gz: 1e6dc149c74e78056604e463a8c7868308e2857d
+  metadata.gz: c7f3c794df6dc0a5cd82ae0ed33a3cd555c58e02
+  data.tar.gz: bfc83e409c4b6daa53a5be411be8b9f645353c49
 SHA512:
-  metadata.gz: 235a44f8ba3596df28e20a411e11f700c068d9b2f99cc63b4e75d5a5c096ff4484029198959ecdffcaabd976fc195e16a57178a9648c2857b32217f9915e1130
-  data.tar.gz: 72e318606acf692f108481298541fb07c0d2a756b307a2994c686cfa3c99ab82f84c7ac86defca2088d5159787bbe5665eef22b6a17a6285c6a1c759ba73e9c8
+  metadata.gz: 5aa6e50c5bf45bb129d1e0978d46ffad40feef098efb8d01e1d986b19563ddff192e19544f91948ab83e841719b4323ae3eb97ae3d39fc17165677df27a89e58
+  data.tar.gz: 0bd5fe9a8a057d0bf66678614c74066f42a4e355a2c8361dace35878ae7dcac8760c70f810cfac31c21e71ee6680b095405d6cd43dbc304d632c886b8aee606d

data/fastlane/lib/fastlane/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
-  VERSION = '2.52.0.beta.20170809010003'.freeze
+  VERSION = '2.52.0'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
   MINIMUM_XCODE_RELEASE = "7.0".freeze
 end

data/produce/README.md

@@ -61,6 +61,8 @@ Get in contact with the developers on Twitter: [@FastlaneTools](https://twitter.
 - **Modify** Application Services on the Apple Developer Portal
 - **Create** App Groups on the Apple Developer Portal
 - **Associate** apps with App Groups on the Apple Developer Portal
+- **Create** Merchant Identifiers on the Apple Developer Portal
+- **Associate** apps with Merchant Identifiers on the Apple Developer Portal
 - Support for **multiple Apple accounts**, storing your credentials securely in the Keychain
 
 ##### [Do you like fastlane? Be the first to know about updates and new fastlane tools](https://tinyletter.com/fastlane-tools)
@@ -78,15 +80,17 @@ Get in contact with the developers on Twitter: [@FastlaneTools](https://twitter.
 To get a list of all available parameters:
 
     fastlane produce --help
-    
+
 ```
   Commands: (* default)
-    associate_group    Associate with a group, which is created if needed or simply located otherwise
-    create           * Creates a new app on iTunes Connect and the Apple Developer Portal
-    disable_services   Disable specific Application Services for a specific app on the Apple Developer Portal
-    enable_services    Enable specific Application Services for a specific app on the Apple Developer Portal
-    group              Ensure that a specific App Group exists
-    help               Display global or [command] help documentation
+    associate_group      Associate with a group, which is created if needed or simply located otherwise
+    associate_merchant   Associate with a merchant for use with Apple Pay. Apple Pay will be enabled for this app
+    create             * Creates a new app on iTunes Connect and the Apple Developer Portal
+    disable_services     Disable specific Application Services for a specific app on the Apple Developer Portal
+    enable_services      Enable specific Application Services for a specific app on the Apple Developer Portal
+    group                Ensure that a specific App Group exists
+    help                 Display global or [command] help documentation
+    merchant             Ensure that a specific Merchant exists
 
   Global Options:
     --verbose
@@ -173,6 +177,37 @@ Get a list of all available options using
     --vpn-conf           Disable VPN Configuration
 ```
 
+## Creating Apple Pay merchants and associating them with an App ID
+
+If you want to create a new Apple Pay Merchant Identifier:
+
+```
+fastlane produce merchant -o merchant.com.example.production -r "Example Merchant Production"
+```
+
+Use `--help` for more information about all available parameters
+```
+fastlane produce merchant --help
+```
+
+If you want to associate an app with a Merchant Identifier:
+
+```
+fastlane produce associate_merchant -a com.krausefx.app merchant.com.example.production
+```
+
+If you want to associate an app with multiple Merchant Identifiers:
+
+```
+fastlane produce associate_merchant -a com.krausefx.app merchant.com.example.production merchant.com.example.sandbox
+```
+
+Use --help for more information about all available parameters
+
+```
+fastlane produce associate_merchant --help
+```
+
 ## Environment Variables
 
 All available values can also be passed using environment variables, run `fastlane produce --help` to get a list of all available parameters.

data/produce/lib/produce/commands_generator.rb

@@ -135,6 +135,43 @@ module Produce
         end
       end
 
+      command :merchant do |c|
+        c.syntax = 'fastlane produce merchant'
+        c.description = 'Ensure that a specific Merchant exists'
+        c.example 'Create merchant', 'fastlane produce merchant -o merchant.com.example.production -r "Example Merchant Production"'
+
+        c.option '-r', '--merchant_name STRING', String, 'Name for the merchant that is created (PRODUCE_MERCHANT_NAME)'
+        c.option '-o', '--merchant_identifier STRING', String, 'Merchant identifier for the merchant (PRODUCE_MERCHANT_IDENTIFIER)'
+
+        FastlaneCore::CommanderGenerator.new.generate(Produce::Options.available_options, command: c)
+
+        c.action do |args, options|
+          extra_options = [FastlaneCore::ConfigItem.new(key: :merchant_name, optional: true), FastlaneCore::ConfigItem.new(key: :merchant_identifier)]
+          all_options = Produce::Options.available_options + extra_options
+          allowed_keys = all_options.collect(&:key)
+
+          Produce.config = FastlaneCore::Configuration.create(all_options, options.__hash__.select { |key, value| allowed_keys.include? key })
+
+          require 'produce/merchant'
+          Produce::Merchant.new.create(options, args)
+        end
+      end
+
+      command :associate_merchant do |c|
+        c.syntax = 'fastlane produce associate_merchant -a APP_IDENTIFIER MERCHANT_IDENTIFIER1, MERCHANT_IDENTIFIER2, ...'
+        c.description = 'Associate with a merchant for use with Apple Pay. Apple Pay will be enabled for this app.'
+        c.example 'Associate with merchant', 'fastlane produce associate_merchant -a com.example.app merchant.com.example.production'
+
+        FastlaneCore::CommanderGenerator.new.generate(Produce::Options.available_options, command: c)
+
+        c.action do |args, options|
+          Produce.config = FastlaneCore::Configuration.create(Produce::Options.available_options, options.__hash__)
+
+          require 'produce/merchant'
+          Produce::Merchant.new.associate(options, args)
+        end
+      end
+
       default_command :create
 
       run!

data/produce/lib/produce/merchant.rb

@@ -0,0 +1,120 @@
+require 'spaceship'
+
+module Produce
+  class Merchant
+    def create(_options, _args)
+      login
+
+      merchant_identifier = detect_merchant_identifier
+      merchant = find_merchant(merchant_identifier)
+
+      if merchant
+        UI.success("[DevCenter] Merchant '#{merchant.bundle_id})' already exists, nothing to do on the Dev Center")
+      else
+        merchant_name = Produce.config[:merchant_name] || merchant_name_from_identifier(merchant_identifier)
+        UI.success("Creating new merchant '#{merchant_name}' with identifier '#{merchant_identifier}' on the Apple Dev Center")
+        merchant = Spaceship.merchant.create!(bundle_id: merchant_identifier, name: merchant_name, mac: self.class.mac?)
+
+        if merchant.name != merchant_name
+          UI.important("Your merchant name might include non-ASCII characters, which are not supported by the Apple Developer Portal.")
+          UI.important("To fix this a unique (internal) name '#{merchant.name}' has been created for you.")
+        end
+
+        UI.message("Created merchant #{merchant.merchant_id}")
+        UI.success("Finished creating new merchant '#{merchant_name}' on the Dev Center")
+      end
+    end
+
+    def associate(_options, args)
+      login
+
+      app = Spaceship.app.find(app_identifier)
+
+      if app
+        app.update_service(Spaceship.app_service.apple_pay.on)
+
+        UI.message("Validating merchants before association")
+
+        # associate requires identifiers to exist. This splits the provided identifiers into existing/non-existing. See: https://ruby-doc.org/core/Enumerable.html#method-i-partition
+        valid_identifiers, errored_identifiers = args.partition { |identifier| merchant_exists?(identifier) }
+        new_merchants = valid_identifiers.map { |identifier| find_merchant(identifier) }
+
+        errored_identifiers.each do |merchant_identifier|
+          UI.message("[DevCenter] Merchant '#{merchant_identifier}' does not exist, please create it first, skipping for now")
+        end
+
+        UI.message("Finalising association with #{new_merchants.count} #{pluralize('merchant', new_merchants)}")
+        app.associate_merchants(new_merchants)
+        UI.success("Done!")
+      else
+        UI.message("[DevCenter] App '#{Produce.config[:app_identifier]}' does not exist, nothing to associate with the merchants")
+      end
+    end
+
+    def login
+      UI.message("Starting login with user '#{Produce.config[:username]}'")
+      Spaceship.login(Produce.config[:username], nil)
+      Spaceship.select_team
+      UI.message("Successfully logged in")
+    end
+
+    def app_identifier
+      Produce.config[:app_identifier]
+    end
+
+    def pluralize(singular, arr)
+      return singular if arr.count == 1
+
+      "#{singular}s"
+    end
+
+    def merchant_exists?(identifier)
+      find_merchant(identifier)
+    end
+
+    def detect_merchant_identifier
+      self.class.detect_merchant_identifier
+    end
+
+    def self.detect_merchant_identifier(config = Produce.config)
+      identifier = config[:merchant_identifier] || input("Merchant identifier (reverse-domain name style string starting with 'merchant'): ", ":merchant_identifier option is required")
+      prepare_identifier(identifier)
+    end
+
+    def self.input(message, error_message)
+      if UI.interactive?
+        UI.input(message)
+      else
+        UI.user_error!(error_message)
+      end
+    end
+
+    def self.prepare_identifier(identifier)
+      return identifier if identifier.start_with?("merchant.")
+
+      "merchant.#{identifier}"
+    end
+
+    def find_merchant(identifier)
+      self.class.find_merchant(identifier)
+    end
+
+    def self.find_merchant(identifier, merchant: Spaceship.merchant)
+      @cache ||= {}
+      @cache[identifier] ||= merchant.find(identifier, mac: mac?)
+    end
+
+    def self.mac?(config = Produce.config)
+      config[:platform].to_s == "mac"
+    end
+
+    def merchant_name_from_identifier(identifier)
+      self.class.merchant_name_from_identifier(identifier)
+    end
+
+    def self.merchant_name_from_identifier(identifier)
+      capitalized_words = identifier.split(".").map(&:capitalize)
+      capitalized_words.reverse.join(' ')
+    end
+  end
+end

data/spaceship/lib/spaceship.rb

@@ -25,6 +25,7 @@ module Spaceship
   Passbook = Spaceship::Portal::Passbook
   WebsitePush = Spaceship::Portal::WebsitePush
   AppService = Spaceship::Portal::AppService
+  Merchant = Spaceship::Portal::Merchant
 
   # iTunes Connect
   AppVersion = Spaceship::Tunes::AppVersion

data/spaceship/lib/spaceship/portal/app.rb

@@ -144,6 +144,13 @@ module Spaceship
         self.class.factory(app)
       end
 
+      # Associate specific merchants with this app
+      # @return (App) The updated detailed app. This is nil if the app couldn't be found
+      def associate_merchants(merchants)
+        app = client.associate_merchants_with_app(self, merchants, mac?)
+        self.class.factory(app)
+      end
+
       # Update a service for the app with given AppService object
       # @return (App) The updated detailed app. This is nil if the app couldn't be found
       def update_service(service)

data/spaceship/lib/spaceship/portal/merchant.rb

@@ -0,0 +1,84 @@
+module Spaceship
+  module Portal
+    # Represents a Merchant ID from the Developer Portal
+    class Merchant < PortalBase
+      # @return (String) The identifier of this merchant, provided by the Dev Portal
+      # @example
+      #   "LM1UX73BAC"
+      attr_accessor :merchant_id
+
+      # @return (String) The name you provided for this merchant
+      # @example
+      #   "Spaceship Production"
+      attr_accessor :name
+
+      # @return (String) the supported platform of this merchant
+      # @example
+      #   "ios"
+      attr_accessor :platform
+
+      # Prefix provided by the Dev Portal
+      # @example
+      #   "5A9972XTK2"
+      attr_accessor :prefix
+
+      # @return (String) The bundle_id (merchant identifier) of merchant id
+      # @example
+      #   "merchant.com.krausefx.app.production"
+      attr_accessor :bundle_id
+
+      # @return (String) Status of the merchant
+      # @example
+      #   "current"
+      attr_accessor :status
+
+      attr_mapping(
+        'omcId' => :merchant_id,
+        'name' => :name,
+        'prefix' => :prefix,
+        'identifier' => :bundle_id,
+        'status' => :status
+      )
+
+      class << self
+        # @param mac [Bool] Fetches Mac merchant if true
+        # @return (Array) Returns all merchants available for this account
+        def all(mac: false)
+          client.merchants(mac: mac).map { |merchant| new(merchant) }
+        end
+
+        # Creates a new Merchant on the Apple Dev Portal
+        #
+        # @param bundle_id [String] the bundle id (merchant_identifier) of the merchant
+        # @param name [String] the name of the Merchant
+        # @param mac [Bool] is this a Mac Merchant?
+        # @return (Merchant) The Merchant you just created
+        def create!(bundle_id: nil, name: nil, mac: false)
+          new_merchant = client.create_merchant!(name, bundle_id, mac: mac)
+          new(new_merchant)
+        end
+
+        # Find a specific Merchant ID based on the bundle_id
+        # @param mac [Bool] Searches Mac merchants if true
+        # @return (Merchant) The Merchant you're looking for. This is nil if the merchant can't be found.
+        def find(bundle_id, mac: false)
+          all(mac: mac).find do |merchant|
+            merchant.bundle_id == bundle_id
+          end
+        end
+      end
+
+      # Delete this Merchant
+      # @return (Merchant) The merchant you just deleted
+      def delete!
+        client.delete_merchant!(merchant_id, mac: mac?)
+        self
+      end
+
+      # @return (Bool) Is this a Mac merchant?
+      def mac?
+        platform == 'mac'
+      end
+    end
+  end
+end

data/spaceship/lib/spaceship/portal/portal.rb

@@ -10,5 +10,6 @@ require 'spaceship/portal/portal_client'
 require 'spaceship/portal/persons'
 require 'spaceship/portal/person'
 require 'spaceship/portal/key'
+require 'spaceship/portal/merchant'
 require 'spaceship/portal/passbook'
 require 'spaceship/portal/invite'

data/spaceship/lib/spaceship/portal/portal_client.rb

@@ -132,6 +132,18 @@ module Spaceship
       details_for_app(app)
     end
 
+    def associate_merchants_with_app(app, merchants, mac)
+      ensure_csrf(Spaceship::Merchant)
+
+      request(:post, "account/#{platform_slug(mac)}/identifiers/assignOMCToAppId.action", {
+        teamId: team_id,
+        appIdId: app.app_id,
+        omcIds: merchants.map(&:merchant_id)
+      })
+
+      details_for_app(app)
+    end
+
     def valid_name_for(input)
       latinized = input.to_slug.transliterate
       latinized = latinized.gsub(/[^0-9A-Za-z\d\s]/, '') # remove non-valid characters
@@ -273,6 +285,43 @@ module Spaceship
       parse_response(r)
     end
 
+    #####################################################
+    # @!group Merchant
+    #####################################################
+
+    def merchants(mac: false)
+      paging do |page_number|
+        r = request(:post, "account/#{platform_slug(mac)}/identifiers/listOMCs.action", {
+            teamId: team_id,
+            pageNumber: page_number,
+            pageSize: page_size,
+            sort: 'name=asc'
+        })
+        parse_response(r, 'identifierList')
+      end
+    end
+
+    def create_merchant!(name, bundle_id, mac: false)
+      ensure_csrf(Spaceship::Merchant)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/addOMC.action", {
+          name: name,
+          identifier: bundle_id,
+          teamId: team_id
+      })
+      parse_response(r, 'omcId')
+    end
+
+    def delete_merchant!(merchant_id, mac: false)
+      ensure_csrf(Spaceship::Merchant)
+
+      r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteOMC.action", {
+          teamId: team_id,
+          omcId: merchant_id
+      })
+      parse_response(r)
+    end
+
     #####################################################
     # @!group App Groups
     #####################################################

data/spaceship/lib/spaceship/portal/spaceship.rb

@@ -78,6 +78,11 @@ module Spaceship
       def provisioning_profile
         Spaceship::ProvisioningProfile.set_client(@client)
       end
+
+      # @return (Class) Access the merchants for the spaceship
+      def merchant
+        Spaceship::Merchant.set_client(@client)
+      end
     end
   end
 
@@ -126,5 +131,9 @@ module Spaceship
     def client
       Spaceship::Portal.client
     end
+
+    def merchant
+      Spaceship::Portal.merchant
+    end
   end
 end

data/supply/lib/supply/options.rb

@@ -24,7 +24,7 @@ module Supply
         FastlaneCore::ConfigItem.new(key: :rollout,
                                      short_option: "-r",
                                      description: "The percentage of the user fraction when uploading to the rollout track",
-                                     default_value: '0.1',
+                                     optional: true,
                                      verify_block: proc do |value|
                                        min = 0.0
                                        max = 1.0

data/supply/lib/supply/uploader.rb

@@ -43,7 +43,7 @@ module Supply
       # the actual value passed for the rollout argument does not matter because it will be ignored by the Google Play API
       # but it has to be between 0.0 and 1.0 to pass the validity check. So we are passing the default value 0.1
       client.update_track(Supply.config[:track], 0.1, nil)
-      client.update_track(Supply.config[:track_promote_to], Supply.config[:rollout], version_codes)
+      client.update_track(Supply.config[:track_promote_to], Supply.config[:rollout] || 0.1, version_codes)
     end
 
     def upload_changelogs(language)
@@ -157,8 +157,8 @@ module Supply
       UI.message("Updating track '#{Supply.config[:track]}'...")
       check_superseded_tracks(apk_version_codes) if Supply.config[:check_superseded_tracks]
 
-      if Supply.config[:track].eql? "rollout"
-        client.update_track(Supply.config[:track], Supply.config[:rollout], apk_version_codes)
+      if Supply.config[:track].eql?("rollout")
+        client.update_track(Supply.config[:track], Supply.config[:rollout] || 0.1, apk_version_codes)
       else
         client.update_track(Supply.config[:track], 1.0, apk_version_codes)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.52.0.beta.20170809010003
+  version: 2.52.0
 platform: ruby
 authors:
 - Felix Krause
@@ -830,6 +830,7 @@ files:
 - fastlane/lib/assets/s3_plist_template.erb
 - fastlane/lib/assets/s3_version_template.erb
 - fastlane/lib/fastlane.rb
+- fastlane/lib/fastlane/.DS_Store
 - fastlane/lib/fastlane/action.rb
 - fastlane/lib/fastlane/action_collector.rb
 - fastlane/lib/fastlane/actions/README.md
@@ -1233,6 +1234,7 @@ files:
 - produce/lib/produce/group.rb
 - produce/lib/produce/itunes_connect.rb
 - produce/lib/produce/manager.rb
+- produce/lib/produce/merchant.rb
 - produce/lib/produce/options.rb
 - produce/lib/produce/service.rb
 - scan/README.md
@@ -1317,6 +1319,7 @@ files:
 - spaceship/lib/spaceship/portal/device.rb
 - spaceship/lib/spaceship/portal/invite.rb
 - spaceship/lib/spaceship/portal/key.rb
+- spaceship/lib/spaceship/portal/merchant.rb
 - spaceship/lib/spaceship/portal/passbook.rb
 - spaceship/lib/spaceship/portal/person.rb
 - spaceship/lib/spaceship/portal/persons.rb
@@ -1403,24 +1406,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
-- spaceship/lib
-- scan/lib
-- sigh/lib
-- snapshot/lib
-- screengrab/lib
-- fastlane/lib
 - cert/lib
-- pem/lib
-- gym/lib
-- produce/lib
+- credentials_manager/lib
 - deliver/lib
-- supply/lib
-- match/lib
+- fastlane/lib
+- fastlane_core/lib
 - frameit/lib
-- credentials_manager/lib
+- gym/lib
+- match/lib
+- pem/lib
 - pilot/lib
 - precheck/lib
-- fastlane_core/lib
+- produce/lib
+- scan/lib
+- screengrab/lib
+- sigh/lib
+- snapshot/lib
+- spaceship/lib
+- supply/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1428,14 +1431,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
+has_rdoc: