cupertino 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f34dafa2ee7735e8e2cfbbf1c288646d89d2630
-  data.tar.gz: 6cfae45ba3385252735c66ead7b958e48c8b2ebd
+  metadata.gz: f2fe21bc508207cbfaf9d5a89cec2ff1b4371126
+  data.tar.gz: 87a5b6c64e5e0282986bcc0da0b47aa04dcf6d4c
 SHA512:
-  metadata.gz: ce67fee76f47e88958ad9be8e82cfc35032153ab25e30f98ce93d162d3c300a91d6c0b5bc9e56885fbd588845725a61f6a1eedd1823be9be9e5902b002b90a58
-  data.tar.gz: fe06155709eeda1854b2c490ad0c644d506b04958f8b8ef09e573753c651e486e6c4fb1663417c5892148b0bc24adba8b9d2af713661577827c021459e9e61b2
+  metadata.gz: e1cd6cc09b28b4aeee344a2727f53fc51edab09162811708614f66f64263277edca0fc958c23ef366c0a7d946e162ad70490cc377eca534d05691f16ce210193
+  data.tar.gz: f9a84ebc0faf92930ec89ab5e08f7c8659140d1193c5d7528d0b7d2b297f146bb3dec5890f9fd2b92909fa5c83ca76fdeee5025660a607e0e3a4527c12795143

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    cupertino (0.8.1)
+    cupertino (0.9.0)
       certified (>= 0.1.0)
       commander (~> 4.1.2)
       mechanize (~> 2.5.1)
+      nokogiri (~> 1.5.9)
       security (~> 0.1.2)
       shenzhen (>= 0.0.1)
       term-ansicolor (~> 1.0.7)
@@ -14,16 +15,17 @@ GEM
   remote: https://rubygems.org/
   specs:
     certified (0.1.1)
-    commander (4.1.3)
+    commander (4.1.5)
       highline (~> 1.6.11)
-    domain_name (0.5.7)
-      unf (~> 0.0.3)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
-    faraday_middleware (0.8.8)
+    domain_name (0.5.12)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (0.9.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
-    highline (1.6.18)
-    json (1.7.7)
+    highline (1.6.19)
+    json (1.8.0)
     mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)
@@ -32,26 +34,27 @@ GEM
       nokogiri (~> 1.4)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (~> 0.0, >= 0.0.9)
-    mime-types (1.23)
+    mime-types (1.25)
     multipart-post (1.2.0)
-    net-http-digest_auth (1.2.1)
+    net-http-digest_auth (1.3)
     net-http-persistent (2.8)
-    nokogiri (1.5.9)
+    nokogiri (1.5.10)
     ntlm-http (0.1.1)
     rake (0.9.2.2)
     rspec (0.6.4)
     security (0.1.2)
-    shenzhen (0.3.0)
-      commander (~> 4.1.2)
-      faraday (~> 0.8.0)
-      faraday_middleware (~> 0.8.7)
-      json (~> 1.7.3)
+    shenzhen (0.4.0)
+      commander (~> 4.1)
+      dotenv (~> 0.7)
+      faraday (~> 0.8)
+      faraday_middleware (~> 0.9)
+      json (~> 1.8)
     term-ansicolor (1.0.7)
     terminal-table (1.4.5)
-    unf (0.0.5)
+    unf (0.1.1)
       unf_ext
-    unf_ext (0.0.5)
-    webrobots (0.0.13)
+    unf_ext (0.0.6)
+    webrobots (0.1.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,4 @@
-# Cupertino
-**CLI for the Apple Dev Center**
+![Cupertino](https://raw.github.com/mattt/nomad-cli.com/assets/cupertino-banner.png)
 
 Automate administrative tasks that you would normally have to do through the Apple Dev Center websites. Life's too short to manage device identifiers by hand!
 
@@ -100,6 +99,7 @@ _Removes (without an editor) a list of devices from a provisioning profile_
 - `profiles:manage:devices:add`
 - `profiles:manage:devices:remove`
 - `profiles:download`
+- `profiles:download:all`
 - `certificates:list [development|distribution]`
 - `certificates:download`
 - `app_ids:list`
@@ -114,6 +114,10 @@ _Removes (without an editor) a list of devices from a provisioning profile_
 - `pass_type_ids:certificates:add`
 - `pass_type_ids:certificates:download`
 
+## Proxies
+
+Cupertino will access the provisioning portal through a proxy if the `HTTP_PROXY` environment variable is set, with optional credentials `HTTP_PROXY_USER` and `HTTP_PROXY_PASSWORD`.
+
 ## Contact
 
 Mattt Thompson

data/cupertino.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
+
 require "cupertino"
 
 Gem::Specification.new do |s|
@@ -17,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "terminal-table", "~> 1.4.5"
   s.add_dependency "term-ansicolor", "~> 1.0.7"
   s.add_dependency "mechanize", "~> 2.5.1"
+  s.add_dependency "nokogiri", "~> 1.5.9"
   s.add_dependency "security", "~> 0.1.2"
   s.add_dependency "shenzhen", ">= 0.0.1"
   s.add_dependency "certified", ">= 0.1.0"

data/lib/cupertino/provisioning_portal/agent.rb

@@ -1,5 +1,6 @@
 require 'mechanize'
 require 'security'
+require 'uri'
 require 'json'
 
 module Cupertino
@@ -9,8 +10,17 @@ module Cupertino
 
       def initialize
         super
+
         self.user_agent_alias = 'Mac Safari'
 
+        if ENV['HTTP_PROXY']
+          uri = URI.parse(ENV['HTTP_PROXY'])
+          user = ENV['HTTP_PROXY_USER'] if ENV['HTTP_PROXY_USER']
+          password = ENV['HTTP_PROXY_PASSWORD'] if ENV['HTTP_PROXY_PASSWORD']
+
+          set_proxy(uri.host, uri.port, user || uri.user, password || uri.password)
+        end
+
         pw = Security::InternetPassword.find(:server => Cupertino::ProvisioningPortal::HOST)
         @username, @password = pw.attributes['acct'], pw.password if pw
       end
@@ -24,12 +34,12 @@ module Cupertino
           return page unless page.respond_to?(:title)
 
           case page.title
-            when /Sign in with your Apple ID/
-              login! and redo
-            when /Select 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,13 +48,13 @@ module Cupertino
 
       def list_certificates(type = :development)
         url = case type
-                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
+        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)
 
@@ -59,7 +69,7 @@ module Cupertino
 
         certificate_data_url += certificate_request_types + certificate_statuses
 
-        get(certificate_data_url)
+        post(certificate_data_url)
         certificate_data = page.content
         parsed_certificate_data = JSON.parse(certificate_data)
 
@@ -81,7 +91,7 @@ module Cupertino
         list_certificates(certificate.type)
 
         self.pluggable_parser.default = Mechanize::Download
-        download = get(certificate.download_url)
+        download = post(certificate.download_url)
         download.save
         download.filename
       end
@@ -92,7 +102,8 @@ module Cupertino
         regex = /deviceDataURL = "([^"]*)"/
         device_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
 
-        get(device_data_url)
+        post(device_data_url)
+
         device_data = page.content
         parsed_device_data = JSON.parse(device_data)
 
@@ -101,6 +112,7 @@ module Cupertino
           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')
           devices << device
         end
 
@@ -153,6 +165,7 @@ module Cupertino
                 raise ArgumentError, 'Provisioning profile type must be :development or :distribution'
               end
 
+        self.pluggable_parser.default = Mechanize::File
         get(url)
 
         regex = /profileDataURL = "([^"]*)"/
@@ -165,7 +178,8 @@ module Cupertino
                               '&type=production'
                             end
 
-        get(profile_data_url)
+        post(profile_data_url)
+
         profile_data = page.content
         parsed_profile_data = JSON.parse(profile_data)
 
@@ -236,7 +250,7 @@ module Cupertino
         regex = /bundleDataURL = "([^"]*)"/
         bundle_data_url = (page.body.match regex or raise UnexpectedContentError)[1]
 
-        get(bundle_data_url)
+        post(bundle_data_url)
         bundle_data = page.content
         parsed_bundle_data = JSON.parse(bundle_data)
 
@@ -277,7 +291,6 @@ module Cupertino
 
       def select_team!
         if form = page.form_with(:name => 'saveTeamSelection')
-          # self.team now stores team ID, not name
           team_option = form.radiobutton_with(:value => self.team)
           team_option.check
 

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

