cocoapods 0.9.2 → 0.10.0

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.10.0 (Unreleased)
+
+[CocoaPods](http://git.io/4i75YA)
+
+###### Enhancements
+
+- Added a `--local-only` option to `pod push` so that developers can push locally and test before pushing to a remote. [#405](http://git.io/0ILJEw)
+- Added line number information for errors generated in the Podfile. [#408](http://git.io/fWQvMg)
+- Pods stored in git repositories now initialize submodules. [#406](http://git.io/L9ssSw)
+
+
+###### Bug fixes
+
+- Removed note about the post install hook form the linter.
+- Improved xcodebuild error detection in the linter.
+- Ensure the git cache exists, before updating it, when trying to install the ‘bleeding edge’ of a pod. [#426](http://git.io/d4eqRA)
+- Clean downloaded external pods **after** resolving and activating (sub)specs. [#414](http://git.io/i77q_w)
+- Support `tar.gz` as filename in a HTTP source. [#428](http://git.io/qhwKkA)
+
+
 ## 0.9.2
 
 [CocoaPods](http://git.io/AVlRKg) • [Xcodeproj](http://git.io/xHbc0w)
@@ -135,9 +155,9 @@ configurations are based on the `Release` configuration, to base them on the
 `Debug` configuration you will have to explicitely specify them as can be seen
 above in the following line:
 
-``ruby
+```ruby
 xcodeproj 'TestProject', 'Test' => :debug
-``
+```
 
 
 ### Documentation
@@ -147,16 +167,16 @@ CocoaPods will now generate documentation for every library with the
 
 You can customize the settings used like so:
 
-``ruby
+```ruby
 s.documentation = { :appledoc => ['--product-name', 'My awesome project!'] }
-``
+```
 
 Alternatively, you can specify a URL where an HTML version of the documentation
 can be found:
 
-``ruby
+```ruby
 s.documentation = { :html => 'http://example.com/docs/index.html' }
-``
+```
 
 See [#149](https://github.com/CocoaPods/CocoaPods/issues/149) and
 [#151](https://github.com/CocoaPods/CocoaPods/issues/151) for more info.
@@ -177,18 +197,18 @@ If you're not happy with the default boilerplate text generated for the title, h
 and footnotes in the files, it's possible to customise these by overriding the methods
 that generate the text in your `Podfile` like this:
 
-``ruby
+```ruby
 class ::Pod::Generator::Acknowledgements
   def header_text
     "My custom header text"
   end
 end
-``
+```
 
 You can even go one step further and customise the text on a per target basis by 
 checking against the target name, like this:
 
-``ruby
+```ruby
 class ::Pod::Generator::Acknowledgements
   def header_text
     if @target_definition.label.end_with?("MyTargetName")
@@ -198,16 +218,16 @@ class ::Pod::Generator::Acknowledgements
     end
   end
 end
-``
+```
 
 Finally, here's a list of the methods that are available to override:
 
-``ruby
+```ruby
 header_title
 header_text
 footnote_title
 footnote_text
-``
+```
 
 
 ### Introduced two new classes: LocalPod and Sandbox.
@@ -318,7 +338,7 @@ different sets of depedencies. This means that you can create a separate
 library which contains all dependencies, including extra ones that you only use
 in, for instance, a debug or test build. [[docs][1]]
 
-``ruby
+```ruby
 # This Podfile will build three static libraries:
 # * libPods.a
 # * libPods-debug.a
@@ -339,7 +359,7 @@ target :test, :exclusive => true do
   # the `libPods-test.a` library.
   dependency 'Kiwi'
 end
-``
+```
 
 ### Install libraries from anywhere
 
@@ -347,7 +367,7 @@ A dependency can take a git url if the repo contains a podspec file in its
 root, or a podspec can be loaded from a file or HTTP location. If no podspec is
 available, a specification can be defined inline in the Podfile. [[docs][2]]
 
-``ruby
+```ruby
 # From a spec repo.
 dependency 'SSToolkit'
 
@@ -378,14 +398,14 @@ dependency do |s|
     end
   end
 end
-``
+```
 
 ### Add a `post_install` hook to the Podfile class
 
 This allows the user to customize, for instance, the generated Xcode project
 _before_ it’s written to disk. [[docs][3]]
 
-``ruby
+```ruby
 # Enable garbage collection support for MacRuby applications.
 post_install do |installer|
   installer.project.targets.each do |target|
@@ -394,14 +414,14 @@ post_install do |installer|
     end
   end
 end
-``
+```
 
 ### Manifest
 
 Generate a Podfile.lock file next to the Podfile, which contains a manifest of
 your application’s dependencies and their dependencies.
 
-``
+```
 PODS:
   - JSONKit (1.4)
   - LibComponentLogging-Core (1.1.4)
@@ -423,7 +443,7 @@ DOWNLOAD_ONLY:
 DEPENDENCIES:
   - RestKit-JSON-JSONKit
   - RestKit-ObjectMapping
-``
+```
 
 ### Generate Xcode projects from scratch
 

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.9.2'
+  VERSION = '0.10.0'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/command/push.rb

@@ -14,7 +14,8 @@ module Pod
       end
 
       def self.options
-        [["--allow-warnings", "Allows to push if warnings are not evitable"]].concat(super)
+        [ ["--allow-warnings", "Allows to push if warnings are not evitable"],
+          ["--local-only", "Does not perform the step of pushing REPO to its remote"] ].concat(super)
       end
 
       extend Executable
@@ -22,6 +23,7 @@ module Pod
 
       def initialize(argv)
         @allow_warnings = argv.option('--allow-warnings')
+        @local_only = argv.option('--local-only')
         @repo = argv.shift_argument
         @podspec = argv.shift_argument
         super unless argv.empty? && @repo
@@ -32,7 +34,7 @@ module Pod
         check_repo_status
         update_repo
         add_specs_to_repo
-        push_repo
+        push_repo unless @local_only
         puts
       end
 

data/lib/cocoapods/command/spec.rb

@@ -205,7 +205,6 @@ module Pod
               @platform_notes[platform]    << "#{platform.name} [!] Fatal errors found skipping the rest of the validation"
             else
               @platform_warnings[platform] += podspec_warnings + deprecation_warnings
-              @platform_notes[platform]    += podspec_notes
               peform_extensive_analysis unless quick
             end
           end
@@ -360,14 +359,6 @@ module Pod
           @spec.source && @spec.source[:git] =~ /github.com/
         end
 
-        # @return [Array<String>] List of the comments detected in the podspec
-        def podspec_notes
-          text = @file.read
-          deprecations = []
-          deprecations << "The `post_install' hook is reserved for edge cases"          if text. =~ /post_install/
-          deprecations
-        end
-
         # It reads a podspec file and checks for strings corresponding
         # to features that are or will be deprecated
         #
@@ -399,7 +390,7 @@ module Pod
         def process_xcode_build_output(output)
           output_by_line = output.split("\n")
           selected_lines = output_by_line.select do |l|
-            l.include?('error: ') && (l !~ /errors? generated\./) \
+            l.include?('error: ') && (l !~ /errors? generated\./) && (l !~ /error: \(null\)/)\
               || l.include?('warning: ') && (l !~ /warnings? generated\./)\
               || l.include?('note: ') && (l !~ /expanded from macro/)
           end

data/lib/cocoapods/dependency.rb

@@ -146,16 +146,20 @@ module Pod
         end
 
         def specification_from_sandbox(sandbox, platform)
+          specification_from_local(sandbox, platform) || specification_from_external(sandbox, platform)
+        end
+
+        def specification_from_local(sandbox, platform)
           if local_pod = sandbox.installed_pod_named(name, platform)
             local_pod.top_specification
-          else
-            copy_external_source_into_sandbox(sandbox)
-            local_pod = sandbox.installed_pod_named(name, platform)
-            local_pod.clean if config.clean? && local_pod.exists?
-            local_pod.top_specification
           end
         end
 
+        def specification_from_external(sandbox, platform)
+          copy_external_source_into_sandbox(sandbox, platform)
+          specification_from_local(sandbox, platform)
+        end
+
         def ==(other_source)
           return if other_source.nil?
           name == other_source.name && params == other_source.params
@@ -163,10 +167,12 @@ module Pod
       end
 
       class GitSource < AbstractExternalSource
-        def copy_external_source_into_sandbox(sandbox)
+        def copy_external_source_into_sandbox(sandbox, platform)
           puts "  * Pre-downloading: '#{name}'" unless config.silent?
-          Downloader.for_target(sandbox.root + name, @params).tap do |downloader|
-            downloader.download
+          downloader = Downloader.for_target(sandbox.root + name, @params)
+          downloader.download
+          if local_pod = sandbox.installed_pod_named(name, platform)
+            local_pod.downloaded = true
           end
         end
 
@@ -181,7 +187,7 @@ module Pod
 
       # can be http, file, etc
       class PodspecSource < AbstractExternalSource
-        def copy_external_source_into_sandbox(sandbox)
+        def copy_external_source_into_sandbox(sandbox, _)
           output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
           output_path.dirname.mkpath
           puts "  * Fetching podspec for `#{name}' from: #{@params[:podspec]}" unless config.silent?

data/lib/cocoapods/downloader/git.rb

@@ -76,6 +76,7 @@ module Pod
           git "reset --hard HEAD"
           git "clean -d -x -f"
           git "pull"
+          git "submodule update"
         end
       end
 
@@ -99,7 +100,11 @@ module Pod
       end
 
       def download_head
-        update_cache
+        if cache_exist?
+          update_cache
+        else
+          create_cache
+        end
         clone(clone_url, target_path)
       end
 
@@ -111,6 +116,7 @@ module Pod
           git "fetch origin tags/#{options[:tag]}"
           git "reset --hard FETCH_HEAD"
           git "checkout -b activated-pod-commit"
+          git "submodule update --init"
         end
       end
 
@@ -135,6 +141,9 @@ module Pod
 
       def clone(from, to)
         git "clone \"#{from}\" \"#{to}\""
+        Dir.chdir(to) do
+          git "submodule update --init"
+        end
       end
     end
 

data/lib/cocoapods/downloader/http.rb

@@ -29,7 +29,7 @@ module Pod
       def type_with_url(url)
         if url =~ /.zip$/
           :zip
-        elsif url =~ /.tgz$/
+        elsif url =~ /.(tgz|tar\.gz)$/
           :tgz
         elsif url =~ /.tar$/
           :tar

data/lib/cocoapods/installer.rb

@@ -57,12 +57,17 @@ module Pod
           puts marker << ( pod.exists? ? "Using #{name}" : "Installing #{name}".green )
         end
 
-        unless pod.exists?
-          download_pod(pod)
-          # The docs need to be generated before cleaning because
-          # the documentation is created for all the subspecs.
+        download_pod(pod) unless pod.exists?
+
+        # This will not happen if the pod existed before we started the install
+        # process.
+        if pod.downloaded?
+          # The docs need to be generated before cleaning because the
+          # documentation is created for all the subspecs.
           generate_docs(pod)
-          pod.clean if config.clean
+          # Here we clean pod's that just have been downloaded or have been
+          # pre-downloaded in AbstractExternalSource#specification_from_sandbox.
+          pod.clean! if config.clean?
         end
       end
     end
@@ -74,10 +79,12 @@ module Pod
         if downloader.respond_to?(:download_head)
           downloader.download_head
         else
+          raise Informative, "The downloader of class `#{downloader.class.name}' does not support the `:head' option."
         end
       else
         downloader.download
       end
+      pod.downloaded = true
     end
 
     #TODO: move to generator ?
@@ -206,18 +213,12 @@ module Pod
       specs_by_target.each do |target_definition, specs|
         @pods_by_spec[target_definition.platform] = {}
         result[target_definition] = specs.map do |spec|
-          pod = pod_for_spec(spec, target_definition.platform)
-          pod.add_specification(spec)
-          pod
+          @sandbox.local_pod_for_spec(spec, target_definition.platform)
         end.uniq.compact
       end
       result
     end
 
-    def pod_for_spec(spec, platform)
-      @pods_by_spec[platform][spec.top_level_parent.name] ||= LocalPod.new(spec, @sandbox, platform)
-    end
-
     private
 
     def print_title(title, only_verbose = true)

data/lib/cocoapods/local_pod.rb

@@ -38,6 +38,13 @@ module Pod
     #
     attr_reader :platform
 
+    # @return [Boolean] Wether or not the pod has been downloaded in the
+    #                   current install process and still needs its docs
+    #                   generated and be cleaned.
+    #
+    attr_accessor :downloaded
+    alias_method :downloaded?, :downloaded
+
     # @param [Specification] specification
     #   The first activated specification of the pod.
     # @param [Sandbox] sandbox
@@ -139,7 +146,7 @@ module Pod
     #
     # @return [void]
     #
-    def clean
+    def clean!
       clean_paths.each { |path| FileUtils.rm_rf(path) }
       @cleaned = true
     end
@@ -299,8 +306,8 @@ module Pod
     #
     def all_specs_public_header_files
       if @cleaned
-        raise Informative, "The pod is cleaned and cannot compute the all the "\
-          "header files as they might be deleted."
+        raise Informative, "The pod is cleaned and cannot compute the " \
+                           "header files, as some might have been deleted."
       end
 
       all_specs = [ top_specification ] + top_specification.subspecs

data/lib/cocoapods/podfile.rb

@@ -1,5 +1,19 @@
 module Pod
   class Podfile
+    class Informative < ::Pod::Informative
+      def podfile_line
+        @podfile_line ||= self.backtrace.find {|t| t =~ /Podfile/}
+      end
+
+      def message
+        if podfile_line
+          super + " (#{podfile_line})\n".red
+        else
+          super
+        end
+      end
+    end
+
     class UserProject
       include Config::Mixin
 
@@ -200,7 +214,7 @@ module Pod
         when :osx
           target = '10.6'
         else
-          raise Informative, "Unsupported platform: platform must be one of [:ios, :osx]"
+          raise ::Pod::Podfile::Informative, "Unsupported platform: platform must be one of [:ios, :osx]"
         end
       end
       @target_definition.platform = Platform.new(name, target)

data/lib/cocoapods/sandbox.rb

@@ -9,6 +9,7 @@ module Pod
     def initialize(path)
       @root = Pathname.new(path)
       @header_search_paths = [HEADERS_DIR]
+      @cached_local_pods = {}
 
       FileUtils.mkdir_p(@root)
     end
@@ -56,17 +57,25 @@ module Pod
       headers_root.rmtree if headers_root.exist?
     end
 
-    def podspec_for_name(name)
-      if spec_path = Dir[root + "#{name}/*.podspec"].first
-        Pathname.new(spec_path)
-      elsif spec_path = Dir[root + "Local Podspecs/#{name}.podspec"].first
-        Pathname.new(spec_path)
+    def local_pod_for_spec(spec, platform)
+      key = [spec.top_level_parent.name, platform.to_sym]
+      (@cached_local_pods[key] ||= LocalPod.new(spec.top_level_parent, self, platform)).tap do |pod|
+        pod.add_specification(spec)
       end
     end
 
     def installed_pod_named(name, platform)
       if spec_path = podspec_for_name(name)
-        LocalPod.from_podspec(spec_path, self, platform)
+        key = [name, platform.to_sym]
+        @cached_local_pods[key] ||= LocalPod.from_podspec(spec_path, self, platform)
+      end
+    end
+
+    def podspec_for_name(name)
+      if spec_path = Dir[root + "#{name}/*.podspec"].first
+        Pathname.new(spec_path)
+      elsif spec_path = Dir[root + "Local Podspecs/#{name}.podspec"].first
+        Pathname.new(spec_path)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday