cocoapods 0.10.0 → 0.11.0

data/lib/cocoapods/config.rb

@@ -53,16 +53,6 @@ module Pod
     end
     attr_writer :podfile
 
-    def ios?
-      # TODO: deprecate in 0.7
-      podfile.target_definitions[:default].platform == :ios if podfile
-    end
-
-    def osx?
-      # TODO: deprecate in 0.7
-      podfile.target_definitions[:default].platform == :osx if podfile
-    end
-
     module Mixin
       def config
         Config.instance

data/lib/cocoapods/dependency.rb

@@ -14,13 +14,14 @@ module Pod
         super(@specification.name, @specification.version)
 
       elsif !name_and_version_requirements.empty? && block.nil?
+        version = name_and_version_requirements.last
         if name_and_version_requirements.last.is_a?(Hash)
           @external_source = ExternalSources.from_params(name_and_version_requirements[0].split('/').first, name_and_version_requirements.pop)
-
-        elsif (symbol = name_and_version_requirements.last).is_a?(Symbol) && symbol == :head
+        elsif version.is_a?(Symbol) && version == :head || version.is_a?(Version) && version.head?
           name_and_version_requirements.pop
           @head = true
         end
+
         super(*name_and_version_requirements)
 
         if head? && !latest_version?

data/lib/cocoapods/downloader/subversion.rb

@@ -6,17 +6,23 @@ module Pod
       def download
         if options[:revision]
           download_revision
+        elsif options[:tag]
+          download_tag
         else
           download_head
         end
       end
 
       def download_head
-        svn "checkout \"#{url}\" \"#{target_path}\""
+        svn %|checkout "#{url}/#{options[:folder]}" "#{target_path}"|
       end
 
       def download_revision
-        svn "checkout \"#{url}\" -r '#{options[:revision]}' \"#{target_path}\""
+        svn %|checkout "#{url}/#{options[:folder]}" -r "#{options[:revision]}" "#{target_path}"|
+      end
+
+      def download_tag
+        svn %|checkout "#{url}/tags/#{options[:tag]}/#{options[:folder]}" "#{target_path}"|
       end
     end
   end

data/lib/cocoapods/file_list.rb

@@ -5,7 +5,7 @@ else
 end
 
 # This makes Rake::FileList usable with the Specification attributes
-# source_files, clean_paths, and resources.
+# source_files, public_header_files, preserve_paths, and resources.
 
 module Rake
   class FileList

data/lib/cocoapods/installer/target_installer.rb

@@ -13,9 +13,10 @@ module Pod
       def xcconfig
         @xcconfig ||= Xcodeproj::Config.new({
           # In a workspace this is where the static library headers should be found.
-          'PODS_ROOT'                => @target_definition.relative_pods_root,
-          'ALWAYS_SEARCH_USER_PATHS' => 'YES', # needed to make EmbedReader build
-          'OTHER_LDFLAGS'            => default_ld_flags,
+          'PODS_ROOT'                 => @target_definition.relative_pods_root,
+          'PODS_HEADERS_SEARCH_PATHS' => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
+          'ALWAYS_SEARCH_USER_PATHS'  => 'YES', # needed to make EmbedReader build
+          'OTHER_LDFLAGS'             => default_ld_flags,
         })
       end
 
@@ -72,22 +73,25 @@ module Pod
         end
         @target.add_source_files(source_file_descriptions)
 
-        xcconfig.merge!('HEADER_SEARCH_PATHS' => quoted(sandbox.header_search_paths).join(" "))
+        xcconfig.merge!('HEADER_SEARCH_PATHS' => '${PODS_HEADERS_SEARCH_PATHS}')
+        xcconfig.merge!('PODS_BUILD_HEADERS_SEARCH_PATHS' => quoted(sandbox.build_headers.search_paths).join(" "))
+        xcconfig.merge!('PODS_PUBLIC_HEADERS_SEARCH_PATHS' => quoted(sandbox.public_headers.search_paths).join(" "))
 
         support_files_group = @project.group("Targets Support Files").create_group(@target_definition.label)
         support_files_group.create_files(target_support_files)
 
         xcconfig_file = support_files_group.files.where(:path => @target_definition.xcconfig_name)
-        configure_build_configurations(xcconfig_file)
+        configure_build_configurations(xcconfig_file, sandbox)
         create_files(pods, sandbox)
       end
 
-      def configure_build_configurations(xcconfig_file)
+      def configure_build_configurations(xcconfig_file, sandbox)
         @target.build_configurations.each do |config|
           config.base_configuration = xcconfig_file
           config.build_settings['OTHER_LDFLAGS'] = ''
           config.build_settings['GCC_PREFIX_HEADER'] = @target_definition.prefix_header_name
           config.build_settings['PODS_ROOT'] = '${SRCROOT}'
+          config.build_settings['PODS_HEADERS_SEARCH_PATHS'] = '${PODS_BUILD_HEADERS_SEARCH_PATHS}'
         end
       end
 

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -141,7 +141,10 @@ module Pod
         end
 
         def add_pods_library
-          pods_library = user_project.group("Frameworks").files.new_static_library(@target_definition.label)
+          framework_group = user_project.group("Frameworks")
+          raise Informative, "Cannot add pod library to project. Please check if the project have a 'Frameworks' group in the root of the project." unless framework_group
+
+          pods_library = framework_group.files.new_static_library(@target_definition.label)
           targets.each do |target|
             target.frameworks_build_phases.each { |build_phase| build_phase << pods_library }
           end

data/lib/cocoapods/local_pod.rb

@@ -229,6 +229,24 @@ module Pod
       result
     end
 
+    # @return [Hash{Specification => Array<Pathname>}] The paths of the public
+    #   header files grouped by {Specification}.
+    #
+    # @TODO: complete, fix and comment
+    # @TODO: decide a policy for subspecs
+    #
+    def public_header_files_by_specs
+      cached_header_files_by_spec = header_files_by_spec
+      public_header_files = paths_by_spec(:source_files, :glob => '*.h')
+
+      result = {}
+      public_header_files.map do |spec, paths|
+        result[spec] = paths.empty? ? cached_header_files_by_spec[spec] : paths
+      end
+
+      result
+    end
+
     # @return [Array<Pathname>] The paths of the resources.
     #
     def resource_files
@@ -322,9 +340,14 @@ module Pod
     # @return [void] Copies the pods headers to the sandbox.
     #
     def link_headers
-      @sandbox.add_header_search_path(headers_sandbox)
+      @sandbox.build_headers.add_search_path(headers_sandbox)
       header_mappings.each do |namespaced_path, files|
-        @sandbox.add_header_files(namespaced_path, files)
+        @sandbox.build_headers.add_files(namespaced_path, files)
+      end
+
+      @sandbox.public_headers.add_search_path(headers_sandbox)
+      public_header_mappings.each do |namespaced_path, files|
+        @sandbox.public_headers.add_files(namespaced_path, files)
       end
     end
 
@@ -389,6 +412,23 @@ module Pod
       mappings
     end
 
+    # TODO: complete, fix and comment
+    def public_header_mappings
+      mappings = {}
+      public_header_files_by_specs.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
+
+    # @return <Pathname> The name of the folder where the headers of this pod
+    #   will be namespaced.
+    #
     def headers_sandbox
       @headers_sandbox ||= Pathname.new(top_specification.name)
     end

data/lib/cocoapods/sandbox.rb

@@ -3,14 +3,17 @@ require 'fileutils'
 module Pod
   class Sandbox
     attr_reader :root
+    attr_reader :build_headers
+    attr_reader :public_headers
 
-    HEADERS_DIR = "Headers"
+    BUILD_HEADERS_DIR = "BuildHeaders"
+    PUBLIC_HEADERS_DIR = "Headers"
 
     def initialize(path)
       @root = Pathname.new(path)
-      @header_search_paths = [HEADERS_DIR]
+      @build_headers = HeadersDirectory.new(self, BUILD_HEADERS_DIR)
+      @public_headers = HeadersDirectory.new(self, PUBLIC_HEADERS_DIR)
       @cached_local_pods = {}
-
       FileUtils.mkdir_p(@root)
     end
 
@@ -18,43 +21,13 @@ module Pod
       root.rmtree
     end
 
-    def headers_root
-      root + HEADERS_DIR
-    end
-
     def project_path
       root + "Pods.xcodeproj"
     end
 
-    def add_header_file(namespace_path, relative_header_path)
-      namespaced_header_path = headers_root + namespace_path
-      namespaced_header_path.mkpath unless File.exist?(namespaced_header_path)
-      source = (root + relative_header_path).relative_path_from(namespaced_header_path)
-      Dir.chdir(namespaced_header_path) { FileUtils.ln_sf(source, relative_header_path.basename)}
-      @header_search_paths << namespaced_header_path.relative_path_from(root)
-      namespaced_header_path + relative_header_path.basename
-    end
-
-    def add_header_files(namespace_path, relative_header_paths)
-      relative_header_paths.map { |path| add_header_file(namespace_path, path) }
-    end
-
-    def header_search_paths
-      @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?
+      build_headers.prepare_for_install
+      public_headers.prepare_for_install
     end
 
     def local_pod_for_spec(spec, platform)
@@ -79,4 +52,47 @@ module Pod
       end
     end
   end
+
+  class HeadersDirectory
+    def initialize(sandbox, base_dir)
+      @sandbox = sandbox
+      @base_dir = base_dir
+      @search_paths = [base_dir]
+    end
+
+    def root
+      @sandbox.root + @base_dir
+    end
+
+    def add_file(namespace_path, relative_header_path)
+      namespaced_header_path = root + namespace_path
+      namespaced_header_path.mkpath unless File.exist?(namespaced_header_path)
+      source = (@sandbox.root + relative_header_path).relative_path_from(namespaced_header_path)
+      Dir.chdir(namespaced_header_path) { FileUtils.ln_sf(source, relative_header_path.basename)}
+      @search_paths << namespaced_header_path.relative_path_from(@sandbox.root)
+      namespaced_header_path + relative_header_path.basename
+    end
+
+    def add_files(namespace_path, relative_header_paths)
+      relative_header_paths.map { |path| add_file(namespace_path, path) }
+    end
+
+    def search_paths
+      @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_search_path(path)
+      @search_paths << Pathname.new(@base_dir) + path
+    end
+
+    def prepare_for_install
+      root.rmtree if root.exist?
+    end
+  end
 end

data/lib/cocoapods/specification.rb

@@ -40,6 +40,7 @@ module Pod
 
       # multi-platform attributes
       %w[ source_files
+          public_header_files
           resources
           preserve_paths
           exclude_header_search_paths
@@ -121,6 +122,7 @@ module Pod
       end
 
       %w{ source_files=
+          public_header_files=
           resource=
           resources=
           preserve_paths=
@@ -239,6 +241,7 @@ module Pod
 
 
     pltf_chained_attr_accessor  :source_files,                lambda {|value, current| pattern_list(value) }
+    pltf_chained_attr_accessor  :public_header_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
     pltf_chained_attr_accessor  :exclude_header_search_paths, lambda {|value, current| pattern_list(value) } # Headers to be excluded from being added to search paths (RestKit)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -189,6 +189,7 @@ extra_rdoc_files: []
 files:
 - lib/cocoapods/command/error_report.rb
 - lib/cocoapods/command/install.rb
+- lib/cocoapods/command/linter.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/presenter/cocoa_pod.rb
 - lib/cocoapods/command/presenter.rb
@@ -246,6 +247,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3007268623485849260
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -254,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.