Merge pull request #4836 from CocoaPods/mr-dsl-project-directive

[Podfile] Adopt renaming from xcodeproj to project

CHANGELOG.md

@@ -6,6 +6,12 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
 
 ## Master
 
+##### Breaking
+
+* Rename the `xcodeproj` Podfile directive to `project`.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [Core#298](https://github.com/CocoaPods/Core/issues/298)
+
 ##### Enhancements
 
 ##### Bug Fixes

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: https://github.com/CocoaPods/Core.git
-  revision: 28418bb448a7b5712cd196fed70d72778af0d128
+  revision: 8c55fdc3e2bacca908c9cf12eff0e64e8ed036f5
   branch: master
   specs:
     cocoapods-core (1.0.0.beta.2)

cocoapods-integration-specs @ 05c3fc9b

-Subproject commit bfd098b2ee45861951a200f609dbe7d7a1485628
+Subproject commit 05c3fc9beea098b5e1ce3aaa882d454511e6348c

spec/unit/installer/analyzer_spec.rb

@@ -6,7 +6,7 @@ module Pod
       before do
         @podfile = Pod::Podfile.new do
           platform :ios, '6.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
 
           target 'SampleProject' do
             pod 'JSONKit',                     '1.5pre'
@@ -88,7 +88,7 @@ module Pod
 
         podfile = Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           pod 'BananaLib', '1.0'
         end
         config.skip_repo_update = false
@@ -159,7 +159,7 @@ module Pod
       it 'generates the set of dependent pod targets' do
         @podfile = Pod::Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           pod 'RestKit', '~> 0.23.0'
           target 'TestRunner' do
             pod 'RestKit/Testing', '~> 0.23.0'
@@ -191,7 +191,7 @@ module Pod
           podfile = Pod::Podfile.new do
             source SpecHelper.test_repo_url
             platform :ios, '6.0'
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
             target 'SampleProject' do
               pod 'BananaLib'
               pod 'monkey'
@@ -217,7 +217,7 @@ module Pod
           podfile = Pod::Podfile.new do
             source SpecHelper.test_repo_url
             platform :ios, '6.0'
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
             pod 'BananaLib'
             pod 'monkey'
 
@@ -251,7 +251,7 @@ module Pod
 
             source SpecHelper.test_repo_url
             platform :ios, '6.0'
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
 
             pod 'BananaLib'
 
@@ -295,7 +295,7 @@ module Pod
           podfile = Pod::Podfile.new do
             install! 'cocoapods', :integrate_targets => false
             source SpecHelper.test_repo_url
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
             target 'TestRunner' do
               platform :osx
               pod 'monkey'
@@ -310,7 +310,7 @@ module Pod
           podfile = Pod::Podfile.new do
             install! 'cocoapods', :integrate_targets => false
             source SpecHelper.test_repo_url
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
             platform :osx
             target 'TestRunner' do
               pod 'monkey'
@@ -325,7 +325,7 @@ module Pod
           podfile = Pod::Podfile.new do
             install! 'cocoapods', :integrate_targets => false
             source SpecHelper.test_repo_url
-            xcodeproj 'SampleProject/SampleProject'
+            project 'SampleProject/SampleProject'
             target 'TestRunner' do
               pod 'monkey'
             end
@@ -372,7 +372,7 @@ module Pod
       it 'unlocks all dependencies with the same root name in update mode' do
         podfile = Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           target 'SampleProject' do
             pod 'AFNetworking'
             pod 'AFNetworkActivityLogger'
@@ -406,7 +406,7 @@ module Pod
       it 'takes into account locked implicit dependencies' do
         podfile = Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           target 'SampleProject' do
             pod 'ARAnalytics/Mixpanel'
           end
@@ -506,7 +506,7 @@ module Pod
       it 'warns when a dependency is duplicated' do
         podfile = Podfile.new do
           source 'https://github.com/CocoaPods/Specs.git'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           platform :ios, '8.0'
           target 'SampleProject' do
             pod 'RestKit', '~> 0.23.0'
@@ -581,7 +581,7 @@ module Pod
         'external sources' do
         podfile = Podfile.new do
           source 'https://github.com/CocoaPods/Specs.git'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           platform :ios
           target 'SampleProject' do
             pod 'SEGModules', :git => 'https://github.com/segiddins/SEGModules.git'
@@ -600,7 +600,7 @@ module Pod
         'external sources' do
         podfile = Podfile.new do
           source 'https://github.com/CocoaPods/Specs.git'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           platform :ios
           target 'SampleProject' do
             pod 'RestKit/Core', :git => 'https://github.com/RestKit/RestKit.git'
@@ -619,7 +619,7 @@ module Pod
         'external sources with one being nil' do
         podfile = Podfile.new do
           source 'https://github.com/CocoaPods/Specs.git'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           platform :ios
           target 'SampleProject' do
             pod 'RestKit', :git => 'https://github.com/RestKit/RestKit.git'

spec/unit/installer/target_installer/aggregate_target_installer_spec.rb

@@ -7,7 +7,7 @@ module Pod
         config.sandbox.prepare
         @podfile = Podfile.new do
           platform :ios
-          xcodeproj 'dummy'
+          project 'dummy'
         end
         @target_definition = @podfile.target_definitions['Pods']
         @project = Project.new(config.sandbox.project_path)

spec/unit/installer/target_installer/pod_target_installer_spec.rb

@@ -7,7 +7,7 @@ module Pod
         config.sandbox.prepare
         @podfile = Podfile.new do
           platform :ios, '6.0'
-          xcodeproj 'dummy'
+          project 'dummy'
         end
         @target_definition = @podfile.target_definitions['Pods']
         @project = Project.new(config.sandbox.project_path)

spec/unit/installer/target_installer_spec.rb

@@ -5,7 +5,7 @@ module Pod
     before do
       @podfile = Podfile.new do
         platform :ios
-        xcodeproj 'dummy'
+        project 'dummy'
       end
       @target_definition = @podfile.target_definitions['Pods']
       @project = Project.new(config.sandbox.project_path)

spec/unit/installer/user_project_integrator_spec.rb

@@ -8,7 +8,7 @@ module Pod
         sample_project_path = @sample_project_path
         @podfile = Podfile.new do
           platform :ios
-          xcodeproj sample_project_path
+          project sample_project_path
           target 'SampleProject' do
             pod 'JSONKit'
             target :empty do

spec/unit/installer_spec.rb

@@ -18,7 +18,7 @@ end
 def generate_podfile(pods = ['JSONKit'])
   Pod::Podfile.new do
     platform :ios
-    xcodeproj SpecHelper.fixture('SampleProject/SampleProject'), 'Test' => :debug, 'App Store' => :release
+    project SpecHelper.fixture('SampleProject/SampleProject'), 'Test' => :debug, 'App Store' => :release
     target 'SampleProject' do
       pods.each { |name| pod name }
       target 'SampleProjectTests' do
@@ -33,7 +33,7 @@ end
 def generate_local_podfile
   Pod::Podfile.new do
     platform :ios
-    xcodeproj SpecHelper.fixture('SampleProject/SampleProject'), 'Test' => :debug, 'App Store' => :release
+    project SpecHelper.fixture('SampleProject/SampleProject'), 'Test' => :debug, 'App Store' => :release
     target 'SampleProject' do
       pod 'Reachability', :path => SpecHelper.fixture('integration/Reachability')
       target 'SampleProjectTests' do
@@ -228,7 +228,7 @@ module Pod
         config.repos_dir = fixture_path + 'spec-repos'
         podfile = Pod::Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           use_frameworks!
           pod 'BananaLib',       :path => (fixture_path + 'banana-lib').to_s
           pod 'OrangeFramework', :path => (fixture_path + 'orange-framework').to_s
@@ -268,7 +268,7 @@ module Pod
         config.repos_dir = fixture_path + 'spec-repos'
         podfile = Pod::Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           pod 'BananaLib',       :path => (fixture_path + 'banana-lib').to_s
           pod 'OrangeFramework', :path => (fixture_path + 'orange-framework').to_s
           pod 'monkey',          :path => (fixture_path + 'monkey').to_s
@@ -288,7 +288,7 @@ module Pod
         config.repos_dir = fixture_path + 'spec-repos'
         podfile = Pod::Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           use_frameworks!
           pod 'BananaLib',       :path => (fixture_path + 'banana-lib').to_s
           pod 'monkey',          :path => (fixture_path + 'monkey').to_s
@@ -311,7 +311,7 @@ module Pod
         @podfile = Pod::Podfile.new do
           install! 'cocoapods', 'integrate_targets' => false
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           use_frameworks!
           pod 'BananaLib',       :path => (fixture_path + 'banana-lib').to_s
           pod 'OrangeFramework', :path => (fixture_path + 'orange-framework').to_s
@@ -356,7 +356,7 @@ module Pod
         config.repos_dir = fixture_path + 'spec-repos'
         podfile = Pod::Podfile.new do
           platform :ios, '8.0'
-          xcodeproj 'SampleProject/SampleProject'
+          project 'SampleProject/SampleProject'
           pod 'OrangeFramework', :path => (fixture_path + 'orange-framework').to_s
           target 'SampleProject'
         end