spaceship 0.0.15 → 0.1.0

data/lib/spaceship/client.rb

@@ -5,6 +5,7 @@ require 'spaceship/ui'
 require 'spaceship/helper/plist_middleware'
 require 'spaceship/helper/net_http_generic_request'
 
+
 if ENV["DEBUG"]
   require 'openssl'
   # this has to be on top of this file, since the value can't be changed later
@@ -49,8 +50,12 @@ module Spaceship
       end
     end
 
+    def self.hostname
+      raise "You must implemented self.hostname"
+    end
+
     def initialize
-      @client = Faraday.new("https://developer.apple.com/services-account/#{PROTOCOL_VERSION}/") do |c|
+      @client = Faraday.new(self.class.hostname) do |c|
         c.response :json, content_type: /\bjson$/
         c.response :xml, content_type: /\bxml$/
         c.response :plist, content_type: /\bplist$/
@@ -65,28 +70,6 @@ module Spaceship
       end
     end
 
-    # Fetches the latest API Key from the Apple Dev Portal
-    def api_key
-      cache_path = "/tmp/spaceship_api_key.txt"
-      begin
-        cached = File.read(cache_path) 
-      rescue Errno::ENOENT
-      end
-      return cached if cached
-
-      landing_url = "https://developer.apple.com/membercenter/index.action"
-      logger.info("GET: " + landing_url)
-      headers = @client.get(landing_url).headers
-      results = headers['location'].match(/.*appIdKey=(\h+)/)
-      if results.length > 1
-        api_key = results[1]
-        File.write(cache_path, api_key)
-        return api_key
-      else
-        raise "Could not find latest API Key from the Dev Portal"
-      end
-    end
-
     # The logger in which all requests are logged
     # /tmp/spaceship.log by default
     def logger
@@ -162,19 +145,7 @@ module Spaceship
         raise InvalidUserCredentialsError.new("No login data provided")
       end
 
-      response = request(:post, "https://idmsa.apple.com/IDMSWebAuth/authenticate", {
-        appleId: user,
-        accountPassword: password,
-        appIdKey: api_key
-      })
-
-      if response['Set-Cookie'] =~ /myacinfo=(\w+);/
-        @cookie = "myacinfo=#{$1};"
-        return @client
-      else
-        # User Credentials are wrong
-        raise InvalidUserCredentialsError.new(response)
-      end
+      send_login_request(user, password) # different in subclasses
     end
 
     # @return (Bool) Do we have a valid session?
@@ -182,243 +153,6 @@ module Spaceship
       !!@cookie
     end
 
-    # @return (Array) A list of all available teams
-    def teams
-      r = request(:post, 'account/listTeams.action')
-      parse_response(r, 'teams')
-    end
-
-    # @return (String) The currently selected Team ID
-    def team_id
-      return @current_team_id if @current_team_id
-
-      if teams.count > 1
-        puts "The current user is in #{teams.count} teams. Pass a team ID or call `select_team` to choose a team. Using the first one for now."
-      end
-      @current_team_id ||= teams[0]['teamId']
-    end
-
-    # Shows a team selection for the user in the terminal. This should not be
-    # called on CI systems
-    def select_team
-      @current_team_id = self.UI.select_team
-    end
-
-    # Set a new team ID which will be used from now on
-    def team_id=(team_id)
-      @current_team_id = team_id
-    end
-
-    # @return (Hash) Fetches all information of the currently used team
-    def team_information
-      teams.find do |t|
-        t['teamId'] == team_id
-      end
-    end
-
-    # Is the current session from an Enterprise In House account?
-    def in_house?
-      return @in_house unless @in_house.nil?
-      @in_house = (team_information['type'] == 'In-House')
-    end
-
-    #####################################################
-    # @!group Apps
-    #####################################################
-
-    def apps
-      paging do |page_number|
-        r = request(:post, 'account/ios/identifiers/listAppIds.action', {
-          teamId: team_id,
-          pageNumber: page_number,
-          pageSize: page_size,
-          sort: 'name=asc'
-        })
-        parse_response(r, 'appIds')
-      end
-    end
-
-    def details_for_app(app)
-      r = request(:post, 'account/ios/identifiers/getAppIdDetail.action', {
-        teamId: team_id,
-        appIdId: app.app_id
-      })
-      parse_response(r, 'appId')
-    end
-
-    def create_app!(type, name, bundle_id)
-      ident_params = case type.to_sym
-      when :explicit
-        {
-          type: 'explicit',
-          explicitIdentifier: bundle_id,
-          appIdentifierString: bundle_id,
-          push: 'on',
-          inAppPurchase: 'on',
-          gameCenter: 'on'
-        }
-      when :wildcard
-        {
-          type: 'wildcard',
-          wildcardIdentifier: bundle_id,
-          appIdentifierString: bundle_id
-        }
-      end
-
-      params = {
-        appIdName: name,
-        teamId: team_id
-      }
-
-      params.merge!(ident_params)
-
-      r = request(:post, 'account/ios/identifiers/addAppId.action', params)
-      parse_response(r, 'appId')
-    end
-
-    def delete_app!(app_id)
-      r = request(:post, 'account/ios/identifiers/deleteAppId.action', {
-        teamId: team_id,
-        appIdId: app_id
-      })
-      parse_response(r)
-    end
-
-    #####################################################
-    # @!group Devices
-    #####################################################
-
-    def devices
-      paging do |page_number|
-        r = request(:post, 'account/ios/device/listDevices.action', {
-          teamId: team_id,
-          pageNumber: page_number,
-          pageSize: page_size,
-          sort: 'name=asc'
-        })
-        parse_response(r, 'devices')
-      end
-    end
-
-    def create_device!(device_name, device_id)
-      r = request(:post) do |r|
-        r.url "https://developerservices2.apple.com/services/#{PROTOCOL_VERSION}/ios/addDevice.action"
-        r.params = {
-          teamId: team_id,
-          deviceNumber: device_id,
-          name: device_name
-        }
-      end
-
-      parse_response(r, 'device')
-    end
-
-    #####################################################
-    # @!group Certificates
-    #####################################################
-
-    def certificates(types)
-      paging do |page_number|
-        r = request(:post, 'account/ios/certificate/listCertRequests.action', {
-          teamId: team_id,
-          types: types.join(','),
-          pageNumber: page_number,
-          pageSize: page_size,
-          sort: 'certRequestStatusCode=asc'
-        })
-        parse_response(r, 'certRequests')
-      end
-    end
-
-    def create_certificate!(type, csr, app_id = nil)
-      r = request(:post, 'account/ios/certificate/submitCertificateRequest.action', {
-        teamId: team_id,
-        type: type,
-        csrContent: csr,
-        appIdId: app_id  #optional
-      })
-      parse_response(r, 'certRequest')
-    end
-
-    def download_certificate(certificate_id, type)
-      {type: type, certificate_id: certificate_id}.each { |k, v| raise "#{k} must not be nil" if v.nil? }
-
-      r = request(:post, 'https://developer.apple.com/account/ios/certificate/certificateContentDownload.action', {
-        teamId: team_id,
-        displayId: certificate_id,
-        type: type
-      })
-      parse_response(r)
-    end
-
-    def revoke_certificate!(certificate_id, type)
-      r = request(:post, 'account/ios/certificate/revokeCertificate.action', {
-        teamId: team_id,
-        certificateId: certificate_id,
-        type: type
-      })
-      parse_response(r, 'certRequests')
-    end
-
-    #####################################################
-    # @!group Provisioning Profiles
-    #####################################################
-
-    def provisioning_profiles
-      r = 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,
-        }
-      end
-
-      parse_response(r, 'provisioningProfiles')
-    end
-
-    def create_provisioning_profile!(name, distribution_method, app_id, certificate_ids, device_ids)
-      r = request(:post, 'account/ios/profile/createProvisioningProfile.action', {
-        teamId: team_id,
-        provisioningProfileName: name,
-        appIdId: app_id,
-        distributionType: distribution_method,
-        certificateIds: certificate_ids,
-        deviceIds: device_ids
-      })
-      parse_response(r, 'provisioningProfile')
-    end
-
-    def download_provisioning_profile(profile_id)
-      r = request(:get, 'https://developer.apple.com/account/ios/profile/profileContentDownload.action', {
-        teamId: team_id,
-        displayId: profile_id
-      })
-      parse_response(r)
-    end
-
-    def delete_provisioning_profile!(profile_id)
-      r = request(:post, 'account/ios/profile/deleteProvisioningProfile.action', {
-        teamId: team_id,
-        provisioningProfileId: profile_id
-      })
-      parse_response(r)
-    end
-
-    def repair_provisioning_profile!(profile_id, name, distribution_method, app_id, certificate_ids, device_ids)
-      r = request(:post, 'account/ios/profile/regenProvisioningProfile.action', {
-        teamId: team_id,
-        provisioningProfileId: profile_id,
-        provisioningProfileName: name,
-        appIdId: app_id,
-        distributionType: distribution_method,
-        certificateIds: certificate_ids.first, # we are most of the times only allowed to pass one
-        deviceIds: device_ids
-      })
-
-      parse_response(r, 'provisioningProfile')
-    end
-
     private
       # Is called from `parse_response` to store the latest csrf_token (if available)
       def store_csrf_tokens(response)
@@ -460,7 +194,8 @@ module Spaceship
 
       def log_request(method, url, params)
         params_to_log = Hash(params).dup # to also work with nil
-        params_to_log.delete(:accountPassword)
+        params_to_log.delete(:accountPassword) # Dev Portal
+        params_to_log.delete(:theAccountPW) # iTC
         params_to_log = params_to_log.collect do |key, value|
           "{#{key}: #{value}}"
         end

data/lib/spaceship/launcher.rb

@@ -19,7 +19,7 @@ module Spaceship
     # 
     # @raise InvalidUserCredentialsError: raised if authentication failed
     def initialize(user = nil, password = nil)
-      @client = Client.new
+      @client = PortalClient.new
 
       if user or password
         @client.login(user, password)

data/lib/spaceship/portal/app.rb

@@ -0,0 +1,125 @@
+module Spaceship
+  module Portal
+    # Represents an App ID from the Developer Portal
+    class App < PortalBase
+
+      # @return (String) The identifier of this app, provided by the Dev Portal
+      # @example 
+      #   "RGAWZGXSAA"
+      attr_accessor :app_id
+
+      # @return (String) The name you provided for this app
+      # @example
+      #   "Spaceship"
+      attr_accessor :name
+
+      # @return (String) the supported platform of this app
+      # @example 
+      #   "ios"
+      attr_accessor :platform
+
+      # Prefix provided by the Dev Portal
+      # @example 
+      #   "5A997XSHK2"
+      attr_accessor :prefix
+
+      # @return (String) The bundle_id (app identifier) of your app
+      # @example 
+      #   "com.krausefx.app"
+      attr_accessor :bundle_id
+
+      # @return (Bool) Is this app a wildcard app (e.g. com.krausefx.*)
+      attr_accessor :is_wildcard
+
+      # @return (Hash) Feature details
+      attr_accessor :features
+      
+      # @return (Array) List of enabled features
+      attr_accessor :enabled_features
+
+      # @return (Bool) Development Push Enabled?
+      attr_accessor :dev_push_enabled
+
+      # @return (Bool) Production Push Enabled?
+      attr_accessor :prod_push_enabled
+
+      # @return (Fixnum) Number of associated app groups
+      attr_accessor :app_groups_count
+      
+      # @return (Fixnum) Number of associated cloud containers
+      attr_accessor :cloud_containers_count
+      
+      # @return (Fixnum) Number of associated identifiers
+      attr_accessor :identifiers_count
+
+      attr_mapping(
+        'appIdId' => :app_id,
+        'name' => :name,
+        'appIdPlatform' => :platform,
+        'prefix' => :prefix,
+        'identifier' => :bundle_id,
+        'isWildCard' => :is_wildcard,
+        'features' => :features,
+        'enabledFeatures' => :enabled_features,
+        'isDevPushEnabled' => :dev_push_enabled,
+        'isProdPushEnabled' => :prod_push_enabled,
+        'associatedApplicationGroupsCount' => :app_groups_count,
+        'associatedCloudContainersCount' => :cloud_containers_count,
+        'associatedIdentifiersCount' => :identifiers_count
+      )
+
+      class << self
+        # Create a new object based on a hash.
+        # This is used to create a new object based on the server response.
+        def factory(attrs)
+          self.new(attrs)
+        end
+
+        # @return (Array) Returns all apps available for this account
+        def all
+          client.apps.map { |app| self.factory(app) }
+        end
+
+        # Creates a new App ID on the Apple Dev Portal
+        # 
+        # if bundle_id ends with '*' then it is a wildcard id otherwise, it is an explicit id
+        # @param bundle_id [String] the bundle id (app_identifier) of the app associated with this provisioning profile
+        # @param name [String] the name of the App
+        # @return (App) The app you just created
+        def create!(bundle_id: nil, name: nil)
+          if bundle_id.end_with?('*')
+            type = :wildcard
+          else
+            type = :explicit
+          end
+
+          new_app = client.create_app!(type, name, bundle_id)
+          self.new(new_app)
+        end
+
+        # Find a specific App ID based on the bundle_id
+        # @return (App) The app you're looking for. This is nil if the app can't be found.
+        def find(bundle_id)
+          all.find do |app|
+            app.bundle_id == bundle_id
+          end
+        end
+      end
+
+      # Delete this App ID. This action will most likely fail if the App ID is already in the store
+      # or there are active profiles
+      # @return (App) The app you just deletd
+      def delete!
+        client.delete_app!(app_id)
+        self
+      end
+      
+      # Fetch a specific App ID details based on the bundle_id
+      # @return (App) The app you're looking for. This is nil if the app can't be found.
+      def details
+        app = client.details_for_app(self)
+        self.class.factory(app)
+      end
+    end
+  end
+end