cocoapods 0.11.0 → 0.11.1

data/CHANGELOG.md

@@ -1,6 +1,16 @@
+## 0.11.1 (Unreleased)
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.11.0...master)
+
+###### Bug fixes
+
+- Fixed a crash related to subspecs without header files. [#449]
+- Git submodules are loaded after the appropriate referenced is checked out and will be not loaded anymore in the cache. [#451]
+- Fixed SVN support for the head version. [#432]
+
 ## 0.11.0
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.10.0...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.10.0...0.11.0)
 
 ###### Enhancements
 

data/README.md

@@ -41,7 +41,8 @@ Now that you've got CocoaPods installed you can easily add it to your project.
 
 **NOTES**
 
-1. If you're using a fresh out of the box Mac with Lion using Xcode from the Mac App Store, you will need to install the Command Line Tools for Xcode first: [here](https://developer.apple.com/downloads/index.action)
+1. If you're using a fresh out of the box Mac with Lion using Xcode from the Mac App Store, you will need to install the Command Line Tools for Xcode first: [here](https://developer.apple.com/downloads/index.action)  
+Or from `Xcode > Settings > Downloads > Components > Command Line Tools`
 
 2. CocoaPods re-uses some of the RubyGems classes. If you have a version older than 1.4.0, you will have to update RubyGems: `$ gem update --system`.
 

data/lib/cocoapods.rb

@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/downloader/git.rb

@@ -30,7 +30,7 @@ module Pod
         puts "-> Creating cache git repo (#{cache_path})" if config.verbose?
         cache_path.rmtree if cache_path.exist?
         cache_path.mkpath
-        clone(url, cache_path)
+        git %Q|clone "#{url}" "#{cache_path}"|
       end
 
       def prune_cache
@@ -95,7 +95,6 @@ module Pod
       def ensure_remote_branch_exists(branch)
         Dir.chdir(cache_path) { git "branch -r | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
         return if $? == 0
-
         raise Informative, "[!] Cache unable to find git reference `#{branch}' for `#{url}' (#{$?}).".red
       end
 
@@ -105,7 +104,8 @@ module Pod
         else
           create_cache
         end
-        clone(clone_url, target_path)
+        git %Q|clone "#{clone_url}" "#{target_path}"|
+        Dir.chdir(target_path) { git "submodule update --init" }
       end
 
       def download_tag
@@ -122,27 +122,22 @@ module Pod
 
       def download_commit
         ensure_ref_exists(options[:commit])
-        clone(clone_url, target_path)
+        git %Q|clone "#{clone_url}" "#{target_path}"|
         Dir.chdir(target_path) do
           git "checkout -b activated-pod-commit #{options[:commit]}"
+          git "submodule update --init"
         end
       end
 
       def download_branch
         ensure_remote_branch_exists(options[:branch])
-        clone(clone_url, target_path)
+        git %Q|clone "#{clone_url}" "#{target_path}"|
         Dir.chdir(target_path) do
           git "remote add upstream '#{@url}'" # we need to add the original url, not the cache url
           git "fetch -q upstream" # refresh the branches
           git "checkout --track -b activated-pod-commit upstream/#{options[:branch]}" # create a new tracking branch
-          puts "Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}" if config.verbose?
-        end
-      end
-
-      def clone(from, to)
-        git "clone \"#{from}\" \"#{to}\""
-        Dir.chdir(to) do
           git "submodule update --init"
+          puts "Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}" if config.verbose?
         end
       end
     end

data/lib/cocoapods/downloader/subversion.rb

@@ -4,25 +4,26 @@ module Pod
       executable :svn
 
       def download
-        if options[:revision]
-          download_revision
-        elsif options[:tag]
-          download_tag
-        else
-          download_head
-        end
+        svn %|checkout "#{reference_url}" "#{target_path}"|
       end
 
       def download_head
-        svn %|checkout "#{url}/#{options[:folder]}" "#{target_path}"|
+        svn %|checkout "#{trunk_url}" "#{target_path}"|
       end
 
-      def download_revision
-        svn %|checkout "#{url}/#{options[:folder]}" -r "#{options[:revision]}" "#{target_path}"|
+      def reference_url
+        result = url.dup
+        result << '/'       << options[:folder] if options[:folder]
+        result << '/tags/'  << options[:tag] if options[:tag]
+        result << '" -r "'  << options[:revision] if options[:revision]
+        result
       end
 
-      def download_tag
-        svn %|checkout "#{url}/tags/#{options[:tag]}/#{options[:folder]}" "#{target_path}"|
+      def trunk_url
+        result = url.dup
+        result << '/' << options[:folder] if options[:folder]
+        result << '/trunk'
+        result
       end
     end
   end

data/lib/cocoapods/local_pod.rb

@@ -229,21 +229,25 @@ module Pod
       result
     end
 
-    # @return [Hash{Specification => Array<Pathname>}] The paths of the public
-    #   header files grouped by {Specification}.
+    # @return [Hash{Specification => Array<Pathname>}] The paths of the header
+    #   files grouped by {Specification} that should be copied in the public
+    #   folder.
     #
-    # @TODO: complete, fix and comment
-    # @TODO: decide a policy for subspecs
+    #   If a spec does not match any public header it means that all the
+    #   header files (i.e. the build ones) are intended to be public.
     #
-    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')
+    def public_header_files_by_spec
+      public_headers = paths_by_spec(:public_header_files, :glob => '*.h')
+      build_headers  = header_files_by_spec
 
       result = {}
-      public_header_files.map do |spec, paths|
-        result[spec] = paths.empty? ? cached_header_files_by_spec[spec] : paths
+      specifications.each do |spec|
+        if (public_h = public_headers[spec]) && !public_h.empty?
+          result[spec] = public_h
+        elsif (build_h = build_headers[spec]) && !build_h.empty?
+          result[spec] = build_h
+        end
       end
-
       result
     end
 
@@ -341,12 +345,13 @@ module Pod
     #
     def link_headers
       @sandbox.build_headers.add_search_path(headers_sandbox)
-      header_mappings.each do |namespaced_path, files|
+      @sandbox.public_headers.add_search_path(headers_sandbox)
+
+      header_mappings(header_files_by_spec).each do |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|
+      header_mappings(public_header_files_by_spec).each do |namespaced_path, files|
         @sandbox.public_headers.add_files(namespaced_path, files)
       end
     end
@@ -399,23 +404,9 @@ module Pod
     #
     # @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
-
-    # TODO: complete, fix and comment
-    def public_header_mappings
+    def header_mappings(files_by_spec)
       mappings = {}
-      public_header_files_by_specs.each do |spec, paths|
+      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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -249,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3007268623485849260
+      hash: -2225480835849784751
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: