Merge branch 'newcommandspec' of https://github.com/carsonmcdonald/CocoaPods…

Merge branch 'newcommandspec' of https://github.com/carsonmcdonald/CocoaPods into carsonmcdonald-newcommandspec

Conflicts:
	spec/spec_helper/user_interface.rb

lib/cocoapods/command.rb

@@ -45,8 +45,8 @@ module Pod
     def self.run(argv)
       argv = CLAide::ARGV.new(argv)
       if argv.flag?('version')
-        puts VERSION
-        exit!(0)
+        UI.puts VERSION
+        exit 0
       end
       super(argv)
       UI.print_warnings

spec/functional/command_spec.rb

+require File.expand_path('../../spec_helper', __FILE__)
+
+module Pod
+  describe Command do
+    extend SpecHelper::Command
+
+    it "displays the current version number with the --version flag" do
+      lambda { Pod::Command.run(['--version']) }.should.raise SystemExit
+      UI.output.should.include VERSION
+    end
+
+    it "reports the location of the AFNetworking spec" do
+      lambda { Pod::Command.run(['spec', 'which', 'AFNetworking']) }.should.not.raise
+      UI.output.should.include 'spec/fixtures/spec-repos/master/AFNetworking'
+    end
+
+  end
+end

spec/spec_helper/user_interface.rb

@@ -31,6 +31,9 @@ module Pod
       def gets
         @next_input
       end
+
+      def print_warnings
+      end
     end
   end
 end