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

* 'master' of github.com:CocoaPods/CocoaPods:
  Some 'informative' messages should just be plain simple.
  Make all specs green by updating some of the submodule fixtures.

lib/cocoapods.rb

@@ -3,7 +3,10 @@ Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
 module Pod
   VERSION = '0.6.0.rc1'
 
-  class Informative < StandardError
+  class PlainInformative < StandardError
+  end
+
+  class Informative < PlainInformative
     def message
       #TODO: remove formatting from raise calls and remove conditional
       super !~ /\[!\]/ ? "[!] #{super}\n".red : super

lib/cocoapods/command.rb

@@ -73,7 +73,7 @@ module Pod
       Config.instance.verbose? ? raise : exit(1)
 
     rescue Exception => e
-      if e.is_a?(Informative)
+      if e.is_a?(PlainInformative) # also catches Informative
         puts e.message
         puts *e.backtrace if Config.instance.verbose?
       else
@@ -84,7 +84,7 @@ module Pod
 
     def self.parse(*argv)
       argv = ARGV.new(argv)
-      raise Informative, VERSION if argv.option('--version')
+      raise PlainInformative, VERSION if argv.option('--version')
 
       show_help = argv.option('--help')
       Config.instance.silent = argv.option('--silent')

sstoolkit @ 287a7880

-Subproject commit 2adcd0f81740d6b0cd4589af98790eee3bd1ae7b
+Subproject commit 287a78804972c1c4ce41d9e2771e4beb63764a16

master @ 7e76f3d2

-Subproject commit c4c1485856500fe0b7c5612a2c3aaac67ba7995d
+Subproject commit 7e76f3d2314fe5ce1948d7ce7ac0232748587d8a