./lib/cupertino/provisioning_portal/commands/profiles.rb in cupertino-0.8.1 vs ./lib/cupertino/provisioning_portal/commands/profiles.rb in cupertino-0.9.0

@@ -1,13 +1,15 @@
 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?
 
     table = Terminal::Table.new do |t|
       t << ["Profile", "App ID", "Status"]
@@ -29,40 +31,74 @@
 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
       say_error "Could not download profile"
     end
   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
 
     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}"}
@@ -97,20 +133,20 @@
     profiles = try{agent.list_profiles(:development) + agent.list_profiles(:distribution)}
     profile = profiles.find {|profile| profile.name == args.first }
 
     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
 
     say_ok "Successfully added devices to #{args.first}."
   end
@@ -127,20 +163,13 @@
     profiles = try{agent.list_profiles(:development) + agent.list_profiles(:distribution)}
     profile = profiles.find {|profile| profile.name == args.first }
 
     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}."
   end
 end