cocoapods 0.1.1 → 0.2.0

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 
   class Informative < StandardError
   end
@@ -12,6 +12,7 @@ module Pod
   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'
@@ -22,6 +23,7 @@ module Pod
     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'

data/lib/cocoapods/command/install.rb

@@ -4,10 +4,11 @@ module Pod
       def self.banner
 %{Installing dependencies of a pod spec:
 
-    $ pod install [NAME]
+    $ pod install [NAME] [PROJECT]
 
-      Downloads all dependencies of the specified podspec file `NAME' and
-      creates an Xcode Pods library project in `./Pods'. In case `NAME' is
+      Downloads all dependencies of the specified podspec file `NAME',
+      creates an Xcode Pods library project in `./Pods', and sets up `PROJECT' 
+      to use the specified pods (if `PROJECT' is given). In case `NAME' is
       omitted it defaults to either `Podfile' or `*.podspec' in the current
       working directory.
 }
@@ -20,9 +21,10 @@ module Pod
 
       def initialize(argv)
         config.clean = !argv.option('--no-clean')
-        if podspec = argv.shift_argument
-          @podspec = Pathname.new(podspec)
-        end
+        projpath = argv.shift_argument
+        projpath =~ /\.xcodeproj\/?$/ ? @projpath = projpath : podspec = projpath
+        @podspec = Pathname.new(podspec) if podspec
+        @projpath ||= argv.shift_argument
         super unless argv.empty?
       end
 
@@ -39,7 +41,9 @@ module Pod
             raise Informative, "No `Podfile' or `.podspec' file found in the current working directory."
           end
         end
-        Installer.new(spec).install!
+        installer = Installer.new(spec)
+        installer.install!
+        installer.configure_project(@projpath) if @projpath
       end
     end
   end

data/lib/cocoapods/command/repo.rb

@@ -44,7 +44,7 @@ module Pod
       def add
         puts "==> Cloning spec repo `#{@name}' from `#{@url}'" unless config.silent?
         config.repos_dir.mkpath
-        Dir.chdir(config.repos_dir) { git("clone #{@url} #{@name}") }
+        Dir.chdir(config.repos_dir) { git("clone '#{@url}' #{@name}") }
       end
 
       def update

data/lib/cocoapods/installer.rb

@@ -29,8 +29,12 @@ module Pod
       })
     end
 
+    def template
+      @template ||= ProjectTemplate.new(@specification.platform)
+    end
+
     def xcodeproj
-      @xcodeproj ||= Xcode::Project.static_library(@specification.platform)
+      @xcodeproj ||= Xcode::Project.new(template.xcodeproj_path)
     end
 
     # TODO move xcconfig related code into the xcconfig method, like copy_resources_script and generate_bridge_support.
@@ -79,7 +83,11 @@ module Pod
       generate_project
 
       root = config.project_pods_root
-      xcodeproj.create_in(root)
+      puts "  * Copying contents of template directory `#{template.path}' to `#{root}'" if config.verbose?
+      template.copy_to(root)
+      pbxproj = File.join(root, 'Pods.xcodeproj')
+      puts "  * Writing Xcode project file to `#{pbxproj}'" if config.verbose?
+      xcodeproj.save_as(pbxproj)
       xcconfig.create_in(root)
       if @specification.generate_bridge_support?
         path = bridge_support_generator.create_in(root)
@@ -89,5 +97,57 @@ module Pod
 
       build_specifications.each(&:post_install)
     end
+    
+    def configure_project(projpath)
+      root = File.dirname(projpath)
+      xcworkspace = File.join(root, File.basename(projpath, '.xcodeproj') + '.xcworkspace')
+      workspace = Xcode::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|
+        path = Pathname.new(path).expand_path.relative_path_from(root).to_s
+        workspace << path unless workspace.include? path
+      end
+      workspace.save_as(xcworkspace)
+
+      app_project = Xcode::Project.new(projpath)
+      return if app_project.files.find { |file| file.path =~ /libPods\.a$/ }
+
+      configfile = app_project.files.new({
+        'path' => 'Pods/Pods.xcconfig',
+        'lastKnownFileType' => 'text.xcconfig'
+      })
+      app_project.targets.each do |target|
+        target.buildConfigurationList.buildConfigurations.each do |config|
+          config.baseConfigurationReference = configfile
+        end
+      end
+      app_project.main_group << configfile
+      
+      libfile = app_project.files.new({
+        'path' => 'libPods.a',
+        'lastKnownFileType' => 'archive.ar',
+        'includeInIndex' => '0',
+        'sourceTree' => 'BUILT_PRODUCTS_DIR'
+      })
+      app_project.objects.select_by_class(Xcode::Project::PBXFrameworksBuildPhase).each do |build_phase|
+        build_phase.files << libfile.build_file
+      end
+      app_project.main_group << libfile
+      
+      copy_resources = app_project.objects.add(Xcode::Project::PBXShellScriptBuildPhase, {
+        'name' => 'Copy Pods Resources',
+        'buildActionMask' => '2147483647',
+        'files' => [],
+        'inputPaths' => [],
+        'outputPaths' => [],
+        'runOnlyForDeploymentPostprocessing' => '0',
+        'shellPath' => '/bin/sh',
+        'shellScript' => "${SRCROOT}/Pods/PodsResources.sh\n"
+      })
+      app_project.targets.each { |target| target.buildPhases << copy_resources }
+      
+      app_project.save_as(projpath)
+    end
   end
 end

data/lib/cocoapods/project_template.rb

@@ -0,0 +1,35 @@
+require 'fileutils'
+
+module Pod
+  class ProjectTemplate
+    def initialize(platform)
+      @platform = platform
+    end
+    
+    # TODO this is a workaround for an issue with MacRuby with compiled files
+    # that makes the use of __FILE__ impossible.
+    #
+    #TEMPLATES_DIR = Pathname.new(File.expand_path('../../../xcode-project-templates', __FILE__))
+    file = $LOADED_FEATURES.find { |file| file =~ %r{cocoapods/project_template\.rbo?$} }
+    TEMPLATES_DIR = Pathname.new(File.expand_path('../../../xcode-project-templates', file))
+    
+    def path
+      @path ||= case @platform
+      when :osx
+        TEMPLATES_DIR + 'cocoa-static-library'
+      when :ios
+        TEMPLATES_DIR + 'cocoa-touch-static-library'
+      else
+        raise "No Xcode project template exists for the platform `#{platform.inspect}'"
+      end
+    end
+    
+    def xcodeproj_path
+      @xcodeproj_path = File.join(path, 'Pods.xcodeproj')
+    end
+    
+    def copy_to(pods_root)
+      FileUtils.cp_r("#{path}/.", pods_root)
+    end
+  end
+end

data/lib/cocoapods/xcode/project.rb

@@ -88,6 +88,10 @@ module Pod
           end
           file
         end
+        
+        def <<(child)
+          children << child.uuid
+        end
       end
 
       class PBXFileReference < PBXObject
@@ -122,7 +126,7 @@ module Pod
 
         # Returns a PBXFileReference instance corresponding to the uuid in the fileRef attribute.
         def file
-          project.objects[fileRef]
+          @project.objects[fileRef]
         end
       end
 
@@ -140,17 +144,60 @@ module Pod
           list_by_class(file_uuids, PBXBuildFile)
         end
       end
-      class PBXSourcesBuildPhase < PBXBuildPhase;   end
-      class PBXCopyFilesBuildPhase < PBXBuildPhase; end
+      
+      class PBXSourcesBuildPhase < PBXBuildPhase;     end
+      class PBXCopyFilesBuildPhase < PBXBuildPhase;   end
+      class PBXFrameworksBuildPhase < PBXBuildPhase;  end
+      class PBXShellScriptBuildPhase < PBXBuildPhase
+        attributes_accessor :shellScript
+      end
 
       class PBXNativeTarget < PBXObject
-        attributes_accessor :buildPhases
+        attributes_accessor :buildPhases, :buildConfigurationList
         alias_method :build_phase_uuids, :buildPhases
         alias_method :build_phase_uuids=, :buildPhases=
+        alias_method :build_configuration_list_uuid, :buildConfigurationList
+        alias_method :build_configuration_list_uuid=, :buildConfigurationList=
 
         def buildPhases
           list_by_class(build_phase_uuids, PBXBuildPhase)
         end
+        
+        def buildConfigurationList
+          @project.objects[build_configuration_list_uuid]
+        end
+        
+        def buildConfigurationList=(config_list)
+          self.build_configuration_list_uuid = config_list.uuid
+        end
+      end
+
+      class XCBuildConfiguration < PBXObject
+        attributes_accessor :baseConfigurationReference
+        alias_method :base_configuration_reference_uuid, :baseConfigurationReference
+        alias_method :base_configuration_reference_uuid=, :baseConfigurationReference=
+        
+        def baseConfigurationReference
+          @project.objects[base_configuration_reference_uuid]
+        end
+        
+        def baseConfigurationReference=(config)
+          self.base_configuration_reference_uuid = config.uuid
+        end
+      end
+      
+      class XCConfigurationList < PBXObject
+        attributes_accessor :buildConfigurations
+        alias_method :build_configuration_uuids, :buildConfigurations
+        alias_method :build_configuration_uuids=, :buildConfigurations=
+        
+        def buildConfigurations
+          list_by_class(build_configuration_uuids, XCBuildConfiguration)
+        end
+        
+        def buildConfigurations=(configs)
+          self.build_configuration_uuids = configs.map(&:uuid)
+        end
       end
 
       # Missing constants that begin with either `PBX' or `XC' are assumed to be
@@ -215,42 +262,17 @@ module Pod
         end
       end
 
-      include Pod::Config::Mixin
-
-      # TODO this is a workaround for an issue with MacRuby with compiled files
-      # that makes the use of __FILE__ impossible.
-      #
-      #TEMPLATES_DIR = Pathname.new(File.expand_path('../../../../xcode-project-templates', __FILE__))
-      file = $LOADED_FEATURES.find { |file| file =~ %r{cocoapods/xcode/project\.rbo?$} }
-      TEMPLATES_DIR = Pathname.new(File.expand_path('../../../../xcode-project-templates', file))
-
-      def self.static_library(platform)
-        case platform
-        when :osx
-          new TEMPLATES_DIR + 'cocoa-static-library'
-        when :ios
-          new TEMPLATES_DIR + 'cocoa-touch-static-library'
-        else
-          raise "No Xcode project template exists for the platform `#{platform.inspect}'"
-        end
-      end
-
-      def initialize(template_dir)
-        @template_dir = template_dir
-        file = template_dir + template_file
-        @template = NSMutableDictionary.dictionaryWithContentsOfFile(file.to_s)
-      end
-
-      def template_file
-        'Pods.xcodeproj/project.pbxproj'
+      def initialize(xcodeproj)
+        file = File.join(xcodeproj, 'project.pbxproj')
+        @plist = NSMutableDictionary.dictionaryWithContentsOfFile(file.to_s)
       end
 
       def to_hash
-        @template
+        @plist
       end
 
       def objects_hash
-        @template['objects']
+        @plist['objects']
       end
 
       def objects
@@ -260,6 +282,11 @@ module Pod
       def groups
         objects.select_by_class(PBXGroup)
       end
+      
+      def main_group
+        project = objects[@plist['rootObject']]
+        objects[project.attributes['mainGroup']]
+      end
 
       # Shortcut access to the `Pods' PBXGroup.
       def pods
