add a couple more requires to edge cases where deferall needs to be o…

…verridden
themgt · Jun 27, 2012 · e610eff · e610eff
1 parent 1f1dd23
commit e610eff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/heroku/auth.rb b/lib/heroku/auth.rb
@@ -211,6 +211,7 @@ def ask_for_password
     end
 
     def ask_for_and_save_credentials
+      require("heroku-api") # for the errors
       begin
         @credentials = ask_for_credentials
         write_credentials

diff --git a/lib/heroku/command.rb b/lib/heroku/command.rb
@@ -173,10 +173,10 @@ def self.prepare_run(cmd, args=[])
     end
 
     def self.run(cmd, arguments=[])
-      object, method = prepare_run(cmd, arguments.dup)
       begin
+        object, method = prepare_run(cmd, arguments.dup)
         object.send(method)
-      rescue => error
+      rescue Interrupt, StandardError => error
         # load likely error classes, as they may not be loaded yet due to defered loads
         require 'heroku-api'
         require 'rest_client'