@@ -9,17 +9,19 @@ command :'devices:list' do |c|
     number_of_devices = devices.compact.length
     number_of_additional_devices = devices.length - number_of_devices
 
-    title = "Listing #{pluralize(number_of_devices, 'device')}. "
-    title += "You can register #{pluralize(number_of_additional_devices, 'additional device')}." if number_of_additional_devices > 0
+    title = "Listing #{pluralize(number_of_devices, 'device')} "
+    title += "(You can register #{pluralize(number_of_additional_devices, 'additional device')})" if number_of_additional_devices > 0
 
     table = Terminal::Table.new :title => title do |t|
-      t << ["Device Name", "Device Identifier"]
+      t << ["Device Name", "Device Identifier", "Enabled"]
       t.add_separator
       devices.compact.each do |device|
-        t << [device.name, device.udid]
+        t << [device.name, device.udid, device.enabled]
       end
     end
 
+    table.align_column 2, :center
+
     puts table
   end
 end
@@ -40,11 +42,12 @@ command :'devices:add' do |c|
       device = Device.new
       device.name = components.first
       device.udid = components.last
+      say_warning "Invalid UDID: #{device.udid}" and next unless /\h{40}/ === device.udid
       devices << device
     end
 
     agent.add_devices(*devices)
 
-    say_ok "Added #{devices.length} #{devices.length == 1 ? 'device' : 'devices'}"
+    say_ok "Added #{pluralize(devices.length, 'device')}"
   end
 end

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

@@ -1,11 +1,13 @@
 command :'profiles:list' do |c|
-  c.syntax = 'ios profiles:list [development|distribution]'
+  c.syntax = 'ios profiles:list'
   c.summary = 'Lists the Provisioning Profiles'
   c.description = ''
 
+  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+
   c.action do |args, options|
-    type = args.first.downcase.to_sym rescue nil
-    profiles = try{agent.list_profiles(type ||= :development)}
+    type = options.type || :development
+    profiles = try{agent.list_profiles(type)}
 
     say_warning "No #{type} provisioning profiles found." and abort if profiles.empty?
 
@@ -31,17 +33,24 @@ end
 alias_command :profiles, :'profiles:list'
 
 command :'profiles:download' do |c|
-  c.syntax = 'ios profiles:download'
+  c.syntax = 'ios profiles:download [PROFILE_NAME]'
   c.summary = 'Downloads the Provisioning Profiles'
   c.description = ''
 
+  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+
   c.action do |args, options|
-    type = args.first.downcase.to_sym rescue nil
-    profiles = try{agent.list_profiles(type ||= :development)}
-    profiles = profiles.find_all{|profile| profile.status == 'Active'}
+    type = options.type || :development
+    profiles = try{agent.list_profiles(type)}
+    profiles = profiles.select{|profile| profile.status == 'Active'}
 
     say_warning "No active #{type} profiles found." and abort if profiles.empty?
-    profile = choose "Select a profile to download:", *profiles
+
+    name = args.join(" ")
+    unless profile = profiles.detect{|p| p.name == name}
+      profile = choose "Select a profile to download:", *profiles
+    end
+
     if filename = agent.download_profile(profile)
       say_ok "Successfully downloaded: '#{filename}'"
     else
@@ -50,16 +59,43 @@ command :'profiles:download' do |c|
   end
 end
 
+command :'profiles:download:all' do |c|
+  c.syntax = 'ios profiles:download:all'
+  c.summary = 'Downloads all the active Provisioning Profiles'
+  c.description = ''
+
+  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+
+  c.action do |args, options|
+    type = options.type || :development
+    profiles = try{agent.list_profiles(type)}
+    profiles = profiles.select{|profile| profile.status == 'Active'}
+
+    say_warning "No active #{type} profiles found." and abort if profiles.empty?
+    profiles.each do |profile|
+      if filename = agent.download_profile(profile)
+        say_ok "Successfully downloaded: '#{filename}'"
+      else
+        say_error "Could not download profile: '#{profile.name}'"
+      end
+    end
+  end
+end
+
 command :'profiles:manage:devices' do |c|
   c.syntax = 'ios profiles:manage:devices'
   c.summary = 'Manage active devices for a development provisioning profile'
   c.description = ''
 
+  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+
   c.action do |args, options|
-    type = args.first.downcase.to_sym rescue nil
-    profiles = try{agent.list_profiles(type ||= :development)}
+    type = options.type || :development
+    profiles = try{agent.list_profiles(type)}
 
-    say_warning "No #{type} provisioning profiles found." and abort if profiles.empty?
+    profiles.delete_if{|profile| profile.status == "Invalid"}
+
+    say_warning "No valid #{type} provisioning profiles found." and abort if profiles.empty?
 
     profile = choose "Select a provisioning profile to manage:", *profiles
 
@@ -99,16 +135,16 @@ command :'profiles:manage:devices:add' do |c|
 
     say_warning "No provisioning profiles named #{args.first} were found." and abort unless profile
 
-    devices = []
-    args[1..-1].each do |arg|
-      components = arg.strip.gsub(/\"/, '').split(/\=/)
-      device = Device.new
-      device.name = components.first
-      device.udid = components.last
-      devices << device
-    end
-
     agent.manage_devices_for_profile(profile) do |on, off|
+      names = args[1..-1].collect{|arg| arg.sub /\=.*/, ''}
+      devices = []
+      
+      names.each do |name|
+        device = (on + off).detect{|d| d.name === name}
+        say_warning "No device named #{name} was found." and abort unless device
+        devices << Device.new(name, device.udid)
+      end
+      
       on + devices
     end
 
@@ -129,17 +165,10 @@ command :'profiles:manage:devices:remove' do |c|
 
     say_warning "No provisioning profiles named #{args.first} were found." and abort unless profile
 
-    devices = []
-    args[1..-1].each do |arg|
-      components = arg.strip.gsub(/\"/, '').split(/\=/)
-      device = Device.new
-      device.name = components.first
-      device.udid = components.last
-      devices << device
-    end
+    names = args[1..-1].collect{|arg| arg.gsub /\=.*/, ''}
 
     agent.manage_devices_for_profile(profile) do |on, off|
-      on.delete_if {|active| devices.any? {|inactive| inactive.udid == active.udid }}
+      on.delete_if{|active| names.include?(active.name)}
     end
 
     say_ok "Successfully removed devices from #{args.first}."

data/lib/cupertino/provisioning_portal/commands.rb

@@ -1,6 +1,10 @@
 include Cupertino::ProvisioningPortal
 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('-tm', '--team TEAM', 'Team') { |arg| agent.team = arg unless arg.nil? }
+
 require 'cupertino/provisioning_portal/commands/certificates'
 require 'cupertino/provisioning_portal/commands/devices'
 require 'cupertino/provisioning_portal/commands/profiles'

data/lib/cupertino/provisioning_portal/helpers.rb

@@ -24,14 +24,14 @@ module Cupertino
             end
 
             def team
-              teams_by_name = {}
+              teams = []
               page.form_with(:name => 'saveTeamSelection').radiobuttons.each do |radio|
                 name = page.search("label[for=\"#{radio.dom_id}\"]").first.text.strip
-                teams_by_name[name] = radio.value
+                teams << [name, radio.value]
               end
 
-              name = choose "Select a team:", *teams_by_name.keys
-              @team ||= teams_by_name[name]
+              name = choose "Select a team:", *teams.collect(&:first)
+              @team ||= teams.detect{|e| e.first == name}.last
             end
           end
         end

data/lib/cupertino/provisioning_portal.rb

@@ -8,9 +8,9 @@ module Cupertino
     class UnsuccessfulAuthenticationError < RuntimeError; end
     class UnexpectedContentError < RuntimeError; end
 
-    class Device < Struct.new(:name, :udid)
+    class Device < Struct.new(:name, :udid, :enabled)
       def to_s
-        "#{self.name} #{self.udid}"
+        "#{self.name} #{self.udid} #{self.enabled}"
       end
     end
 

data/lib/cupertino.rb

@@ -1,3 +1,3 @@
 module Cupertino
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cupertino
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.5.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.9
 - !ruby/object:Gem::Dependency
   name: security
   requirement: !ruby/object:Gem::Requirement
@@ -84,56 +98,56 @@ dependencies:
   name: shenzhen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: certified
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A command-line interface for the iOS Provisioning Portal
@@ -171,12 +185,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []