cocoapods 0.13.0 → 0.14.0.rc1

data/lib/cocoapods/config.rb

@@ -41,11 +41,16 @@ module Pod
       @project_podfile ||= project_root + 'Podfile'
     end
 
+    def project_lockfile
+      @project_lockfile ||= project_root + 'Podfile.lock'
+    end
+
     def headers_symlink_root
       @headers_symlink_root ||= "#{project_pods_root}/Headers"
     end
 
-    # Returns the spec at the pat returned from `project_podfile`.
+    # @return [Podfile] The Podfile to use for the current execution.
+    #
     def podfile
       @podfile ||= begin
         Podfile.from_file(project_podfile) if project_podfile.exist?
@@ -53,6 +58,14 @@ module Pod
     end
     attr_writer :podfile
 
+    # @return [Lockfile] The Lockfile to use for the current execution.
+    #
+    def lockfile
+      @lockfile ||= begin
+        Lockfile.from_file(project_lockfile) if project_lockfile.exist?
+      end
+    end
+
     module Mixin
       def config
         Config.instance

data/lib/cocoapods/dependency.rb

@@ -3,9 +3,9 @@ require 'cocoapods/open_uri'
 module Pod
   class Dependency < Gem::Dependency
 
-    attr_reader :external_source, :head
+    attr_reader :head
     alias :head? :head
-    attr_accessor :specification
+    attr_accessor :specification, :external_source
 
     def initialize(*name_and_version_requirements, &block)
       if name_and_version_requirements.empty? && block
@@ -40,7 +40,7 @@ module Pod
     end
 
     def ==(other)
-      super && (@specification ? @specification == other.specification : @external_source == other.external_source)
+      super && (head? == other.head?) && (@specification ? @specification == other.specification : @external_source == other.external_source)
     end
 
     def subspec_dependency?
@@ -76,13 +76,14 @@ module Pod
       if external?
         version << @external_source.description
       elsif inline?
-        version << "defined in Podfile"
+        version << 'defined in Podfile'
+      elsif head?
+        version << 'HEAD'
       elsif @version_requirements != Gem::Requirement.default
         version << @version_requirements.to_s
       end
       result = @name.dup
-      result += " (#{version})" unless version.empty?
-      result += " [HEAD]" if head?
+      result << " (#{version})" unless version.empty?
       result
     end
 
@@ -90,6 +91,10 @@ module Pod
       @external_source.specification_from_sandbox(sandbox, platform)
     end
 
+    def match_version?(version)
+      match?(name, version) && (version.head? == head?)
+    end
+
     # Taken from RubyGems 1.3.7
     unless public_method_defined?(:match?)
       def match?(spec_name, spec_version)
@@ -128,10 +133,13 @@ module Pod
 
     module ExternalSources
       def self.from_params(name, params)
+        return unless name && params
         if params.key?(:git)
           GitSource.new(name, params)
         elsif params.key?(:podspec)
           PodspecSource.new(name, params)
+        elsif params.key?(:local)
+          LocalSource.new(name, params)
         else
           raise Informative, "Unknown external source parameters for #{name}: #{params}"
         end
@@ -158,18 +166,22 @@ module Pod
 
         def specification_from_external(sandbox, platform)
           copy_external_source_into_sandbox(sandbox, platform)
-          specification_from_local(sandbox, platform)
+          spec = specification_from_local(sandbox, platform)
+          raise Informative, "No podspec found for `#{name}' in #{description}" unless spec
+          spec
         end
 
-        def ==(other_source)
-          return if other_source.nil?
-          name == other_source.name && params == other_source.params
+        def ==(other)
+          return if other.nil?
+          name == other.name && params == other.params
         end
       end
 
       class GitSource < AbstractExternalSource
         def copy_external_source_into_sandbox(sandbox, platform)
