Merge branch 'xcodeproj-gem'. Closes CocoaPods#24.

.gitmodules

@@ -13,3 +13,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 = git@github.com:alloy/xcodeproj.git

bin/pod

@@ -1,8 +1,7 @@
 #!/usr/bin/env macruby
 
 if $0 == __FILE__
-  require 'rubygems'
-  gem 'activesupport', '~> 3.1.1'
+  $:.unshift File.expand_path('../../external/xcodeproj/lib', __FILE__)
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 

cocoapods.gemspec

@@ -31,8 +31,7 @@ Gem::Specification.new do |s|
                            "    $ sudo macgem install rubygems-compile\n" \
                            "    $ sudo macgem compile cocoapods\n\n"
 
-  s.add_runtime_dependency 'activesupport', '~> 3.1.1'
-  s.add_runtime_dependency 'i18n', '~> 0.6.0' # only needed for ActiveSupport :-/
+  s.add_runtime_dependency 'xcodeproj', '~> 0.0.1'
 
   ## Make sure you can build the gem on older versions of RubyGems too:
   s.rubygems_version = "1.6.2"

lib/cocoapods.rb

@@ -12,26 +12,23 @@ class Informative < StandardError
   autoload :Executable,             'cocoapods/executable'
   autoload :Installer,              'cocoapods/installer'
   autoload :Podfile,                'cocoapods/podfile'
-  autoload :ProjectTemplate,        'cocoapods/project_template'
   autoload :Resolver,               'cocoapods/resolver'
   autoload :Source,                 'cocoapods/source'
   autoload :Spec,                   'cocoapods/specification'
   autoload :Specification,          'cocoapods/specification'
   autoload :Version,                'cocoapods/version'
 
-  module Xcode
-    autoload :Config,               'cocoapods/xcode/config'
-    autoload :CopyResourcesScript,  'cocoapods/xcode/copy_resources_script'
-    autoload :Project,              'cocoapods/xcode/project'
-    autoload :Workspace,            'cocoapods/xcode/workspace'
-  end
-
   autoload :Pathname,               'pathname'
 end
 
+module Xcodeproj
+  autoload :Config,                 'cocoapods/xcodeproj_ext'
+  autoload :Project,                'cocoapods/xcodeproj_ext'
+  autoload :Workspace,              'cocoapods/xcodeproj_ext'
+end
+
 class Pathname
   def glob(pattern = '')
     Dir.glob((self + pattern).to_s).map { |f| Pathname.new(f) }
   end
 end
-

lib/cocoapods/installer.rb

@@ -14,6 +14,36 @@ def build_specifications
       end
     end
 
+    class CopyResourcesScript
+      CONTENT = <<EOS
+#!/bin/sh
+
+install_resource()
+{
+  echo "cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+  cp -R ${SRCROOT}/Pods/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}
+}
+EOS
+
+      attr_reader :resources
+
+      # A list of files relative to the project pods root.
+      def initialize(resources)
+        @resources = resources
+      end
+
+      def save_as(pathname)
+        pathname.open('w') do |script|
+          script.puts CONTENT
+          @resources.each do |resource|
+            script.puts "install_resource '#{resource}'"
+          end
+        end
+        # TODO use File api
+        system("chmod +x '#{pathname}'")
+      end
+    end
+
     class Target
       include Config::Mixin
       include Shared
@@ -25,7 +55,7 @@ def initialize(podfile, project, definition)
       end
 
       def xcconfig
-        @xcconfig ||= Xcode::Config.new({
+        @xcconfig ||= Xcodeproj::Config.new({
           # In a workspace this is where the static library headers should be found.
           'USER_HEADER_SEARCH_PATHS' => '"$(BUILT_PRODUCTS_DIR)/Pods"',
           'ALWAYS_SEARCH_USER_PATHS' => 'YES',
@@ -40,7 +70,7 @@ def xcconfig_filename
       end
 
       def copy_resources_script
-        @copy_resources_script ||= Xcode::CopyResourcesScript.new(build_specifications.map do |spec|
+        @copy_resources_script ||= CopyResourcesScript.new(build_specifications.map do |spec|
           spec.expanded_resources
         end.flatten)
       end
@@ -134,7 +164,7 @@ def initialize(podfile)
 
     def project
       return @project if @project
-      @project = ProjectTemplate.for_platform(@podfile.platform)
+      @project = Xcodeproj::Project.for_platform(@podfile.platform)
       # First we need to resolve dependencies across *all* targets, so that the
       # same correct versions of pods are being used for all targets. This
       # happens when we call `build_specifications'.
@@ -191,7 +221,7 @@ def install!
     def configure_project(projpath)
       root = File.dirname(projpath)
       xcworkspace = File.join(root, File.basename(projpath, '.xcodeproj') + '.xcworkspace')
-      workspace = Xcode::Workspace.new_from_xcworkspace(xcworkspace)
+      workspace = Xcodeproj::Workspace.new_from_xcworkspace(xcworkspace)
       pods_projpath = File.join(config.project_pods_root, 'Pods.xcodeproj')
       root = Pathname.new(root).expand_path
       [projpath, pods_projpath].each do |path|
@@ -200,7 +230,7 @@ def configure_project(projpath)
       end
       workspace.save_as(xcworkspace)
 
-      app_project = Xcode::Project.new(projpath)
+      app_project = Xcodeproj::Project.new(projpath)
       return if app_project.files.find { |file| file.path =~ /libPods\.a$/ }
 
       configfile = app_project.files.new('path' => 'Pods/Pods.xcconfig')
@@ -212,7 +242,7 @@ def configure_project(projpath)
 
       libfile = app_project.files.new_static_library('Pods')
       libfile.group = app_project.main_group.groups.find { |g| g.name == 'Frameworks' }
-      app_project.objects.select_by_class(Xcode::Project::PBXFrameworksBuildPhase).each do |build_phase|
+      app_project.objects.select_by_class(Xcodeproj::Project::PBXFrameworksBuildPhase).each do |build_phase|
         build_phase.files << libfile.buildFiles.new
       end
 

lib/cocoapods/specification.rb

@@ -22,7 +22,7 @@ def self.from_file(path)
 
     def initialize
       @dependencies = []
-      @xcconfig = Xcode::Config.new
+      @xcconfig = Xcodeproj::Config.new
       yield self if block_given?
     end