@@ -301,12 +328,10 @@ module Pod
         source_files
       end
 
-      def create_in(pods_root)
-        puts "  * Copying contents of template directory `#{@template_dir}' to `#{pods_root}'" if config.verbose?
-        FileUtils.cp_r("#{@template_dir}/.", pods_root)
-        pbxproj = pods_root + template_file
-        puts "  * Writing Xcode project file to `#{pbxproj}'" if config.verbose?
-        @template.writeToFile(pbxproj.to_s, atomically:true)
+      def save_as(projpath)
+        projpath = projpath.to_s
+        FileUtils.mkdir_p(projpath)
+        @plist.writeToFile(File.join(projpath, 'project.pbxproj'), atomically:true)
       end
 
       # TODO add comments, or even constants, describing what these magic numbers are.

data/lib/cocoapods/xcode/workspace.rb

@@ -0,0 +1,56 @@
+framework 'Foundation'
+require 'fileutils'
+
+module Pod
+  module Xcode
+    class Workspace
+      def initialize(*projpaths)
+        @projpaths = projpaths
+      end
+      
+      def self.new_from_xcworkspace(path)
+        begin
+          from_s(File.read(File.join(path, 'contents.xcworkspacedata')))
+        rescue Errno::ENOENT
+          new
+        end
+      end
+      
+      def self.from_s(xml)
+        doc = NSXMLDocument.alloc.initWithXMLString(xml, options:0, error:nil)
+        projpaths = doc.nodesForXPath("/Workspace/FileRef", error:nil).map do |node|
+          node.attributeForName("location").stringValue.sub(/^group:/, '')
+        end
+        new(*projpaths)
+      end
+      
+      attr_reader :projpaths
+      
+      def <<(projpath)
+        @projpaths << projpath
+      end
+      
+      def include?(projpath)
+        @projpaths.include?(projpath)
+      end
+      
+      TEMPLATE = %q[<?xml version="1.0" encoding="UTF-8"?><Workspace version="1.0"></Workspace>]
+      def to_s
+        doc = NSXMLDocument.alloc.initWithXMLString(TEMPLATE, options:0, error:nil)
+        @projpaths.each do |projpath|
+          el = NSXMLNode.elementWithName("FileRef")
+          el.addAttribute(NSXMLNode.attributeWithName("location", stringValue:"group:#{projpath}"))
+          doc.rootElement.addChild(el)
+        end
+        NSString.alloc.initWithData(doc.XMLData, encoding:NSUTF8StringEncoding)
+      end
+      
+      def save_as(path)
+        FileUtils.mkdir_p(path)
+        File.open(File.join(path, 'contents.xcworkspacedata'), 'w') do |out|
+          out << to_s
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cocoapods
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Eloy Duran
@@ -14,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 +02:00
-default_executable: 
+date: 2011-09-17 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -42,6 +42,7 @@ files:
 - lib/cocoapods/executable.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/podfile.rb
+- lib/cocoapods/project_template.rb
 - lib/cocoapods/resolver.rb
 - lib/cocoapods/source.rb
 - lib/cocoapods/specification/set.rb
@@ -50,6 +51,7 @@ files:
 - lib/cocoapods/xcode/config.rb
 - lib/cocoapods/xcode/copy_resources_script.rb
 - lib/cocoapods/xcode/project.rb
+- lib/cocoapods/xcode/workspace.rb
 - lib/cocoapods.rb
 - xcode-project-templates/cocoa-static-library/Pods-Prefix.pch
 - xcode-project-templates/cocoa-static-library/Pods.xcconfig
@@ -62,7 +64,6 @@ files:
 - bin/pod
 - README.md
 - LICENSE
-has_rdoc: true
 homepage: https://github.com/alloy/cocoapods
 licenses: 
 - MIT
@@ -77,23 +78,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: A simple Objective-C library package manager. (Requires MacRuby.)