cocoapods 0.36.4 → 0.37.0.beta.1

data/lib/cocoapods/downloader/request.rb

@@ -0,0 +1,90 @@
+require 'digest'
+
+module Pod
+  module Downloader
+    # This class represents a download request for a given Pod.
+    #
+    class Request
+      # @return [Specification,Nil] The specification for the pod whose download
+      #         is being requested.
+      #
+      attr_reader :spec
+
+      # @return [Boolean] Whether this download request is for a released pod.
+      #
+      attr_reader :released_pod
+      alias_method :released_pod?, :released_pod
+
+      # @return [String] The name of the pod whose dowload is being requested.
+      #
+      attr_reader :name
+
+      # @return [Hash<Symbol, String>] The download parameters for this request.
+      #
+      attr_reader :params
+
+      # @return [Boolean] Whether the download request is for a head download.
+      #
+      attr_reader :head
+      alias_method :head?, :head
+
+      # @param  [Specification,Nil] spec
+      #         see {#spec}
+      #
+      # @param  [Boolean] released
+      #         see {#released_pod}
+      #
+      # @param  [String,Nil] name
+      #         see {#name}
+      #
+      # @param  [Hash<Symbol,String>,Nil] params
+      #         see {#params}
+      #
+      # @param  [Boolean] head
+      #         see {#head}
+      #
+      def initialize(spec: nil, released: false, name: nil, params: false, head: false)
+        @released_pod = released
+        @spec = spec
+        @params = spec ? (spec.source && spec.source.dup) : params
+        @name = spec ? spec.name : name
+        @head = head
+
+        validate!
+      end
+
+      # @param  [String] name
+      #         the name of the pod being downloaded.
+      #
+      # @param  [Hash<#to_s, #to_s>] params
+      #         the download parameters of the pod being downloaded.
+      #
+      # @return [String] The slug used to store the files resulting from this
+      #         download request.
+      #
+      def slug(name: self.name, params: self.params, spec: self.spec)
+        checksum = spec && spec.checksum &&  '-' << spec.checksum[0, 5]
+        if released_pod?
+          "Release/#{name}/#{spec.version}#{checksum}"
+        else
+          opts = params.to_a.sort_by(&:first).map { |k, v| "#{k}=#{v}" }.join('-')
+          digest = Digest::MD5.hexdigest(opts)
+          "External/#{name}/#{digest}#{checksum}"
+        end
+      end
+
+      private
+
+      # Validates that the given request is well-formed.
+      #
+      # @return [Void]
+      #
+      def validate!
+        raise ArgumentError, 'Requires a name' unless name
+        raise ArgumentError, 'Must give a spec for a released download request' if released_pod? && !spec
+        raise ArgumentError, 'Requires a version if released' if released_pod? && !spec.version
+        raise ArgumentError, 'Requires params' unless params
+      end
+    end
+  end
+end

data/lib/cocoapods/downloader/response.rb

@@ -0,0 +1,16 @@
+module Pod
+  module Downloader
+    # A response to a download request.
+    #
+    # @attr [Pathname] location
+    #       the location where this downloaded pod is stored on disk.
+    #
+    # @attr [Specification] spec
+    #       the specification that describes this downloaded pod.
+    #
+    # @attr [Hash<Symbol, String>] checkout_options
+    #       the downloader parameters necessary to recreate this exact download.
+    #
+    Response = Struct.new(:location, :spec, :checkout_options)
+  end
+end

data/lib/cocoapods/external_sources/abstract_external_source.rb

@@ -98,35 +98,31 @@ module Pod
         title = "Pre-downloading: `#{name}` #{description}"
         UI.titled_section(title,  :verbose_prefix => '-> ') do
           target = sandbox.pod_dir(name)
-          target.rmtree if target.exist?
-          downloader = Downloader.for_target(target, params)
-          downloader.download
-
-          podspec_path = target + "#{name}.podspec"
-          json = false
-          unless Pathname(podspec_path).exist?
-            podspec_path = target + "#{name}.podspec.json"
-            json = true
-          end
-
-          store_podspec(sandbox, target + podspec_path, json)
+          download_result = Downloader.download(download_request, target)
+          spec = download_result.spec
+
+          raise Informative, "Unable to find a specification for '#{name}'." unless spec
+
+          store_podspec(sandbox, spec)
           sandbox.store_pre_downloaded_pod(name)
-          if downloader.options_specific?
-            source = params
-          else
-            source = downloader.checkout_options
-          end
-          sandbox.store_checkout_source(name, source)
+          sandbox.store_checkout_source(name, download_result.checkout_options)
         end
       end
 
