cocoapods 1.6.2 → 1.7.0.beta.1

data/lib/cocoapods/resolver.rb

@@ -1,4 +1,5 @@
 require 'molinillo'
+require 'cocoapods/podfile'
 
 module Pod
   class NoSpecFoundError < Informative
@@ -14,10 +15,6 @@ module Pod
     require 'cocoapods/resolver/lazy_specification'
     require 'cocoapods/resolver/resolver_specification'
 
-    include Pod::Installer::InstallationOptions::Mixin
-
-    delegate_installation_options { podfile }
-
     # @return [Sandbox] the Sandbox used by the resolver to find external
     #         dependencies.
     #
@@ -109,10 +106,10 @@ module Pod
           resolver_specs_by_target[target] = vertices.
             map do |vertex|
               payload = vertex.payload
-              test_only = (!explicit_dependencies.include?(vertex.name) || payload.test_specification?) &&
+              non_library = (!explicit_dependencies.include?(vertex.name) || payload.test_specification? || payload.app_specification?) &&
                 (vertex.recursive_predecessors & vertices).all? { |v| !explicit_dependencies.include?(v.name) || v.payload.test_specification? }
               spec_source = payload.respond_to?(:spec_source) && payload.spec_source
-              ResolverSpecification.new(payload, test_only, spec_source)
+              ResolverSpecification.new(payload, non_library, spec_source)
             end.
             sort_by(&:name)
         end
@@ -333,7 +330,7 @@ module Pod
     def specifications_for_dependency(dependency, additional_requirements = [])
       requirement = Requirement.new(dependency.requirement.as_list + additional_requirements.flat_map(&:as_list))
       find_cached_set(dependency).
-        all_specifications(installation_options.warn_for_multiple_pod_sources).
+        all_specifications(warn_for_multiple_pod_sources).
         select { |s| requirement.satisfied_by? s.version }.
         map { |s| s.subspec_by_name(dependency.name, false, true) }.
         compact
@@ -504,7 +501,7 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
     #
     # @param  [Dependency] dependency
     #
-    # @param  [Specification] specification
+    # @param  [Specification] spec
     #
     # @return [Bool]
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
@@ -574,5 +571,11 @@ Note: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by
 
       @edge_validity[EdgeAndPlatform.new(edge, target_platform)]
     end
+
+    # @return [Boolean] whether to emit a warning when a pod is found in multiple sources
+    #
+    def warn_for_multiple_pod_sources
+      podfile.installation_options.warn_for_multiple_pod_sources
+    end
   end
 end

data/lib/cocoapods/resolver/resolver_specification.rb

@@ -12,14 +12,14 @@ module Pod
       #
       attr_reader :source
 
-      # @return [Bool] whether this resolved specification is only used by tests.
+      # @return [Bool] whether this resolved specification is by non-library targets.
       #
-      attr_reader :used_by_tests_only
-      alias used_by_tests_only? used_by_tests_only
+      attr_reader :used_by_non_library_targets_only
+      alias used_by_non_library_targets_only? used_by_non_library_targets_only
 
-      def initialize(spec, used_by_tests_only, source)
+      def initialize(spec, used_by_non_library_targets_only, source)
         @spec = spec
-        @used_by_tests_only = used_by_tests_only
+        @used_by_non_library_targets_only = used_by_non_library_targets_only
         @source = source
       end
 
@@ -33,8 +33,8 @@ module Pod
 
       def ==(other)
         self.class == other.class &&
-          spec == other.spec &&
-          used_by_tests_only? == other.used_by_tests_only?
+            spec == other.spec &&
+            used_by_non_library_targets_only? == other.used_by_non_library_targets_only?
       end
     end
   end

data/lib/cocoapods/sandbox.rb

@@ -34,6 +34,14 @@ module Pod
   #     +-- Manifest.lock
   #     |
   #     +-- Pods.xcodeproj
+  #  (if installation option 'generate_multiple_pod_projects' is enabled)
+  #     |
+  #     +-- PodTarget1.xcodeproj
+  #     |
+  #    ...
+  #     |
+  #     +-- PodTargetN.xcodeproj
+  #
   #
   class Sandbox
     autoload :FileAccessor,  'cocoapods/sandbox/file_accessor'
@@ -66,20 +74,14 @@ module Pod
     end
 
     # @return [Lockfile] the manifest which contains the information about the
-    #         installed pods.
+    #         installed pods or `nil` if one is not present.
     #
-    attr_accessor :manifest
-
     def manifest
       @manifest ||= begin
         Lockfile.from_file(manifest_path) if manifest_path.exist?
       end
     end
 
-    # @return [Project] the Pods project.
-    #
-    attr_accessor :project
-
     # Removes the files of the Pod with the given name from the sandbox.
     #
     # @return [void]