-          puts "  * Pre-downloading: '#{name}'" unless config.silent?
+          puts "-> Pre-downloading: '#{name}'" unless config.silent?
+          target = sandbox.root + name
+          target.rmtree if target.exist?
           downloader = Downloader.for_target(sandbox.root + name, @params)
           downloader.download
           if local_pod = sandbox.installed_pod_named(name, platform)
@@ -191,8 +203,10 @@ module Pod
         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?
-          open(@params[:podspec]) do |io|
+          puts "-> Fetching podspec for `#{name}' from: #{@params[:podspec]}" unless config.silent?
+          path = @params[:podspec]
+          path = Pathname.new(path).expand_path if path.start_with?("~")
+          open(path) do |io|
             output_path.open('w') { |f| f << io.read }
           end
         end
@@ -201,6 +215,35 @@ module Pod
           "from `#{@params[:podspec]}'"
         end
       end
+
+      class LocalSource < AbstractExternalSource
+        def pod_spec_path
+          path = Pathname.new(@params[:local]).expand_path + "#{name}.podspec"
+          raise Informative, "No podspec found for `#{name}' in `#{@params[:local]}'" unless path.exist?
+          path
+        end
+
+        def copy_external_source_into_sandbox(sandbox, _)
+          output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
+          output_path.dirname.mkpath
+          FileUtils.copy(pod_spec_path, output_path)
+        end
+
+        def specification_from_local(sandbox, platform)
+          specification_from_external(sandbox, platform)
+        end
+
+        def specification_from_external(sandbox, platform)
+          copy_external_source_into_sandbox(sandbox, platform)
+          spec = Specification.from_file(pod_spec_path)
+          spec.source = @params
+          spec
+        end
+
+        def description
+          "from `#{@params[:local]}'"
+        end
+      end
     end
   end
 end

data/lib/cocoapods/downloader/git.rb

@@ -79,6 +79,7 @@ module Pod
           git! "reset --hard HEAD"
           git! "clean -d -x -f"
           git! "pull origin master"
+          git! "fetch --tags"
         end
       end
 

data/lib/cocoapods/downloader/subversion.rb

@@ -3,12 +3,16 @@ module Pod
     class Subversion < Downloader
       executable :svn
 
+      def initialize(target_path, url, options)
+        @target_path, @url, @options = target_path, url, options
+      end
+
       def download
-        svn! %|checkout "#{reference_url}" "#{target_path}"|
+        svn! %|export "#{reference_url}" "#{target_path}"|
       end
 
       def download_head
-        svn! %|checkout "#{trunk_url}" "#{target_path}"|
+        svn! %|export "#{trunk_url}" "#{target_path}"|
       end
 
       def reference_url

data/lib/cocoapods/installer.rb

@@ -7,19 +7,12 @@ module Pod
 
     include Config::Mixin
 
-    attr_reader :sandbox
-
-    def initialize(podfile)
-      @podfile = podfile
-      # FIXME: pass this into the installer as a parameter
-      @sandbox = Sandbox.new(config.project_pods_root)
-      @resolver = Resolver.new(@podfile, @sandbox)
-      # TODO: remove in 0.7 (legacy support for config.ios? and config.osx?)
-      config.podfile = podfile
-    end
+    attr_reader :resolver, :sandbox, :lockfile
 
-    def lock_file
-      config.project_root + 'Podfile.lock'
+    def initialize(resolver)
+      @resolver = resolver
+      @podfile = resolver.podfile
+      @sandbox = resolver.sandbox
     end
 
     def project
@@ -29,7 +22,8 @@ module Pod
       pods.each do |pod|
         # Add all source files to the project grouped by pod
         pod.relative_source_files_by_spec.each do |spec, paths|
-          group = @project.add_spec_group(spec.name)
+          parent_group = pod.local? ? @project.local_pods : @project.pods
+          group = @project.add_spec_group(pod.name, parent_group)
           paths.each do |path|
             group.files.new('path' => path.to_s)
           end
@@ -46,8 +40,17 @@ module Pod
       end.compact
     end
 
