cocoapods 0.6.0.rc2 → 0.6.0.rc3

data/README.md

@@ -50,13 +50,17 @@ Now that you've got CocoaPods installed you can easily add it to your project.
 Search for Pods by name or description.
 
 ```
-$ pod search asi
-==> ASIHTTPRequest (1.8.1)
-    Easy to use CFNetwork wrapper for HTTP requests, Objective-C, Mac OS X and iPhone
+$ pod search json
 
-==> ASIWebPageRequest (1.8.1)
-    The ASIWebPageRequest class included with ASIHTTPRequest lets you download
-    complete webpages, including external resources like images and stylesheets.
+--> JSONKit (1.4, 1.5pre)
+    A Very High Performance Objective-C JSON Library.
+    - Homepage: https://github.com/johnezang/JSONKit
+    - Source:   https://github.com/johnezang/JSONKit.git
+
+--> SBJson (2.2.3, 3.0.4, 3.1)
+    This library implements strict JSON parsing and generation in Objective-C.
+    - Homepage: http://stig.github.com/json-framework/
+    - Source:   https://github.com/stig/json-framework.git
 ```
 
 After you've found your favorite dependencies you add them to your [Podfile](https://github.com/CocoaPods/CocoaPods/wiki/A-Podfile).

data/lib/cocoapods.rb

@@ -1,7 +1,5 @@
-Encoding.default_external = Encoding::UTF_8 if RUBY_VERSION > '1.8.7'
-
 module Pod
-  VERSION = '0.6.0.rc2'
+  VERSION = '0.6.0.rc3'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/command/spec.rb

@@ -241,13 +241,14 @@ module Pod
         end
 
         def podfile_from_spec
-          name         = spec.name
-          podspec      = file.realpath.to_s
-          platform_sym = @platform.to_sym
-          podfile = Pod::Podfile.new do
-            platform(platform_sym)
+          name     = spec.name
+          podspec  = file.realpath.to_s
+          platform = @platform
+          podfile  = Pod::Podfile.new do
+            platform(platform)
             dependency name, :podspec => podspec
           end
+          podfile
         end
 
         def set_up_lint_environment
@@ -337,7 +338,7 @@ module Pod
           messages << "The description should end with a dot"               if @spec.description !~ /.*\./ && @spec.description != @spec.summary
           messages << "Git sources should specify either a tag or a commit" if source[:git] && !source[:commit] && !source[:tag]
           messages << "Github repositories should end in `.git'"            if github_source? && source[:git] !~ /.*\.git/
-          messages << "Github repositories should use `https' link"         if github_source? && source[:git] !~ /https:\/\/github.com/
+          # messages << "Github repositories should use `https' link"         if github_source? && source[:git] !~ /https:\/\/github.com/
           messages << "Comments must be deleted"                            if text =~ /^\w*#\n\w*#/ # allow a single line comment as it is generally used in subspecs
           messages
         end
@@ -405,7 +406,7 @@ module Pod
         def file_patterns_errors
           messages = []
           messages << "The sources did not match any file"                     if !@spec.source_files.empty? && @pod.source_files.empty?
-          messages << "The resources did not match any file"                   if !@spec.resources.empty? && @pod.resources.empty?
+          messages << "The resources did not match any file"                   if !@spec.resources.empty? && @pod.resource_files.empty?
           messages << "The preserve_paths did not match any file"              if !@spec.preserve_paths.empty? && @pod.preserve_paths.empty?
           messages << "The exclude_header_search_paths did not match any file" if !@spec.exclude_header_search_paths.empty? && @pod.headers_excluded_from_search_paths.empty?
           messages

data/lib/cocoapods/installer.rb

@@ -29,7 +29,7 @@ module Pod
       pods.each do |pod|
         # Add all source files to the project grouped by pod
         group = @project.add_pod_group(pod.name)
-        pod.source_files.each do |path|
+        pod.relative_source_files.each do |path|
           group.files.new('path' => path.to_s)
         end
       end

data/lib/cocoapods/installer/target_installer.rb

@@ -20,12 +20,12 @@ module Pod
       end
 
       def copy_resources_script_for(pods)
-        @copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map { |p| p.resources }.flatten)
+        @copy_resources_script ||= Generator::CopyResourcesScript.new(pods.map { |p| p.relative_resource_files }.flatten)
       end
 
       def bridge_support_generator_for(pods, sandbox)
         Generator::BridgeSupport.new(pods.map do |pod|
-          pod.header_files.map { |header| sandbox.root + header }
+          pod.relative_header_files.map { |header| sandbox.root + header }
         end.flatten)
       end
 
