cocoapods 0.2.0 → 0.3.0

data/lib/cocoapods/podfile.rb

@@ -1,5 +1,23 @@
 module Pod
   class Podfile
+    class TargetDefinition
+      attr_reader :name, :parent, :target_dependencies
+
+      def initialize(name, parent = nil)
+        @name, @parent, @target_dependencies = name, parent, []
+      end
+
+      def lib_name
+        name == :default ? "Pods" : "Pods-#{name}"
+      end
+
+      # Returns *all* dependencies of this target, not only the target specific
+      # ones in `target_dependencies`.
+      def dependencies
+        @target_dependencies + (@parent ? @parent.dependencies : [])
+      end
+    end
+
     def self.from_file(path)
       podfile = Podfile.new do
         eval(path.read, nil, path.to_s)
@@ -9,8 +27,10 @@ module Pod
       podfile
     end
 
+    include Config::Mixin
+
     def initialize(&block)
-      @dependencies = []
+      @target_definitions = { :default => (@target_definition = TargetDefinition.new(:default)) }
       instance_eval(&block)
     end
 
@@ -57,12 +77,68 @@ module Pod
     #
     # * http://semver.org
     # * http://docs.rubygems.org/read/chapter/7
-    def dependency(name, *version_requirements)
-      @dependencies << Dependency.new(name, *version_requirements)
+    #
+    #
+    # ## Dependency on a library, outside those available in a spec repo.
+    #
+    # ### From a podspec in the root of a library repo.
+    #
+    # Sometimes you may want to use the bleeding edge version of a Pod. Or a
+    # specific revision. If this is the case, you can specify that with your
+    # dependency declaration.
+    #
+    #
+    # To use the `master` branch of the repo:
+    #
+    #   dependency 'TTTFormatterKit', :git => 'https://github.com/gowalla/AFNetworking.git'
+    #
+    #
+    # Or specify a commit:
+    #
+    #   dependency 'TTTFormatterKit', :git => 'https://github.com/gowalla/AFNetworking.git', :commit => '082f8319af'
+    #
+    #
+    # It is important to note, though, that this means that the version will
+    # have to satisfy any other dependencies on the Pod by other Pods.
+    #
+    #
+    # The `podspec` file is expected to be in the root of the repo, if this
+    # library does not have a `podspec` file in its repo yet, you will have to
+    # use one of the approaches outlined in the sections below.
+    #
+    #
+    # ### From a podspec outside a spec repo, for a library without podspec.
+    #
+    # If a podspec is available from another source outside of the library’s
+    # repo. Consider, for instance, a podpsec available via HTTP:
+    #
+    #   dependency 'JSONKit', :podspec => 'https://raw.github.com/gist/1346394/1d26570f68ca27377a27430c65841a0880395d72/JSONKit.podspec'
+    #
+    #
+    # ### For a library without any available podspec
+    #
+    # Finally, if no man alive has created a podspec, for the library you want
+    # to use, yet, you will have to specify the library yourself.
+    #
+    #
+    # When you omit arguments and pass a block to `dependency`, an instance of
+    # Pod::Specification is yielded to the block. This is the same class which
+    # is normally used to specify a Pod.
+    #
+    #   dependency do |spec|
+    #     spec.name         = 'JSONKit'
+    #     spec.version      = '1.4'
+    #     spec.source       = { :git => 'https://github.com/johnezang/JSONKit.git', :tag => 'v1.4' }
+    #     spec.source_files = 'JSONKit.*'
+    #   end
+    #
+    #
+    # For more info on the definition of a Pod::Specification see:
+    # https://github.com/CocoaPods/CocoaPods/wiki/A-pod-specification
+    def dependency(*name_and_version_requirements, &block)
+      @target_definition.target_dependencies << Dependency.new(*name_and_version_requirements, &block)
     end
 
-    attr_reader :dependencies
-
     # Specifies that a BridgeSupport metadata should be generated from the
     # headers of all installed Pods.
     #
@@ -72,27 +148,86 @@ module Pod
       @generate_bridge_support = true
     end
 
-    # This is to be compatible with a Specification for use in the Installer and
-    # Resolver.
+    # Defines a new static library target and scopes dependencies defined from
+    # the given block. The target will by default include the dependencies
+    # defined outside of the block, unless the `:exclusive => true` option is
+    # given.
+    #
+    # Consider the following Podfile:
+    #
+    #   dependency 'ASIHTTPRequest'
+    #
+    #   target :debug do
+    #     dependency 'SSZipArchive'
+    #   end
+    #
+    #   target :test, :exclusive => true do
+    #     dependency 'JSONKit'
+    #   end
+    #
+    # This Podfile defines three targets. The first one is the `:default` target,
+    # which produces the `libPods.a` file. The second and third are the `:debug`
+    # and `:test` ones, which produce the `libPods-debug.a` and `libPods-test.a`
+    # files.
+    #
+    # The `:default` target has only one dependency (ASIHTTPRequest), whereas the
+    # `:debug` target has two (ASIHTTPRequest, SSZipArchive). The `:test` target,
+    # however, is an exclusive target which means it will only have one
+    # dependency (JSONKit).
+    def target(name, options = {})
+      parent = @target_definition
+      @target_definitions[name] = @target_definition = TargetDefinition.new(name, options[:exclusive] ? nil : parent)
+      yield
+    ensure
+      @target_definition = parent
+    end
+
+    # This hook allows you to make any last changes to the generated Xcode project
+    # before it is written to disk, or any other tasks you might want to perform.
+    #
+    # For instance, say you'd want to customize the `OTHER_LDFLAGS` of all targets:
+    #
+    #   post_install do |installer|
+    #     installer.project.targets.each do |target|
+    #       target.buildConfigurations.each do |config|
+    #         config.buildSettings['GCC_ENABLE_OBJC_GC'] = 'supported'
+    #       end
+    #     end
+    #   end
+    def post_install(&block)
+      @post_install_callback = block
+    end
+
+
+    # Not attributes
 
     def podfile?
       true
     end
 
     attr_accessor :defined_in_file
+    attr_reader :target_definitions
+
+    def dependencies
+      @target_definitions.values.map(&:target_dependencies).flatten
+    end
+
+    def dependency_by_name(name)
+      dependencies.find { |d| d.name == name }
+    end
 
     def generate_bridge_support?
       @generate_bridge_support
     end
 
-    def dependency_by_name(name)
-      @dependencies.find { |d| d.name == name }
+    def post_install!(installer)
+      @post_install_callback.call(installer) if @post_install_callback
     end
 
     def validate!
       lines = []
       lines << "* the `platform` attribute should be either `:osx` or `:ios`" unless [:osx, :ios].include?(@platform)
-      lines << "* no dependencies were specified, which is, well, kinda pointless" if @dependencies.empty?
+      lines << "* no dependencies were specified, which is, well, kinda pointless" if dependencies.empty?
       raise(Informative, (["The Podfile at `#{@defined_in_file}' is invalid:"] + lines).join("\n")) unless lines.empty?
     end
   end

data/lib/cocoapods/resolver.rb

@@ -1,17 +1,17 @@
 module Pod
   class Resolver
-    def initialize(specification)
-      @specification = specification
+    def initialize(specification, dependencies = nil)
+      @specification, @dependencies = specification, dependencies || specification.dependencies
     end
 
     def resolve
       @sets = []
-      find_dependency_sets(@specification)
+      find_dependency_sets(@specification, @dependencies)
       @sets
     end
 
-    def find_dependency_sets(specification)
-      specification.dependencies.each do |dependency|
+    def find_dependency_sets(specification, dependencies = nil)
+      (dependencies || specification.dependencies).each do |dependency|
         set = find_dependency_set(dependency)
         set.required_by(specification)
         unless @sets.include?(set)
@@ -23,7 +23,11 @@ module Pod
     end
 
     def find_dependency_set(dependency)
-      Source.search(dependency)
+      if external_spec = dependency.specification
+        Specification::Set::External.new(external_spec)
+      else
+        Source.search(dependency)
+      end
     end
 
     def validate_platform!(set)

data/lib/cocoapods/specification.rb

@@ -10,6 +10,9 @@ module Pod
 
     # The file is expected to define and return a Pods::Specification.
     def self.from_file(path)
+      unless path.exist?
+        raise Informative, "No podspec exists at path `#{path}'."
+      end
       spec = Pod._eval_podspec(path)
       spec.defined_in_file = path
       spec
@@ -19,7 +22,7 @@ module Pod
 
     def initialize
       @dependencies = []
-      @xcconfig = Xcode::Config.new
+      @xcconfig = Xcodeproj::Config.new
       yield self if block_given?
     end
 
@@ -29,6 +32,7 @@ module Pod
     attr_accessor :homepage
     attr_accessor :description
     attr_accessor :source
+    attr_accessor :license
 
     attr_reader :version
     def version=(version)
@@ -241,7 +245,7 @@ module Pod
     end
 
     def to_s
-      "`#{name}' version `#{version}'"
+      "#{name} (#{version})"
     end
 
     def inspect
@@ -272,8 +276,6 @@ module Pod
 
     # Install and download hooks
 
-    # Places the activated specification in the project's pods directory.
-    #
     # Override this if you need to perform work before or after activating the
     # pod. Eg:
     #
@@ -284,12 +286,10 @@ module Pod
     #       # post-install
     #     end
     #   end
+    #
+    # TODO Do we really need this now that we don’t install the podspec files anymore?
     def install!
       puts "==> Installing: #{self}" unless config.silent?
-      config.project_pods_root.mkpath
-      require 'fileutils'
-      FileUtils.cp(defined_in_file, config.project_pods_root)
-
       # In case this spec is part of another pod's source, we need to dowload
       # the other pod's source.
       (part_of_specification || self).download_if_necessary!
@@ -325,17 +325,18 @@ module Pod
 
     # This is a convenience method which gets called after all pods have been
     # downloaded, installed, and the Xcode project and related files have been
-    # generated. Override this to, for instance, add to the prefix header:
+    # generated. (It receives the Pod::Installer::Target instance for the current
+    # target.) Override this to, for instance, add to the prefix header:
     #
     #   Pod::Spec.new do |s|
-    #     def s.post_install
-    #       prefix_header = config.project_pods_root + 'Pods-Prefix.pch'
+    #     def s.post_install(target)
+    #       prefix_header = config.project_pods_root + target.prefix_header_filename
     #       prefix_header.open('a') do |file|
     #         file.puts(%{#ifdef __OBJC__\n#import "SSToolkitDefines.h"\n#endif})
     #       end
     #     end
     #   end
-    def post_install
+    def post_install(target)
     end
 
   end

data/lib/cocoapods/specification/set.rb

@@ -81,6 +81,40 @@ module Pod
           Version.new(basename) if v.directory? && basename[0,1] != '.'
         end.compact.sort.reverse
       end
+
+      class External < Set
+        def initialize(specification)
+          @specification = specification
+          @required_by = []
+        end
+
+        def name
+          @specification.name
+        end
+
+        def required_by(specification)
+          before = @specification
+          super(specification)
+        ensure
+          @specification = before
+        end
+
+        def only_part_of_other_pod?
+          false
+        end
+
+        def specification_path
+          raise "specification_path"
+        end
+
+        def specification
+          @specification
+        end
+
+        def versions
+          [@specification.version]
+        end
+      end
     end
   end
 end

data/lib/cocoapods/xcodeproj_ext.rb

@@ -0,0 +1,99 @@
+require 'xcodeproj'
+
+module Xcodeproj
+  class Project
+    # Shortcut access to the `Pods' PBXGroup.
+    def pods
+      groups.find { |g| g.name == 'Pods' } || groups.new({ 'name' => 'Pods' })
+    end
+
+    # Adds a group as child to the `Pods' group.
+    def add_pod_group(name)
+      pods.groups.new('name' => name)
+    end
+
+    class PBXCopyFilesBuildPhase
+      def self.new_pod_dir(project, pod_name, path)
+        new(project, nil, {
+          "dstPath" => "$(PRODUCT_NAME)/#{path}",
+          "name"    => "Copy #{pod_name} Public Headers",
+        })
+      end
+    end
+
+    def self.for_platform(platform)
+      project = Xcodeproj::Project.new
+      project.main_group << project.groups.new({ 'name' => 'Pods' })
+      framework = project.add_system_framework(platform == :ios ? 'Foundation' : 'Cocoa')
+      framework.group = project.groups.new({ 'name' => 'Frameworks' })
+      project.main_group << framework.group
+      products = project.groups.new({ 'name' => 'Products' })
+      project.main_group << products
+      project.root_object.products = products
+      
+      project.root_object.attributes['buildConfigurationList'] = project.objects.add(Xcodeproj::Project::XCConfigurationList, {
+        'defaultConfigurationIsVisible' => '0',
+        'defaultConfigurationName' => 'Release',
+        'buildConfigurations' => [
+          project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
+            'name' => 'Debug',
+            'buildSettings' => build_settings(platform, :debug)
+          }),
+          project.objects.add(Xcodeproj::Project::XCBuildConfiguration, {
+            'name' => 'Release',
+            'buildSettings' => build_settings(platform, :release)
+          })
+        ].map(&:uuid)
+      }).uuid
+      project
+    end
+
+    private
+
+    COMMON_BUILD_SETTINGS = {
+      :all => {
+        'ALWAYS_SEARCH_USER_PATHS' => 'NO',
+        'GCC_C_LANGUAGE_STANDARD' => 'gnu99',
+        'INSTALL_PATH' => "$(BUILT_PRODUCTS_DIR)",
+        'GCC_WARN_ABOUT_MISSING_PROTOTYPES' => 'YES',
+        'GCC_WARN_ABOUT_RETURN_TYPE' => 'YES',
+        'GCC_WARN_UNUSED_VARIABLE' => 'YES',
+        'OTHER_LDFLAGS' => ''
+      },
+      :debug => {
+        'GCC_DYNAMIC_NO_PIC' => 'NO',
+        'GCC_PREPROCESSOR_DEFINITIONS' => ["DEBUG=1", "$(inherited)"],
+        'GCC_SYMBOLS_PRIVATE_EXTERN' => 'NO',
+        'GCC_OPTIMIZATION_LEVEL' => '0'
+      },
+      :ios => {
+        'ARCHS' => "$(ARCHS_STANDARD_32_BIT)",
+        'GCC_VERSION' => 'com.apple.compilers.llvmgcc42',
+        'IPHONEOS_DEPLOYMENT_TARGET' => '4.3',
+        'PUBLIC_HEADERS_FOLDER_PATH' => "$(TARGET_NAME)",
+        'SDKROOT' => 'iphoneos'
+      },
+      :osx => {
+        'ARCHS' => "$(ARCHS_STANDARD_64_BIT)",
+        'GCC_ENABLE_OBJC_EXCEPTIONS' => 'YES',
+        'GCC_WARN_64_TO_32_BIT_CONVERSION' => 'YES',
+        'GCC_VERSION' => 'com.apple.compilers.llvm.clang.1_0',
+        'MACOSX_DEPLOYMENT_TARGET' => '10.7',
+        'SDKROOT' => 'macosx'
+      }
+    }
+
+    def self.build_settings(platform, scheme)
+      settings = COMMON_BUILD_SETTINGS[:all].merge(COMMON_BUILD_SETTINGS[platform])
+      settings['COPY_PHASE_STRIP'] = scheme == :debug ? 'NO' : 'YES'
+      if scheme == :debug
+        settings.merge!(COMMON_BUILD_SETTINGS[:debug])
+        settings['ONLY_ACTIVE_ARCH'] = 'YES' if platform == :osx
+      else
+        settings['VALIDATE_PRODUCT'] = 'YES' if platform == :ios
+        settings['DEBUG_INFORMATION_FORMAT'] = "dwarf-with-dsym" if platform == :osx
+      end
+      settings
+    end
+  end
+end