Merge pull request #528 from CocoaPods/podfile_extension

[Config] Support extension for Podfile.

lib/cocoapods/config.rb

@@ -39,7 +39,13 @@ module Pod
     end
 
     def project_podfile
-      @project_podfile ||= project_root + 'Podfile'
+      unless @project_podfile
+        @project_podfile = project_root + 'Podfile.cocoapods'
+        unless @project_podfile.exist?
+          @project_podfile = project_root + 'Podfile'
+        end
+      end
+      @project_podfile
     end
 
     def project_lockfile

spec/unit/config_spec.rb

@@ -29,6 +29,13 @@ describe "Pod::Config" do
       end
     end
 
+    it "returns the path to the project Podfile if specified with the extension" do
+      (temporary_directory + 'Podfile.cocoapods').open('w') { |f| f << '# Yo' }
+      Dir.chdir(temporary_directory) do
+        config.project_podfile.should == Pathname.pwd + 'Podfile.cocoapods'
+      end
+    end
+
     it "returns the path to the Pods directory that holds the dependencies" do
       config.project_pods_root.should == Pathname.pwd + 'Pods'
     end