cupertino 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2fe21bc508207cbfaf9d5a89cec2ff1b4371126
-  data.tar.gz: 87a5b6c64e5e0282986bcc0da0b47aa04dcf6d4c
+  metadata.gz: e6fad9af88f84e96ecd1b050a0d5a69cc99849e2
+  data.tar.gz: a5b03a00078657f3a24e2c283cfb1b01e09861bc
 SHA512:
-  metadata.gz: e1cd6cc09b28b4aeee344a2727f53fc51edab09162811708614f66f64263277edca0fc958c23ef366c0a7d946e162ad70490cc377eca534d05691f16ce210193
-  data.tar.gz: f9a84ebc0faf92930ec89ab5e08f7c8659140d1193c5d7528d0b7d2b297f146bb3dec5890f9fd2b92909fa5c83ca76fdeee5025660a607e0e3a4527c12795143
+  metadata.gz: 9c89c3ce10f363e396991c989b03b66b75a9555312de4d50607e758a9d619da510271e47e4c7df0b4267e9e609b81e6419cf049362db80aa5e93a6526b9e0344
+  data.tar.gz: e6f144b4f64217dbec2b0f8e7541069a28c32b6a9d5463a502ca759a8beb112a24b14c965549a432103da117230ac157a1cf4d70d6625943062b02a9708505fd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cupertino (0.9.0)
+    cupertino (0.9.1)
       certified (>= 0.1.0)
       commander (~> 4.1.2)
       mechanize (~> 2.5.1)
@@ -25,7 +25,7 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     highline (1.6.19)
-    json (1.8.0)
+    json (1.8.1)
     mechanize (2.5.1)
       domain_name (~> 0.5, >= 0.5.1)
       mime-types (~> 1.17, >= 1.17.2)

data/README.md

@@ -100,7 +100,7 @@ _Removes (without an editor) a list of devices from a provisioning profile_
 - `profiles:manage:devices:remove`
 - `profiles:download`
 - `profiles:download:all`
-- `certificates:list [development|distribution]`
+- `certificates:list`
 - `certificates:download`
 - `app_ids:list`
 

data/cupertino.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 
-require "cupertino"
+require "cupertino/version"
 
 Gem::Specification.new do |s|
   s.name        = "cupertino"

data/lib/cupertino/provisioning_portal/agent.rb

@@ -2,6 +2,7 @@ require 'mechanize'
 require 'security'
 require 'uri'
 require 'json'
+require 'logger'
 
 module Cupertino
   module ProvisioningPortal
@@ -12,6 +13,9 @@ module Cupertino
         super
 
         self.user_agent_alias = 'Mac Safari'
+        
+        self.log ||= Logger.new(STDOUT)
+        self.log.level = Logger::ERROR
 
         if ENV['HTTP_PROXY']
           uri = URI.parse(ENV['HTTP_PROXY'])
@@ -291,7 +295,7 @@ module Cupertino
 
       def select_team!
         if form = page.form_with(:name => 'saveTeamSelection')
-          team_option = form.radiobutton_with(:value => self.team)
+          team_option = form.radiobutton_with(:value => self.team_id)
           team_option.check
 
           button = form.button_with(:name => 'action:saveTeamSelection!save')

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

@@ -3,11 +3,11 @@ command :'profiles:list' do |c|
   c.summary = 'Lists the Provisioning Profiles'
   c.description = ''
 
-  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+  c.option '--type [TYPE]', [:development, :distribution], "Type of profile (defaults to :development)"
 
   c.action do |args, options|
-    type = options.type || :development
-    profiles = try{agent.list_profiles(type)}
+    type = options.type.downcase.to_sym if options.type
+    profiles = try{agent.list_profiles(type || :development)}
 
     say_warning "No #{type} provisioning profiles found." and abort if profiles.empty?
 
@@ -37,11 +37,11 @@ command :'profiles:download' do |c|
   c.summary = 'Downloads the Provisioning Profiles'
   c.description = ''
 
-  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+  c.option '--type [TYPE]', [:development, :distribution], "Type of profile (defaults to :development)"
 
   c.action do |args, options|
-    type = options.type || :development
-    profiles = try{agent.list_profiles(type)}
+    type = options.type.downcase.to_sym if options.type
+    profiles = try{agent.list_profiles(type || :development)}
     profiles = profiles.select{|profile| profile.status == 'Active'}
 
     say_warning "No active #{type} profiles found." and abort if profiles.empty?
@@ -64,11 +64,11 @@ command :'profiles:download:all' do |c|
   c.summary = 'Downloads all the active Provisioning Profiles'
   c.description = ''
 
-  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+  c.option '--type [TYPE]', [:development, :distribution], "Type of profile (defaults to :development)"
 
   c.action do |args, options|
-    type = options.type || :development
-    profiles = try{agent.list_profiles(type)}
+    type = options.type.downcase.to_sym if options.type
+    profiles = try{agent.list_profiles(type || :development)}
     profiles = profiles.select{|profile| profile.status == 'Active'}
 
     say_warning "No active #{type} profiles found." and abort if profiles.empty?
@@ -87,11 +87,11 @@ command :'profiles:manage:devices' do |c|
   c.summary = 'Manage active devices for a development provisioning profile'
   c.description = ''
 
-  c.option '-t', '--type [TYPE]', [:development, :distribution], "Type of profile"
+  c.option '--type [TYPE]', [:development, :distribution], "Type of profile (defaults to :development)"
 
   c.action do |args, options|
-    type = options.type || :development
-    profiles = try{agent.list_profiles(type)}
+    type = options.type.downcase.to_sym if options.type
+    profiles = try{agent.list_profiles(type || :development)}
 
     profiles.delete_if{|profile| profile.status == "Invalid"}
 

data/lib/cupertino/provisioning_portal/commands.rb

@@ -3,7 +3,9 @@ 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? }
+global_option('--team TEAM', 'Team') { |arg| agent.team = arg unless arg.nil? }
+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 }
 
 require 'cupertino/provisioning_portal/commands/certificates'
 require 'cupertino/provisioning_portal/commands/devices'

data/lib/cupertino/provisioning_portal/helpers.rb

@@ -23,15 +23,30 @@ module Cupertino
               @password ||= pw "Password:"
             end
 
-            def team
+            def team_id
               teams = []
+
               page.form_with(:name => 'saveTeamSelection').radiobuttons.each do |radio|
-                name = page.search("label[for=\"#{radio.dom_id}\"]").first.text.strip
+                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
 
-              name = choose "Select a team:", *teams.collect(&:first)
-              @team ||= teams.detect{|e| e.first == name}.last
+              team_names = teams.collect(&:first)
+              team_ids   = teams.collect(&:last)
+
+              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
+              end
             end
           end
         end

data/lib/cupertino/version.rb

@@ -0,0 +1,3 @@
+module Cupertino
+  VERSION = '0.9.1'
+end

data/lib/cupertino.rb

@@ -1,3 +1 @@
-module Cupertino
-  VERSION = '0.9.0'
-end
+require 'cupertino/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cupertino
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -170,6 +170,7 @@ files:
 - ./lib/cupertino/provisioning_portal/commands.rb
 - ./lib/cupertino/provisioning_portal/helpers.rb
 - ./lib/cupertino/provisioning_portal.rb
+- ./lib/cupertino/version.rb
 - ./lib/cupertino.rb
 - ./LICENSE
 - ./Rakefile