cupertino 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6903973b7fe02987d18a630dd223186b6fef294b
-  data.tar.gz: a743291023cc6ac965b2af41fd772fd8d02194c8
+  metadata.gz: a835eac9b4d42e3d9ebaae1b702d614842f63650
+  data.tar.gz: 8c2f2b34bec8fa87532955dda13c3022d0e32d0a
 SHA512:
-  metadata.gz: 050ee070538cf2f88da389ca4c707c9de9907998700cbebe42cc0eea88c70db64f7f5e6cfada588196c0d0397624c31ec20d8d0c30b04635ceb1f7390f13a948
-  data.tar.gz: 6f1dfeb02514479210bb421338127cf2f0a3b4d383a990cbe2e2dadd73c4b23d913cd60ea8e9bdfd1487494d457f01053151ab1faf64d1c17886e5dfc8251e93
+  metadata.gz: 61f5fc469464d8fe208d00e5ed38fadc4e8dfd12ea672de9a71b16c3e601ecc7be85082460184196d97a0851a0d17301b1a79765f624fbb4aed7f11264eec225
+  data.tar.gz: 93cba167d779afab989a6ae8bfdaadbcc0f054d7b106f422b07021c41f8bb02691592232ea4489bb8678bc04dcb81c46723bf551f46eccce40c775e7ebf66525

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cupertino (0.9.2)
+    cupertino (0.9.3)
       certified (>= 0.1.0)
       commander (~> 4.1.2)
       mechanize (~> 2.5.1)

data/lib/cupertino/provisioning_portal/agent.rb

@@ -7,17 +7,13 @@ require 'logger'
 module Cupertino
   module ProvisioningPortal
     class Agent < ::Mechanize
-      attr_accessor :username, :password, :team_id
-
-      # Maintain backward compatibility
-      alias_method :team, :team_id
-      alias_method :team=, :team_id=
+      attr_accessor :username, :password, :team
 
       def initialize
         super
 
         self.user_agent_alias = 'Mac Safari'
-        
+
         self.log ||= Logger.new(STDOUT)
         self.log.level = Logger::ERROR
 
@@ -119,8 +115,8 @@ module Cupertino
         parsed_device_data['devices'].each do |row|
           device = Device.new
           device.name = row['name']
-          device.udid = row['deviceNumber'] # Apple doesn't provide the UDID on this page anymore
           device.enabled = (row['status'] == 'c' ? 'Y' : 'N')
+          device.device_id = row['deviceId']
           devices << device
         end
 
@@ -202,6 +198,7 @@ module Cupertino
           profile.edit_url = "https://developer.apple.com/account/ios/profile/profileEdit.action?provisioningProfileId=#{row['provisioningProfileId']}"
           profiles << profile
         end
+
         profiles
       end
 
@@ -217,17 +214,18 @@ module Cupertino
       def manage_devices_for_profile(profile)
         raise ArgumentError unless block_given?
 
-        list_profiles(profile.type)
+        devices = list_devices
 
-        get(profile.edit_url)
+        begin
+          get(profile.edit_url)
+        rescue Mechanize::ResponseCodeError
+          say_error "Cannot manage devices for #{profile}" and abort
+        end
 
         on, off = [], []
         page.search('dd.selectDevices div.rows div').each do |row|
           checkbox = row.search('input[type="checkbox"]').first
-
-          device = Device.new
-          device.name = row.search('span.title').text rescue nil
-          device.udid = checkbox['value'] rescue nil
+          device = devices.detect{|device| device.device_id == checkbox['value']}
 
           if checkbox['checked']
             on << device
@@ -240,14 +238,16 @@ module Cupertino
 
         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']}
+          if devices.detect{|device| device.device_id == checkbox['value']}
             checkbox.check
           else
             checkbox.uncheck
           end
         end
 
+        adssuv = cookies.find{|cookie| cookie.name == 'adssuv'}
+        form.add_field!('adssuv-value', Mechanize::Util::uri_unescape(adssuv.value))
+
         form.method = 'POST'
         form.submit
       end

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

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

data/lib/cupertino/provisioning_portal/commands.rb

@@ -5,7 +5,7 @@ include Cupertino::ProvisioningPortal::Helpers
 
 global_option('-u', '--username USER', 'Username') { |arg| agent.username = arg unless arg.nil? }
 global_option('-p', '--password PASSWORD', 'Password') { |arg| agent.password = arg unless arg.nil? }
-global_option('--team TEAM', 'Team') { |arg| agent.team = arg unless arg.nil? }
+global_option('--team TEAM', 'Team') { |arg| agent.team = arg if arg }
 global_option('--info', 'Set log level to INFO') { agent.log.level = Logger::INFO }
 global_option('--debug', 'Set log level to DEBUG') { agent.log.level = Logger::DEBUG }
 

data/lib/cupertino/provisioning_portal/helpers.rb

@@ -24,29 +24,23 @@ module Cupertino
             end
 
             def team_id
-              teams = []
+              unless @team_id
+                teams = []
+                page.form_with(:name => 'saveTeamSelection').radiobuttons.each do |radio|
+                  name = page.search(".label-primary[for=\"#{radio.dom_id}\"]").first.text.strip
+                  programs = page.search(".label-secondary[for=\"#{radio.dom_id}\"]").first.text.strip.split(/\,\s+/)
+                  team_id = radio.value
+                  teams << Team.new(name, programs, radio.value)
+                end
 
-              page.form_with(:name => 'saveTeamSelection').radiobuttons.each do |radio|
-                primary = page.search(".label-primary[for=\"#{radio.dom_id}\"]").first.text.strip
-                secondary = page.search(".label-secondary[for=\"#{radio.dom_id}\"]").first.text.strip
-                team_id = radio.value
-                name = "#{primary}, #{secondary} (#{team_id})"
-                teams << [name, radio.value]
-              end
-
-              team_names = teams.collect(&:first)
-              team_ids   = teams.collect(&:last)
+                unless team = teams.detect{|t| t.name == @team || t.identifier == @team}
+                  team = choose "Select a team:", *teams
+                end
 
-              if @team.nil?
-                selected_team_name = choose "Select a team:", *team_names
-                teams.detect { |t| t.first == selected_team_name }.last
-              elsif team_ids.member? @team
-                @team
-              elsif team = teams.detect { |t| t.first.start_with?(@team) }
-                team.last
-              else
-                say_error "Team should be a name or identifier" and abort
+                @team_id = team.identifier
               end
+
+              @team_id
             end
           end
         end

data/lib/cupertino/provisioning_portal.rb

@@ -8,7 +8,7 @@ module Cupertino
     class UnsuccessfulAuthenticationError < RuntimeError; end
     class UnexpectedContentError < RuntimeError; end
 
-    class Device < Struct.new(:name, :udid, :enabled)
+    class Device < Struct.new(:name, :udid, :enabled, :device_id)
       def to_s
         "#{self.name} #{self.udid} #{self.enabled}"
       end
@@ -43,7 +43,13 @@ module Cupertino
         "#{self.certificate_id}"
       end
     end
+
+    class Team < Struct.new(:name, :programs, :identifier)
+      def to_s
+        "#{self.name} (#{self.identifier})" + (" [#{self.programs.join(', ')}]" unless self.programs.empty?).to_s
+      end
+    end
   end
 end
 
-require 'cupertino/provisioning_portal/agent'
+require 'cupertino/provisioning_portal/agent'

data/lib/cupertino/version.rb

@@ -1,3 +1,3 @@
 module Cupertino
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cupertino
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -157,7 +157,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ./cupertino-0.9.1.gem
 - ./cupertino.gemspec
 - ./Gemfile
 - ./Gemfile.lock