cupertino 0.7.1 → 0.8.0

data/lib/cupertino/provisioning_portal/agent.rb

@@ -11,12 +11,12 @@ module Cupertino
         super
         self.user_agent_alias = 'Mac Safari'
 
-        pw = Security::InternetPassword.find(:server => Cupertino::HOSTNAME)
+        pw = Security::InternetPassword.find(:server => Cupertino::ProvisioningPortal::HOST)
         @username, @password = pw.attributes['acct'], pw.password if pw
       end
 
       def get(uri, parameters = [], referer = nil, headers = {})
-        uri = ::File.join("https://#{Cupertino::HOSTNAME}", uri) unless /^https?/ === uri
+        uri = ::File.join("https://#{Cupertino::ProvisioningPortal::HOST}", uri) unless /^https?/ === uri
 
         3.times do
           super(uri, parameters, referer, headers)
@@ -24,12 +24,12 @@ module Cupertino
           return page unless page.respond_to?(:title)
 
           case page.title
-          when %r{Sign in with your Apple ID}
-            login! and redo
-          when %r{Select Your Team}
-            select_team! and redo
-          else
-            return page
+            when /Sign in with your Apple ID/
+              login! and redo
+            when /Select Team/
+              select_team! and redo
+            else
+              return page
           end
         end
 
@@ -38,87 +38,106 @@ module Cupertino
 
       def list_certificates(type = :development)
         url = case type
-              when :development
-                "https://developer.apple.com/ios/manage/certificates/team/index.action"
-              when :distribution
-                "https://developer.apple.com/ios/manage/certificates/team/distribute.action"
-              else
-                raise ArgumentError, "Certificate type must be :development or :distribution"
+                when :development
+                  "https://developer.apple.com/account/ios/certificate/certificateList.action?type=development"
+                when :distribution
+                  "https://developer.apple.com/account/ios/certificate/certificateList.action?type=distribution"
+                else
+                  raise ArgumentError, "Certificate type must be :development or :distribution"
               end
 
         get(url)
 
+        regex = /certificateDataURL = "([^"]*)"/
+        certificate_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        regex = /certificateRequestTypes = "([^"]*)"/
+        certificate_request_types = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        regex = /certificateStatuses = "([^"]*)"/
+        certificate_statuses = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        certificate_data_url += certificate_request_types + certificate_statuses
+
+        get(certificate_data_url)
+        certificate_data = page.content
+        parsed_certificate_data = JSON.parse(certificate_data)
+
         certificates = []
-        page.parser.xpath('//div[@class="nt_multi"]/table/tbody/tr').each do |row|
+        parsed_certificate_data['certRequests'].each do |row|
           certificate = Certificate.new
-          certificate.name = row.at_xpath('td[@class="name"]//p/text()').to_s.strip rescue nil
+          certificate.name = row['name']
           certificate.type = type
-          certificate.provisioning_profiles = row.at_xpath('td[@class="profiles"]/text()').to_s.strip.split(/\n+/) rescue []
-          certificate.expiration_date = row.at_xpath('td[@class="date"]/text()').to_s.strip rescue nil
-          certificate.status = row.at_xpath('td[@class="status"]/text()').to_s.strip rescue nil
+          certificate.download_url = "https://developer.apple.com/account/ios/certificate/certificateContentDownload.action?displayId=#{row['certificateId']}&type=#{row['certificateTypeDisplayId']}"
+          certificate.expiration_date = row['expirationDateString']
+          certificate.status = row['statusString']
           certificates << certificate
         end
+
         certificates
       end
 
       def download_certificate(certificate)
         list_certificates(certificate.type)
 
-        page.parser.xpath('//div[@class="nt_multi"]/table/tbody/tr').each do |row|
-          name = row.at_xpath('td[@class="name"]//p/text()').to_s.strip rescue nil
-
-          if name == certificate.name
-            download_url = row.at_xpath('td[@class="last"]/a')['href'].to_s.strip rescue nil
-
-            self.pluggable_parser.default = Mechanize::Download
-            download = get(download_url)
-            download.save
-            return download.filename
-          end
-        end
-
-        return nil
+        self.pluggable_parser.default = Mechanize::Download
+        download = get(certificate.download_url)
+        download.save
+        download.filename
       end
 
       def list_devices
