Merge branch 'security'

README.md

@@ -19,7 +19,7 @@ $ gem install cupertino
 $ ios login
 ```
 
-_Credentials are saved in `.netrc`. You will not be prompted for your username or password by commands  while you are logged in._
+_Credentials are saved in the keychain. You will not be prompted for your username or password by commands  while you are logged in._
 
 ### Devices
 

bin/ios

@@ -3,11 +3,11 @@
 require 'commander/import'
 require 'terminal-table'
 require 'term/ansicolor'
-require 'netrc'
 
 require 'cupertino'
 
 HighLine.track_eof = false # Fix for built-in Ruby
+Signal.trap("INT") {} # Suppress backtrace when exiting command
 
 program :version, Cupertino::VERSION
 program :description, 'A command-line interface for the iOS Provisioning Portal'

cupertino.gemspec

@@ -19,7 +19,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 "netrc", "~> 0.7.2"
+  s.add_dependency "security", "~> 0.1.1"
 
   s.files         = Dir["./**/*"].reject { |file| file =~ /\.\/(bin|log|pkg|script|spec|test|vendor)/ }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

lib/cupertino.rb

@@ -1,4 +1,4 @@
 module Cupertino
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
   HOSTNAME = "developer.apple.com"
 end

lib/cupertino/provisioning_portal/agent.rb

@@ -1,5 +1,5 @@
 require 'mechanize'
-require 'netrc'
+require 'security'
 
 module Cupertino
   module ProvisioningPortal
@@ -10,7 +10,8 @@ def initialize
         super
         self.user_agent_alias = 'Mac Safari'
 
-        @username, @password = Netrc.read[Cupertino::HOSTNAME]
+        pw = Security::InternetPassword.find(:server => Cupertino::HOSTNAME)
+        @username, @password = pw.attributes['acct'], pw.password if pw
       end
 
       def get(uri, parameters = [], referer = nil, headers = {})

lib/cupertino/provisioning_portal/commands/login.rb

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

lib/cupertino/provisioning_portal/commands/logout.rb

@@ -4,11 +4,9 @@
   c.description = ''
 
   c.action do |args, options|
-    say_error "You are not authenticated" and abort unless Netrc.read[Cupertino::HOSTNAME]
+    say_error "You are not authenticated" and abort unless Security::InternetPassword.find(:server => Cupertino::HOSTNAME)
 
-    netrc = Netrc.read
-    netrc.delete(Cupertino::HOSTNAME)
-    netrc.save
+    Security::InternetPassword.delete(:server => Cupertino::HOSTNAME)
 
     say_ok "Account credentials removed"
   end