+    # Install the Pods. If the resolver indicated that a Pod should be installed
+    #   and it exits, it is removed an then reinstalled. In any case if the Pod
+    #   doesn't exits it is installed.
+    #
+    # @return [void]
+    #
     def install_dependencies!
-      pods.each do |pod|
+      pods.sort_by { |pod| pod.top_specification.name.downcase }.each do |pod|
+        name = pod.top_specification.name
+        should_install = @resolver.should_install?(name) || !pod.exists?
+
         unless config.silent?
           marker = config.verbose ? "\n-> ".green : ''
           if subspec_name = pod.top_specification.preferred_dependency
@@ -55,15 +58,14 @@ module Pod
           else
             name = pod.to_s
           end
-          name << " [HEAD]" if pod.top_specification.version.head?
-          puts marker << ( pod.exists? ? "Using #{name}" : "Installing #{name}".green )
+          puts marker << ( should_install ? "Installing #{name}".green : "Using #{name}" )
         end
 
-        download_pod(pod) unless pod.exists?
-
-        # This will not happen if the pod existed before we started the install
-        # process.
-        if pod.downloaded?
+        if should_install
+          unless pod.downloaded?
+            pod.implode
+            download_pod(pod)
+          end
           # The docs need to be generated before cleaning because the
           # documentation is created for all the subspecs.
           generate_docs(pod)
@@ -100,12 +102,26 @@ module Pod
       end
     end
 
+    # @TODO: use the local pod implode
+    #
+    def remove_deleted_dependencies!
+      resolver.removed_pods.each do |pod_name|
+        marker = config.verbose ? "\n-> ".red : ''
+        path = sandbox.root + pod_name
+        puts marker << "Removing #{pod_name}".red
+        path.rmtree if path.exist?
+      end
+    end
+
     def install!
       @sandbox.prepare_for_install
 
       print_title "Resolving dependencies of: #{@podfile.defined_in_file}"
       specs_by_target
 
+      print_title "Removing deleted dependencies" unless resolver.removed_pods.empty?
+      remove_deleted_dependencies!
+
       print_title "Installing dependencies"
       install_dependencies!
 
@@ -119,15 +135,17 @@ module Pod
         generate_dummy_source(target_installer)
       end
 
-      generate_lock_file!(specifications)
-
       puts "- Running post install hooks" if config.verbose?
       # Post install hooks run _before_ saving of project, so that they can alter it before saving.
       run_post_install_hooks
 
-      puts "- Writing Xcode project file to `#{@sandbox.project_path}'\n\n" if config.verbose?
+      puts "- Writing Xcode project file to `#{@sandbox.project_path}'" if config.verbose?
       project.save_as(@sandbox.project_path)
 
+      puts "- Writing lockfile in `#{config.project_lockfile}'\n\n" if config.verbose?
+      @lockfile = Lockfile.generate(@podfile, specs_by_target.values.flatten)
+      @lockfile.write_to_disk(config.project_lockfile)
+
       UserProjectIntegrator.new(@podfile).integrate! if config.integrate_targets?
     end
 
@@ -143,44 +161,6 @@ module Pod
       @podfile.post_install!(self)
     end
 
-    def generate_lock_file!(specs)
-      lock_file.open('w') do |file|
-        file.puts "PODS:"
-
-        # Get list of [name, dependencies] pairs.
-        pod_and_deps = specs.map do |spec|
-          [spec.to_s, spec.dependencies.map(&:to_s).sort]
-        end.uniq
-
-        # Merge dependencies of ios and osx version of the same pod.
-        tmp = {}
-        pod_and_deps.each do |name, deps|
-          if tmp[name]
-            tmp[name].concat(deps).uniq!
-          else
-            tmp[name] = deps
-          end
-        end
-        pod_and_deps = tmp
-
-        # Sort by name and print
-        pod_and_deps.sort_by(&:first).each do |name, deps|
-          if deps.empty?
-            file.puts "  - #{name}"
-          else
-            file.puts "  - #{name}:"
-            deps.each { |dep| file.puts "    - #{dep}" }
-          end
-        end
-
-        file.puts
-        file.puts "DEPENDENCIES:"
-        @podfile.dependencies.map(&:to_s).sort.each do |dep|
-          file.puts "  - #{dep}"
-        end
-      end
-    end
-
     def generate_dummy_source(target_installer)
       class_name_identifier = target_installer.target_definition.label
       dummy_source = Generator::DummySource.new(class_name_identifier)