-        get("https://developer.apple.com/ios/manage/devices/index.action")
+        get('https://developer.apple.com/account/ios/device/deviceList.action')
+
+        regex = /deviceDataURL = "([^"]*)"/
+        device_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        get(device_data_url)
+        device_data = page.content
+        parsed_device_data = JSON.parse(device_data)
 
         devices = []
-        page.parser.xpath('//fieldset[@id="fs-0"]/table/tbody/tr').each do |row|
+        parsed_device_data['devices'].each do |row|
           device = Device.new
-          device.name = row.at_xpath('td[@class="name"]/span/text()').to_s.strip rescue nil
-          device.udid = row.at_xpath('td[@class="id"]/text()').to_s.strip rescue nil
+          device.name = row['name']
+          device.udid = row['deviceNumber'] # Apple doesn't provide the UDID on this page anymore
           devices << device
         end
 
-        if message = page.parser.at_xpath('//p[@class="devicesannounce"]/strong/text()').to_s.strip rescue nil
-          number_of_devices_available = message.scan(/\d{1,3}/).first.to_i
-          number_of_devices_available.times do
-            devices << nil
-          end
-        end
-
         devices
       end
 
       def add_devices(*devices)
         return if devices.empty?
 
-        get("https://developer.apple.com/ios/manage/devices/upload.action")
+        get('https://developer.apple.com/account/ios/device/deviceCreate.action')
 
         begin
-          file = Tempfile.new(['devices', '.txt'])
-          file.write("deviceIdentifier\tdeviceName")
+          file = Tempfile.new(%w(devices .txt))
+          file.write("Device ID\tDevice Name")
           devices.each do |device|
             file.write("\n#{device.udid}\t#{device.name}")
           end
           file.rewind
 
-          if form = page.form_with(:name => 'saveupload')
-            upload = form.file_uploads.first
-            upload.file_name = file.path
+          form = page.form_with(:name => 'deviceImport') or raise UnexpectedContentError
+
+          upload = form.file_uploads.first
+          upload.file_name = file.path
+          form.radiobuttons.first.check()
+          form.submit
+
+          if form = page.form_with(:name => 'deviceSubmit')
+            form.method = 'POST'
+            form.field_with(:name => 'deviceNames').name = 'name'
+            form.field_with(:name => 'deviceNumbers').name = 'deviceNumber'
             form.submit
+          elsif form = page.form_with(:name => 'deviceImport')
+            form.submit
+          else
+            raise UnexpectedContentError
           end
+
         ensure
           file.close!
         end
@@ -127,22 +146,38 @@ module Cupertino
       def list_profiles(type = :development)
         url = case type
               when :development
-                "https://developer.apple.com/ios/manage/provisioningprofiles/index.action"
+                'https://developer.apple.com/account/ios/profile/profileList.action?type=limited'
               when :distribution
-                  "https://developer.apple.com/ios/manage/provisioningprofiles/viewDistributionProfiles.action"
+                'https://developer.apple.com/account/ios/profile/profileList.action?type=production'
               else
-                raise ArgumentError, "Provisioning profile type must be :development or :distribution"
+                raise ArgumentError, 'Provisioning profile type must be :development or :distribution'
               end
 
         get(url)
 
+        regex = /profileDataURL = "([^"]*)"/
+        profile_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        profile_data_url += case type
+                            when :development
+                              '&type=limited'
+                            when :distribution
+                              '&type=production'
+                            end
+
+        get(profile_data_url)
+        profile_data = page.content
+        parsed_profile_data = JSON.parse(profile_data)
+
         profiles = []
-        page.parser.xpath('//fieldset[@id="fs-0"]/table/tbody/tr').each do |row|
+        parsed_profile_data['provisioningProfiles'].each do |row|
           profile = ProvisioningProfile.new
-          profile.name = row.at_xpath('td[@class="profile"]//text()').to_s.strip rescue nil
+          profile.name = row['name']
           profile.type = type
-          profile.app_id = row.at_xpath('td[@class="appid"]/text()').to_s.strip rescue nil
-          profile.status = row.at_xpath('td[@class="statusXcode"]/text()').to_s.strip rescue nil
+          profile.app_id = row['appId']['appIdId']
+          profile.status = row['status']
+          profile.download_url = "https://developer.apple.com/account/ios/profile/profileContentDownload.action?displayId=#{row['provisioningProfileId']}"
+          profile.edit_url = "https://developer.apple.com/account/ios/profile/profileEdit.action?provisioningProfileId=#{row['provisioningProfileId']}"
           profiles << profile
         end
         profiles
@@ -151,20 +186,10 @@ module Cupertino
       def download_profile(profile)
         list_profiles(profile.type)
 
-        page.parser.xpath('//fieldset[@id="fs-0"]/table/tbody/tr').each do |row|
-          name = row.at_xpath('td[@class="profile"]//span/text()').to_s.strip rescue nil
-
-          if name == profile.name
-            download_url = row.at_xpath('td[@class="action"]/a')['href'].to_s.strip rescue nil
-
-            self.pluggable_parser.default = Mechanize::Download
-            download = get(download_url)
-            download.save
-            return download.filename
-          end
-        end
-
-        return nil
+        self.pluggable_parser.default = Mechanize::Download
+        download = get(profile.download_url)
+        download.save
+        download.filename
       end
 
       def manage_devices_for_profile(profile)
@@ -172,154 +197,74 @@ module Cupertino
 
         list_profiles(profile.type)
 
-        modify_url = nil
-        page.parser.xpath('//fieldset[@id="fs-0"]/table/tbody/tr').each do |row|
-          break if modify_url
-
-          name = row.at_xpath('td[@class="profile"]//text()').to_s.strip rescue nil
-
-          if name == profile.name
-            row.css('td.action a').each do |a|
-              if /edit\.action/ === a['href']
-                modify_url = a['href']
-              end
-            end
-          end
-        end
-
-        if modify_url
-          get(modify_url)
+        get(profile.edit_url)
 
-          on, off = [], []
-          page.parser.css('.checkboxlist.last td').each do |td|
-            checkbox = td.at_xpath('input[@type="checkbox"]')
+        on, off = [], []
+        page.search('dd.selectDevices div.rows div').each do |row|
+          checkbox = row.search('input[type="checkbox"]').first
 
-            device = Device.new
-            device.name = td.at_xpath('label/text()').to_s.strip rescue nil
-            device.udid = checkbox['value'].to_s.strip rescue nil
+          device = Device.new
+          device.name = row.search('span.title').text rescue nil
+          device.udid = checkbox['value'] rescue nil
 
-            if checkbox['checked']
-              on << device
-            else
-              off << device
-            end
+          if checkbox['checked']
+            on << device
+          else
+            off << device
           end
+        end
 
-          devices = yield on, off
+        devices = yield on, off
 
-          form = page.form_with(:name => 'save')
-          form.checkboxes_with(:name => "selectedDevices").each do |checkbox|
+        form = page.form_with(:name => 'profileEdit') or raise UnexpectedContentError
+        form.checkboxes_with(:name => 'deviceIds').each do |checkbox|
+          checkbox.check
+          if devices.detect{|device| device.udid == checkbox['value']}
             checkbox.check
-            if devices.detect{|device| device.udid == checkbox['value']}
-              checkbox.check
-            else
-              checkbox.uncheck
-            end
+          else
+            checkbox.uncheck
           end
-
-          button = form.button_with(:name => 'submit')
-          form.click_button(button)
         end
 
-        return nil
+        form.method = 'POST'
+        form.submit
       end
 
       def list_app_ids
-        get("https://developer.apple.com/ios/manage/bundles/index.action")
+        get('https://developer.apple.com/account/ios/identifiers/bundle/bundleList.action')
+
+        regex = /bundleDataURL = "([^"]*)"/
+        bundle_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
+
+        get(bundle_data_url)
+        bundle_data = page.content
+        parsed_bundle_data = JSON.parse(bundle_data)
 
         app_ids = []
-        page.parser.xpath('//div[@class="nt_multi"]/table/tbody/tr').each do |row|
+        parsed_bundle_data['appIds'].each do |row|
           app_id = AppID.new
-          app_id.bundle_seed_id = row.at_xpath('td[@class="name"]/strong/text()').to_s.strip rescue nil
-          app_id.description = row.at_xpath('td[@class="name"]/text()').to_s.strip rescue nil
-
-          keys = row.xpath('td[@class="name"]/p/text()').collect(&:to_s).collect(&:strip)
-          app_id.development_properties, app_id.distribution_properties = row.xpath('td')[1..2].collect do |td|
-            values = td.xpath('p//text()').collect(&:to_s).collect(&:strip).reject{|text| text.empty?}
-            keys.zip(values)
-            keys.zip(values)
+          app_id.bundle_seed_id = [row['prefix'], row['identifier']].join(".")
+          app_id.description = row['name']
+
+          app_id.development_properties, app_id.distribution_properties = [], []
+          row['features'].each do |feature, value|
+            if value == true
+              app_id.development_properties << feature
+            elsif value.kind_of?(String) && !value.empty?
+              app_id.development_properties << "#{feature}: #{value}"
+            end
+          end
+
+          row['enabledFeatures'].each do |feature|
+            app_id.distribution_properties << feature
           end
 
           app_ids << app_id
         end
+
         app_ids
       end
-      
-      def list_pass_type_ids
-        get("https://developer.apple.com/ios/manage/passtypeids/index.action")
-        
-        pass_type_ids = []
-        page.parser.xpath('//fieldset[@id="fs-0"]/table/tbody/tr').each do |row|
-          pass_type_id = PassTypeID.new
-          pass_type_id.card_id = row.at_xpath('td[@class="checkbox"]/input[@name="selectedValues"]')['value'].to_s.strip rescue nil
-          pass_type_id.id = row.at_xpath('td[@class="name"]/strong/text()').to_s.strip rescue nil
-          pass_type_id.description = row.at_xpath('td[@class="name"]/text()').to_s.strip rescue nil
-          pass_type_id.pass_certificates = row.at_xpath('td[@class="profile"]').inner_text.strip rescue nil
-          
-          pass_type_ids << pass_type_id
-        end
-        pass_type_ids
-      end
-      
-      def list_pass_certificates(pass_type_id)
-        pass_type_id = list_pass_type_ids().delete_if{ |item| item.id != pass_type_id }.shift rescue nil
-        return [] if pass_type_id.nil?
-        
-        get("https://developer.apple.com/ios/manage/passtypeids/configure.action?displayId=#{pass_type_id.card_id}")
-        
-        pass_certificates = []
-        page.parser.xpath('//form[@name="form_logginMemberCert"]/table/tr[position()>1]').each do |row|
-          pass_certificate = PassCertificate.new
-          pass_certificate.name = row.at_xpath('td[1]').inner_text.strip rescue nil
-          pass_certificate.status = row.at_xpath('td[2]/span/text()').to_s.strip rescue nil
-          pass_certificate.expiration_date = row.at_xpath('td[3]/text()').to_s.strip rescue nil
-          pass_certificate.certificate_id = row.at_xpath('td[4]//a[@id="form_logginMemberCert_"]')['href'].to_s.strip.match(/certDisplayId=(.+?)$/)[1] rescue nil
-          
-          pass_certificates << pass_certificate unless pass_certificate.certificate_id.nil?
-        end
-        pass_certificates
-      end
-      
-      def add_pass_type_id(pass_type_id, description)
-        get("https://developer.apple.com/ios/manage/passtypeids/add.action")
-        
-        if form = page.form_with(:name => 'save')
-          form['cardName'] = description
-          form['cardIdentifier'] = pass_type_id
-          
-          button = form.button_with(:name => 'submit')
-          form.click_button(button)
-        end
-      end
-      
-      def add_pass_certificate(pass_type_id, csr_path, aps_cert_type = 'development')
-        pass_type_id = list_pass_type_ids().delete_if{ |item| item.id != pass_type_id }.shift rescue nil
-        return if pass_type_id.nil?
-        
-        csr_contents = ::File.open(csr_path, "rb").read
-        
-        post("https://developer.apple.com/ios/assistant/passtypecommit.action", { 'cardIdValue' => pass_type_id.card_id, 'csrValue' => csr_contents, 'apsCertType' => aps_cert_type })
-        
-        JSON.parse(page.content)
-      end
-      
-      def pass_type_generate(aps_cert_type = 'development')
-        post("https://developer.apple.com/ios/assistant/passtypegenerate.action", { 'apsCertType' => aps_cert_type })
-        
-        ::JSON.parse(page.content)
-      end
-      
-      def download_pass_certificate(pass_type_id, certificate_id = nil)
-        pass_certificate = (certificate_id.nil? ? list_pass_certificates(pass_type_id).last : list_pass_certificates(pass_type_id).delete_if{ |item| item.certificate_id != certificate_id }.shift) rescue nil
-        return nil if pass_certificate.nil?
 
-        self.pluggable_parser.default = Mechanize::Download
-        download = get("/ios/manage/passtypeids/downloadCert.action?certDisplayId=#{pass_certificate.certificate_id}")
-        download.filename = "#{pass_certificate.certificate_id}.cer"
-        download.save
-        return download.filename
-      end
-      
       private
 
       def login!
@@ -332,9 +277,9 @@ module Cupertino
 
       def select_team!
         if form = page.form_with(:name => 'saveTeamSelection')
-          team_list = form.field_with(:name => 'memberDisplayId')
-          team_option = team_list.option_with(:text => self.team)
-          team_option.select
+          # self.team now stores team ID, not name
+          team_option = form.radiobutton_with(:value => self.team)
+          team_option.check
 
           button = form.button_with(:name => 'action:saveTeamSelection!save')
           form.click_button(button)

data/lib/cupertino/provisioning_portal/commands/certificates.rb

@@ -10,17 +10,17 @@ command :'certificates:list' do |c|
     say_warning "No #{type} certificates found." and abort if certificates.empty?
 
     table = Terminal::Table.new do |t|
-      t << ["Name", "Provisioning Profiles", "Expiration Date", "Status"]
+      t << ["Name", "Type", "Expiration Date", "Status"]
       t.add_separator
       certificates.each do |certificate|
         status = case certificate.status
-                 when "Issued"
-                   certificate.status.green
-                 else
-                   certificate.status.red
+                   when "Issued"
+                     certificate.status.green
+                   else
+                     certificate.status.red
                  end
 
-        t << [certificate.name, certificate.provisioning_profiles.join("\n"), certificate.expiration_date, status]
+        t << [certificate.name, certificate.type, certificate.expiration_date, status]
       end
     end
 

data/lib/cupertino/provisioning_portal/commands/devices.rb

@@ -36,7 +36,7 @@ command :'devices:add' do |c|
 
     devices = []
     args.each do |arg|
-      components = arg.strip.gsub(/\"/, '').split(/\=/)
+      components = arg.strip.gsub(/"/, '').split(/\=/)
       device = Device.new
       device.name = components.first
       device.udid = components.last

data/lib/cupertino/provisioning_portal/commands/login.rb

@@ -4,12 +4,12 @@ command :login do |c|
   c.description = ''
 
   c.action do |args, options|
-    say_warning "You are already authenticated" if Security::InternetPassword.find(:server => Cupertino::HOSTNAME)
+    say_warning "You are already authenticated" if Security::InternetPassword.find(:server => Cupertino::ProvisioningPortal::HOST)
 
     user = ask "Username:"
     pass = password "Password:"
 
-    Security::InternetPassword.add(Cupertino::HOSTNAME, user, pass)
+    Security::InternetPassword.add(Cupertino::ProvisioningPortal::HOST, user, pass)
 
     say_ok "Account credentials saved"
   end

data/lib/cupertino/provisioning_portal/commands/logout.rb

@@ -4,9 +4,9 @@ command :logout do |c|
   c.description = ''
 
   c.action do |args, options|
-    say_error "You are not authenticated" and abort unless Security::InternetPassword.find(:server => Cupertino::HOSTNAME)
+    say_error "You are not authenticated" and abort unless Security::InternetPassword.find(:server => Cupertino::ProvisioningPortal::HOST)
 
-    Security::InternetPassword.delete(:server => Cupertino::HOSTNAME)
+    Security::InternetPassword.delete(:server => Cupertino::ProvisioningPortal::HOST)
 
     say_ok "Account credentials removed"
   end

data/lib/cupertino/provisioning_portal/commands/profiles.rb

@@ -47,11 +47,11 @@ command :'profiles:manage:devices' do |c|
       lines = ["# Comment / Uncomment Devices to Turn Off / On for Provisioning Profile"]
       lines += on.collect{|device| "#{device}"}
       lines += off.collect{|device| "# #{device}"}
-      result = ask_editor lines.join("\n")
+      (result = ask_editor lines.join("\n")) or abort("EDITOR undefined. Try run 'export EDITOR=vi'")
 
       devices = []
       result.split(/\n+/).each do |line|
-        next if /^\#/ === line
+        next if /^#/ === line
         components = line.split(/\s+/)
         device = Device.new
         device.udid = components.pop

data/lib/cupertino/provisioning_portal/commands.rb

@@ -5,6 +5,5 @@ require 'cupertino/provisioning_portal/commands/certificates'
 require 'cupertino/provisioning_portal/commands/devices'
 require 'cupertino/provisioning_portal/commands/profiles'
 require 'cupertino/provisioning_portal/commands/app_ids'
-require 'cupertino/provisioning_portal/commands/pass_type_ids'
 require 'cupertino/provisioning_portal/commands/login'
 require 'cupertino/provisioning_portal/commands/logout'

data/lib/cupertino/provisioning_portal/helpers.rb

@@ -24,19 +24,28 @@ module Cupertino
             end
 
             def team
-              teams = page.form_with(:name => 'saveTeamSelection').field_with(:name => 'memberDisplayId').options.collect(&:text)
-              @team ||= choose "Select a team:", *teams
+              # we're working with radio buttons instead of a drop down menu
+              teams = page.form_with(:name => 'saveTeamSelection').radiobuttons
+              # create a dictionary of team.value -> team name
+              formatted_teams = {}
+              teams.each do |team|
+                # we can't use team.label as this only returns the last label
+                # Apple use two labels with the same for="", we want the first
+                formatted_teams[team.value] = page.search("label[for=\"#{team.dom_id}\"]").first.text.strip
+              end
+              teamname = choose "Select a team:", *formatted_teams.values
+              @team ||= formatted_teams.key(teamname)
             end
           end
         end
 
         @agent
       end
-      
+
       def pluralize(n, singular, plural = nil)
         n.to_i == 1 ? "1 #{singular}" : "#{n} #{plural || singular + 's'}"
       end
-      
+
       def try
         return unless block_given?
 

data/lib/cupertino/provisioning_portal.rb

@@ -3,7 +3,10 @@ require 'certified'
 
 module Cupertino
   module ProvisioningPortal
+    HOST = "developer.apple.com"
+
     class UnsuccessfulAuthenticationError < RuntimeError; end
+    class UnexpectedContentError < RuntimeError; end
 
     class Device < Struct.new(:name, :udid)
       def to_s
@@ -11,7 +14,7 @@ module Cupertino
       end
     end
 
-    class Certificate < Struct.new(:name, :type, :provisioning_profiles, :expiration_date, :status)
+    class Certificate < Struct.new(:name, :type, :expiration_date, :status, :download_url) #:provisioning_profiles,
       def to_s
         "#{self.name}"
       end
@@ -23,18 +26,18 @@ module Cupertino
       end
     end
 
-    class ProvisioningProfile < Struct.new(:name, :type, :app_id, :status)
+    class ProvisioningProfile < Struct.new(:name, :type, :app_id, :status, :download_url, :edit_url)
       def to_s
         "#{self.name}"
       end
     end
-    
+
     class PassTypeID < Struct.new(:description, :id, :pass_certificates, :card_id)
       def to_s
         "#{self.id} #{self.description}"
       end
     end
-    
+
     class PassCertificate < Struct.new(:name, :status, :expiration_date, :certificate_id)
       def to_s
         "#{self.certificate_id}"

data/lib/cupertino.rb

@@ -1,4 +1,3 @@
 module Cupertino
-  VERSION = '0.7.1'
-  HOSTNAME = "developer.apple.com"
+  VERSION = '0.8.0'
 end