@@ -62,13 +62,15 @@ module Pod
 
         @target = @project.add_pod_target(@target_definition.label, @target_definition.platform)
 
+        source_file_descriptions = []
         pods.each do |pod|
           xcconfig.merge!(pod.xcconfig)
-          pod.add_to_target(@target)
+          source_file_descriptions += pod.source_file_descriptions
 
           # TODO: this doesn't need to be done here, it has nothing to do with the target
           pod.link_headers
         end
+        @target.add_source_files(source_file_descriptions)
 
         xcconfig.merge!('HEADER_SEARCH_PATHS' => quoted(sandbox.header_search_paths).join(" "))
 

data/lib/cocoapods/local_pod.rb

@@ -1,125 +1,266 @@
 module Pod
+
+  # A {LocalPod} interfaces one or more specifications belonging to one pod
+  # (a library) and their concrete instance in the file system.
+  #
+  # The {LocalPod} is responsible for orchestrating the activated
+  # specifications of a single pod. Specifically, it keeps track of the
+  # activated specifications and handles issues related to duplicates
+  # files.
+  # Inheritance logic belongs to the {Specification} class.
+  #
+  # The activated specifications are used to compute the paths that can be
+  # safely cleaned by the pod.
+  #
+  # @example
+  #     pod = LocalPod.new 'RestKit/Networking'
+  #     pod.add_specification 'RestKit/UI'
+  #
+  # @note
+  #   Unless otherwise specified in the name of the method the {LocalPod}
+  #   returns absolute paths.
+  #
   class LocalPod
-    attr_reader :top_specification, :specifications
+
+    # @return [Specification] The specification that describes the pod.
+    #
+    attr_reader :top_specification
+
+    # @return [Specification] The activated specifications of the pod.
+    #
+    attr_reader :specifications
+
+    # @return [Sandbox] The sandbox where the pod is installed.
+    #
     attr_reader :sandbox
 
+    # @return [Platform] The platform that will be used to build the pod.
+    #
+    attr_reader :platform
+
+    # @param [Specification] specification
+    #   The first activated specification of the pod.
+    # @param [Sandbox] sandbox
+    #   The sandbox where the files of the pod will be located.
+    # @param [Platform] platform
+    #   The platform that will be used to build the pod.
+    #
+    # @todo The local pod should be initialized with all the activated
+    #   specifications passed as an array, in order to be able to cache the
+    #   computed values. In other words, it should be immutable.
+    #
     def initialize(specification, sandbox, platform)
-      @top_specification, @sandbox = specification.top_level_parent, sandbox
+      @top_specification, @sandbox, @platform = specification.top_level_parent, sandbox, platform
       @top_specification.activate_platform(platform)
       @specifications = [] << specification
     end
 
+    # Initializes a local pod from the top specification of a podspec file.
+    #
+    # @return [LocalPod] A new local pod.
+    #
     def self.from_podspec(podspec, sandbox, platform)
       new(Specification.from_file(podspec), sandbox, platform)
     end
 
-    # Method to add the specifications sharing the same top level
-    # parent. With this information the local pod can determine the
-    # paths to clean and avoid duplication in file processing.
+    # Activates a specification or subspecs for the pod.
     # Adding specifications is idempotent.
+    #
+    # @param {Specification} spec The specification to add to the pod.
+    #
+    # @raise {Informative} If the specification is not part of the same pod.
+    #
     def add_specification(spec)
-      raise Informative, "[Local Pod] Attempt to add a specification from another pod" unless spec.top_level_parent == top_specification
+      unless spec.top_level_parent == top_specification
+        raise Informative,
+          "[Local Pod] Attempt to add a specification from another pod"
+      end
       spec.activate_platform(platform)
       @specifications << spec unless @specifications.include?(spec)
     end
 
+    # @return [Pathname] The root directory of the pod
+    #
     def root
       @sandbox.root + top_specification.name
     end
 
-    def subspecs
-      specifications.reject{|s| s.parent.nil? }
-    end
-
+    # @return [String] A string representation of the pod which indicates if
+    # the pods comes from a local source.
+    #
     def to_s
       result = top_specification.to_s
       result << " [LOCAL]" if top_specification.local?
       result
     end
 
+    # @return [String] The name of the Pod.
+    #
     def name
       top_specification.name
     end
 
