cocoapods 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0881feaf291a34b53110b92c56d327e0b956a1
-  data.tar.gz: a65960c704edd79a75f03dbc2a574c3da7799057
+  metadata.gz: 9e460bfedda8d6e9df7398183867f5c605b1bbe2
+  data.tar.gz: 771269534428bde0e97b8f167f709a4013ad9e0f
 SHA512:
-  metadata.gz: 681f330ef6eba8a347504cec27bfdc43653797d3f6d2c9ed4937e5d14580f67a3735d7e99927b80d5a3ed12c8649c5f9e30e58a462a4c52cc0b70f42426acda6
-  data.tar.gz: e95439f57785df354f3b4be232813ea8fc94d2504781dfad64b4ad72dd2cf0c70fa35e2218eec68423c7e87733eec426e6c9f40c671051f1b25833282176960c
+  metadata.gz: b5495d6f6d3e041470e7d8a09483faa989a97c8f2292f28bb237c5bd7c7a64aa176a995f2f7ad30774d5e12cca94c368e8bc53efc85cee2b095f947584fc2049
+  data.tar.gz: f34a4f956ed9bc12305259bc457f148de99b0bf4ba40d41252f98ebe6e75024ad9089ed152f86645c8469d3f6e82a33c3b3fceebcfc67fa11d6bc33911206bc1

data/CHANGELOG.md