+      def download_request
+        Downloader::Request.new(
+          :name => name,
+          :params => params,
+        )
+      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
+      # @param  [Pathname, String, Specification] spec
       #         The path of the specification or its contents.
       #
       # @note   All the concrete implementations of #{fetch} should invoke this
@@ -144,6 +140,9 @@ module Pod
         elsif spec.is_a?(String) && !json
           spec = Specification.from_string(spec, 'spec.podspec').to_pretty_json
           json = true
+        elsif spec.is_a?(Specification)
+          spec = spec.to_pretty_json
+          json = true
         end
         sandbox.store_podspec(name, spec, true, json)
       end

data/lib/cocoapods/external_sources/path_source.rb

@@ -3,8 +3,6 @@ module Pod
     # 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
       #

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.36.4' unless defined? Pod::VERSION
+  VERSION = '0.37.0.beta.1' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -63,8 +63,8 @@ module Pod
             fi
 
             # use filter instead of exclude so missing patterns dont' throw errors
-            echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers/\" --filter \"- PrivateHeaders/\" ${source} ${destination}"
-            rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" "${source}" "${destination}"
+            echo "rsync -av --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers/\" --filter \"- PrivateHeaders/\" --filter \"- Modules/\" ${source} ${destination}"
+            rsync -av --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers/" --filter "- PrivateHeaders/" --filter "- Modules/" "${source}" "${destination}"
             # Resign the code if required by the build settings to avoid unstable apps
             if [ "${CODE_SIGNING_REQUIRED}" == "YES" ]; then
                 code_sign "${destination}/$1"

data/lib/cocoapods/generator/module_map.rb

@@ -10,10 +10,15 @@ module Pod
       #
       attr_reader :target
 
+      # @return [Array] the private headers of the module
+      #
+      attr_accessor :private_headers
+
       # @param  [Target] target @see target
       #
       def initialize(target)
         @target = target
+        @private_headers = []
       end
 
       # Generates and saves the Info.plist to the given path.
@@ -35,14 +40,24 @@ module Pod
       # @return [String]
       #
       def generate
-        <<-eos.strip_heredoc
+        result = <<-eos.strip_heredoc
           framework module #{target.product_module_name} {
             umbrella header "#{target.umbrella_header_path.basename}"
 
             export *
             module * { export * }
-          }
         eos
+
+        result << "\n#{generate_private_header_exports}" unless private_headers.empty?
+        result << "}\n"
+      end
+
+      private
+
+      def generate_private_header_exports
+        private_headers.reduce('') do |string, header|
+          string << %(  private header "#{header}"\n)
+        end
       end
     end
   end

data/lib/cocoapods/installer/analyzer.rb

@@ -55,7 +55,7 @@ module Pod
 
         store_existing_checkout_options
         fetch_external_sources if allow_fetches
-        @result.specs_by_target = resolve_dependencies
+        @result.specs_by_target = validate_platforms(resolve_dependencies)
         @result.specifications  = generate_specifications
         @result.targets         = generate_targets
         @result.sandbox_state   = generate_sandbox_state
@@ -431,6 +431,26 @@ module Pod
         specs_by_target
       end
 
+      # Warns for any specification that is incompatible with its target.
+      #
+      # @param  [Hash{TargetDefinition => Array<Spec>}] specs_by_target
+      #         the specifications grouped by target.
+      #
+      # @return [Hash{TargetDefinition => Array<Spec>}] the specifications
+      #         grouped by target.
+      #
+      def validate_platforms(specs_by_target)
+        specs_by_target.each do |target, specs|
+          specs.each do |spec|
+            unless spec.available_platforms.any? { |p| target.platform.supports?(p) }
+              UI.warn "The platform of the target `#{target.name}` "     \
+                "(#{target.platform}) may not be compatible with `#{spec}` which has "  \
+                "a minimum requirement of #{spec.available_platforms.join(' - ')}."
+            end
+          end
+        end
+      end
+
       # Returns the list of all the resolved the resolved specifications.
       #
       # @return [Array<Specification>] the list of the specifications.

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -44,12 +44,6 @@ module Pod
       def install!
         download_source unless predownloaded? || local?
         run_prepare_command
-      rescue Informative
-        raise
-      rescue Object
-        UI.notice("Error installing #{root_spec.name}")
-        clean!
-        raise
       end
 
       # Cleans the installations if appropriate.
@@ -80,32 +74,21 @@ module Pod
       # @return [void]
       #
       def download_source
-        root.rmtree if root.exist?
-        if head_pod?
-          begin
-            downloader.download_head
-            @specific_source = downloader.checkout_options
-          rescue RuntimeError => e
-            if e.message == 'Abstract method'
-              raise Informative, "The pod '" + root_spec.name + "' does not " \
-                'support the :head option, as it uses a ' + downloader.name +
-                ' source. Remove that option to use this pod.'
-            else
-              raise
-            end
-          end
-        else
-          downloader.download
-          unless downloader.options_specific?
-            @specific_source = downloader.checkout_options
-          end
-        end
+        download_result = Downloader.download(download_request, root)
 
-        if specific_source
+        if (@specific_source = download_result.checkout_options) && specific_source != root_spec.source
           sandbox.store_checkout_source(root_spec.name, specific_source)
         end
       end
 
+      def download_request
+        Downloader::Request.new(
+          :spec => root_spec,
+          :released => released?,
+          :head => head_pod?,
+        )
+      end
+
       extend Executable
       executable :bash
 
@@ -135,20 +118,8 @@ module Pod
       # @return [void]
       #
       def clean_installation
-        clean_paths.each { |path| FileUtils.rm_rf(path) } if root.exist?
-      end
-
-      #-----------------------------------------------------------------------#
-
-      public
-
-      # @!group Dependencies
-
-      # @return [Downloader] The downloader to use for the retrieving the
-      #         source.
-      #
-      def downloader
-        @downloader ||= Downloader.for_target(root, root_spec.source.dup)
+        cleaner = Sandbox::PodDirCleaner.new(root, specs_by_platform)
+        cleaner.clean!
       end
 
       #-----------------------------------------------------------------------#
@@ -194,76 +165,8 @@ module Pod
         sandbox.head_pod?(root_spec.name)
       end
 
-      #-----------------------------------------------------------------------#
-
-      private
-
-      # @!group Private helpers
-
-      # @return [Array<Sandbox::FileAccessor>] the file accessors for all the
-      #         specifications on their respective platform.
-      #
-      def file_accessors
-        return @file_accessors if @file_accessors
-        @file_accessors = []
-        specs_by_platform.each do |platform, specs|
-          specs.each do |spec|
-            @file_accessors << Sandbox::FileAccessor.new(path_list, spec.consumer(platform))
-          end
-        end
-        @file_accessors
-      end
-
-      # @return [Sandbox::PathList] The path list for this Pod.
-      #
-      def path_list
-        @path_list ||= Sandbox::PathList.new(root)
-      end
-
-      # Finds the absolute paths, including hidden ones, of the files
-      # that are not used by the pod and thus can be safely deleted.
-      #
-      # @note   Implementation detail: Don't use `Dir#glob` as there is an
-      #         unexplained issue (#568, #572 and #602).
-      #
-      # @todo   The paths are down-cased for the comparison as issues similar
-      #         to #602 lead the files not being matched and so cleaning all
-      #         the files. This solution might create side effects.
-      #
-      # @return [Array<Strings>] The paths that can be deleted.
-      #
-      def clean_paths
-        cached_used = used_files
-        glob_options = File::FNM_DOTMATCH | File::FNM_CASEFOLD
-        files = Pathname.glob(root + '**/*', glob_options).map(&:to_s)
-
-        files.reject! do |candidate|
-          candidate = candidate.downcase
-          candidate.end_with?('.', '..') || cached_used.any? do |path|
-            path = path.downcase
-            path.include?(candidate) || candidate.include?(path)
-          end
-        end
-        files
-      end
-
-      # @return [Array<String>] The absolute path of all the files used by the
-      #         specifications (according to their platform) of this Pod.
-      #
-      def used_files
-        files = [
-          file_accessors.map(&:vendored_frameworks),
-          file_accessors.map(&:vendored_libraries),
-          file_accessors.map(&:resource_bundle_files),
-          file_accessors.map(&:license),
-          file_accessors.map(&:prefix_header),
-          file_accessors.map(&:preserve_paths),
-          file_accessors.map(&:readme),
-          file_accessors.map(&:resources),
-          file_accessors.map(&:source_files),
-        ]
-
-        files.flatten.compact.map(&:to_s).uniq
+      def released?
+        !local? && !head_pod? && !predownloaded? && sandbox.specification(root_spec.name) != root_spec
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/installer/target_installer.rb

@@ -107,12 +107,16 @@ module Pod
       # Creates the module map file which ensures that the umbrella header is
       # recognized with a customized path
       #
+      # @yield_param [Generator::ModuleMap]
+      #              yielded once to configure the private headers
+      #
       # @return [void]
       #
       def create_module_map
         path = target.module_map_path
         UI.message "- Generating module map file at #{UI.path(path)}" do
           generator = Generator::ModuleMap.new(target)
+          yield generator if block_given?
           generator.save_as(path)
           add_file_to_support_group(path)