Replace Xcodeproj git submodule by adding it to the Gemfile. Closes #172.

.gitignore

@@ -12,7 +12,6 @@ examples/Pods
 examples/**/Pods
 spec/fixtures/banana-lib
 spec/fixtures/integration/Headers/
-pod
 /concatenated.*
 spec/fixtures/mercurial-repo/.hg/*cache
 .hg

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "spec/fixtures/integration/sstoolkit"]
 	path = spec/fixtures/integration/sstoolkit
 	url = https://github.com/samsoffes/sstoolkit.git
-[submodule "external/Xcodeproj"]
-	path = external/Xcodeproj
-	url = https://github.com/CocoaPods/Xcodeproj.git
 [submodule "spec/fixtures/spec-repos/master"]
 	path = spec/fixtures/spec-repos/master
 	url = https://github.com/CocoaPods/Specs.git

.travis.yml

@@ -2,5 +2,5 @@ language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
-before_install: git submodule update --init && cd external/Xcodeproj && rake travis:setup && sudo apt-get install subversion
-script: cd ../.. && bundle exec rake spec
+install: git submodule update --init && bundle install --path bundle && pushd . && cd bundle/ruby/*/bundler/gems/Xcodeproj-* && rake travis:setup && popd && sudo apt-get install subversion
+script: bundle exec rake spec

Gemfile

@@ -3,14 +3,16 @@ source "http://rubygems.org"
 gem "open4"
 
 group :development do
-  gem "rake"
+  gem "xcodeproj", :git => "git://github.com/CocoaPods/Xcodeproj.git"
+
   gem "bacon"
   gem "guard"
   gem "guard-shell"
-  gem "rb-fsevent"
   gem "growl"
+  gem "kicker"
   gem "mocha-on-bacon"
+  gem "rake"
+  gem "rb-fsevent"
   gem "vcr"
   gem "webmock"
-  gem "kicker"
 end

Gemfile.lock

+GIT
+  remote: git://github.com/CocoaPods/Xcodeproj.git
+  revision: 338e4d37f282121754f10f6d169256a57a64860d
+  specs:
+    xcodeproj (0.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -40,3 +46,4 @@ DEPENDENCIES
   rb-fsevent
   vcr
   webmock
+  xcodeproj!

Rakefile

@@ -41,20 +41,6 @@ namespace :gem do
   end
 end
 
-namespace :ext do
-  XCODEPROJ_DIR = "./external/Xcodeproj"
-  
-  task :clean do
-    sh "cd #{XCODEPROJ_DIR} && rake ext:clean"
-  end
-
-  task :build do
-    sh "cd #{XCODEPROJ_DIR} && rake ext:build"
-  end
-
-  task :cleanbuild => [:clean, :build]
-end
-
 namespace :spec do
   def specs(dir)
     FileList["spec/#{dir}/*_spec.rb"].shuffle.join(' ')
@@ -110,7 +96,7 @@ namespace :spec do
     sh "rm -f spec/fixtures/vcr/tarballs.yml"
   end
 
-  task :clean_env => [:clean_vcr, :unpack_fixture_tarballs, "ext:cleanbuild"]
+  task :clean_env => [:clean_vcr, :unpack_fixture_tarballs]
 end
 
 namespace :examples do

bin/pod

 #!/usr/bin/env ruby
 
 if $0 == __FILE__
-  $:.unshift File.expand_path('../../external/Xcodeproj/ext', __FILE__)
-  $:.unshift File.expand_path('../../external/Xcodeproj/lib', __FILE__)
+  require "rubygems"
+  require "bundler/setup"
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 

Xcodeproj @ 338e4d37

-Subproject commit 338e4d37f282121754f10f6d169256a57a64860d

spec/spec_helper.rb

 require 'rubygems'
+require 'bundler/setup'
 
 require 'bacon'
 require 'mocha-on-bacon'
@@ -7,8 +8,6 @@ Bacon.summary_at_exit
 require 'pathname'
 ROOT = Pathname.new(File.expand_path('../../', __FILE__))
 
-$:.unshift File.expand_path('../../external/Xcodeproj/ext', __FILE__)
-$:.unshift File.expand_path('../../external/Xcodeproj/lib', __FILE__)
 $:.unshift((ROOT + 'lib').to_s)
 require 'cocoapods'