@@ -206,7 +186,7 @@ module Pod
     # @return [Array<LocalPod>]  A list of LocalPod instances for each
     #                            dependency that is not a download-only one.
     def pods
-      pods_by_target.values.flatten
+      pods_by_target.values.flatten.uniq
     end
 
     def pods_by_target
@@ -215,7 +195,11 @@ module Pod
       specs_by_target.each do |target_definition, specs|
         @pods_by_spec[target_definition.platform] = {}
         result[target_definition] = specs.map do |spec|
-          @sandbox.local_pod_for_spec(spec, target_definition.platform)
+          if spec.local?
+            LocalPod::LocalSourcedPod.new(spec, sandbox, target_definition.platform)
+          else
+            @sandbox.local_pod_for_spec(spec, target_definition.platform)
+          end
         end.uniq.compact
       end
       result

data/lib/cocoapods/local_pod.rb

@@ -45,16 +45,18 @@ module Pod
     attr_accessor :downloaded
     alias_method :downloaded?, :downloaded
 
-    # @param [Specification] specification
-    #   The first activated specification of the pod.
-    # @param [Sandbox] sandbox
-    #   The sandbox where the files of the pod will be located.
-    # @param [Platform] platform
-    #   The platform that will be used to build the pod.
+    # @param [Specification] specification  The first activated specification
+    #                                       of the pod.
+    #
+    # @param [Sandbox] sandbox              The sandbox where the files of the
+    #                                       pod will be located.
+    #
+    # @param [Platform] platform            The platform that will be used to
+    #                                       build the pod.
     #
     # @todo The local pod should be initialized with all the activated
-    #   specifications passed as an array, in order to be able to cache the
-    #   computed values. In other words, it should be immutable.
+    #       specifications passed as an array, in order to be able to cache the
+    #       computed values. In other words, it should be immutable.
     #
     def initialize(specification, sandbox, platform)
       @top_specification, @sandbox, @platform = specification.top_level_parent, sandbox, platform
@@ -93,12 +95,10 @@ module Pod
     end
 
     # @return [String] A string representation of the pod which indicates if
-    # the pods comes from a local source.
+    #                  the pods comes from a local source.
     #
     def to_s
-      result = top_specification.to_s
-      result << " [LOCAL]" if top_specification.local?
-      result
+      top_specification.to_s
     end
 
     # @return [String] The name of the Pod.
@@ -140,6 +140,10 @@ module Pod
       root.rmtree if exists?
     end
 
+    def local?
+      false
+    end
+
     # @!group Cleaning
 
     # Deletes any path that is not used by the pod.
@@ -508,5 +512,39 @@ module Pod
         Pathname.glob(pattern, File::FNM_CASEFOLD)
       end.flatten
     end
+
+    # A {LocalSourcedPod} is a {LocalPod} that interacts with the files of
+    # a folder controlled by the users. As such this class does not alter
+    # in any way the contents of the folder.
+    #
+    class LocalSourcedPod < LocalPod
+      def downloaded?
+        true
+      end
+
+      def create
+        # No ops
+      end
+
+      def root
+        @root ||= Pathname.new(@top_specification.source[:local]).expand_path
+      end
+
+      def implode
+        # No ops
+      end
+
+      def clean!
+        # No ops
+      end
+
+      def to_s
+        super + " [LOCAL]"
+      end
+
+      def local?
+        true
+      end
+    end
   end
 end