fastlane 2.74.0.beta.20180106010004 → 2.74.0.beta.20180107010004

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

@@ -1,5 +1,7 @@
 require 'openssl'
 
+require_relative 'app'
+
 module Spaceship
   module Portal
     # Represents a certificate from the Apple Developer Portal.
@@ -287,7 +289,7 @@ module Spaceship
 
           # look up the app_id by the bundle_id
           if bundle_id
-            app = Spaceship::App.set_client(client).find(bundle_id)
+            app = Spaceship::Portal::App.set_client(client).find(bundle_id)
             raise "Could not find app with bundle id '#{bundle_id}'" unless app
             app_id = app.app_id
           end

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     # Represents a device from the Apple Developer Portal
@@ -97,11 +99,11 @@ module Spaceship
         # @return (Array) Returns all devices matching the provided profile_type
         def all_for_profile_type(profile_type)
           if profile_type.include? "tvOS"
-            Spaceship::Device.all_apple_tvs
+            Spaceship::Portal::Device.all_apple_tvs
           elsif profile_type.include? "Mac"
-            Spaceship::Device.all_macs
+            Spaceship::Portal::Device.all_macs
           else
-            Spaceship::Device.all_ios_profile_devices
+            Spaceship::Portal::Device.all_ios_profile_devices
           end
         end
 

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     class Invite < PortalBase

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     class Key < PortalBase

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

@@ -0,0 +1,21 @@
+require_relative 'certificate'
+require_relative 'provisioning_profile'
+require_relative 'device'
+require_relative 'app'
+require_relative 'app_group'
+require_relative 'passbook'
+require_relative 'website_push'
+require_relative 'app_service'
+require_relative 'merchant'
+
+module Spaceship
+  Certificate = Spaceship::Portal::Certificate
+  ProvisioningProfile = Spaceship::Portal::ProvisioningProfile
+  Device = Spaceship::Portal::Device
+  App = Spaceship::Portal::App
+  AppGroup = Spaceship::Portal::AppGroup
+  Passbook = Spaceship::Portal::Passbook
+  WebsitePush = Spaceship::Portal::WebsitePush
+  AppService = Spaceship::Portal::AppService
+  Merchant = Spaceship::Portal::Merchant
+end

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     # Represents a Merchant ID from the Developer Portal

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     # Represents an Passbook ID from the Developer Portal

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

@@ -1,3 +1,5 @@
+require_relative 'portal_base'
+
 module Spaceship
   module Portal
     class Person < PortalBase

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

@@ -1,3 +1,6 @@
+require_relative 'person'
+require_relative 'invite'
+
 module Spaceship
   module Portal
     class Persons < PortalBase

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

@@ -1,7 +1,10 @@
+require_relative '../base'
+
 module Spaceship
   class PortalBase < Spaceship::Base
     class << self
       def client
+        require_relative 'spaceship'
         (
           @client or
           Spaceship::Portal.client or

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

@@ -1,3 +1,15 @@
+require_relative '../client'
+
+require_relative 'app'
+require_relative 'app_group'
+require_relative 'device'
+require_relative 'merchant'
+require_relative 'passbook'
+require_relative 'provisioning_profile'
+require_relative 'certificate'
+require_relative 'website_push'
+require_relative 'persons'
+
 module Spaceship
   # rubocop:disable Metrics/ClassLength
   class PortalClient < Spaceship::Client
@@ -5,6 +17,8 @@ module Spaceship
     # @!group Init and Login
     #####################################################
 
+    PROTOCOL_VERSION = Spaceship::Client::PROTOCOL_VERSION
+
     def self.hostname
       "https://developer.apple.com/services-account/#{PROTOCOL_VERSION}/"
     end
@@ -107,7 +121,7 @@ module Spaceship
     end
 
     def update_service_for_app(app, service)
-      ensure_csrf(Spaceship::App)
+      ensure_csrf(Spaceship::Portal::App)
 
       request(:post, service.service_uri, {
         teamId: team_id,
@@ -120,7 +134,7 @@ module Spaceship
     end
 
     def associate_groups_with_app(app, groups)
-      ensure_csrf(Spaceship::AppGroup)
+      ensure_csrf(Spaceship::Portal::AppGroup)
 
       request(:post, 'account/ios/identifiers/assignApplicationGroupToAppId.action', {
         teamId: team_id,
@@ -133,7 +147,7 @@ module Spaceship
     end
 
     def associate_merchants_with_app(app, merchants, mac)
-      ensure_csrf(Spaceship::Merchant)
+      ensure_csrf(Spaceship::Portal::Merchant)
 
       request(:post, "account/#{platform_slug(mac)}/identifiers/assignOMCToAppId.action", {
         teamId: team_id,
@@ -160,7 +174,7 @@ module Spaceship
       # We moved the ensure_csrf to the top of this method
       # as we got some users with issues around creating new apps
       # https://github.com/fastlane/fastlane/issues/5813
-      ensure_csrf(Spaceship::App)
+      ensure_csrf(Spaceship::Portal::App)
 
       ident_params = case type.to_sym
                      when :explicit
@@ -191,7 +205,7 @@ module Spaceship
     end
 
     def delete_app!(app_id, mac: false)
-      ensure_csrf(Spaceship::App)
+      ensure_csrf(Spaceship::Portal::App)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteAppId.action", {
         teamId: team_id,
@@ -201,7 +215,7 @@ module Spaceship
     end
 
     def update_app_name!(app_id, name, mac: false)
-      ensure_csrf(Spaceship::App)
+      ensure_csrf(Spaceship::Portal::App)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/updateAppIdName.action", {
         teamId: team_id,
@@ -228,7 +242,7 @@ module Spaceship
     end
 
     def create_passbook!(name, bundle_id)
-      ensure_csrf(Spaceship::Passbook)
+      ensure_csrf(Spaceship::Portal::Passbook)
 
       r = request(:post, "account/ios/identifiers/addPassTypeId.action", {
           name: name,
@@ -239,7 +253,7 @@ module Spaceship
     end
 
     def delete_passbook!(passbook_id)
-      ensure_csrf(Spaceship::Passbook)
+      ensure_csrf(Spaceship::Portal::Passbook)
 
       r = request(:post, "account/ios/identifiers/deletePassTypeId.action", {
           teamId: team_id,
@@ -265,7 +279,7 @@ module Spaceship
     end
 
     def create_website_push!(name, bundle_id, mac: false)
-      ensure_csrf(Spaceship::WebsitePush)
+      ensure_csrf(Spaceship::Portal::WebsitePush)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/addWebsitePushId.action", {
           name: name,
@@ -276,7 +290,7 @@ module Spaceship
     end
 
     def delete_website_push!(website_id, mac: false)
-      ensure_csrf(Spaceship::WebsitePush)
+      ensure_csrf(Spaceship::Portal::WebsitePush)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteWebsitePushId.action", {
           teamId: team_id,
@@ -302,7 +316,7 @@ module Spaceship
     end
 
     def create_merchant!(name, bundle_id, mac: false)
-      ensure_csrf(Spaceship::Merchant)
+      ensure_csrf(Spaceship::Portal::Merchant)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/addOMC.action", {
           name: name,
@@ -313,7 +327,7 @@ module Spaceship
     end
 
     def delete_merchant!(merchant_id, mac: false)
-      ensure_csrf(Spaceship::Merchant)
+      ensure_csrf(Spaceship::Portal::Merchant)
 
       r = request(:post, "account/#{platform_slug(mac)}/identifiers/deleteOMC.action", {
           teamId: team_id,
@@ -339,7 +353,7 @@ module Spaceship
     end
 
     def create_app_group!(name, group_id)
-      ensure_csrf(Spaceship::AppGroup)
+      ensure_csrf(Spaceship::Portal::AppGroup)
 
       r = request(:post, 'account/ios/identifiers/addApplicationGroup.action', {
         name: valid_name_for(name),
@@ -350,7 +364,7 @@ module Spaceship
     end
 
     def delete_app_group!(app_group_id)
-      ensure_csrf(Spaceship::AppGroup)
+      ensure_csrf(Spaceship::Portal::AppGroup)
 
       r = request(:post, 'account/ios/identifiers/deleteApplicationGroup.action', {
         teamId: team_id,
@@ -441,7 +455,7 @@ module Spaceship
         })
         result = parse_response(r, 'devices')
 
-        csrf_cache[Spaceship::Device] = self.csrf_tokens
+        csrf_cache[Spaceship::Portal::Device] = self.csrf_tokens
 
         result
       end
@@ -462,7 +476,7 @@ module Spaceship
     end
 
     def create_device!(device_name, device_id, mac: false)
-      ensure_csrf(Spaceship::Device)
+      ensure_csrf(Spaceship::Portal::Device)
 
       req = request(:post, "account/#{platform_slug(mac)}/device/addDevices.action", {
         teamId: team_id,
@@ -509,7 +523,7 @@ module Spaceship
     end
 
     def create_certificate!(type, csr, app_id = nil, mac = false)
-      ensure_csrf(Spaceship::Certificate)
+      ensure_csrf(Spaceship::Portal::Certificate)
 
       r = request(:post, "account/#{platform_slug(mac)}/certificate/submitCertificateRequest.action", {
         teamId: team_id,
@@ -537,7 +551,7 @@ module Spaceship
     end
 
     def revoke_certificate!(certificate_id, type, mac: false)
-      ensure_csrf(Spaceship::Certificate)
+      ensure_csrf(Spaceship::Portal::Certificate)
 
       r = request(:post, "account/#{platform_slug(mac)}/certificate/revokeCertificate.action", {
         teamId: team_id,
@@ -564,7 +578,7 @@ module Spaceship
 
         result = parse_response(req, 'provisioningProfiles')
 
-        csrf_cache[Spaceship::ProvisioningProfile] = self.csrf_tokens
+        csrf_cache[Spaceship::Portal::ProvisioningProfile] = self.csrf_tokens
 
         result
       end
@@ -587,7 +601,7 @@ module Spaceship
 
       result = parse_response(req, 'provisioningProfiles')
 
-      csrf_cache[Spaceship::ProvisioningProfile] = self.csrf_tokens
+      csrf_cache[Spaceship::Portal::ProvisioningProfile] = self.csrf_tokens
 
       result
     end
@@ -601,7 +615,7 @@ module Spaceship
     end
 
     def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids, mac: false, sub_platform: nil, template_name: nil)
-      ensure_csrf(Spaceship::ProvisioningProfile) do
+      ensure_csrf(Spaceship::Portal::ProvisioningProfile) do
         fetch_csrf_token_for_provisioning
       end
 
@@ -623,7 +637,7 @@ module Spaceship
     end
 
     def download_provisioning_profile(profile_id, mac: false)
-      ensure_csrf(Spaceship::ProvisioningProfile) do
+      ensure_csrf(Spaceship::Portal::ProvisioningProfile) do
         fetch_csrf_token_for_provisioning
       end
 
@@ -640,7 +654,7 @@ module Spaceship
     end
 
     def delete_provisioning_profile!(profile_id, mac: false)
-      ensure_csrf(Spaceship::ProvisioningProfile) do
+      ensure_csrf(Spaceship::Portal::ProvisioningProfile) do
         fetch_csrf_token_for_provisioning
       end
 

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

@@ -1,3 +1,8 @@
+require_relative 'app'
+require_relative 'device'
+require_relative 'certificate'
+require_relative 'provisioning_profile_template'
+
 module Spaceship
   module Portal
     # Represents a provisioning profile of the Apple Dev Portal
@@ -81,7 +86,7 @@ module Spaceship
       # @return (App) The app this profile is for
       #
       # @example Example Value
-      #   <Spaceship::App
+      #   <Spaceship::Portal::App
       #     @app_id="2UMR2S6PAA"
       #     @name="App Name"
       #     @platform="ios"
@@ -98,7 +103,7 @@ module Spaceship
       # @return (Array) A list of certificates used for this profile
       # @example Example Value
       #  [
-      #   <Spaceship::Certificate::Production
+      #   <Spaceship::Portal::Certificate::Production
       #     @status=nil
       #     @id="XC5PH8D4AA"
       #     @name="iOS Distribution"
@@ -118,7 +123,7 @@ module Spaceship
       #   This will always be [] for AppStore profiles
       #
       # @example Example Value
-      #  <Spaceship::Device
+      #  <Spaceship::Portal::Device
       #    @id="WXQ7V239BE"
       #    @name="Grahams iPhone 4s"
       #    @udid="ba0ac7d70f7a14c6fa02ef0e02f4fe9c5178e2f7"
@@ -188,6 +193,7 @@ module Spaceship
         # Create a new object based on a hash.
         # This is used to create a new object based on the server response.
         def factory(attrs)
+          # rubocop:disable Lint/MissingRequireStatement
           # available values of `distributionMethod` at this point: ['adhoc', 'store', 'limited', 'direct']
           klass = case attrs['distributionMethod']
                   when 'limited'
@@ -201,6 +207,7 @@ module Spaceship
                   else
                     raise "Can't find class '#{attrs['distributionMethod']}'"
                   end
+          # rubocop:enable Lint/MissingRequireStatement
 
           # Parse the dates
           # rubocop:disable Style/RescueModifier
@@ -252,9 +259,9 @@ module Spaceship
         # @return (ProvisioningProfile): The profile that was just created
         def create!(name: nil, bundle_id: nil, certificate: nil, devices: [], mac: false, sub_platform: nil, template_name: nil)
           raise "Missing required parameter 'bundle_id'" if bundle_id.to_s.empty?
-          raise "Missing required parameter 'certificate'. e.g. use `Spaceship::Certificate::Production.all.first`" if certificate.to_s.empty?
+          raise "Missing required parameter 'certificate'. e.g. use `Spaceship::Portal::Certificate::Production.all.first`" if certificate.to_s.empty?
 
-          app = Spaceship::App.find(bundle_id, mac: mac)
+          app = Spaceship::Portal::App.find(bundle_id, mac: mac)
           raise "Could not find app with bundle id '#{bundle_id}'" unless app
 
           raise "Invalid sub_platform #{sub_platform}, valid values are tvOS" if !sub_platform.nil? and sub_platform != 'tvOS'
@@ -262,7 +269,7 @@ module Spaceship
           # Fill in sensible default values
           name ||= [bundle_id, self.pretty_type].join(' ')
 
-          if self == AppStore || self == InHouse || self == Direct
+          if self == AppStore || self == InHouse || self == Direct # rubocop:disable Lint/MissingRequireStatement
             # Distribution Profiles MUST NOT have devices
             devices = []
           end
@@ -274,14 +281,14 @@ module Spaceship
           certificate_parameter = certificate_parameter.first if certificate_parameter.count == 1
 
           if devices.nil? or devices.count == 0
-            if self == Development or self == AdHoc
+            if self == Development or self == AdHoc # rubocop:disable Lint/MissingRequireStatement
               # For Development and AdHoc we usually want all compatible devices by default
               if mac
-                devices = Spaceship::Device.all_macs
+                devices = Spaceship::Portal::Device.all_macs
               elsif sub_platform == 'tvOS'
-                devices = Spaceship::Device.all_apple_tvs
+                devices = Spaceship::Portal::Device.all_apple_tvs
               else
-                devices = Spaceship::Device.all_ios_profile_devices
+                devices = Spaceship::Portal::Device.all_ios_profile_devices
               end
             end
           end
@@ -326,8 +333,8 @@ module Spaceship
           # a details request (see `profile_details`). This is an expensive operation
           # which we can't do for every single provisioning profile
           # Instead we'll treat App Store profiles the same way as Ad Hoc profiles
-          # Spaceship::ProvisioningProfile::AdHoc.all will return the same array as
-          # Spaceship::ProvisioningProfile::AppStore.all, containing only AppStore
+          # Spaceship::Portal::ProvisioningProfile::AdHoc.all will return the same array as
+          # Spaceship::Portal::ProvisioningProfile::AppStore.all, containing only AppStore
           # profiles. To determine if it's an Ad Hoc profile, you can use the
           # is_adhoc? method on the profile.
           klass = self
@@ -438,19 +445,19 @@ module Spaceship
         unless certificate_valid?
           if mac?
             if self.kind_of? Development
-              self.certificates = [Spaceship::Certificate::MacDevelopment.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::MacDevelopment.all.first]
             elsif self.kind_of? Direct
-              self.certificates = [Spaceship::Certificate::DeveloperIDApplication.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::DeveloperIDApplication.all.first]
             else
-              self.certificates = [Spaceship::Certificate::MacAppDistribution.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::MacAppDistribution.all.first]
             end
           else
             if self.kind_of? Development
-              self.certificates = [Spaceship::Certificate::Development.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::Development.all.first]
             elsif self.kind_of? InHouse
-              self.certificates = [Spaceship::Certificate::InHouse.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::InHouse.all.first]
             else
-              self.certificates = [Spaceship::Certificate::Production.all.first]
+              self.certificates = [Spaceship::Portal::Certificate::Production.all.first]
             end
           end
         end
@@ -470,7 +477,7 @@ module Spaceship
         end
 
         # We need to fetch the provisioning profile again, as the ID changes
-        profile = Spaceship::ProvisioningProfile.all(mac: mac?).find do |p|
+        profile = Spaceship::Portal::ProvisioningProfile.all(mac: mac?).find do |p|
           p.name == self.name # we can use the name as it's valid
         end
 
@@ -482,7 +489,7 @@ module Spaceship
       def certificate_valid?
         return false if (certificates || []).count == 0
         certificates.each do |c|
-          if Spaceship::Certificate.all(mac: mac?).collect(&:id).include?(c.id)
+          if Spaceship::Portal::Certificate.all(mac: mac?).collect(&:id).include?(c.id)
             return true
           end
         end