-    def platform
-      top_specification.active_platform
-    end
-
-    # Installation methods
+    # @!group Installation
 
+    # Creates the root path of the pod.
+    #
+    # @return [void]
+    #
     def create
       root.mkpath unless exists?
     end
 
+    # Whether the root path of the pod exists.
+    #
     def exists?
       root.exist?
     end
 
+    # Executes a block in the root directory of the Pod.
+    #
+    # @return [void]
+    #
     def chdir(&block)
       create
       Dir.chdir(root, &block)
     end
 
+    # Deletes the pod from the file system.
+    #
+    # @return [void]
+    #
     def implode
       root.rmtree if exists?
     end
 
-    ### Cleaning
+    # @!group Cleaning
 
-    # Public: Deletes any path that is not used by the pod.
+    # Deletes any path that is not used by the pod.
+    #
+    # @return [void]
+    #
     def clean
       clean_paths.each { |path| FileUtils.rm_rf(path) }
+      @cleaned = true
     end
 
-    # Public: Finds the absolute paths, including hidden ones, of the files
-    # that are not used by the pod and can be safely deleted.
+    # Finds the absolute paths, including hidden ones, of the files
+    # that are not used by the pod and thus can be safely deleted.
+    #
+    # @return [Array<Strings>] The paths that can be deleted.
     #
-    # Returns an Array of Strings containing the absolute paths.
     def clean_paths
-      cached_used_paths = used_paths.map{ |path| path.to_s }
+      cached_used_paths = used_files
       files = Dir.glob(root + "**/*", File::FNM_DOTMATCH)
+
       files.reject! do |candidate|
-        candidate.end_with?('.', '..') ||
-          cached_used_paths.any? { |path| path.include?(candidate) || candidate.include?(path) }
+        candidate.end_with?('.', '..') || cached_used_paths.any? do |path|
+          path.include?(candidate) || candidate.include?(path)
+        end
       end
       files
     end
 
-    # Public: Finds all the absolute paths used by pod.
+    # @return [Array<String>] The absolute path of the files used by the pod.
     #
-    # Returns an Array of Pathnames containing the absolute paths.
-    def used_paths
-      files = source_files(false) + resources(false) + preserve_paths + [ readme_file, license_file, prefix_header_file ]
-      files.compact
+    def used_files
+      files = [ source_files, resource_files, preserve_files, readme_file, license_file, prefix_header_file ]
+      files.compact!
+      files.flatten!
+      files.map!{ |path| path.to_s }
+      files
     end
 
-    ### File attributes
+    # @!group Files
 
-    def prefix_header_file
-      root + top_specification.prefix_header_file if top_specification.prefix_header_file
+    # @return [Array<Pathname>] The paths of the source files.
+    #
+    def source_files
+      source_files_by_spec.values.flatten
+    end
+
+    # @return [Array<Pathname>] The *relative* paths of the source files.
+    #
+    def relative_source_files
+      source_files.map{ |p| p.relative_path_from(@sandbox.root) }
     end
 
-    def source_files(relative = true)
-      chained_expanded_paths(:source_files, :glob => '*.{h,m,mm,c,cpp}', :relative_to_sandbox => relative)
+    # Finds the source files that every activated {Specification} requires.
+    #
+    # @note If the same file is required by two specifications the one at the
+    #   higher level in the inheritance chain wins.
+    #
+    # @return [Hash{Specification => Array<Pathname>}] The files grouped by
+    #   {Specification}.
+    #
+    def source_files_by_spec
+      options = {:glob => '*.{h,m,mm,c,cpp}'}
+      paths_by_spec(:source_files, options)
     end
 
+    # @return [Array<Pathname>] The paths of the header files.
+    #
     def header_files
-      source_files.select { |f| f.extname == '.h' }
+      header_files_by_spec.values.flatten
     end
 
-    def resources(relative = true)
-      chained_expanded_paths(:resources, :relative_to_sandbox => relative)
+    # @return [Array<Pathname>] The *relative* paths of the source files.
+    #
+    def relative_header_files
+      header_files.map{ |p| p.relative_path_from(@sandbox.root) }
     end
 
-    # TODO: implement case insensitive search
-    def preserve_paths
-      chained_expanded_paths(:preserve_paths) + expanded_paths(%w[ *.podspec notice* NOTICE* CREDITS* ])
+    # @return [Hash{Specification => Array<Pathname>}] The paths of the header
+    #   files grouped by {Specification}.
+    #
+    def header_files_by_spec
+      result = {}
+      source_files_by_spec.each do |spec, paths|
+        headers = paths.select { |f| f.extname == '.h' }
+        result[spec] = headers unless headers.empty?
+      end
+      result
+    end
+
+    # @return [Array<Pathname>] The paths of the resources.
+    #
+    def resource_files
+      paths_by_spec(:resources).values.flatten
+    end
+
+    # @return [Array<Pathname>] The *relative* paths of the resources.
+    #
+    def relative_resource_files
+      resource_files.map{ |p| p.relative_path_from(@sandbox.root) }
+    end
+
+    # @return [Pathname] The absolute path of the prefix header file
+    #
+    def prefix_header_file
+      root + top_specification.prefix_header_file if top_specification.prefix_header_file
     end
 
+    # @return [Array<Pathname>] The absolute paths of the files of the pod
+    #   that should be preserved.
+    #
+    def preserve_files
+      paths  = paths_by_spec(:preserve_paths).values
+      paths += expanded_paths(%w[ *.podspec notice* NOTICE* CREDITS* ])
+      paths.compact!
+      paths.uniq!
+      paths
+    end
+
+    # @return [Pathname] The automatically detected absolute path of the README
+    #  file.
+    #
     def readme_file
       expanded_paths(%w[ README{*,.*} readme{*,.*} ]).first
     end
 
+    # @return [Pathname] The absolute path of the license file from the
+    #   specification or automatically detected.
+    #
     def license_file
       if top_specification.license && top_specification.license[:file]
         root + top_specification.license[:file]
@@ -128,6 +269,9 @@ module Pod
       end
     end
 
+    # @return [String] The text of the license of the pod from the
+    #  specification or from the license file.
+    #
     def license_text
       if (license_hash = top_specification.license)
         if (result = license_hash[:text])
@@ -142,88 +286,162 @@ module Pod
       specifications.map { |s| s.xcconfig }.reduce(:merge)
     end
 
-    # Method used by documentation generator. It return the source files
-    # of all the specs.
+    # Computes the paths of all the public headers of the pod including every
+    # subspec. For this reason the pod must not be cleaned before calling it.
+    #
+    # This method is used by {Generator::Documentation}.
+    #
+    # @raise [Informative] If the pod was cleaned.
+    #
+    # @todo Merge with #221
+    #
+    # @return [Array<Pathname>] The path of all the public headers of the pod.
+    #
     def all_specs_public_header_files
-      #TODO: merge with #221
-      specs = top_specification.recursive_subspecs << top_specification
-      specs.map { |s| expanded_paths(s.source_files, :glob => '*.{h}') }.compact.flatten.select { |f| f.extname == '.h' }.uniq
+      if @cleaned
+        raise Informative, "The pod is cleaned and cannot compute the all the "\
+          "header files as they might be deleted."
+      end
+
+      all_specs = [ top_specification ] + top_specification.subspecs
+      options   = {:glob => '*.{h}'}
+      files     = paths_by_spec(:source_files, options, all_specs).values.flatten!
+      headers   = files.select { |f| f.extname == '.h' }
+      headers
     end
 
-    # Integration methods
+    # @!group Target integration
 
+    # @return [void] Copies the pods headers to the sandbox.
+    #
     def link_headers
-      copy_header_mappings.each do |namespaced_path, files|
+      @sandbox.add_header_search_path(headers_sandbox)
+      header_mappings.each do |namespaced_path, files|
         @sandbox.add_header_files(namespaced_path, files)
       end
     end
 
-    def add_to_target(target)
-      sources_files_by_specification.each do | spec, files |
+    # @param [Xcodeproj::Project::Object::PBXNativeTarget] target
+    #   The target to integrate.
+    #
+    # @return [void] Adds the pods source files to a given target.
+    #
+    def source_file_descriptions
+      result = []
+      source_files_by_spec.each do | spec, files |
+        compiler_flags = spec.compiler_flags.strip
         files.each do |file|
-          # TODO: Xcodeproj::Project::Object::PBXNativeTarget#add_source_file is quite slow
-          # The issus appears to be related to the find call in line 107.
-          target.add_source_file(file, nil, spec.compiler_flags.strip)
+          file = file.relative_path_from(@sandbox.root)
+          desc = Xcodeproj::Project::PBXNativeTarget::SourceFileDescription.new(file, compiler_flags, nil)
+          result << desc
         end
       end
+      result
     end
 
+    # @return Whether the pod requires ARC.
+    #
     def requires_arc?
       top_specification.requires_arc
     end
 
     private
 
+    # @return [Array<Pathname>] The implementation files
+    # (the files the need to compiled) of the pod.
+    #
     def implementation_files
-      source_files.select { |f| f.extname != '.h' }
+      relative_source_files.select { |f| f.extname != '.h' }
     end
 
+    # @return [Pathname] The path of the pod relative from the sandbox.
+    #
     def relative_root
       root.relative_path_from(@sandbox.root)
     end
 
-    # TODO this is being overriden in the RestKit 0.9.4 spec, need to do
+    # @return Hash{Pathname => [Array<Pathname>]} A hash containing the headers
+    #   folders as the keys and the the absolute paths of the header files
+    #   as the values.
+    #
+    # @todo this is being overridden in the RestKit 0.9.4 spec, need to do
     # something with that, and this method also still exists in Specification.
     #
-    # This is not overriden anymore in specification refactor and the code
-    # Pod::Specification#copy_header_mapping can be moved here.
-    def copy_header_mappings
-      search_path_headers = header_files - headers_excluded_from_search_paths
-      search_path_headers.inject({}) do |mappings, from|
-        from_without_prefix = from.relative_path_from(relative_root)
-        to = top_specification.header_dir + top_specification.copy_header_mapping(from_without_prefix)
-        (mappings[to.dirname] ||= []) << from
-        mappings
+    # @todo This is not overridden anymore in specification refactor and the
+    #   code Pod::Specification#copy_header_mapping can be moved here.
+    def header_mappings
+      mappings = {}
+      header_files_by_spec.each do |spec, paths|
+        paths = paths - headers_excluded_from_search_paths
+        paths.each do |from|
+          from_relative = from.relative_path_from(root)
+          to = headers_sandbox + (spec.header_dir) + spec.copy_header_mapping(from_relative)
+          (mappings[to.dirname] ||= []) << from
+        end
       end
+      mappings
     end
 
-    # returns an hash where the source_files are groupped by specification.
-    # If the same file is required by two specifications the one at the
-    # higher level in the inheritance chain wins.
-    def sources_files_by_specification
-      files_by_spec   = {}
-      processed_files = []
-      specifications.sort_by { |s| s.name.length }.each do |spec|
-        files = []
-        expanded_paths(spec.source_files, :glob => '*.{h,m,mm,c,cpp}', :relative_to_sandbox => true).each do | file |
-          files << file unless processed_files.include?(file)
-        end
-        files_by_spec[spec] = files
-        processed_files    += files
-      end
-      files_by_spec
+    def headers_sandbox
+      @headers_sandbox ||= Pathname.new(top_specification.name)
     end
 
+    # @return [<Pathname>] The relative path of the headers that should not be
+    # included in the linker search paths.
+    #
     def headers_excluded_from_search_paths
-      chained_expanded_paths(:exclude_header_search_paths, :glob => '*.h', :relative_to_sandbox => true)
+      options = { :glob => '*.h' }
+      paths = paths_by_spec(:exclude_header_search_paths, options)
+      paths.values.compact.uniq
     end
 
-    def chained_expanded_paths(accessor, options = {})
-      specifications.map { |s| expanded_paths(s.send(accessor), options) }.compact.flatten.uniq
+    # @!group Paths Patterns
+
+    # The paths obtained by resolving the patterns of an attribute
+    # groupped by spec.
+    #
+    # @param [Symbol] accessor The accessor to use to obtain the paths patterns.
+    # @param [Hash] options (see #expanded_paths)
+    #
+    def paths_by_spec(accessor, options = {}, specs = nil)
+      specs ||= specifications
+      paths_by_spec   = {}
+      processed_paths = []
+
+      specs = specs.sort_by { |s| s.name.length }
+      specs.each do |spec|
+        paths = expanded_paths(spec.send(accessor), options)
+        unless paths.empty?
+          paths_by_spec[spec] = paths - processed_paths
+          processed_paths += paths
+        end
+      end
+      paths_by_spec
     end
 
