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,9 +54,13 @@ module Pod
     end
 
     def self.run(*argv)
-      begin
       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
@@ -66,7 +70,6 @@ module Pod
       end
       exit 1
     end
-    end
 
     def self.parse(*argv)
       argv = ARGV.new(argv)

lib/cocoapods/command/error_report.rb

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