Merge branch 'master' of github.com:CocoaPods/CocoaPods

* 'master' of github.com:CocoaPods/CocoaPods:
  Don't print an error report when someone sends an interrupt signal.
  Add correct encoding comment to error_report.rb.

examples/AFNetworking Mac Example/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - AFNetworking (0.7.0):
     - JSONKit
   - FormatterKit (0.7.0)
-  - JSONKit (1.4)
+  - JSONKit (1.5pre)
 
 DEPENDENCIES:
   - AFNetworking (~> 0.7.0)

examples/AFNetworking iOS Example/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - AFNetworking (0.7.0):
     - JSONKit
   - FormatterKit (0.7.0)
-  - JSONKit (1.4)
+  - JSONKit (1.5pre)
 
 DEPENDENCIES:
   - AFNetworking (~> 0.7.0)

lib/cocoapods/command.rb

@@ -54,18 +54,21 @@ module Pod
     end
 
     def self.run(*argv)
-      begin
-        Setup.new(ARGV.new()).run_if_needed
-        parse(*argv).run
-      rescue Exception => e
-        if e.is_a?(Informative)
-          puts e.message
-          puts *e.backtrace if Config.instance.verbose?
-        else
-          puts ErrorReport.report(e)
-        end
-        exit 1
+      Setup.new(ARGV.new()).run_if_needed
+      parse(*argv).run
+
+    rescue Interrupt
+      puts "[!] Cancelled".red
+      Config.instance.verbose? ? raise : exit(1)
+
+    rescue Exception => e
+      if e.is_a?(Informative)
+        puts e.message
+        puts *e.backtrace if Config.instance.verbose?
+      else
+        puts ErrorReport.report(e)
       end
+      exit 1
     end
 
     def self.parse(*argv)

lib/cocoapods/command/error_report.rb

+# encoding: UTF-8
+
 require 'rbconfig'
 require 'cgi'
 require 'rubygems'