cocoapods 0.3.6 → 0.3.7

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 
   class Informative < StandardError
   end

data/lib/cocoapods/command/install.rb

@@ -19,11 +19,13 @@ module Pod
 
       def self.options
         "    --no-clean  Leave SCM dirs like `.git' and `.svn' in tact after downloading\n" +
+        "    --no-update Skip running `pod repo update` before install\n" +
         super
       end
 
       def initialize(argv)
         config.clean = !argv.option('--no-clean')
+        @update_repo = !argv.option('--no-update')
         @projpath = argv.shift_argument
         super unless argv.empty?
       end
@@ -35,6 +37,9 @@ module Pod
         if @projpath && !File.exist?(@projpath)
           raise Informative, "The specified project `#{@projpath}' does not exist."
         end
+        if @update_repo
+          Repo.new(ARGV.new(["update"])).run
+        end
         installer = Installer.new(podfile)
         installer.install!
         installer.configure_project(@projpath) if @projpath

data/lib/cocoapods/dependency.rb

@@ -36,6 +36,26 @@ module Pod
          (@specification ? @specification == other.specification : @external_spec_source == other.external_spec_source)
     end
 
+    def subspec_dependency?
+      @name.include?('/')
+    end
+
+    # In case this is a dependency for a subspec, e.g. 'RestKit/Networking',
+    # this returns 'RestKit', which is what the Pod::Source needs to know to
+    # retrieve the correct Set from disk.
+    def top_level_spec_name
+      subspec_dependency? ? @name.split('/').first : @name
+    end
+
+    # Returns a copy of the dependency, but with the name of the top level
+    # spec. This is used by Pod::Specification::Set to merge dependencies on
+    # the complete set, irrespective of what spec in the set wil be used.
+    def to_top_level_spec_dependency
+      dep = dup
+      dep.name = top_level_spec_name
+      dep
+    end
+
     def to_s
       version = ''
       if source = @external_spec_source

data/lib/cocoapods/installer.rb

@@ -1,16 +1,18 @@
 module Pod
   class Installer
     module Shared
-      def dependent_specification_sets
-        @dependent_specification_sets ||= Resolver.new(@podfile, @definition ? @definition.dependencies : nil).resolve
+      def dependent_specifications
+        @dependent_specifications ||= Resolver.new(@podfile, @definition ? @definition.dependencies : nil).resolve
       end
 
       def build_specifications
-        dependent_specification_sets.reject(&:only_part_of_other_pod?).map(&:specification)
+        dependent_specifications.reject do |spec|
+          spec.wrapper? || spec.defined_in_set.only_part_of_other_pod?
+        end
       end
 
       def download_only_specifications
-        dependent_specification_sets.select(&:only_part_of_other_pod?).map(&:specification)
+        dependent_specifications - build_specifications
       end
     end
 

data/lib/cocoapods/podfile.rb

@@ -222,8 +222,8 @@ module Pod
       @target_definitions.values.map(&:target_dependencies).flatten
     end
 
-    def dependency_by_name(name)
-      dependencies.find { |d| d.name == name }
+    def dependency_by_top_level_spec_name(name)
+      dependencies.find { |d| d.top_level_spec_name == name }
     end
 
     def generate_bridge_support?

data/lib/cocoapods/resolver.rb

@@ -5,19 +5,31 @@ module Pod
     end
 
     def resolve
-      @sets = []
+      @sets, @loaded_spec_names, @specs = [], [], []
       find_dependency_sets(@specification, @dependencies)
-      @sets
+      @specs
     end
 
     def find_dependency_sets(specification, dependencies = nil)
       (dependencies || specification.dependencies).each do |dependency|
         set = find_dependency_set(dependency)
         set.required_by(specification)
-        unless @sets.include?(set)
-          validate_platform!(set)
-          @sets << set
-          find_dependency_sets(set.specification)
+        unless @loaded_spec_names.include?(dependency.name)
+          # Get a reference to the spec that’s actually being loaded.
+          # If it’s a subspec dependency, e.g. 'RestKit/Network', then
+          # find that subspec.
+          spec = set.specification
+          if dependency.subspec_dependency?
+            spec = spec.subspec_by_name(dependency.name)
+          end
+          validate_platform!(spec)
+
+          # Ensure we don't resolve the same spec twice
+          @loaded_spec_names << spec.name
+          @specs << spec
+          @sets << set unless @sets.include?(set)
+
+          find_dependency_sets(spec)
         end
       end
     end
@@ -30,8 +42,7 @@ module Pod
       end
     end
 
-    def validate_platform!(set)
-      spec = set.specification
+    def validate_platform!(spec)
       unless spec.platform.nil? || spec.platform == @specification.platform
         raise Informative, "The platform required by the Podfile (:#{@specification.platform}) " \
                            "does not match that of #{spec} (:#{spec.platform})"

data/lib/cocoapods/source.rb

@@ -13,8 +13,7 @@ module Pod
 
     def self.search(dependency)
       all.map { |s| s.search(dependency) }.compact.first ||
-        raise(Informative, "Unable to find a pod named `#{dependency.name}'.\n" \
-                           "You might want to run `pod repo update` and try again.")
+        raise(Informative, "Unable to find a pod named `#{dependency.name}'")
     end
 
     def self.search_by_name(query, full_text_search)
@@ -42,7 +41,13 @@ module Pod
     end
 
     def search(dependency)
-      pod_sets.find { |set| set.name == dependency.name }
+      pod_sets.find do |set|
+        # First match the (top level) name, which does not yet load the spec from disk
+        set.name == dependency.top_level_spec_name &&
+          # Now either check if it's a dependency on the top level spec, or if it's not
+          # check if the requested subspec exists in the top level spec.
+          (!dependency.subspec_dependency? || !set.specification.subspec_by_name(dependency.name).nil?)
+      end
     end
 
     def search_by_name(query, full_text_search)

data/lib/cocoapods/specification.rb

@@ -21,11 +21,16 @@ module Pod
     attr_accessor :defined_in_file
 
     def initialize
-      @dependencies, @resources, @clean_paths = [], [], []
-      @xcconfig = Xcodeproj::Config.new
+      post_initialize
       yield self if block_given?
     end
 
+    # TODO This is just to work around a MacRuby bug
+    def post_initialize
+      @dependencies, @source_files, @resources, @clean_paths, @subspecs = [], [], [], [], []
+      @xcconfig = Xcodeproj::Config.new
+    end
+
     # Attributes
 
     attr_accessor :name
@@ -53,10 +58,13 @@ module Pod
 
     def summary=(summary)
       @summary = summary
-      @description ||= summary
     end
     attr_reader :summary
 
+    def description
+      @description || summary
+    end
+
     def part_of=(*name_and_version_requirements)
       self.part_of_dependency = *name_and_version_requirements
       @part_of.only_part_of_other_pod = true
@@ -111,19 +119,14 @@ module Pod
     attr_writer :compiler_flags
     def compiler_flags
       flags = "#{@compiler_flags} "
-      flags << '-fobjc-arc' if @requires_arc
+      flags << '-fobjc-arc' if requires_arc
       flags
     end
 
-    # These are attributes which are also on a Podfile
-
     attr_accessor :platform
 
     attr_accessor :requires_arc
 
-    attr_accessor :generate_bridge_support
-    alias_method :generate_bridge_support?, :generate_bridge_support
-
     def dependency(*name_and_version_requirements)
       name, *version_requirements = name_and_version_requirements.flatten
       dep = Dependency.new(name, *version_requirements)
@@ -132,18 +135,46 @@ module Pod
     end
     attr_reader :dependencies
 
+    def subspec(name, &block)
+      subspec = Subspec.new(self, name, &block)
+      @subspecs << subspec
+      subspec
+    end
+    attr_reader :subspecs
+
     # Not attributes
 
+    # TODO when we move to use a 'ResolveContext' this should happen there.
+    attr_accessor :defined_in_set
+
     include Config::Mixin
 
+    def wrapper?
+      source_files.empty? && !subspecs.empty?
+    end
+
+    def subspec_by_name(name)
+      # Remove this spec's name from the beginning of the name we’re looking for
+      # and take the first component from the remainder, which is the spec we need
+      # to find now.
+      remainder = name[self.name.size+1..-1].split('/')
+      subspec_name = remainder.shift
+      subspec = subspecs.find { |s| s.name == "#{self.name}/#{subspec_name}" }
+      # If this was the last component in the name, then return the subspec,
+      # otherwise we recursively keep calling subspec_by_name until we reach the
+      # last one and return that
+      remainder.empty? ? subspec : subspec.subspec_by_name(name)
+    end
+
     def ==(other)
-      self.class === other &&
-        name && name == other.name &&
-          version && version == other.version
+      object_id == other.object_id ||
+        (self.class === other &&
+          name && name == other.name &&
+            version && version == other.version)
     end
 
-    def dependency_by_name(name)
-      @dependencies.find { |d| d.name == name }
+    def dependency_by_top_level_spec_name(name)
+      @dependencies.find { |d| d.top_level_spec_name == name }
     end
 
     def part_of_specification_set
@@ -284,7 +315,9 @@ module Pod
       missing << "`homepage'"                   unless homepage
       missing << "`author(s)'"                  unless authors
       missing << "either `source' or `part_of'" unless source || part_of
-      missing << "`source_files'"               unless source_files
+      missing << "`source_files'"               if source_files.empty? && subspecs.empty?
+      # TODO
+      # * validate subspecs
 
       incorrect = []
       allowed = [nil, :ios, :osx]
@@ -363,6 +396,52 @@ module Pod
     def post_install(target)
     end
 
+    class Subspec < Specification
+      attr_reader :parent
+
+      def initialize(parent, name)
+        @parent, @name = parent, name
+        # TODO a MacRuby bug, the correct super impl `initialize' is not called consistently
+        #super(&block)
+        post_initialize
+
+        # A subspec is _always_ part of the source of its top level spec.
+        self.part_of = top_level_parent.name, version
+        # A subspec has a dependency on the parent if the parent is a subspec too.
+        dependency(@parent.name, version) if @parent.is_a?(Subspec)
+
+        yield self if block_given?
+      end
+
+      undef_method :name=, :version=, :source=, :defined_in_set=
+
+      def top_level_parent
+        top_level_parent = @parent
+        top_level_parent = top_level_parent.parent while top_level_parent.is_a?(Subspec)
+        top_level_parent
+      end
+
+      def name
+        "#{@parent.name}/#{@name}"
+      end
+
+      # TODO manually forwarding the attributes that we have so far needed to forward,
+      # but need to think if there's a better way to do this.
+
+      def summary
+        @summary ? @summary : top_level_parent.summary
+      end
+
+      # Override the getters to always return the value of the top level parent spec.
+      [:version, :summary, :platform, :license, :authors, :requires_arc, :compiler_flags, :defined_in_set].each do |attr|
+        define_method(attr) { top_level_parent.send(attr) }
+      end
+
+      def copy_header_mapping(from)
+        top_level_parent.copy_header_mapping(from)
+      end
+    end
+
   end
 
   Spec = Specification

data/lib/cocoapods/specification/set.rb

@@ -25,7 +25,7 @@ module Pod
       end
 
       def required_by(specification)
-        dependency = specification.dependency_by_name(name)
+        dependency = specification.dependency_by_top_level_spec_name(name)
         unless @required_by.empty? || dependency.requirement.satisfied_by?(required_version)
           # TODO add graph that shows which dependencies led to this.
           raise Informative, "#{specification} tries to activate `#{dependency}', " \
@@ -38,12 +38,12 @@ module Pod
 
       def dependency
         @required_by.inject(Dependency.new(name)) do |previous, spec|
-          previous.merge(spec.dependency_by_name(name))
+          previous.merge(spec.dependency_by_top_level_spec_name(name).to_top_level_spec_dependency)
         end
       end
 
       def only_part_of_other_pod?
-        @required_by.all? { |spec| spec.dependency_by_name(name).only_part_of_other_pod? }
+        @required_by.all? { |spec| spec.dependency_by_top_level_spec_name(name).only_part_of_other_pod? }
       end
 
       def name
@@ -55,7 +55,7 @@ module Pod
       end
 
       def specification
-        @specification ||= Specification.from_file(specification_path)
+        @specification ||= Specification.from_file(specification_path).tap { |spec| spec.defined_in_set = self }
       end
 
       # Return the first version that matches the current dependency.
@@ -85,6 +85,7 @@ module Pod
       class External < Set
         def initialize(specification)
           @specification = specification
+          @specification.defined_in_set = self
           @required_by = []
         end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Eloy Duran