Merge pull request #2215 from tapi/2181-init-search

[init] Changes the check used to determine if a Podfile already exists.

CHANGELOG.md

@@ -29,6 +29,11 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Fabio Pelosin][irrationalfab]
   [Core#132](https://github.com/CocoaPods/Core/issues/132)
 
+* Fixed `pod init` so that it doesn't recurse when checking for Podfiles.
+  [Paddy O'Brien](tapi)
+  [#2181](https://github.com/CocoaPods/CocoaPods/issues/2181)
+
+
 * Fixed missing XCTest framework in Xcode 6
   [Paul Williamson](squarefrog)
   [#2296](https://github.com/CocoaPods/CocoaPods/issues/2296)

lib/cocoapods/command/init.rb

@@ -30,7 +30,7 @@ module Pod
 
       def validate!
         super
-        raise Informative, "Existing Podfile found in directory" unless config.podfile.nil?
+        raise Informative, "Existing Podfile found in directory" unless config.podfile_path_in_dir(Pathname.pwd).nil?
         if @project_path
           help! "Xcode project at #{@project_path} does not exist" unless File.exist? @project_path
           project_path = @project_path

lib/cocoapods/config.rb

@@ -320,6 +320,8 @@ module Pod
       'Podfile',
     ]
 
+    public
+
     # Returns the path of the Podfile in the given dir if any exists.
     #
     # @param  [Pathname] dir