cocoapods 0.31.1 → 0.32.0

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -0,0 +1,139 @@
+module Pod
+  module ExternalSources
+
+    # Abstract class that defines the common behaviour of external sources.
+    #
+    class AbstractExternalSource
+
+      # @return [String] the name of the Pod described by this external source.
+      #
+      attr_reader :name
+
+      # @return [Hash{Symbol => String}] the hash representation of the
+      #         external source.
+      #
+      attr_reader :params
+
+      # @return [String] the path where the podfile is defined to resolve
+      #         relative paths.
+      #
+      attr_reader :podfile_path
+
+      # @param [String] name @see name
+      # @param [Hash] params @see params
+      # @param [String] podfile_path @see podfile_path
+      #
+      def initialize(name, params, podfile_path)
+        @name = name
+        @params = params
+        @podfile_path = podfile_path
+      end
+
+      # @return [Bool] whether an external source source is equal to another
+      #         according to the {#name} and to the {#params}.
+      #
+      def ==(other)
+        return false if other.nil?
+        name == other.name && params == other.params
+      end
+
+      public
+
+      # @!group Subclasses hooks
+
+      # Fetches the external source from the remote according to the params.
+      #
+      # @param  [Sandbox] sandbox
+      #         the sandbox where the specification should be stored.
+      #
+      # @return [void]
+      #
+      def fetch(sandbox)
+        raise "Abstract method"
+      end
+
+      # @return [String] a string representation of the source suitable for UI.
+      #
+      def description
+        raise "Abstract method"
+      end
+
+      protected
+
+      # @return [String] The uri of the podspec appending the name of the file
+      #         and expanding it if necessary.
+      #
+      # @note   If the declared path is expanded only if the represents a path
+      #         relative to the file system.
+      #
+      def normalized_podspec_path(declared_path)
+        if File.extname(declared_path) == '.podspec'
+          path_with_ext = declared_path
+        else
+          path_with_ext = "#{declared_path}/#{name}.podspec"
+        end
+        podfile_dir = File.dirname(podfile_path || '')
+        File.expand_path(path_with_ext, podfile_dir)
+      end
+
+      private
+
+      # @! Subclasses helpers
+
+      # Pre-downloads a Pod passing the options to the downloader and informing
+      # the sandbox.
+      #
+      # @param  [Sandbox] sandbox
+      #         The sandbox where the Pod should be downloaded.
+      #
+      # @note   To prevent a double download of the repository the pod is
+      #         marked as pre-downloaded indicating to the installer that only
+      #         clean operations are needed.
+      #
+      # @todo  The downloader configuration is the same of the
+      #        #{PodSourceInstaller} and it needs to be kept in sync.
+      #
+      # @return [void]
+      #
+      def pre_download(sandbox)
+        title = "Pre-downloading: `#{name}` #{description}"
+        UI.titled_section(title, { :verbose_prefix => "-> " }) do
+          target = sandbox.root + name
+          target.rmtree if target.exist?
+          downloader = Config.instance.downloader(target, params)
+          downloader.download
+          store_podspec(sandbox, target + "#{name}.podspec")
+          sandbox.store_pre_downloaded_pod(name)
+          if downloader.options_specific?
+            source = params
+          else
+            source = downloader.checkout_options
+          end
+          sandbox.store_checkout_source(name, source)
+        end
+      end
+
+      # Stores the podspec in the sandbox and marks it as from an external
+      # source.
+      #
+      # @param  [Sandbox] sandbox
+      #         The sandbox where the specification should be stored.
+      #
+      # @param  [Pathname, String] spec
+      #         The path of the specification or its contents.
+      #
+      # @note   All the concrete implementations of #{fetch} should invoke this
+      #         method.
+      #
+      # @note   The sandbox ensures that the podspec exists and that the names
+      #         match.
+      #
+      # @return [void]
+      #
+      def store_podspec(sandbox, spec)
+        sandbox.store_podspec(name, spec, true)
+      end
+    end
+  end
+end
+

data/lib/cocoapods/external_sources/downloader_source.rb

@@ -0,0 +1,32 @@
+module Pod
+  module ExternalSources
+
+    # Provides support for fetching a specification file from a source handled
+    # by the downloader. Supports all the options of the downloader
+    #
+    # @note The podspec must be in the root of the repository and should have a
+    #       name matching the one of the dependency.
+    #
+    class DownloaderSource < AbstractExternalSource
+
+      # @see AbstractExternalSource#fetch
+      #
+      def fetch(sandbox)
+        pre_download(sandbox)
+      end
+
+      # @see AbstractExternalSource#description
+      #
+      def description
+        strategy = Downloader.strategy_from_options(params)
+        options = params.dup
+        url = options.delete(strategy)
+        result = "from `#{url}`"
+        options.each do |key, value|
+          result << ", #{key} `#{value}`"
+        end
+        result
+      end
+    end
+  end
+end

data/lib/cocoapods/external_sources/path_source.rb

@@ -0,0 +1,58 @@
+module Pod
+  module ExternalSources
+
+    # Provides support for fetching a specification file from a path local to
+    # the machine running the installation.
+    #
+    # Works with the {LocalPod::LocalSourcedPod} class.
+    #
+    class PathSource < AbstractExternalSource
+
+      # @see  AbstractExternalSource#fetch
+      #
+      def fetch(sandbox)
+        title = "Fetching podspec for `#{name}` #{description}"
+        UI.titled_section(title, { :verbose_prefix => "-> " }) do
+          podspec = podspec_path
+          unless podspec.exist?
+            raise Informative, "No podspec found for `#{name}` in " \
+              "`#{declared_path}`"
+          end
+          store_podspec(sandbox, podspec)
+          is_absolute = absolute?(podspec)
+          sandbox.store_local_path(name, podspec.dirname, is_absolute)
+        end
+      end
+
+      # @see  AbstractExternalSource#description
+      #
+      def description
+        "from `#{params[:path] || params[:local]}`"
+      end
+
+      private
+
+      # @!group Helpers
+
+      # @return [String] The path as declared by the user.
+      #
+      def declared_path
+        result = params[:path] || params[:local]
+        result.to_s if result
+      end
+
+      # @return [Pathname] The absolute path of the podspec.
+      #
+      def podspec_path
+        Pathname(normalized_podspec_path(declared_path))
+      end
+
+      # @return [Bool]
+      #
+      def absolute?(path)
+        Pathname(path).absolute? || path.to_s.start_with?('~')
+      end
+    end
+  end
+end
+

data/lib/cocoapods/external_sources/podspec_source.rb

@@ -0,0 +1,45 @@
+module Pod
+  module ExternalSources
+
+    # Provides support for fetching a specification file from an URL. Can be
+    # http, file, etc.
+    #
+    class PodspecSource < AbstractExternalSource
+
+      # @see AbstractExternalSource#fetch
+      #
+      def fetch(sandbox)
+        title = "Fetching podspec for `#{name}` #{description}"
+        UI.titled_section(title, { :verbose_prefix => "-> " }) do
+          require 'open-uri'
+          open(podspec_uri) { |io| store_podspec(sandbox, io.read) }
+        end
+      end
+
+      # @see AbstractExternalSource#description
+      #
+      def description
+        "from `#{params[:podspec]}`"
+      end
+
+      private
+
+      # @!group Helpers
+
+      # @return [String] The uri of the podspec appending the name of the file
+      #         and expanding it if necessary.
+      #
+      # @note   If the declared path is expanded only if the represents a path
+      #         relative to the file system.
+      #
+      def podspec_uri
+        declared_path = params[:podspec].to_s
+        if declared_path.match(%r{^.+://})
+          declared_path
+        else
+          normalized_podspec_path(declared_path)
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/gem_version.rb

@@ -1,6 +1,6 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.31.1' unless defined? Pod::VERSION
+  VERSION = '0.32.0' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/generator/prefix_header.rb

@@ -40,9 +40,12 @@ module Pod
       #         added to the top of the prefix header. For OS X `Cocoa/Cocoa.h`
       #         is imported.
       #
+      # @note   Only unique prefix_header_contents are added to the prefix header.
+      #
       # @return [String]
       #
       # @todo   Subspecs can specify prefix header information too.
+      # @todo   Check to see if we have a similar duplication issue with file_accessor.prefix_header.
       #
       def generate
         result =  "#ifdef __OBJC__\n"
@@ -53,12 +56,18 @@ module Pod
           result << %|\n#import "#{import}"|
         end
 
-        file_accessors.each do |file_accessor|
+        unique_prefix_header_contents = file_accessors.collect do |file_accessor|
+          file_accessor.spec_consumer.prefix_header_contents
+        end.compact.uniq
+        
+        result << "\n"
+        
+        unique_prefix_header_contents.each do |prefix_header_contents|
+          result << prefix_header_contents
           result << "\n"
-          if prefix_header_contents = file_accessor.spec_consumer.prefix_header_contents
-            result << prefix_header_contents
-            result << "\n"
-          end
+        end
+        
+        file_accessors.each do |file_accessor|
           if prefix_header = file_accessor.prefix_header
             result << Pathname(prefix_header).read
           end

data/lib/cocoapods/installer.rb

@@ -64,11 +64,12 @@ module Pod
       @lockfile = lockfile
     end
 
-    # @return [Bool] Whether the installer is in update mode. In update mode
-    #         the contents of the Lockfile are not taken into account for
-    #         deciding what Pods to install.
+    # @return [Hash, Boolean, nil] Pods that have been requested to be
+    #         updated or true if all Pods should be updated.
+    #         If all Pods should been updated the contents of the Lockfile are
+    #         not taken into account for deciding what Pods to install.
     #
-    attr_accessor :update_mode
+    attr_accessor :update
 
     # Installs the Pods.
     #
@@ -169,7 +170,7 @@ module Pod
       end
 
       analyzer = Analyzer.new(sandbox, podfile, lockfile)
-      analyzer.update_mode = update_mode
+      analyzer.update = update
       @analysis_result = analyzer.analyze
       @aggregate_targets = analyzer.result.targets
     end
@@ -235,7 +236,13 @@ module Pod
       title_options = { :verbose_prefix => "-> ".green }
       root_specs.sort_by(&:name).each do |spec|
         if pods_to_install.include?(spec.name)
-          UI.titled_section("Installing #{spec}".green, title_options) do
+          if sandbox_state.changed.include?(spec.name) && sandbox.manifest
+            previous = sandbox.manifest.version(spec.name)
+            title = "Installing #{spec.name} #{spec.version} (was #{previous})"
+          else
+            title = "Installing #{spec}"
+          end
+          UI.titled_section(title.green, title_options) do
             install_source_of_pod(spec.name)
           end
         else
@@ -295,9 +302,10 @@ module Pod
 
         pod_names = pod_targets.map(&:pod_name).uniq
         pod_names.each do |pod_name|
-          path = sandbox.pod_dir(pod_name)
           local = sandbox.local?(pod_name)
-          @pods_project.add_pod_group(pod_name, path, local)
+          path = sandbox.pod_dir(pod_name)
+          was_absolute = sandbox.local_path_was_absolute?(pod_name)
+          @pods_project.add_pod_group(pod_name, path, local, was_absolute)
         end
 
         if config.podfile_path

data/lib/cocoapods/installer/analyzer.rb

@@ -33,7 +33,7 @@ module Pod
         @podfile  = podfile
         @lockfile = lockfile
 
-        @update_mode = false
+        @update = false
         @allow_pre_downloads = true
         @archs_by_target_def = {}
       end
@@ -91,11 +91,30 @@ module Pod
 
       # @!group Configuration
 
+      # @return [Hash, Boolean, nil] Pods that have been requested to be
+      #         updated or true if all Pods should be updated
+      #
+      attr_accessor :update
+
       # @return [Bool] Whether the version of the dependencies which did non
       #         change in the Podfile should be locked.
       #
-      attr_accessor :update_mode
-      alias_method  :update_mode?, :update_mode
+      def update_mode?
+        !!update
+      end
+
+      # @return [Symbol] Whether and how the dependencies in the Podfile
+      #                  should be updated.
+      #
+      def update_mode
+        if !update
+          :none
+        elsif update == true
+          :all
+        elsif update[:pods] != nil
+          :selected
+        end
+      end
 
       # @return [Bool] Whether the analysis allows pre-downloads and thus
       #         modifications to the sandbox.
@@ -219,10 +238,15 @@ module Pod
       #         that prevent the resolver to update a Pod.
       #
       def generate_version_locking_dependencies
-        if update_mode?
+        if update_mode == :all
           []
         else
-          result.podfile_state.unchanged.map do |pod|
+          locking_pods = result.podfile_state.unchanged
+          if update_mode == :selected
+            # If selected Pods should been updated, filter them out of the list
+            locking_pods = locking_pods.select { |pod| !update[:pods].include?(pod) }
+          end
+          locking_pods.map do |pod|
             lockfile.dependency_to_lock_pod_named(pod)
           end
         end
@@ -252,10 +276,14 @@ module Pod
         deps_to_fetch = []
         deps_to_fetch_if_needed = []
         deps_with_external_source = podfile.dependencies.select { |dep| dep.external_source }
-        if update_mode?
+
+        if update_mode == :all
           deps_to_fetch = deps_with_external_source
         else
           pods_to_fetch = result.podfile_state.added + result.podfile_state.changed
+          if update_mode == :selected
+            pods_to_fetch += update[:pods]
+          end
           deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.root_name) }
           deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.root_name) }
           deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.root_name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? }
@@ -316,7 +344,7 @@ module Pod
       def generate_sandbox_state
         sandbox_state = nil
         UI.section "Comparing resolved specification to the sandbox manifest" do
-          sandbox_analyzer = SandboxAnalyzer.new(sandbox, result.specifications, update_mode, lockfile)
+          sandbox_analyzer = SandboxAnalyzer.new(sandbox, result.specifications, update_mode?, lockfile)
           sandbox_state = sandbox_analyzer.analyze
           sandbox_state.print
         end