[Config] Restore support for CocoaPods.podfile

Closes #1004

CHANGELOG.md

@@ -19,11 +19,15 @@
 * Added `pod help` command. You can still use the old format
   with --help flag.
   [#957](https://github.com/CocoaPods/CocoaPods/pull/957)
+* Restored support for Podfiles named `CocoaPods.podfile`. Moreover, the
+  experimental YAML format of the Podfile now is associated with files named
+  `CocoaPods.podfile.yaml`.
+  [#1004](https://github.com/CocoaPods/CocoaPods/pull/1004)
 
-###### Deprications
+###### Deprecations
 
 * `:local` flag in Podfile is deprecated. Please use `:path` when
-  specitying a pod source.
+  specifying a pod source.
   [#971](https://github.com/CocoaPods/CocoaPods/issues/971)
 ###### Bug fixes
 

Gemfile

@@ -11,7 +11,7 @@ group :development do
     gem 'xcodeproj',            :path => '../Xcodeproj'
     gem 'cocoapods-downloader', :path => '../cocoapods-downloader'
   else
-    gem 'cocoapods-core',       :git => "https://github.com/CocoaPods/Core.git"
+    gem 'cocoapods-core',       :git => "https://github.com/CocoaPods/Core.git", :branch => 'master'
     gem 'xcodeproj',            :git => "https://github.com/CocoaPods/Xcodeproj.git"
     gem 'cocoapods-downloader', :git => "https://github.com/CocoaPods/cocoapods-downloader.git"
   end

lib/cocoapods/config.rb

@@ -188,7 +188,8 @@ module Pod
     #
     def podfile_path
       unless @podfile_path
-        path = installation_root + 'Podfile.yaml'
+        path = installation_root + 'CocoaPods.podfile.yaml'
+        path = installation_root + 'CocoaPods.podfile' unless path.exist?
         path = installation_root + 'Podfile' unless path.exist?
         @podfile_path = path
       end

spec/unit/config_spec.rb

@@ -44,8 +44,13 @@ module Pod
       end
 
       it "can detect yaml Podfiles" do
-        (temporary_directory + 'Podfile.yaml').open('w') { |f| f << '# Yo' }
-        config.podfile_path.should == temporary_directory + 'Podfile.yaml'
+        (temporary_directory + 'CocoaPods.podfile.yaml').open('w') { |f| f << '# Yo' }
+        config.podfile_path.should == temporary_directory + 'CocoaPods.podfile.yaml'
+      end
+
+      it "can detect files named `CocoaPods.podfile`" do
+        (temporary_directory + 'CocoaPods.podfile').open('w') { |f| f << '# Yo' }
+        config.podfile_path.should == temporary_directory + 'CocoaPods.podfile'
       end
 
       it "returns the path to the Pods directory that holds the dependencies" do