cocoapods 0.8.0 → 0.9.0

data/CHANGELOG.md

@@ -1,16 +1,34 @@
+## 0.9.0
+
+[CocoaPods](http://git.io/kucJQw) • [Xcodeproj](http://git.io/5eLL8g)
+
+###### Enhancements
+
+- Force downloading the ‘bleeding edge’ version of a pod with the `:head` flag. [#392](http://git.io/t_NVRQ)
+- Support for weak frameworks. [#263](http://git.io/XZDuog)
+- Use double quotes when shelling out. This makes a url like `$HOME/local/lib` work. [#396](http://git.io/DnBzhA)
+
+###### Bug fixes
+
+- Relaxed linter to accepts pod that only specify paths to preserve (like TuneupJS).
+- Gender neutralization of podfile documentation. [#384](http://git.io/MAsHXg)
+- Exit early when using an old RubyGems version (< 1.4.0). These versions contain subtle bugs
+  related to prerelease version comparisons. Unfortunately, OS X >= 10.7 ships with 1.3.6. [#398](http://git.io/Lr7DoA)
+
+
 ## 0.8.0
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.7.0...0.8.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.2.2...0.2.3)
+[CocoaPods](http://git.io/RgMF3w) • [Xcodeproj](http://git.io/KBKE_Q)
 
 ###### Breaking change
 
 Syntax change in Podfile: `dependency` has been replaced by `pod`.
 
-```ruby
+``ruby
 platform :ios
 pod 'JSONKit',      '~> 1.4'
 pod 'Reachability', '~> 2.0.4'
-```
+``
 
 ###### Bug fixes
 
@@ -19,7 +37,7 @@ pod 'Reachability', '~> 2.0.4'
 
 ## 0.7.0
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.1...0.7.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.2.1...0.2.2)
+[CocoaPods](http://git.io/Agia6A) • [Xcodeproj](http://git.io/mlqquw)
 
 ###### Features
 
@@ -38,7 +56,7 @@ pod 'Reachability', '~> 2.0.4'
 
 ## 0.6.1
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.6.0...0.6.1) • [Xcodeproj](https://github.com/CocoaPods/XcodeProj/compare/0.2.0...0.2.1)
+[CocoaPods](http://git.io/45wFjw) • [Xcodeproj](http://git.io/rRA4XQ)
 
 ###### Bug fixes
 
@@ -60,7 +78,7 @@ CocoaPods can now integrate all the targets specified in your `Podfile`.
 To specify which target, in your Xcode project, a Pods target should be linked
 with, use the `link_with` method like so:
 
-```ruby
+``ruby
 platform :ios
 
 workspace 'MyWorkspace'
@@ -73,7 +91,7 @@ target :test, :exclusive => true do
   link_with 'TestRunnerTarget'
   dependency 'Kiwi'
 end
-```
+``
 
 _NOTE: As you can see it can take either one target name, or an array of names._
 
@@ -98,9 +116,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
@@ -110,16 +128,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.
@@ -140,18 +158,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")
@@ -161,16 +179,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.
@@ -281,7 +299,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
@@ -302,7 +320,7 @@ target :test, :exclusive => true do
   # the `libPods-test.a` library.
   dependency 'Kiwi'
 end
-```
+``
 
 ### Install libraries from anywhere
 
@@ -310,7 +328,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'
 
@@ -341,14 +359,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|
@@ -357,14 +375,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)
@@ -386,7 +404,7 @@ DOWNLOAD_ONLY:
 DEPENDENCIES:
   - RestKit-JSON-JSONKit
   - RestKit-ObjectMapping
-```
+``
 
 ### Generate Xcode projects from scratch
 

data/README.md

@@ -43,7 +43,7 @@ Now that you've got CocoaPods installed you can easily add it to your project.
 
 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)
 
-2. CocoaPods re-uses some of the RubyGems 1.3.6 classes. If you have an older version (pre OS X 10.7), you will have to update RubyGems: `$ gem update --system`.
+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`.
 
 
 ## Adding it to your project

data/lib/cocoapods.rb

@@ -1,5 +1,19 @@
+require 'rubygems'
+
+# Better to fail early and clear then during installation of pods.
+#
+# RubyGems 1.3.6 (which ships with OS X >= 10.7) up to 1.4.0 have a couple of
+# bugs related to comparing prerelease versions.
+#
+# E.g. https://github.com/CocoaPods/CocoaPods/issues/398
+unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION))
+  require 'colored'
+  STDERR.puts "Your RubyGems version (#{Gem::VERSION}) is too old, please update with: `gem update --system`".red
+  exit 1
+end
+
 module Pod
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/command/error_report.rb

@@ -2,7 +2,6 @@
 
 require 'rbconfig'
 require 'cgi'
-require 'rubygems'
 
 module Pod
   class Command

data/lib/cocoapods/command/spec.rb

@@ -301,7 +301,7 @@ module Pod
 
           # attributes with multiplatform values
           return messages unless platform_valid?
-          messages << "Missing source_files" if spec.source_files.empty? && spec.subspecs.empty? && spec.resources.empty?
+          messages << "The spec appears to be empty (no source files, resources, or preserve paths)" if spec.source_files.empty? && spec.subspecs.empty? && spec.resources.empty? && spec.preserve_paths.empty?
           messages += paths_starting_with_a_slash_errors
           messages
         end
@@ -352,7 +352,7 @@ module Pod
           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 << "Comments must be deleted"                            if text =~ /^\w*#\n\w*#/ # allow a single line comment as it is generally used in subspecs
+          messages << "Comments must be deleted"                            if text.scan(/^\s*#/).length > 24
           messages
         end
 

data/lib/cocoapods/dependency.rb

@@ -1,12 +1,10 @@
-module Gem
-end
-require 'rubygems/dependency'
 require 'open-uri'
 
 module Pod
   class Dependency < Gem::Dependency
 
-    attr_reader :external_source
+    attr_reader :external_source, :head
+    alias :head? :head
     attr_accessor :specification
 
     def initialize(*name_and_version_requirements, &block)
@@ -18,15 +16,28 @@ module Pod
       elsif !name_and_version_requirements.empty? && block.nil?
         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
+          name_and_version_requirements.pop
+          @head = true
         end
         super(*name_and_version_requirements)
 
+        if head? && !latest_version?
+          raise Informative, "A `:head' dependency may not specify version requirements."
+        end
+
       else
         raise Informative, "A dependency needs either a name and version requirements, " \
                            "a source hash, or a block which defines a podspec."
       end
     end
 
+    def latest_version?
+      versions = @version_requirements.requirements.map(&:last)
+      versions == [Gem::Version.new('0')]
+    end
+
     def ==(other)
       super && (@specification ? @specification == other.specification : @external_source == other.external_source)
     end
@@ -68,7 +79,10 @@ module Pod
       elsif @version_requirements != Gem::Requirement.default
         version << @version_requirements.to_s
       end
-      version.empty? ? @name : "#{@name} (#{version})"
+      result = @name.dup
+      result += " (#{version})" unless version.empty?
+      result += " [HEAD]" if head?
+      result
     end
 
     def specification_from_sandbox(sandbox, platform)

data/lib/cocoapods/downloader/git.rb

@@ -23,7 +23,7 @@ module Pod
         else
           download_head
         end
-        removed_cached_repos_if_needed
+        prune_cache
       end
 
       def create_cache
@@ -33,7 +33,7 @@ module Pod
         clone(url, cache_path)
       end
 
-      def removed_cached_repos_if_needed
+      def prune_cache
         return unless caches_dir.exist?
         Dir.chdir(caches_dir) do
           repos = Pathname.new(caches_dir).children.select { |c| c.directory? }.sort_by(&:ctime)
@@ -134,7 +134,7 @@ module Pod
       end
 
       def clone(from, to)
-        git "clone '#{from}' '#{to}'"
+        git "clone \"#{from}\" \"#{to}\""
       end
     end
 

data/lib/cocoapods/downloader/mercurial.rb

@@ -12,11 +12,11 @@ module Pod
       end
 
       def download_head
-        hg "clone '#{url}' '#{target_path}'"
+        hg "clone \"#{url}\" \"#{target_path}\""
       end
 
       def download_revision
-        hg "clone '#{url}' --rev '#{options[:revision]}' '#{target_path}'"
+        hg "clone \"#{url}\" --rev '#{options[:revision]}' \"#{target_path}\""
       end
     end
   end

data/lib/cocoapods/downloader/subversion.rb

@@ -12,11 +12,11 @@ module Pod
       end
 
       def download_head
-        svn "checkout '#{url}' '#{target_path}'"
+        svn "checkout \"#{url}\" \"#{target_path}\""
       end
 
       def download_revision
-        svn "checkout '#{url}' -r '#{options[:revision]}' '#{target_path}'"
+        svn "checkout \"#{url}\" -r '#{options[:revision]}' \"#{target_path}\""
       end
     end
   end

data/lib/cocoapods/installer.rb

@@ -48,13 +48,17 @@ module Pod
       pods.each do |pod|
         unless config.silent?
           marker = config.verbose ? "\n-> ".green : ''
-          name = pod.top_specification.preferred_dependency ? "#{pod.top_specification.name}/#{pod.top_specification.preferred_dependency} (#{pod.top_specification.version})" : pod.to_s
+          if subspec_name = pod.top_specification.preferred_dependency
+            name = "#{pod.top_specification.name}/#{subspec_name} (#{pod.top_specification.version})"
+          else
+            name = pod.to_s
+          end
+          name << " [HEAD]" if pod.top_specification.version.head?
           puts marker << ( pod.exists? ? "Using #{name}" : "Installing #{name}".green )
         end
 
         unless pod.exists?
-          downloader = Downloader.for_pod(pod)
-          downloader.download
+          download_pod(pod)
           # The docs need to be generated before cleaning because
           # the documentation is created for all the subspecs.
           generate_docs(pod)
@@ -63,6 +67,19 @@ module Pod
       end
     end
 
+    def download_pod(pod)
+      downloader = Downloader.for_pod(pod)
+      # Force the `bleeding edge' version if necessary.
+      if pod.top_specification.version.head?
+        if downloader.respond_to?(:download_head)
+          downloader.download_head
+        else
+        end
+      else
+        downloader.download
+      end
+    end
+
     #TODO: move to generator ?
     def generate_docs(pod)
       doc_generator = Generator::Documentation.new(pod)

data/lib/cocoapods/podfile.rb

@@ -295,16 +295,22 @@ module Pod
     # * `<= 0.1`   Version 0.1 and any lower version
     # * `~> 0.1.2` Version 0.1.2 and the versions upto 0.2, not including 0.2
     #
-    #
-    # Finally, a list of version requirements can be specified for even more fine
+    # A list of version requirements can be specified for even more fine
     # grained control.
     #
+    #
     # For more information, regarding versioning policy, see:
     #
     # * http://semver.org
     # * http://docs.rubygems.org/read/chapter/7
     #
     #
+    # Finally, instead of a version, you can specify the `:head` flag. This will
+    # use the pod’s latest version spec version, but force the download of the
+    # ‘bleeding edge’ version. Use this with caution, as the spec might not be
+    # compatible anymore.
+    #
+    #
     # ## Dependency on a library, outside those available in a spec repo.
     #
     # ### From a podspec in the root of a library repo.
@@ -343,7 +349,7 @@ module Pod
     #
     # ### For a library without any available podspec
     #
-    # Finally, if no man alive has created a podspec, for the library you want
+    # Finally, if no living soul has created a podspec, for the library you want
     # to use, yet, you will have to specify the library yourself.
     #
     #

data/lib/cocoapods/resolver.rb

@@ -61,10 +61,12 @@ module Pod
         set.required_by(dependent_specification)
         # Ensure we don't resolve the same spec twice for one target
         unless @loaded_specs.include?(dependency.name)
-        spec = set.specification_by_name(dependency.name)
+          spec = set.specification_by_name(dependency.name)
           @loaded_specs << spec.name
           @specs[spec.name] = spec
+          # Configure the specification
           spec.activate_platform(target_definition.platform)
+          spec.version.head = dependency.head?
           # And recursively load the dependencies of the spec.
           find_dependency_specs(spec, spec.dependencies, target_definition) if spec.dependencies
         end

data/lib/cocoapods/specification.rb

@@ -44,6 +44,7 @@ module Pod
           preserve_paths
           exclude_header_search_paths
           frameworks
+          weak_frameworks
           libraries
           dependencies
           compiler_flags ].each do |attr|
@@ -127,6 +128,8 @@ module Pod
           xcconfig=
           framework=
           frameworks=
+          weak_framework=
+          weak_frameworks=
           library=
           libraries=
           compiler_flags=
@@ -240,12 +243,14 @@ module Pod
     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)
     pltf_chained_attr_accessor  :frameworks,                  lambda {|value, current| (current << value).flatten }
+    pltf_chained_attr_accessor  :weak_frameworks,             lambda {|value, current| (current << value).flatten }
     pltf_chained_attr_accessor  :libraries,                   lambda {|value, current| (current << value).flatten }
 
-    alias_method :resource=,      :resources=
-    alias_method :preserve_path=, :preserve_paths=
-    alias_method :framework=,     :frameworks=
-    alias_method :library=,       :libraries=
+    alias_method :resource=,        :resources=
+    alias_method :preserve_path=,   :preserve_paths=
+    alias_method :framework=,       :frameworks=
+    alias_method :weak_framework=,  :weak_frameworks=
+    alias_method :library=,         :libraries=
 
     # @!method header_dir=
     #
@@ -271,9 +276,11 @@ module Pod
     platform_attr_writer :xcconfig, lambda {|value, current| current.tap { |c| c.merge!(value) } }
 
     def xcconfig
-      raw_xconfig.dup.
-        tap { |x| x.libraries.merge  libraries }.
-        tap { |x| x.frameworks.merge frameworks }
+      result = raw_xconfig.dup
+      result.libraries.merge(libraries)
+      result.frameworks.merge(frameworks)
+      result.weak_frameworks.merge(weak_frameworks)
+      result
     end
 
     def raw_xconfig
@@ -343,15 +350,14 @@ module Pod
     attr_reader :subspecs
 
     def recursive_subspecs
-      unless @recursive_subspecs
+      @recursive_subspecs ||= begin
         mapper = lambda do |spec|
-            spec.subspecs.map do |subspec|
-              [subspec, *mapper.call(subspec)]
-            end.flatten
-          end
-          @recursive_subspecs = mapper.call self
+          spec.subspecs.map do |subspec|
+            [subspec, *mapper.call(subspec)]
+          end.flatten
+        end
+        mapper.call(self)
       end
-      @recursive_subspecs
     end
 
     def subspec_by_name(name)

data/lib/cocoapods/version.rb

@@ -1,9 +1,9 @@
-module Gem
-end
-require 'rubygems/version'
+
 
 module Pod
   class Version < Gem::Version
+    attr_accessor :head
+    alias_method :head?, :head
   end
 end
 

metadata

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