@@ -1,3 +1,43 @@
+## 0.19.0
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.18.1...0.19.0)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.18.1...0.19.0)
+
+###### Enhancements
+
+* Added `pod podfile-info` command. Shows list of used Pods and their info
+  in a project or supplied Podfile.
+  Options: `--all` - with dependancies. `--md` - in Markdown.
+  [#855](https://github.com/CocoaPods/CocoaPods/issues/855)
+* CocoaPods now defines the `COCOAPODS=1` macro in the Pod and the Client
+  targets. This is useful for libraries which conditionally expose interfaces.
+  [#903](https://github.com/CocoaPods/CocoaPods/issues/903)
+* Compile time introspection. Macro definitions which allow to inspect the
+  installed Pods and their version have been introduced in the build
+  environment of the Pod libraries
+  ([example](https://gist.github.com/irrationalfab/5348551)).
+* CocoaPods now defines the deployment target of the Pods project computed as
+  the minimum deployment target of the Pods libraries.
+  [#556](https://github.com/CocoaPods/CocoaPods/issues/556)
+* Added `pod help` command. You can still use the old format
+  with --help flag.
+  [#957](https://github.com/CocoaPods/CocoaPods/pull/957)
+* Restored support for Podfiles named `CocoaPods.podfile`. Moreover, the
+  experimental YAML format of the Podfile now is associated with files named
+  `CocoaPods.podfile.yaml`.
+  [#1004](https://github.com/CocoaPods/CocoaPods/pull/1004)
+
+###### Deprecations
+
+* `:local` flag in Podfile is deprecated. Please use `:path` when
+  specifying a pod source.
+  [#971](https://github.com/CocoaPods/CocoaPods/issues/971)
+###### Bug fixes
+
+* Fix issue related to `pod outdated` and external sources.
+  [#954](https://github.com/CocoaPods/CocoaPods/issues/954)
+* Fix issue with .svn folders in copy resources script.
+  [#972](https://github.com/CocoaPods/CocoaPods/issues/972)
+
 ## 0.18.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.18.0...0.18.1)
 • [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.18.0...0.18.)

data/lib/cocoapods.rb

@@ -39,29 +39,29 @@ module Pod
   #
   STATISTICS_CACHE_FILE = CACHE_ROOT + 'statistics.yml'
 
-  autoload :Command,                'cocoapods/command'
-  autoload :Executable,             'cocoapods/executable'
-  autoload :ExternalSources,        'cocoapods/external_sources'
-  autoload :Installer,              'cocoapods/installer'
-  autoload :SourcesManager,         'cocoapods/sources_manager'
-  autoload :Library,                'cocoapods/library'
-  autoload :Project,                'cocoapods/project'
-  autoload :Resolver,               'cocoapods/resolver'
-  autoload :Sandbox,                'cocoapods/sandbox'
-  autoload :UI,                     'cocoapods/user_interface'
-  autoload :Validator,              'cocoapods/validator'
+  autoload :Command,                   'cocoapods/command'
+  autoload :Executable,                'cocoapods/executable'
+  autoload :ExternalSources,           'cocoapods/external_sources'
+  autoload :Installer,                 'cocoapods/installer'
+  autoload :SourcesManager,            'cocoapods/sources_manager'
+  autoload :Library,                   'cocoapods/library'
+  autoload :Project,                   'cocoapods/project'
+  autoload :Resolver,                  'cocoapods/resolver'
+  autoload :Sandbox,                   'cocoapods/sandbox'
+  autoload :UI,                        'cocoapods/user_interface'
+  autoload :Validator,                 'cocoapods/validator'
 
   module Generator
-    autoload :Acknowledgements,     'cocoapods/generator/acknowledgements'
-    autoload :BridgeSupport,        'cocoapods/generator/bridge_support'
-    autoload :CopyResourcesScript,  'cocoapods/generator/copy_resources_script'
-    autoload :Documentation,        'cocoapods/generator/documentation'
-    autoload :DummySource,          'cocoapods/generator/dummy_source'
-    autoload :Markdown,             'cocoapods/generator/acknowledgements/markdown'
-    autoload :Plist,                'cocoapods/generator/acknowledgements/plist'
-    autoload :PrefixHeader,         'cocoapods/generator/prefix_header'
-    autoload :TargetHeader,         'cocoapods/generator/target_header'
-    autoload :XCConfig,             'cocoapods/generator/xcconfig'
+    autoload :Acknowledgements,        'cocoapods/generator/acknowledgements'
+    autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
+    autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
+    autoload :Documentation,           'cocoapods/generator/documentation'
+    autoload :DummySource,             'cocoapods/generator/dummy_source'
+    autoload :Markdown,                'cocoapods/generator/acknowledgements/markdown'
+    autoload :Plist,                   'cocoapods/generator/acknowledgements/plist'
+    autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
+    autoload :TargetEnvironmentHeader, 'cocoapods/generator/target_environment_header'
+    autoload :XCConfig,                'cocoapods/generator/xcconfig'
   end
 
   module Hooks

data/lib/cocoapods/command.rb

@@ -16,7 +16,9 @@ module Pod
     require 'cocoapods/command/search'
     require 'cocoapods/command/setup'
     require 'cocoapods/command/spec'
+    require 'cocoapods/command/help'
     require 'cocoapods/command/inter_process_communication'
+    require 'cocoapods/command/podfile_info'
 
     self.abstract_command = true
     self.command = 'pod'

data/lib/cocoapods/command/help.rb

@@ -0,0 +1,23 @@
+module Pod
+  class Command
+    class Help < Command
+      self.summary = 'Show help for the given command.'
+      self.arguments = '[COMMAND]'
+
+      def initialize(argv)
+        @help_command = Pod::Command.parse(argv) unless argv.empty?
+        super
+      end
+
+      def run
+        help_command.help!
+      end
+
+      private
+
+      def help_command
+        @help_command || self
+      end
+    end
+  end
+end

data/lib/cocoapods/command/outdated.rb

@@ -19,6 +19,7 @@ module Pod
 
       # @todo the command report new dependencies added to the Podfile as
       #       updates.
+      #
       # @todo fix.
       #
       def run
@@ -30,6 +31,7 @@ module Pod
         updates = []
         pods.each do |pod_name|
           set = SourcesManager.search(Dependency.new(pod_name))
+          next unless set
           source_version = set.versions.first
           lockfile_version = lockfile.version(pod_name)
           if source_version > lockfile_version
@@ -42,7 +44,7 @@ module Pod
         else
           UI.section "The following updates are available:" do
             updates.each do |(name, from_version, to_version)|
-              UI.message "- #{name} #{from_version} -> #{to_version}"
+              UI.puts "- #{name} #{from_version} -> #{to_version}"
             end
           end
         end

data/lib/cocoapods/command/podfile_info.rb

@@ -0,0 +1,91 @@
+module Pod
+  class Command
+
+    class PodfileInfo < Command
+
+      self.summary = 'Shows information on installed Pods.'
+      self.description = <<-DESC
+        Shows information on installed Pods in current Project. 
+        If optional `PODFILE_PATH` provided, the info will be shown for
+        that specific Podfile
+      DESC
+      self.arguments = '[PODFILE_PATH]'
+
+      def self.options
+        [
+          ["--all", "Show information about all Pods with dependencies that are used in a project"],
+          ["--md", "Output information in Markdown format"]
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @info_all = argv.flag?('all')
+        @info_in_md = argv.flag?('md')
+        @podfile_path = argv.shift_argument
+        super
+      end
+
+      def run
+        use_podfile = (@podfile_path || !config.lockfile)
+          
+        if !use_podfile
+          UI.puts "Using lockfile" if config.verbose?
+          verify_lockfile_exists!
+          lockfile = config.lockfile
+          pods = lockfile.pod_names
+          if @info_all
+            deps = lockfile.dependencies.map{|d| d.name}
+            pods = (deps + pods).uniq
+          end
+        elsif @podfile_path
+          podfile = Pod::Podfile.from_file(@podfile_path)
+          pods = pods_from_podfile(podfile)
+        else
+          verify_podfile_exists!
+          podfile = config.podfile
+          pods = pods_from_podfile(podfile)
+        end
+
+        UI.puts "\nPods used:\n".yellow unless @info_in_md
+        pods_info(pods, @info_in_md)
+      end
+
+      def pods_from_podfile(podfile)
+        pods = []
+        podfile.root_target_definitions.each {|e| h = e.to_hash; pods << h['dependencies'] if h['dependencies']}
+        pods.flatten!
+        pods.collect! {|pod| (pod.is_a?(Hash)) ? pod.keys.first : pod}
+      end
+
+      def pods_info_hash(pods, keys=[:name, :homepage, :summary])
+        pods_info = []
+        pods.each do |pod|
+          spec = (Pod::SourcesManager.search_by_name(pod).first rescue nil)
+          if spec
+            info = {}
+            keys.each { |k| info[k] = spec.specification.send(k) }
+            pods_info << info
+          else
+            
+          end
+          
+        end
+        pods_info
+      end
+
+      def pods_info(pods, in_md=false)
+        pods = pods_info_hash(pods, [:name, :homepage, :summary])
+
+        pods.each do |pod| 
+          if in_md
+            UI.puts "* [#{pod[:name]}](#{pod[:homepage]}) - #{pod[:summary]}" 
+          else
+            UI.puts "- #{pod[:name]} - #{pod[:summary]}" 
+          end
+        end
+      end
+
+    end
+    
+  end
+end

data/lib/cocoapods/config.rb

@@ -188,7 +188,8 @@ module Pod
     #
     def podfile_path
       unless @podfile_path
-        path = installation_root + 'Podfile.yaml'
+        path = installation_root + 'CocoaPods.podfile.yaml'
+        path = installation_root + 'CocoaPods.podfile' unless path.exist?
         path = installation_root + 'Podfile' unless path.exist?
         @podfile_path = path
       end

data/lib/cocoapods/external_sources.rb

@@ -13,11 +13,16 @@ module Pod
       name   = dependency.root_name
       params = dependency.external_source
 
-      klass  = if params.key?(:git) then GitSource
-      elsif params.key?(:svn)       then SvnSource
-      elsif params.key?(:hg)        then MercurialSource
-      elsif params.key?(:podspec)   then PodspecSource
-      elsif params.key?(:local)     then LocalSource
+      klass  =  if params.key?(:git)          then GitSource
+                elsif params.key?(:svn)       then SvnSource
+                elsif params.key?(:hg)        then MercurialSource
+                elsif params.key?(:podspec)   then PodspecSource
+                elsif params.key?(:path)      then PathSource
+                end
+
+      if params.key?(:local)
+        klass = PathSource
+        UI.warn "The `:local` option of the Podfile has been renamed to `:path` and is deprecated." \
       end
 
       if klass
@@ -286,7 +291,7 @@ module Pod
 
       # @!group Helpers
 
-      # @return [String] The uri of the podspec appending the name of the file 
+      # @return [String] The uri of the podspec appending the name of the file
       #         and expanding it if necessary.
       #
       # @note   If the declared path is expanded only if the represents a path
@@ -312,7 +317,7 @@ module Pod
     #
     # Works with the {LocalPod::LocalSourcedPod} class.
     #
-    class LocalSource < AbstractExternalSource
+    class PathSource < AbstractExternalSource
 
       # @see  AbstractExternalSource#fetch
       #
@@ -327,7 +332,7 @@ module Pod
       # @see  AbstractExternalSource#description
       #
       def description
-        "from `#{params[:local]}`"
+        "from `#{params[:path] || params[:local]}`"
       end
 
       #--------------------------------------#
@@ -339,7 +344,7 @@ module Pod
       # @return [Pathname] the path of the podspec.
       #
       def podspec_path
-        declared_path = params[:local].to_s
+        declared_path = (params[:path] || params[:local]).to_s
         path_with_ext = File.extname(declared_path) == '.podspec' ? declared_path : "#{declared_path}/#{name}.podspec"
         podfile_dir   = File.dirname(podfile_path || '')
         absolute_path = File.expand_path(path_with_ext, podfile_dir)

data/lib/cocoapods/gem_version.rb

@@ -2,6 +2,6 @@ module Pod
 
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.18.1' unless defined? Pod::VERSION
+  VERSION = '0.19.0' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -24,8 +24,8 @@ install_resource()
       xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
       ;;
     *)
-      echo "cp -R ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-      cp -R "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+      echo "rsync -av --exclude '*/.svn/*' ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
+      rsync -av --exclude '*/.svn/*' "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
       ;;
   esac
 }

data/lib/cocoapods/generator/dummy_source.rb

@@ -10,6 +10,7 @@ module Pod
 
       def save_as(pathname)
         pathname.open('w') do |source|
+          source.puts "#import <Foundation/Foundation.h>"
           source.puts "@interface #{class_name} : NSObject"
           source.puts "@end"
           source.puts "@implementation #{class_name}"

data/lib/cocoapods/generator/target_environment_header.rb

@@ -0,0 +1,86 @@
+module Pod
+  module Generator
+
+    # Generates a header which allows to inspect at compile time the installed
+    # pods and the installed specifications of a pod.
+    #
+    # Example output:
+    #
+    #     #define COCOAPODS_POD_AVAILABLE_ObjectiveSugar 1
+    #     #define COCOAPODS_VERSION_MAJOR_ObjectiveSugar 0
+    #     #define COCOAPODS_VERSION_MINOR_ObjectiveSugar 6
+    #     #define COCOAPODS_VERSION_PATCH_ObjectiveSugar 2
+    #
+    # Example usage:
+    #
+    #     #ifdef COCOAPODS
+    #       #ifdef COCOAPODS_POD_AVAILABLE_ObjectiveSugar
+    #         #import "ObjectiveSugar.h"
+    #       #endif
+    #     #else
+    #       // Non CocoaPods code
+    #     #endif
+    #
+    class TargetEnvironmentHeader
+
+      # @return [Array<LocalPod>] the specifications installed for the target.
+      #
+      attr_reader :specs
+
+      # @param  [Array<LocalPod>] pods @see pods
+      #
+      def initialize(specs)
+        @specs = specs
+      end
+
+      # Generates and saves the file.
+      #
+      # @param  [Pathname] pathname
+      #         The path where to save the generated file.
+      #
+      # @return [void]
+      #
+      def save_as(pathname)
+        pathname.open('w') do |source|
+          source.puts
+          source.puts "// To check if a library is compiled with CocoaPods you"
+          source.puts "// can use the `COCOAPODS` macro definition which is"
+          source.puts "// defined in the xcconfigs so it is available in"
+          source.puts "// headers also when they are imported in the client"
+          source.puts "// project."
+          source.puts
+          source.puts
+          specs.each do |spec|
+            spec_name = safe_spec_name(spec.name)
+            source.puts "// #{spec.name}"
+            source.puts "#define COCOAPODS_POD_AVAILABLE_#{spec_name}"
+            if spec.version.semantic?
+              source.puts "#define COCOAPODS_VERSION_MAJOR_#{spec_name} #{spec.version.major}"
+              source.puts "#define COCOAPODS_VERSION_MINOR_#{spec_name} #{spec.version.minor}"
+              source.puts "#define COCOAPODS_VERSION_PATCH_#{spec_name} #{spec.version.patch}"
+            else
+              source.puts "// This library does not follow semantic-versioning,"
+              source.puts "// so we were not able to define version macros."
+              source.puts "// Please contact the author."
+              source.puts "// Version: #{spec.version}."
+            end
+            source.puts
+          end
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # !@group Private Helpers
+
+      def safe_spec_name(spec_name)
+        spec_name.gsub(/[^\w]/,'_')
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

data/lib/cocoapods/generator/xcconfig.rb

@@ -58,6 +58,7 @@ module Pod
           'PODS_HEADERS_SEARCH_PATHS'        => '${PODS_PUBLIC_HEADERS_SEARCH_PATHS}',
           'PODS_BUILD_HEADERS_SEARCH_PATHS'  => quote(sandbox.build_headers.search_paths),
           'PODS_PUBLIC_HEADERS_SEARCH_PATHS' => quote(sandbox.public_headers.search_paths),
+          'GCC_PREPROCESSOR_DEFINITIONS'     => 'COCOAPODS=1'
         })
 
         spec_consumers.each do |consumer|

data/lib/cocoapods/hooks/pod_representation.rb

@@ -2,7 +2,7 @@ module Pod
 
   class Specification
     def config
-      UI.warn "Specification#config is deprecated. The config is accessible from " \
+      UI.warn "[#{name}] Specification#config is deprecated. The config is accessible from " \
         "the parameter passed to the hooks"
       Config.instance
     end

data/lib/cocoapods/installer.rb

@@ -55,9 +55,9 @@ module Pod
     # @param  [Lockfile] lockfile    @see lockfile
     #
     def initialize(sandbox, podfile, lockfile = nil)
-      @sandbox  =  sandbox
-      @podfile  =  podfile
-      @lockfile =  lockfile
+      @sandbox  = sandbox
+      @podfile  = podfile
+      @lockfile = lockfile
     end
 
     # @return [Bool] Whether the installer is in update mode. In update mode
@@ -151,7 +151,17 @@ module Pod
 
     # @return [void]
     #
+    # @note   The warning about the version of the Lockfile doesn't uses the
+    #         `UI.warn` method because it prints the output only at the end
+    #         of the installation. At that time CocoaPods could have crashed.
+    #
     def analyze
+      if lockfile && lockfile.cocoapods_version > Version.new(VERSION)
+        STDERR.puts '[!] The version of CocoaPods used to generate the lockfile is '\
+          'higher that the one of the current executable. Incompatibility' \
+          'issues might arise.'.yellow
+      end
+
       analyzer = Analyzer.new(sandbox, podfile, lockfile)
       analyzer.update_mode = update_mode
       @analysis_result = analyzer.analyze
@@ -276,6 +286,13 @@ module Pod
           @pods_project.add_podfile(config.podfile_path)
         end
         sandbox.project = @pods_project
+        platforms = libraries.map(&:platform)
+        osx_deployment_target = platforms.select { |p| p.name == :osx }.map(&:deployment_target).min
+        ios_deployment_target = platforms.select { |p| p.name == :ios }.map(&:deployment_target).min
+        @pods_project.build_configurations.each do |build_configuration|
+          build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
+          build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
+        end
       end
     end
 
@@ -372,7 +389,7 @@ module Pod
           executed = false
           libraries_using_spec(spec).each do |lib|
             lib_representation = library_rep(lib)
-            executed ||= run_spec_pre_install_hook(spec, lib_representation)
+            executed |= run_spec_pre_install_hook(spec, lib_representation)
           end
           UI.message "- #{spec.name}" if executed
         end
@@ -431,7 +448,7 @@ module Pod
           executed = false
           libraries_using_spec(spec).each do |lib|
             lib_representation = library_rep(lib)
-            executed ||= run_spec_post_install_hook(spec, lib_representation)
+            executed |= run_spec_post_install_hook(spec, lib_representation)
           end
           UI.message "- #{spec.name}" if executed
         end

data/lib/cocoapods/installer/analyzer.rb

@@ -170,9 +170,9 @@ module Pod
       #
       def generated_libraries
         libraries = []
-        podfile.target_definitions.values.each do |target_definition|
-          lib                           = Library.new(target_definition)
-          lib.support_files_root        = sandbox.library_support_files_dir(lib.name)
+        podfile.target_definition_list.each do |target_definition|
+          lib = Library.new(target_definition)
+          lib.support_files_root = sandbox.library_support_files_dir(lib.name)
 
           if config.integrate_targets?
             project_path = compute_user_project_path(target_definition)
@@ -248,7 +248,7 @@ module Pod
           pods_to_fetch = result.podfile_state.added + result.podfile_state.changed
           deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.root_name) }
           deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.root_name) }
-          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? }
+          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? }
         end
 
         unless deps_to_fetch.empty?
@@ -446,8 +446,7 @@ module Pod
         end
 
         target_definition.set_platform(name, deployment_target)
-        platform = Platform.new(name, deployment_target)
-        platform
+        Platform.new(name, deployment_target)
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/installer/target_installer.rb

@@ -35,7 +35,7 @@ module Pod
           create_suport_files_group
 
           create_xcconfig_file
-          create_target_header
+          create_target_environment_header
           create_prefix_header
           create_bridge_support_file
           create_copy_resources_script
@@ -158,10 +158,10 @@ module Pod
       # Generates a header which allows to inspect at compile time the installed
       # pods and the installed specifications of a pod.
       #
-      def create_target_header
-        path = library.target_header_path
-        UI.message "- Generating target header at #{UI.path(path)}" do
-          generator = Generator::TargetHeader.new(library.specs)
+      def create_target_environment_header
+        path = library.target_environment_header_path
+        UI.message "- Generating target environment header at #{UI.path(path)}" do
+          generator = Generator::TargetEnvironmentHeader.new(library.specs)
           generator.save_as(path)
           add_file_to_support_group(path)
         end
@@ -177,7 +177,7 @@ module Pod
         path = library.prefix_header_path
         UI.message "- Generating prefix header at #{UI.path(path)}" do
           generator = Generator::PrefixHeader.new(library.file_accessors, library.platform)
-          generator.imports << library.target_header_path.basename
+          generator.imports << library.target_environment_header_path.basename
           generator.save_as(path)
           add_file_to_support_group(path)
 

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -152,7 +152,7 @@ module Pod
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
                   cat << EOM
-              error: The sanbox is not in sync with the Podfile.lock. Run 'pod install'.
+              error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.
               EOM
                   exit 1
               fi

data/lib/cocoapods/library.rb

@@ -127,8 +127,8 @@ module Pod
     # @return [Pathname] the absolute path of the header file which contains
     #         the information about the installed pods.
     #
-    def target_header_path
-      support_files_root + "#{label}-header.h"
+    def target_environment_header_path
+      support_files_root + "#{label}-environment.h"
     end
 
     # @return [Pathname] the absolute path of the prefix header file.

data/lib/cocoapods/sandbox.rb

@@ -320,6 +320,8 @@ module Pod
     # @return [Hash{String=>String}] The path of the Pods with a local source
     #         grouped by their name.
     #
+    # @todo   Rename (e.g. `pods_with_local_path`)
+    #
     attr_reader :local_pods
 
     # Checks if a Pod is locally sourced?

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -80,11 +80,13 @@ module Pod
       #
       def public_headers
         public_headers = paths_for_attribute(:public_header_files)
+        private_headers = paths_for_attribute(:private_header_files)
         if public_headers.nil? || public_headers.empty?
-          headers
+          header_files = headers
         else
-          public_headers
+          header_files = public_headers
         end
+        header_files - private_headers
       end
 
       # @return [Hash{ Symbol => Array<Pathname> }] the resources of the

data/lib/cocoapods/sources_manager.rb

@@ -38,11 +38,7 @@ module Pod
       # @raise  If no source including the set can be found.
       #
       def search(dependency)
-        set = aggregate.search(dependency)
-        unless set
-          raise Informative, "Unable to find a pod named `#{dependency.name}`"
-        end
-        set
+        aggregate.search(dependency)
       end
 
       # Search all the sources with the given search term.
@@ -63,18 +59,21 @@ module Pod
       # @return [Array<Set>]  The sets that contain the search term.
       #
       def search_by_name(query, full_text_search = false)
-        set_names = []
-        updated_search_index.each do |name, set_data|
-          text = name.dup
-          if full_text_search
-            text << set_data['authors'].to_s if set_data['authors']
-            text << set_data['summary']      if set_data['summary']
-            text << set_data['description']  if set_data['description']
+        if full_text_search
+          set_names = []
+          updated_search_index.each do |name, set_data|
+            text = name.dup
+            if full_text_search
+              text << set_data['authors'].to_s if set_data['authors']
+              text << set_data['summary']      if set_data['summary']
+              text << set_data['description']  if set_data['description']
+            end
+            set_names << name if text.downcase.include?(query.downcase)
           end
-          set_names << name if text.downcase.include?(query.downcase)
+          sets = set_names.sort.map { |name| aggregate.represenative_set(name) }
+        else
+          sets = aggregate.search_by_name(query, false)
         end
-
-        sets = set_names.sort.map { |name| aggregate.represenative_set(name) }
         if sets.empty?
           extra = ", author, summary, or description" if full_text_search
           raise Informative, "Unable to find a pod with name#{extra} matching `#{query}`"
@@ -90,24 +89,34 @@ module Pod
       #   - description
       #   - authors
       #
+      # @note   This operation is fairly expensive, because of the YAML
+      #         conversion.
+      #
       # @return [Hash{String => String}] The up to date search data.
       #
       def updated_search_index
-        if search_index_path.exist?
-          stored_index = YAML.load(search_index_path.read)
-          if stored_index && stored_index.is_a?(Hash)
-            search_index = aggregate.update_search_index(stored_index)
+        unless @updated_search_index
+          if search_index_path.exist?
+            stored_index = YAML.load(search_index_path.read)
+            if stored_index && stored_index.is_a?(Hash)
+              search_index = aggregate.update_search_index(stored_index)
+            else
+              search_index = aggregate.generate_search_index
+            end
           else
             search_index = aggregate.generate_search_index
           end
-        else
-          search_index = aggregate.generate_search_index
-        end
 
-        File.open(search_index_path, 'w') {|f| f.write(search_index.to_yaml) }
-        search_index
+          File.open(search_index_path, 'w') {|f| f.write(search_index.to_yaml) }
+          @updated_search_index = search_index
+        end
+        @updated_search_index
       end
 
+      # Allows to clear the search index.
+      #
+      attr_writer :updated_search_index
+
       # @return [Pathname] The path where the search index should be stored.
       #
       def search_index_path

data/lib/cocoapods/validator.rb

@@ -106,7 +106,7 @@ module Pod
     # @return [Bool] whether the validation should be performed against the root of
     #         the podspec instead to its original source.
     #
-    # @note   Uses the `:local` option of the Podfile.
+    # @note   Uses the `:path` option of the Podfile.
     #
     attr_writer :local
     def local?; @local; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,9 +207,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cocoapods/command/help.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/list.rb
 - lib/cocoapods/command/outdated.rb
+- lib/cocoapods/command/podfile_info.rb
 - lib/cocoapods/command/project.rb
 - lib/cocoapods/command/push.rb
 - lib/cocoapods/command/repo.rb
@@ -231,7 +233,7 @@ files:
 - lib/cocoapods/generator/documentation.rb
 - lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/generator/prefix_header.rb
-- lib/cocoapods/generator/target_header.rb
+- lib/cocoapods/generator/target_environment_header.rb
 - lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/hooks/installer_representation.rb
 - lib/cocoapods/hooks/library_representation.rb
@@ -273,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -281,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.

data/lib/cocoapods/generator/target_header.rb

@@ -1,58 +0,0 @@
-module Pod
-  module Generator
-
-    # Generates a header which allows to inspect at compile time the installed
-    # pods and the installed specifications of a pod.
-    #
-    # Example output:
-    #
-    #     #define __COCOA_PODS
-    #
-    #     #define __POD_AFIncrementaStore
-    #     #define __POD_AFNetworking
-    #     #define __POD_libextobjc_EXTConcreteProtocol
-    #     #define __POD_libextobjc_EXTKeyPathCoding
-    #     #define __POD_libextobjc_EXTScope
-    #
-    # Example usage:
-    #
-    #     #ifdef __COCOA_PODS
-    #       #ifdef __POD__AFNetworking
-    #         #import "MYLib+AFNetworking.h"
-    #       #endif
-    #     #else
-    #       // Non CocoaPods code
-    #     #endif
-    #
-    class TargetHeader
-
-      # @return [Array<LocalPod>] the specifications installed for the target.
-      #
-      attr_reader :specs
-
-      # @param  [Array<LocalPod>] pods @see pods
-      #
-      def initialize(specs)
-        @specs = specs
-      end
-
-      # Generates and saves the file.
-      #
-      # @param  [Pathname] pathname
-      #         The path where to save the generated file.
-      #
-      # @return [void]
-      #
-      def save_as(pathname)
-        pathname.open('w') do |source|
-          source.puts "// WARNING: This feature of CocoaPods is present for discussion purposes and might be discontinued or changed in future"
-          source.puts "#define __COCOA_PODS"
-          source.puts
-          specs.each do |specs|
-            source.puts "#define __POD_#{specs.name.gsub(/[^\w]/,'_')}"
-          end
-        end
-      end
-    end
-  end
-end