@@ -92,14 +94,14 @@ module Pod
       end
       podspec_path = specification_path(name)
       podspec_path.rmtree if podspec_path
+      pod_target_project_path = pod_target_project_path(name)
+      pod_target_project_path.rmtree if pod_target_project_path.exist?
     end
 
     # Prepares the sandbox for a new installation removing any file that will
     # be regenerated and ensuring that the directories exists.
     #
     def prepare
-      FileUtils.rm_rf(headers_root)
-
       FileUtils.mkdir_p(headers_root)
       FileUtils.mkdir_p(sources_root)
       FileUtils.mkdir_p(specifications_root)
@@ -130,6 +132,33 @@ module Pod
       root + 'Pods.xcodeproj'
     end
 
+    # @return [Pathname] the path of the installation cache.
+    #
+    def project_installation_cache_path
+      root.join('.project_cache', 'installation_cache.yaml')
+    end
+
+    # @return [Pathname] the path of the metadata cache.
+    #
+    def project_metadata_cache_path
+      root.join('.project_cache', 'metadata_cache.yaml')
+    end
+
+    # @return [Pathname] the path of the version cache.
+    #
+    def project_version_cache_path
+      root.join('.project_cache', 'version')
+    end
+
+    # @param [String] pod_target_name
+    # Name of the pod target used to generate the path of its Xcode project.
+    #
+    # @return [Pathname] the path of the project for a pod target.
+    #
+    def pod_target_project_path(pod_target_name)
+      root + "#{pod_target_name}.xcodeproj"
+    end
+
     # Returns the path for the directory where the support files of
     # a target are stored.
     #

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -179,6 +179,27 @@ module Pod
         vendored_frameworks - vendored_dynamic_frameworks
       end
 
+      # @param [Array<FileAccessor>] file_accessors
+      #        The list of all file accessors to compute.
+      #
+      # @return [Array<String>] The list of all file accessors that a target will integrate into the project.
+      #
+      def self.all_files(file_accessors)
+        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),
+          file_accessors.map(&:module_map),
+        ]
+        files.flatten.compact.map(&:to_s).uniq
+      end
+
       # @param  [Pathname] framework
       #         The vendored framework to search into.
       # @return [Pathname] The path of the header directory of the

data/lib/cocoapods/sandbox/headers_store.rb

@@ -66,8 +66,7 @@ module Pod
         end.tap(&:uniq!).freeze
       end
 
-      # Removes the directory as it is regenerated from scratch during each
-      # installation.
+      # Removes the entire root directory.
       #
       # @return [void]
       #
@@ -75,6 +74,18 @@ module Pod
         root.rmtree if root.exist?
       end
 
+      # Removes the directory at the given path relative to the root.
+      #
+      # @param [Pathname] path
+      #        The path used to join with #root and remove.
+      #
+      # @return [void]
+      #
+      def implode_path!(path)
+        path = root.join(path)
+        path.rmtree if path.exist?
+      end
+
       #-----------------------------------------------------------------------#
 
       public
@@ -122,7 +133,11 @@ module Pod
 
         absolute_source = (sandbox.root + relative_header_path)
         source = absolute_source.relative_path_from(namespaced_path)
-        FileUtils.ln_sf(source, namespaced_path)
+        if Gem.win_platform?
+          FileUtils.ln(absolute_source, namespaced_path, :force => true)
+        else
+          FileUtils.ln_sf(source, namespaced_path)
+        end
         namespaced_path + relative_header_path.basename
       end
 

data/lib/cocoapods/sandbox/pod_dir_cleaner.rb

@@ -65,20 +65,7 @@ module Pod
       #         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),
-          file_accessors.map(&:module_map),
-        ]
-
-        files.flatten.compact.map(&:to_s).uniq
+        FileAccessor.all_files(file_accessors)
       end
     end
   end

data/lib/cocoapods/sources_manager.rb

@@ -21,8 +21,13 @@ module Pod
           previous_title_level = UI.title_level
           UI.title_level = 0
           begin
-            if name =~ /^master(-\d+)?$/
+            case
+            when name =~ /^master(-\d+)?$/
               Command::Setup.parse([]).run
+            when url =~ /\.git$/
+              Command::Repo::Add.parse([name, url]).run
+            when url =~ %r{^https:\/\/}
+              Command::Repo::AddCDN.parse([name, url]).run
             else
               Command::Repo::Add.parse([name, url]).run
             end
@@ -98,8 +103,11 @@ module Pod
     extend Executable
     executable :git
 
-    def git(args, include_error: false)
-      Executable.capture_command('git', args, :capture => include_error ? :merge : :out).first.strip
+    def repo_git(args, include_error: false)
+      Executable.capture_command('git', ['-C', repo] + args,
+                                 :capture => include_error ? :merge : :out,
+                                 :env => { 'GIT_CONFIG' => nil }).
+        first.strip
     end
 
     def update_git_repo(show_output = false)

data/lib/cocoapods/target.rb

@@ -1,4 +1,5 @@
 require 'cocoapods/target/build_settings'
+require 'cocoapods/target/build_type'
 
 module Pod
   # Model class which describes a Pods target.
@@ -40,6 +41,11 @@ module Pod
     #
     attr_reader :build_settings
 
+    # @return [Type] the build type for this target.
+    #
+    attr_reader :build_type
+    private :build_type
+
     # Initialize a new target
     #
     # @param [Sandbox] sandbox @see #sandbox
@@ -48,12 +54,14 @@ module Pod
     # @param [Array<String>] archs @see #archs
     # @param [Platform] platform @see #platform
     #
-    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform)
+    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
+                   build_type: Target::BuildType.infer_from_spec(nil, :host_requires_frameworks => host_requires_frameworks?))
       @sandbox = sandbox
       @host_requires_frameworks = host_requires_frameworks
       @user_build_configurations = user_build_configurations
       @archs = archs
       @platform = platform
+      @build_type = build_type
 
       @build_settings = create_build_settings
     end
@@ -84,10 +92,60 @@ module Pod
       false
     end
 
+    # @return [Boolean] whether the target is built dynamically
+    #
+    def build_as_dynamic?
+      build_type.dynamic?
+    end
+
+    # @return [Boolean] whether the target is built as a dynamic framework
+    #
+    def build_as_dynamic_framework?
+      build_type.dynamic_framework?
+    end
+
+    # @return [Boolean] whether the target is built as a dynamic library
+    #
+    def build_as_dynamic_library?
+      build_type.dynamic_library?
+    end
+
+    # @return [Boolean] whether the target is built as a framework
+    #
+    def build_as_framework?
+      build_type.framework?
+    end
+
+    # @return [Boolean] whether the target is built as a library
+    #
+    def build_as_library?
+      build_type.library?
+    end
+
+    # @return [Boolean] whether the target is built statically
+    #
+    def build_as_static?
+      build_type.static?
+    end
+
+    # @return [Boolean] whether the target is built as a static framework
+    #
+    def build_as_static_framework?
+      build_type.static_framework?
+    end
+
+    # @return [Boolean] whether the target is built as a static library
+    #
+    def build_as_static_library?
+      build_type.static_library?
+    end
+
+    # @deprecated Prefer {build_as_static_framework?}.
+    #
     # @return [Boolean] Whether the target should build a static framework.
     #
     def static_framework?
-      false
+      build_as_static_framework?
     end
 
     # @return [String] the name to use for the source code module constructed
@@ -101,7 +159,7 @@ module Pod
     # @return [String] the name of the product.
     #
     def product_name
-      if requires_frameworks?
+      if build_as_framework?
         framework_name
       else
         static_library_name
@@ -113,7 +171,7 @@ module Pod
     #         and #product_module_name or #label.
     #
     def product_basename
-      if requires_frameworks?
+      if build_as_framework?
         product_module_name
       else
         label
@@ -139,10 +197,10 @@ module Pod
     end
 
     # @return [Symbol] either :framework or :static_library, depends on
-    #         #requires_frameworks?.
+    #         #build_as_framework?.
     #
     def product_type
-      requires_frameworks? ? :framework : :static_library
+      build_as_framework? ? :framework : :static_library
     end
 
     # @return [String] A string suitable for debugging.
@@ -155,11 +213,13 @@ module Pod
 
     # @!group Framework support
 
+    # @deprecated Prefer {build_as_framework?}.
+    #
     # @return [Boolean] whether the generated target needs to be implemented
     #         as a framework
     #
     def requires_frameworks?
-      host_requires_frameworks? || false
+      build_as_framework?
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/target/aggregate_target.rb

@@ -64,10 +64,12 @@ module Pod
     # @param [Xcodeproj::Project] user_project @see #user_project
     # @param [Array<String>] user_target_uuids @see #user_target_uuids
     # @param [Hash{String=>Array<PodTarget>}] pod_targets_for_build_configuration @see #pod_targets_for_build_configuration
+    # @param [Target::BuildType] build_type @see #build_type
     #
     def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, target_definition,
-                   client_root, user_project, user_target_uuids, pod_targets_for_build_configuration)
-      super(sandbox, host_requires_frameworks, user_build_configurations, archs, platform)
+                   client_root, user_project, user_target_uuids, pod_targets_for_build_configuration,
+                   build_type: Target::BuildType.infer_from_spec(nil, :host_requires_frameworks => host_requires_frameworks))
+      super(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, :build_type => build_type)
       raise "Can't initialize an AggregateTarget without a TargetDefinition!" if target_definition.nil?
       raise "Can't initialize an AggregateTarget with an abstract TargetDefinition!" if target_definition.abstract?
       @target_definition = target_definition
@@ -93,7 +95,7 @@ module Pod
         (before + after).uniq
       end
       AggregateTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
-                          target_definition, client_root, user_project, user_target_uuids, merged).tap do |aggregate_target|
+                          target_definition, client_root, user_project, user_target_uuids, merged, :build_type => build_type).tap do |aggregate_target|
         aggregate_target.search_paths_aggregate_targets.concat(search_paths_aggregate_targets).freeze
       end
     end
@@ -233,8 +235,8 @@ module Pod
         user_build_configurations.keys.each do |config|
           relevant_pod_targets = pod_targets_for_build_configuration(config)
           framework_paths_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
-            non_test_specs = pod_target.non_test_specs.map(&:name)
-            pod_target.framework_paths.values_at(*non_test_specs).flatten.compact.uniq
+            library_specs = pod_target.library_specs.map(&:name)
+            pod_target.framework_paths.values_at(*library_specs).flatten.compact.uniq
           end
         end
         framework_paths_by_config
@@ -246,13 +248,13 @@ module Pod
     def resource_paths_by_config
       @resource_paths_by_config ||= begin
         relevant_pod_targets = pod_targets.reject do |pod_target|
-          pod_target.should_build? && pod_target.requires_frameworks? && !pod_target.static_framework?
+          pod_target.should_build? && pod_target.build_as_dynamic_framework?
         end
         user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
           targets = relevant_pod_targets & pod_targets_for_build_configuration(config)
           resources_by_config[config] = targets.flat_map do |pod_target|
-            non_test_specs = pod_target.non_test_specs.map(&:name)
-            resource_paths = pod_target.resource_paths.values_at(*non_test_specs).flatten
+            library_specs = pod_target.library_specs.map(&:name)
+            resource_paths = pod_target.resource_paths.values_at(*library_specs).flatten
             resource_paths << bridge_support_file
             resource_paths.compact.uniq
           end
@@ -286,12 +288,44 @@ module Pod
       support_files_dir + "#{label}-resources.sh"
     end
 
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the copy resources script input file list.
+    #
+    def copy_resources_script_input_files_path(configuration)
+      support_files_dir + "#{label}-resources-#{configuration}-input-files.xcfilelist"
+    end
+
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the copy resources script output file list.
+    #
+    def copy_resources_script_output_files_path(configuration)
+      support_files_dir + "#{label}-resources-#{configuration}-output-files.xcfilelist"
+    end
+
     # @return [Pathname] The absolute path of the embed frameworks script.
     #
     def embed_frameworks_script_path
       support_files_dir + "#{label}-frameworks.sh"
     end
 
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the embed frameworks script input file list.
+    #
+    def embed_frameworks_script_input_files_path(configuration)
+      support_files_dir + "#{label}-frameworks-#{configuration}-input-files.xcfilelist"
+    end
+
+    # @param  [String] configuration the configuration this path is for.
+    #
+    # @return [Pathname] The absolute path of the embed frameworks script output file list.
+    #
+    def embed_frameworks_script_output_files_path(configuration)
+      support_files_dir + "#{label}-frameworks-#{configuration}-output-files.xcfilelist"
+    end
+
     # @return [String] The output file path fo the check manifest lock script.
     #
     def check_manifest_lock_script_output_file_path
@@ -336,6 +370,20 @@ module Pod
       "${PODS_ROOT}/#{relative_to_pods_root(copy_resources_script_path)}"
     end
 
+    # @return [String] The path of the copy resources script input file list
+    #         relative to the root of the Pods project.
+    #
+    def copy_resources_script_input_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(copy_resources_script_input_files_path('${CONFIGURATION}'))}"
+    end
+
+    # @return [String] The path of the copy resources script output file list
+    #         relative to the root of the Pods project.
+    #
+    def copy_resources_script_output_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(copy_resources_script_output_files_path('${CONFIGURATION}'))}"
+    end
+
     # @return [String] The path of the embed frameworks relative to the
     #         root of the Pods project.
     #
@@ -343,6 +391,20 @@ module Pod
       "${PODS_ROOT}/#{relative_to_pods_root(embed_frameworks_script_path)}"
     end
 
+    # @return [String] The path of the embed frameworks script input file list
+    #         relative to the root of the Pods project.
+    #
+    def embed_frameworks_script_input_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(embed_frameworks_script_input_files_path('${CONFIGURATION}'))}"
+    end
+
+    # @return [String] The path of the embed frameworks script output file list
+    #         relative to the root of the Pods project.
+    #
+    def embed_frameworks_script_output_files_relative_path
+      "${PODS_ROOT}/#{relative_to_pods_root(embed_frameworks_script_output_files_path('${CONFIGURATION}'))}"
+    end
+
     private
 
     # @!group Private Helpers