+    # Converts patterns of paths to the {Pathname} of the files present in the
+    #   pod.
+    #
+    # @param [String, FileList, Array<String, Pathname>] patterns
+    #   The patterns to expand.
+    # @param [Hash] options
+    #   The options to used for expanding the paths patterns.
+    # @option options [String] :glob
+    #   The pattern to use for globing directories.
+    #
+    # @raise [Informative] If the pod does not exists.
+    #
+    # @todo implement case insensitive search
+    #
+    # @return [Array<Pathname>] A list of the paths.
+    #
     def expanded_paths(patterns, options = {})
-      raise Informative, "[Local Pod] Attempt to resolve paths for non existent pod." unless exists?
+      unless exists?
+        raise Informative, "[Local Pod] Attempt to resolve paths for nonexistent pod.\n" \
+                           "\tSpecifications: #{@specifications.inspect}\n" \
+                           "\t      Patterns: #{patterns.inspect}\n" \
+                           "\t       Options: #{options.inspect}"
+      end
 
       patterns = [ patterns ] if patterns.is_a? String
       patterns.map do |pattern|
@@ -234,11 +452,7 @@ module Pod
         end
 
         pattern.glob.map do |file|
-          if options[:relative_to_sandbox]
-            file.relative_path_from(@sandbox.root)
-          else
-            file
-          end
+          file
         end
       end.flatten
     end

data/lib/cocoapods/platform.rb

@@ -1,68 +1,140 @@
 module Pod
+
+  # A platform describes an SDK name and deployment target.
+  #
   class Platform
+
+    # @return [Platform] Convenience method to initialize an iOS platform.
+    #
     def self.ios
       new :ios
     end
 
+    # @return [Platform] Convenience method to initialize an OS X platform.
+    #
     def self.osx
       new :osx
     end
 
-    attr_reader :deployment_target
+    # Constructs a platform from either another platform or by
+    # specifying the symbolic name and optionally the deployment target.
+    #
+    # @overload initialize(name, deployment_target)
+    #   @param [Symbol] name The name of platform.
+    #   @param [String, Version] deployment_target The optional deployment.
+    #     If not provided a default value according to the platform name will
+    #     be assigned.
+    #
+    #   @note that if the name is not specified a default deployment
+    #     target will not be assigned.
+    #
+    #   @example
+    #
+    #       Platform.new(:ios)
+    #       Platform.new(:ios, '4.3')
+    #
+    # @overload initialize(name, opts)
+    #   @deprecated Remove after adding a warning to {Podfile} class.
+    #   @param [Symbol] name The name of platform.
+    #   @param [Hash] opts The options to create a platform with.
+    #   @option opts [String, Version] :deployment_target The deployment target.
+    #
+    # @overload initialize(platform)
+    #   @param [Platform] platform Another {Platform}.
+    #
+    #   @example
+    #
+    #       platform = Platform.new(:ios)
+    #       Platform.new(platform)
+    #
+    def initialize(input, target = nil)
+      if input.is_a? Platform
+        @symbolic_name = input.name
+        @deployment_target = input.deployment_target
+        @declared_deployment_target = input.declared_deployment_target
+      else
+        @symbolic_name = input
+
+        target = target[:deployment_target] if target.is_a?(Hash)
+        @declared_deployment_target = target
 
-    def initialize(symbolic_name = nil, deployment_target = nil)
-      @symbolic_name = symbolic_name
-      if deployment_target
-        version = deployment_target.is_a?(Hash) ? deployment_target[:deployment_target] : deployment_target # backwards compatibility from 0.6
-        @deployment_target = Pod::Version.create(version)
+        unless target
+          case @symbolic_name
+          when :ios
+            target = '4.3'
+          when :osx
+            target = '10.6'
+          else
+            target = ''
+          end
+        end
+        @deployment_target = Version.create(target)
       end
     end
 
+    # @return [Symbol] The name of the SDK represented by the platform.
+    #
     def name
       @symbolic_name
     end
 
-    def deployment_target= (version)
-      @deployment_target = Pod::Version.create(version)
-    end
+    # @return [Version] The deployment target of the platform.
+    #
+    attr_reader :deployment_target
+
+    # @return [Version] The deployment target declared on initialization.
+    #
+    attr_reader :declared_deployment_target
 
-    def ==(other_platform_or_symbolic_name)
-      if other_platform_or_symbolic_name.is_a?(Symbol)
-        @symbolic_name == other_platform_or_symbolic_name
+    # @param [Platform, Symbol] other The other platform to check.
+    #
+    # @note If a symbol is passed the comparison does not take into account
+    # the deployment target.
+    #
+    # @return [Boolean] Whether two platforms are the equivalent.
+    #
+    def ==(other)
+      if other.is_a?(Symbol)
+        @symbolic_name == other
       else
-        self.name == (other_platform_or_symbolic_name.name) && self.deployment_target == other_platform_or_symbolic_name.deployment_target
+        (name == other.name) && (deployment_target == other.deployment_target)
       end
     end
 
+    # In the context of operating system SDKs, a platform supports another
+    # one if they have the same name and the other platform has a minor or
+    # equal deployment target.
+    #
+    # @return Whether the platform supports another platform.
+    #
     def supports?(other)
-      return true if @symbolic_name.nil? || other.nil?
-      os_check      = @symbolic_name == other.name
-      version_check = (deployment_target.nil? || other.deployment_target.nil? || deployment_target >= other.deployment_target)
-      os_check && version_check
+      other = Platform.new(other)
+      (other.name == name) && (other.deployment_target <= deployment_target)
     end
 
+    # @return [String] A string representation including the deployment target.
+    #
     def to_s
       case @symbolic_name
       when :ios
-        'iOS' + (deployment_target ? " #{deployment_target}" : '')
+        s = 'iOS'
       when :osx
-        'OS X' + (deployment_target ? " #{deployment_target}" : '')
-      else
-        'iOS - OS X'
+        s = 'OS X'
       end
+      s << " #{declared_deployment_target}" if declared_deployment_target
+      s
     end
 
+    # @return [Symbol] A Symbol representation of the name.
+    #
     def to_sym
       name
     end
 
-    def nil?
-      name.nil?
-    end
-
+    # @return Whether the platform requires legacy architectures for iOS.
+    #
     def requires_legacy_ios_archs?
-      return unless deployment_target
-      (name == :ios) && (deployment_target < Pod::Version.new("4.3"))
+      (name == :ios) && (deployment_target < Version.new("4.3"))
     end
   end
 end

data/lib/cocoapods/podfile.rb

@@ -153,7 +153,10 @@ module Pod
 
     def self.from_file(path)
       podfile = Podfile.new do
-        eval(path.read, nil, path.to_s)
+        string = File.open(path, 'r:utf-8')  { |f| f.read }
+        # TODO: work around for Rubinius incomplete encoding in 1.9 mode
+        string.encode!('UTF-8') if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+        eval(string, nil, path.to_s)
       end
       podfile.defined_in_file = path
       podfile.validate!
@@ -332,12 +335,14 @@ module Pod
     # 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:
@@ -455,10 +460,6 @@ module Pod
     end
 
     def validate!
-      #lines = []
-      #lines << "* the `platform` attribute should be either `:osx` or `:ios`" unless @platform && [:osx, :ios].include?(@platform.name)
-      #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
 end

data/lib/cocoapods/sandbox.rb

@@ -42,6 +42,16 @@ module Pod
       @header_search_paths.uniq.map { |path| "${PODS_ROOT}/#{path}" }
     end
 
+    # Adds an header search path to the sandbox.
+    #
+    # @param path [Pathname] The path tho add.
+    #
+    # @return [void]
+    #
+    def add_header_search_path(path)
+      @header_search_paths << Pathname.new(HEADERS_DIR) + path
+    end
+
     def prepare_for_install
       headers_root.rmtree if headers_root.exist?
     end

data/lib/cocoapods/specification.rb

@@ -4,7 +4,10 @@ module Pod
   extend Config::Mixin
 
   def self._eval_podspec(path)
-    eval(path.read, nil, path.to_s)
+    string = File.open(path, 'r:utf-8')  { |f| f.read }
+    # TODO: work around for Rubinius incomplete encoding in 1.9 mode
+    string.encode!('UTF-8') if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+    eval(string, nil, path.to_s)
   end
 
   class Specification
@@ -35,10 +38,18 @@ module Pod
       end
 
       # multi-platform attributes
-      %w[ source_files resources preserve_paths exclude_header_search_paths frameworks libraries dependencies compiler_flags].each do |attr|
+      %w[ source_files
+          resources
+          preserve_paths
+          exclude_header_search_paths
+          frameworks
+          libraries
+          dependencies
+          compiler_flags ].each do |attr|
         instance_variable_set( "@#{attr}", { :ios => [], :osx => [] } )
       end
       @xcconfig = { :ios => Xcodeproj::Config.new, :osx => Xcodeproj::Config.new }
+      @header_dir = { :ios => nil, :osx => nil }
 
       yield self if block_given?
     end
@@ -58,7 +69,7 @@ module Pod
     # be passed to initalize the value
     def self.top_attr_writer(attr, init_lambda = nil)
       define_method("#{attr}=") do |value|
-        raise Informative, "Can't set `#{attr}' for subspecs." if @parent
+        raise Informative, "#{self.inspect} Can't set `#{attr}' for subspecs." if @parent
         instance_variable_set("@#{attr}",  init_lambda ? init_lambda.call(value) : value);
       end
     end
@@ -119,6 +130,7 @@ module Pod
           libraries=
           compiler_flags=
           deployment_target=
+          header_dir=
           dependency }.each do |method|
         define_method(method) do |args|
           @specification._on_platform(@platform) do
@@ -180,16 +192,10 @@ module Pod
     top_attr_accessor :license,             lambda { |l| ( l.kind_of? String ) ? { :type => l } : l }
     top_attr_accessor :version,             lambda { |v| Version.new(v) }
     top_attr_accessor :authors,             lambda { |a| parse_authors(a) }
-    top_attr_accessor :header_mappings_dir, lambda { |file| Pathname.new(file) } # If not provided the headers files are flattened
-    top_attr_accessor :prefix_header_file,  lambda { |file| Pathname.new(file) }
-    top_attr_accessor :prefix_header_contents
 
     top_attr_reader   :description,         lambda {|instance, ivar| ivar || instance.summary }
     top_attr_writer   :description
 
-    top_attr_reader   :header_dir,          lambda {|instance, ivar| ivar || instance.pod_destroot_name }
-    top_attr_writer   :header_dir,          lambda {|dir| Pathname.new(dir) }
-
     alias_method      :author=, :authors=
 
     def self.parse_authors(*names_and_email_addresses)
@@ -203,6 +209,13 @@ module Pod
 
     ### Attributes **with** multiple platform support
 
+    # @todo allow for subspecs
+    #
+    top_attr_accessor :header_mappings_dir, lambda { |file| Pathname.new(file) } # If not provided the headers files are flattened
+    top_attr_accessor :prefix_header_file,  lambda { |file| Pathname.new(file) }
+    top_attr_accessor :prefix_header_contents
+
+
     pltf_chained_attr_accessor  :source_files,                lambda {|value, current| pattern_list(value) }
     pltf_chained_attr_accessor  :resources,                   lambda {|value, current| pattern_list(value) }
     pltf_chained_attr_accessor  :preserve_paths,              lambda {|value, current| pattern_list(value) } # Paths that should not be cleaned
@@ -215,7 +228,28 @@ module Pod
     alias_method :framework=,     :frameworks=
     alias_method :library=,       :libraries=
 
-    platform_attr_writer        :xcconfig,                     lambda {|value, current| current.tap { |c| c.merge!(value) } }
+    # @!method header_dir=
+    #
+    # @abstract The directory where to name space the headers files of
+    #   the specification.
+    #
+    # @param [String] The headers directory.
+    #
+    platform_attr_writer :header_dir, lambda { |dir, _| Pathname.new(dir) }
+
+    # @abstract (see #header_dir=)
+    #
+    # @return [Pathname] The headers directory.
+    #
+    # @note If no value is provided it returns an empty {Pathname}.
+    #
+    def header_dir
+      @header_dir[active_platform] || (@parent.header_dir if @parent) || Pathname.new('')
+    end
+
+    # @!method xcconfig=
+    #
+    platform_attr_writer :xcconfig, lambda {|value, current| current.tap { |c| c.merge!(value) } }
 
     def xcconfig
       raw_xconfig.dup.
@@ -338,12 +372,6 @@ module Pod
       end
     end
 
-    def pod_destroot_name
-      if root = pod_destroot
-        root.basename
-      end
-    end
-
     def self.pattern_list(patterns)
       if patterns.is_a?(Array) && (!defined?(Rake) || !patterns.is_a?(Rake::FileList))
         patterns

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.6.0.rc2
+  version: 0.6.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0.rc1
+        version: 0.2.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0.rc1
+        version: 0.2.0.rc3
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -220,8 +220,7 @@ files:
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
-post_install_message: ! '[!] If this is your first time install of CocoaPods, or if
-  you are upgrading, first run: $ pod setup'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -233,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4185987676698712042
+      hash: -4255808977828615188
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -247,3 +246,4 @@ signing_key:
 specification_version: 3
 summary: An Objective-C library package manager.
 test_files: []
+has_rdoc: