spaceship 0.3.2 → 0.4.0

data/lib/spaceship/portal/app_service.rb

@@ -0,0 +1,222 @@
+module Spaceship
+  module Portal
+    # Represents a single application service (its state to be more precise) on the Apple Dev Portal
+    class AppService
+      # @return (String) The identifier used by the Dev Portal to represent this service
+      # @example
+      #   "homeKit"
+      attr_accessor :service_id
+
+      # @return (Object) The current value for this service
+      # @example
+      #   false
+      attr_accessor :value
+
+      # @return (String) The service URI for this service
+      # @example
+      #    "account/ios/identifiers/updateService.action"
+      attr_accessor :service_uri
+
+      def initialize(service_id, value)
+        @service_id = service_id
+        @value = value
+
+        if @service_id == "push"
+          # Push notifications have a special URI
+          @service_uri = "account/ios/identifiers/updatePushService.action"
+        else
+          # Default service URI
+          @service_uri = "account/ios/identifiers/updateService.action"
+        end
+      end
+
+      class << self
+        def app_group
+          self::AppGroup
+        end
+
+        def associated_domains
+          self::AssociatedDomains
+        end
+
+        def data_protection
+          self::DataProtection
+        end
+
+        def health_kit
+          self::HealthKit
+        end
+
+        def home_kit
+          self::HomeKit
+        end
+
+        def wireless_accessory
+          self::WirelessAccessory
+        end
+
+        def icloud
+          self::Cloud
+        end
+
+        def cloud_kit
+          self::CloudKit
+        end
+
+        def inter_app_audio
+          self::InterAppAudio
+        end
+
+        def passbook
+          self::Passbook
+        end
+
+        def push_notification
+          self::PushNotification
+        end
+
+        def vpn_configuration
+          self::VPNConfiguration
+        end
+      end
+
+      def ==(other)
+        self.class == other.class &&
+        self.service_id == other.service_id &&
+        self.value == other.value &&
+        self.service_uri == other.service_uri
+      end
+
+      #
+      # Modules for "constants"
+      #
+      module AppGroup
+        def self.off
+          AppService.new("APG3427HIY", false)
+        end
+
+        def self.on
+          AppService.new("APG3427HIY", true)
+        end
+      end
+
+      module AssociatedDomains
+        def self.off
+          AppService.new("SKC3T5S89Y", false)
+        end
+
+        def self.on
+          AppService.new("SKC3T5S89Y", true)
+        end
+      end
+
+      module DataProtection
+        def self.off
+          AppService.new("dataProtection", "")
+        end
+
+        def self.complete
+          AppService.new("dataProtection", "complete")
+        end
+
+        def self.unless_open
+          AppService.new("dataProtection", "unlessopen")
+        end
+
+        def self.until_first_auth
+          AppService.new("dataProtection", "untilfirstauth")
+        end
+      end
+
+      module HealthKit
+        def self.off
+          AppService.new("HK421J6T7P", false)
+        end
+
+        def self.on
+          AppService.new("HK421J6T7P", true)
+        end
+      end
+
+      module HomeKit
+        def self.off
+          AppService.new("homeKit", false)
+        end
+
+        def self.on
+          AppService.new("homeKit", true)
+        end
+      end
+
+      module WirelessAccessory
+        def self.off
+          AppService.new("WC421J6T7P", false)
+        end
+
+        def self.on
+          AppService.new("WC421J6T7P", true)
+        end
+      end
+
+      module Cloud
+        def self.off
+          AppService.new("iCloud", false)
+        end
+
+        def self.on
+          AppService.new("iCloud", true)
+        end
+      end
+
+      module CloudKit
+        def self.xcode5_compatible
+          AppService.new("cloudKitVersion", 1)
+        end
+
+        def self.cloud_kit
+          AppService.new("cloudKitVersion", 2)
+        end
+      end
+
+      module InterAppAudio
+        def self.off
+          AppService.new("IAD53UNK2F", false)
+        end
+
+        def self.on
+          AppService.new("IAD53UNK2F", true)
+        end
+      end
+
+      module Passbook
+        def self.off
+          AppService.new("pass", false)
+        end
+
+        def self.on
+          AppService.new("pass", true)
+        end
+      end
+
+      module PushNotification
+        def self.off
+          AppService.new("push", false)
+        end
+
+        def self.on
+          AppService.new("push", true)
+        end
+      end
+
+      module VPNConfiguration
+        def self.off
+          AppService.new("V66P55NK2I", false)
+        end
+
+        def self.on
+          AppService.new("V66P55NK2I", true)
+        end
+      end
+    end
+  end
+end

data/lib/spaceship/portal/certificate.rb

@@ -237,7 +237,7 @@ module Spaceship
           end
 
           # ensure csr is a OpenSSL::X509::Request
-          csr = OpenSSL::X509::Request.new(csr) if csr.is_a?(String)
+          csr = OpenSSL::X509::Request.new(csr) if csr.kind_of?(String)
 
           # if this succeeds, we need to save the .cer and the private key in keychain access or wherever they go in linux
           response = client.create_certificate!(type, csr.to_pem, app_id)
@@ -266,7 +266,7 @@ module Spaceship
 
       # @return (Bool): Is this certificate a push profile for apps?
       def is_push?
-        self.kind_of?PushCertificate
+        self.kind_of? PushCertificate
       end
     end
   end

data/lib/spaceship/portal/device.rb

@@ -3,27 +3,27 @@ module Spaceship
     # Represents a device from the Apple Developer Portal
     class Device < PortalBase
       # @return (String) The ID given from the developer portal. You'll probably not need it.
-      # @example 
+      # @example
       #   "XJXGVS46MW"
       attr_accessor :id
 
       # @return (String) The name of the device
-      # @example 
+      # @example
       #   "Felix Krause's iPhone 6"
       attr_accessor :name
 
       # @return (String) The UDID of the device
-      # @example 
+      # @example
       #   "4c24a7ee5caaa4847f49aaab2d87483053f53b65"
       attr_accessor :udid
 
       # @return (String) The platform of the device. This is probably always "ios"
-      # @example 
+      # @example
       #   "ios"
       attr_accessor :platform
 
       # @return (String) Status of the device. Probably always "c"
-      # @example 
+      # @example
       #   "c"
       attr_accessor :status
 
@@ -47,7 +47,7 @@ module Spaceship
           client.devices.map { |device| self.factory(device) }
         end
 
-        # @return (Device) Find a device based on the ID of the device. *Attention*: 
+        # @return (Device) Find a device based on the ID of the device. *Attention*:
         #  This is *not* the UDID. nil if no device was found.
         def find(device_id)
           all.find do |device|
@@ -72,7 +72,7 @@ module Spaceship
         # Register a new device to this account
         # @param name (String) (required): The name of the new device
         # @param udid (String) (required): The UDID of the new device
-        # @example 
+        # @example
         #   Spaceship.device.create!(name: "Felix Krause's iPhone 6", udid: "4c24a7ee5caaa4847f49aaab2d87483053f53b65")
         # @return (Device): The newly created device
         def create!(name: nil, udid: nil)

data/lib/spaceship/portal/portal.rb

@@ -1,6 +1,8 @@
 require 'spaceship/portal/portal_base'
 require 'spaceship/portal/app'
+require 'spaceship/portal/app_group'
+require 'spaceship/portal/app_service'
 require 'spaceship/portal/certificate'
 require 'spaceship/portal/device'
 require 'spaceship/portal/provisioning_profile'
-require 'spaceship/portal/portal_client'
+require 'spaceship/portal/portal_client'

data/lib/spaceship/portal/portal_base.rb

@@ -10,4 +10,4 @@ module Spaceship
       end
     end
   end
-end
+end

data/lib/spaceship/portal/portal_client.rb

@@ -13,7 +13,7 @@ module Spaceship
     def api_key
       cache_path = "/tmp/spaceship_api_key.txt"
       begin
-        cached = File.read(cache_path) 
+        cached = File.read(cache_path)
       rescue Errno::ENOENT
       end
       return cached if cached
@@ -83,12 +83,10 @@ module Spaceship
 
     # Is the current session from an Enterprise In House account?
     def in_house?
-      # TODO: move to portal
       return @in_house unless @in_house.nil?
       @in_house = (team_information['type'] == 'In-House')
     end
 
-
     #####################################################
     # @!group Apps
     #####################################################
@@ -113,6 +111,28 @@ module Spaceship
       parse_response(r, 'appId')
     end
 
+    def update_service_for_app(app, service)
+      request(:post, service.service_uri, {
+        teamId: team_id,
+        displayId: app.app_id,
+        featureType: service.service_id,
+        featureValue: service.value
+      })
+
+      details_for_app(app)
+    end
+
+    def associate_groups_with_app(app, groups)
+      r = request(:post, 'account/ios/identifiers/assignApplicationGroupToAppId.action', {
+        teamId: team_id,
+        appIdId: app.app_id,
+        displayId: app.app_id,
+        applicationGroups: groups.map { |g| g.app_group_id }
+      })
+
+      details_for_app(app)
+    end
+
     def create_app!(type, name, bundle_id)
       ident_params = case type.to_sym
       when :explicit
@@ -151,6 +171,39 @@ module Spaceship
       parse_response(r)
     end
 
+    #####################################################
+    # @!group App Groups
+    #####################################################
+
+    def app_groups
+      paging do |page_number|
+        r = request(:post, 'account/ios/identifiers/listApplicationGroups.action', {
+          teamId: team_id,
+          pageNumber: page_number,
+          pageSize: page_size,
+          sort: 'name=asc'
+        })
+        parse_response(r, 'applicationGroupList')
+      end
+    end
+
+    def create_app_group!(name, group_id)
+      r = request(:post, 'account/ios/identifiers/addApplicationGroup.action', {
+        name: name,
+        identifier: group_id,
+        teamId: team_id
+      })
+      parse_response(r, 'applicationGroup')
+    end
+
+    def delete_app_group!(app_group_id)
+      r = request(:post, 'account/ios/identifiers/deleteApplicationGroup.action', {
+        teamId: team_id,
+        applicationGroup: app_group_id
+      })
+      parse_response(r)
+    end
+
     #####################################################
     # @!group Devices
     #####################################################
@@ -168,7 +221,7 @@ module Spaceship
     end
 
     def create_device!(device_name, device_id)
-      r = request(:post) do |r|
+      req = request(:post) do |r|
         r.url "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/ios/addDevice.action"
         r.params = {
           teamId: team_id,
@@ -177,7 +230,7 @@ module Spaceship
         }
       end
 
-      parse_response(r, 'device')
+      parse_response(req, 'device')
     end
 
     #####################################################
@@ -202,7 +255,7 @@ module Spaceship
         teamId: team_id,
         type: type,
         csrContent: csr,
-        appIdId: app_id  #optional
+        appIdId: app_id # optional
       })
       parse_response(r, 'certRequest')
     end
@@ -232,16 +285,16 @@ module Spaceship
     #####################################################
 
     def provisioning_profiles
-      r = request(:post) do |r|
+      req = request(:post) do |r|
         r.url "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/ios/listProvisioningProfiles.action"
         r.params = {
           teamId: team_id,
           includeInactiveProfiles: true,
-          onlyCountLists: true,
+          onlyCountLists: true
         }
       end
 
-      parse_response(r, 'provisioningProfiles')
+      parse_response(req, 'provisioningProfiles')
     end
 
     def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids)
@@ -279,11 +332,11 @@ module Spaceship
         provisioningProfileName: name,
         appIdId: app_id,
         distributionType: distribution_method,
-        certificateIds: certificate_ids.first, # we are most of the times only allowed to pass one
+        certificateIds: certificate_ids.join(','),
         deviceIds: device_ids
       })
 
       parse_response(r, 'provisioningProfile')
     end
   end
-end
+end

data/lib/spaceship/portal/provisioning_profile.rb

@@ -16,12 +16,12 @@ module Spaceship
       attr_accessor :uuid
 
       # @return (DateTime) The date and time of when the profile
-      #   expires. 
+      #   expires.
       # @example
       #   #<DateTime: 2015-11-25T22:45:50+00:00 ((2457352j,81950s,0n),+0s,2299161j)>
       attr_accessor :expires
 
-      # @return (String) The profile distribution type. You probably want to 
+      # @return (String) The profile distribution type. You probably want to
       #   use the class type to detect the profile type instead of this string.
       # @example AppStore Profile
       #     "store"
@@ -45,7 +45,7 @@ module Spaceship
       #   "Invalid"
       attr_accessor :status
 
-      # @return (String) The type of the profile (development or distribution). 
+      # @return (String) The type of the profile (development or distribution).
       #   You'll probably not need this value
       # @example Distribution
       #   "iOS Distribution"
@@ -69,7 +69,7 @@ module Spaceship
       # A reference to the app this profile is for.
       # You can then easily access the value directly
       # @return (App) The app this profile is for
-      # 
+      #
       # @example Example Value
       #   <Spaceship::App
       #     @app_id="2UMR2S6PAA"
@@ -80,7 +80,7 @@ module Spaceship
       #     @is_wildcard=false
       #     @dev_push_enabled=false
       #     @prod_push_enabled=false>
-      # 
+      #
       # @example Usage
       #   profile.app.name
       attr_accessor :app
@@ -99,14 +99,14 @@ module Spaceship
       #     @owner_id=nil
       #     @type_display_id="R58UK2EWAA">]
       #  ]
-      # 
+      #
       # @example Usage
       #   profile.certificates.first.id
       attr_accessor :certificates
 
       # @return (Array) A list of devices this profile is enabled for.
       #   This will always be [] for AppStore profiles
-      # 
+      #
       # @example Example Value
       #  <Spaceship::Device
       #    @id="WXQ7V239BE"
@@ -114,7 +114,7 @@ module Spaceship
       #    @udid="ba0ac7d70f7a14c6fa02ef0e02f4fe9c5178e2f7"
       #    @platform="ios"
       #    @status="c">]
-      # 
+      #
       # @example Usage
       #  profile.devices.first.name
       attr_accessor :devices
@@ -204,7 +204,7 @@ module Spaceship
 
           devices = [] if (self == AppStore or self == InHouse) # App Store Profiles MUST NOT have devices
 
-          certificate_parameter = certificate.collect { |c| c.id } if certificate.kind_of?Array
+          certificate_parameter = certificate.collect { |c| c.id } if certificate.kind_of? Array
           certificate_parameter ||= [certificate.id]
 
           # Fix https://github.com/KrauseFx/fastlane/issues/349
@@ -217,29 +217,19 @@ module Spaceship
             end
           end
 
-          def send_create_request(name, type, app_id, certificate_parameter, devices)
-            tries ||= 5
-            client.create_provisioning_profile!(name, type, app_id, certificate_parameter, devices)
-          rescue => ex 
-            unless (tries -= 1).zero?
-              sleep 3
-              retry
-            end
-
-            raise ex # re-raise the exception
+          profile = client.with_retry do
+            client.create_provisioning_profile!(name,
+                                                self.type,
+                                                app.app_id,
+                                                certificate_parameter,
+                                                devices.map {|d| d.id} )
           end
 
-          profile = send_create_request(name,
-                                        self.type,
-                                        app.app_id,
-                                        certificate_parameter,
-                                        devices.map {|d| d.id} )
-          
           self.new(profile)
         end
 
         # @return (Array) Returns all profiles registered for this account
-        #  If you're calling this from a subclass (like AdHoc), this will 
+        #  If you're calling this from a subclass (like AdHoc), this will
         #  only return the profiles that are of this type
         def all
           profiles = client.provisioning_profiles.map do |profile|
@@ -317,7 +307,7 @@ module Spaceship
 
       # Repair an existing provisioning profile
       # alias to update!
-      # @return (ProvisioningProfile) A new provisioning profile, as 
+      # @return (ProvisioningProfile) A new provisioning profile, as
       #  the repair method will generate a profile with a new ID
       def repair!
         update!
@@ -326,56 +316,40 @@ module Spaceship
       # Updates the provisioning profile from the local data
       # e.g. after you added new devices to the profile
       # This will also update the code signing identity if necessary
-      # @return (ProvisioningProfile) A new provisioning profile, as 
+      # @return (ProvisioningProfile) A new provisioning profile, as
       #  the repair method will generate a profile with a new ID
       def update!
         unless certificate_valid?
-          if self.kind_of?Development
+          if self.kind_of? Development
             self.certificates = [Spaceship::Certificate::Development.all.first]
-          elsif self.kind_of?InHouse
+          elsif self.kind_of? InHouse
             self.certificates = [Spaceship::Certificate::InHouse.all.first]
           else
-            self.certificates = [Spaceship::Certificate::Production.all.first]  
+            self.certificates = [Spaceship::Certificate::Production.all.first]
           end
         end
 
-        def send_update_request(id, name, distribution_method, app_id, certificates, devices)
-          tries ||= 5
+        client.with_retry do
           client.repair_provisioning_profile!(
             id,
             name,
             distribution_method,
-            app_id,
-            certificates,
-            devices
+            app.app_id,
+            certificates.map { |c| c.id },
+            devices.map { |d| d.id }
           )
-        rescue => ex 
-          unless (tries -= 1).zero?
-            sleep 3
-            retry
-          end
-          raise ex # re-raise the exception
         end
 
-        send_update_request(
-          self.id,
-          self.name,
-          self.distribution_method,
-          self.app.app_id,
-          self.certificates.map { |c| c.id },
-          self.devices.map { |d| d.id }
-        )
-
         # We need to fetch the provisioning profile again, as the ID changes
-        profile = Spaceship::ProvisioningProfile.all.find do |profile|
-          profile.name == self.name # we can use the name as it's valid
+        profile = Spaceship::ProvisioningProfile.all.find do |p|
+          p.name == self.name # we can use the name as it's valid
         end
 
         return profile
       end
 
       # Is the certificate of this profile available?
-      # @return (Bool) is the certificate valid? 
+      # @return (Bool) is the certificate valid?
       def certificate_valid?
         return false if (certificates || []).count == 0
         certificates.each do |c|