cocoapods 1.7.5 → 1.8.0.beta.1

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -42,17 +42,26 @@ module Pod
       end
 
       class External
-        def all_specifications(_warn_for_multiple_pod_sources)
-          [specification]
+        def all_specifications(_warn_for_multiple_pod_sources, requirement)
+          if requirement.satisfied_by? specification.version
+            [specification]
+          else
+            []
+          end
         end
       end
 
       # returns the highest versioned spec last
-      def all_specifications(warn_for_multiple_pod_sources)
-        @all_specifications ||= begin
+      def all_specifications(warn_for_multiple_pod_sources, requirement)
+        @all_specifications ||= {}
+        @all_specifications[requirement] ||= begin
           sources_by_version = {}
           versions_by_source.each do |source, versions|
-            versions.each { |v| (sources_by_version[v] ||= []) << source }
+            versions.each do |v|
+              next unless requirement.satisfied_by?(v)
+
+              (sources_by_version[v] ||= []) << source
+            end
           end
 
           if warn_for_multiple_pod_sources

data/lib/cocoapods/sandbox.rb

@@ -286,7 +286,7 @@ module Pod
       spec =
         case podspec
         when String
-          output_path.open('w') { |f| f.puts(podspec) }
+          Sandbox.update_changed_file(output_path, podspec)
           Specification.from_file(output_path)
         when Pathname
           unless podspec.exist?
@@ -296,7 +296,7 @@ module Pod
           Specification.from_file(podspec)
         when Specification
           raise ArgumentError, 'can only store Specification objects as json' unless json
-          output_path.open('w') { |f| f.puts(podspec.to_pretty_json) }
+          Sandbox.update_changed_file(output_path, podspec.to_pretty_json)
           podspec.dup
         else
           raise ArgumentError, "Unknown type for podspec: #{podspec.inspect}"
@@ -379,6 +379,18 @@ module Pod
       checkout_sources.delete(root_name)
     end
 
+    # Removes local podspec a Pod.
+    #
+    # @param  [String] name
+    #         The name of the Pod.
+    #
+    # @return [void]
+    #
+    def remove_local_podspec(name)
+      local_podspec = specification_path(name)
+      FileUtils.rm(local_podspec) if local_podspec
+    end
+
     # @return [Hash{String=>Hash}] The options necessary to recreate the exact
     #         checkout of a given Pod grouped by its name.
     #
@@ -432,6 +444,27 @@ module Pod
       development_pods[root_name]
     end
 
+    # @!group Convenience Methods
+
+    # Writes a file if it does not exist or if its contents have changed.
+    #
+    # @param  [Pathname] path
+    #         The path to read from and write to.
+    #
+    # @param  [String] contents
+    #         The contents to write if they do not match or the file does not exist.
+    #
+    # @return [void]
+    #
+    def self.update_changed_file(path, contents)
+      if path.exist?
+        content_stream = StringIO.new(contents)
+        identical = File.open(path, 'rb') { |f| FileUtils.compare_stream(f, content_stream) }
+        return if identical
+      end
+      File.open(path, 'w') { |f| f.write(contents) }
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods/sandbox/pod_dir_cleaner.rb

@@ -48,14 +48,13 @@ module Pod
       # @return [Array<Strings>] The paths that can be deleted.
       #
       def clean_paths
-        cached_used = used_files
+        cached_used = used_files.map(&:downcase)
         glob_options = File::FNM_DOTMATCH | File::FNM_CASEFOLD
         files = Pathname.glob(root + '**/*', glob_options).map(&:to_s)
-
+        cached_used_set = cached_used.to_set
         files.reject do |candidate|
           candidate = candidate.downcase
-          candidate.end_with?('.', '..') || cached_used.any? do |path|
-            path = path.downcase
+          candidate.end_with?('.', '..') || cached_used_set.include?(candidate) || cached_used.any? do |path|
             path.include?(candidate) || candidate.include?(path)
           end
         end

data/lib/cocoapods/sources_manager.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-core/source'
 require 'set'
+require 'rest'
 
 module Pod
   class Source
@@ -15,40 +16,64 @@ module Pod
       #         The URL of the source.
       #
       def find_or_create_source_with_url(url)
-        unless source = source_with_url(url)
-          name = name_for_url(url)
-          # Hack to ensure that `repo add` output is shown.
-          previous_title_level = UI.title_level
-          UI.title_level = 0
-          begin
-            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
-          rescue Informative => e
-            message = "Unable to add a source with url `#{url}` " \
-              "named `#{name}`.\n"
-            message << "(#{e})\n" if Config.instance.verbose?
-            message << 'You can try adding it manually in ' \
-              "`#{Config.instance.repos_dir}` or via `pod repo add`."
-            raise Informative, message
-          ensure
-            UI.title_level = previous_title_level
+        source_with_url(url) || create_source_with_url(url)
+      end
+
+      # Adds the source whose {Source#url} is equal to `url`,
+      # in a manner similarly to `pod repo add` if it is not found.
+      #
+      # @raise  If no source with the given `url` could be created,
+      #
+      # @return [Source] The source whose {Source#url} is equal to `url`,
+      #
+      # @param  [String] url
+      #         The URL of the source.
+      #
+      def create_source_with_url(url)
+        name = name_for_url(url)
+        is_cdn = cdn_url?(url)
+
+        # Hack to ensure that `repo add` output is shown.
+        previous_title_level = UI.title_level
+        UI.title_level = 0
+
+        begin
+          if is_cdn
+            Command::Repo::AddCDN.parse([name, url]).run
+          else
+            Command::Repo::Add.parse([name, url]).run
           end
-          source = source_with_url(url)
+        rescue Informative => e
+          message = "Unable to add a source with url `#{url}` " \
+            "named `#{name}`.\n"
+          message << "(#{e})\n" if Config.instance.verbose?
+          message << 'You can try adding it manually in ' \
+            "`#{Config.instance.repos_dir}` or via `pod repo add`."
+          raise Informative, message
+        ensure
+          UI.title_level = previous_title_level
         end
+        source = source_with_url(url)
 
         raise "Unable to create a source with URL #{url}" unless source
 
         source
       end
 
+      # Determines whether `url` is a CocoaPods CDN URL.
+      #
+      # @return [Boolean] whether `url` is a CocoaPods CDN URL,
+      #
+      # @param  [String] url
+      #         The URL of the source.
+      #
+      def cdn_url?(url)
+        url =~ %r{^https:\/\/} &&
+          REST.head(url + '/all_pods.txt').ok?
+      rescue => e
+        raise Informative, "Couldn't determine repo type for URL: `#{url}`: #{e}"
+      end
+
       # Returns the source whose {Source#name} or {Source#url} is equal to the
       # given `name_or_url`.
       #
@@ -82,22 +107,35 @@ module Pod
       #
       def update(source_name = nil, show_output = false)
         if source_name
-          sources = [git_source_named(source_name)]
+          sources = [updateable_source_named(source_name)]
         else
-          sources =  git_sources
+          sources = updateable_sources
         end
 
         changed_spec_paths = {}
-        sources.each do |source|
-          UI.section "Updating spec repo `#{source.name}`" do
-            changed_source_paths = source.update(show_output)
-            changed_spec_paths[source] = changed_source_paths if changed_source_paths.count > 0
-            source.verify_compatibility!
+        # Ceate the Spec_Lock file if needed and lock it so that concurrent
+        # repo updates do not cause each other to fail
+        File.open("#{Config.instance.repos_dir}/Spec_Lock", File::CREAT) do |f|
+          f.flock(File::LOCK_EX)
+          sources.each do |source|
+            UI.section "Updating spec repo `#{source.name}`" do
+              changed_source_paths = source.update(show_output)
+              changed_spec_paths[source] = changed_source_paths if changed_source_paths.count > 0
+              source.verify_compatibility!
+            end
           end
         end
         # Perform search index update operation in background.
         update_search_index_if_needed_in_background(changed_spec_paths)
       end
+
+      # Adds the provided source to the list of sources
+      #
+      # @param [Source] source the source to add
+      #
+      def add_source(source)
+        all << source unless all.any? { |s| s.url == source || s.name == source.name }
+      end
     end
 
     extend Executable
@@ -131,16 +169,7 @@ module Pod
     end
   end
 
-  class MasterSource
-    def update_git_repo(show_output = false)
-      if repo.join('.git', 'shallow').file?
-        UI.info "Performing a deep fetch of the `#{name}` specs repo to improve future performance" do
-          git!(%W(-C #{repo} fetch --unshallow))
-        end
-      end
-      super
-    end
-
+  class TrunkSource
     def verify_compatibility!
       super
       latest_cocoapods_version = metadata.latest_cocoapods_version && Gem::Version.create(metadata.latest_cocoapods_version)

data/lib/cocoapods/target.rb

@@ -41,7 +41,7 @@ module Pod
     #
     attr_reader :build_settings
 
-    # @return [Type] the build type for this target.
+    # @return [Target::BuildType] the build type for this target.
     #
     attr_reader :build_type
     private :build_type
@@ -290,6 +290,12 @@ module Pod
       support_files_dir + "#{label}-Info.plist"
     end
 
+    # @return [Hash] additional entries for the generated Info.plist
+    #
+    def info_plist_entries
+      {}
+    end
+
     # @return [Pathname] the path of the dummy source generated by CocoaPods
     #
     def dummy_source_path

data/lib/cocoapods/target/aggregate_target.rb

@@ -7,7 +7,8 @@ module Pod
   class AggregateTarget < Target
     # Product types where the product's frameworks must be embedded in a host target
     #
-    EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :static_library, :messages_extension, :watch_extension, :xpc_service].freeze
+    EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES = [:app_extension, :framework, :static_library, :messages_extension,
+                                             :watch_extension, :xpc_service].freeze
 
     # @return [TargetDefinition] the target definition of the Podfile that
     #         generated this target.
@@ -118,7 +119,9 @@ module Pod
       # that this is a library
       return false if user_project.nil?
       symbol_types = user_targets.map(&:symbol_type).uniq
-      raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}." unless symbol_types.count == 1
+      unless symbol_types.count == 1
+        raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}."
+      end
       [:framework, :dynamic_library, :static_library].include? symbol_types.first
     end
 
@@ -134,7 +137,9 @@ module Pod
       # target that would require a host target
       return false if user_project.nil?
       symbol_types = user_targets.map(&:symbol_type).uniq
-      raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}." unless symbol_types.count == 1
+      unless symbol_types.count == 1
+        raise ArgumentError, "Expected single kind of user_target for #{name}. Found #{symbol_types.join(', ')}."
+      end
       EMBED_FRAMEWORKS_IN_HOST_TARGET_TYPES.include?(symbol_types[0])
     end
 
@@ -194,7 +199,7 @@ module Pod
     #
     def specs_by_build_configuration
       result = {}
-      user_build_configurations.keys.each do |build_configuration|
+      user_build_configurations.each_key do |build_configuration|
         result[build_configuration] = pod_targets_for_build_configuration(build_configuration).
           flat_map(&:specs)
       end
@@ -216,14 +221,14 @@ module Pod
     # @return [Boolean] Whether the target contains any resources
     #
     def includes_resources?
-      !resource_paths_by_config.values.all?(&:empty?)
+      !resource_paths_by_config.each_value.all?(&:empty?)
     end
 
     # @return [Boolean] Whether the target contains framework to be embedded into
     #         the user target
     #
     def includes_frameworks?
-      !framework_paths_by_config.values.all?(&:empty?)
+      !framework_paths_by_config.each_value.all?(&:empty?)
     end
 
     # @return [Hash{String => Array<FrameworkPaths>}] The vendored dynamic artifacts and framework target
@@ -232,7 +237,7 @@ module Pod
     def framework_paths_by_config
       @framework_paths_by_config ||= begin
         framework_paths_by_config = {}
-        user_build_configurations.keys.each do |config|
+        user_build_configurations.each_key do |config|
           relevant_pod_targets = pod_targets_for_build_configuration(config)
           framework_paths_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
             library_specs = pod_target.library_specs.map(&:name)
@@ -250,7 +255,7 @@ module Pod
         relevant_pod_targets = pod_targets.reject do |pod_target|
           pod_target.should_build? && pod_target.build_as_dynamic_framework?
         end
-        user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
+        user_build_configurations.each_key.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|
             library_specs = pod_target.library_specs.map(&:name)

data/lib/cocoapods/target/build_settings.rb

@@ -402,8 +402,8 @@ module Pod
       #
       # @return [Hash<String, String>]
       #
-      def merged_xcconfigs(xcconfig_values_by_consumer_by_key, attribute)
-        xcconfig_values_by_consumer_by_key.each_with_object({}) do |(key, values_by_consumer), xcconfig|
+      def merged_xcconfigs(xcconfig_values_by_consumer_by_key, attribute, overriding: {})
+        xcconfig_values_by_consumer_by_key.each_with_object(overriding.dup) do |(key, values_by_consumer), xcconfig|
           uniq_values = values_by_consumer.values.uniq
           values_are_bools = uniq_values.all? { |v| v =~ /\A(yes|no)\z/i }
           if values_are_bools
@@ -417,7 +417,11 @@ module Pod
             end
           elsif PLURAL_SETTINGS.include? key
             # Plural build settings
-            xcconfig[key] = uniq_values.join(' ')
+            if xcconfig.key?(key)
+              overridden = xcconfig[key]
+              uniq_values.prepend(overridden)
+            end
+            xcconfig[key] = uniq_values.uniq.join(' ')
           elsif uniq_values.count > 1
             # Singular build settings
             UI.warn "Can't merge #{attribute} for pod targets: " \
@@ -555,12 +559,11 @@ module Pod
 
           frameworks = []
           frameworks.concat consumer_frameworks
-          if non_library_xcconfig? || (target.should_build? && target.build_as_dynamic?)
+          if library_xcconfig? && (target.should_build? && target.build_as_dynamic?)
             frameworks.concat vendored_static_frameworks.map { |l| File.basename(l, '.framework') }
           end
           if non_library_xcconfig?
-            frameworks.concat vendored_dynamic_frameworks.map { |l| File.basename(l, '.framework') }
-            frameworks.concat dependent_targets.flat_map { |pt| pt.build_settings.frameworks_to_import }
+            frameworks.concat dependent_targets_to_link.flat_map { |pt| pt.build_settings.frameworks_to_import }
           end
           frameworks
         end
@@ -665,7 +668,7 @@ module Pod
           end
           if non_library_xcconfig?
             libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.dynamic_libraries_to_import }
-            libraries.concat dependent_targets.flat_map { |pt| pt.build_settings.static_libraries_to_import }
+            libraries.concat dependent_targets_to_link.flat_map { |pt| pt.build_settings.static_libraries_to_import }
           end
           libraries
         end
@@ -865,6 +868,17 @@ module Pod
           )
         end
 
+        # @return [Array<PodTarget>]
+        define_build_settings_method :dependent_targets_to_link, :memoized => true do
+          if test_xcconfig?
+            # we're embedding into an app defined by an app spec
+            host_targets = target.app_host_dependent_targets_for_spec(non_library_spec)
+            dependent_targets - host_targets
+          else
+            dependent_targets
+          end
+        end
+
         # Returns the +pod_target_xcconfig+ for the pod target and its spec
         # consumers grouped by keys
         #
@@ -884,17 +898,26 @@ module Pod
         # @return [Hash{String, String}]
         #
         define_build_settings_method :merged_pod_target_xcconfigs, :memoized => true do
-          merged_xcconfigs(pod_target_xcconfig_values_by_consumer_by_key, :pod_target_xcconfig)
+          merged_xcconfigs(pod_target_xcconfig_values_by_consumer_by_key, :pod_target_xcconfig,
+                           :overriding => non_library_xcconfig? ? target.build_settings.merged_pod_target_xcconfigs : {})
         end
 
         # @return [Array<Sandbox::FileAccessor>]
         define_build_settings_method :file_accessors, :memoized => true do
-          target.file_accessors.select { |fa| fa.spec.spec_type == @xcconfig_spec_type }
+          if non_library_xcconfig?
+            target.file_accessors.select { |fa| non_library_spec == fa.spec }
+          else
+            target.file_accessors.select { |fa| fa.spec.spec_type == @xcconfig_spec_type }
+          end
         end
 
         # @return [Array<Specification::Consumer>]
         define_build_settings_method :spec_consumers, :memoized => true do
-          target.spec_consumers.select { |fa| fa.spec.spec_type == @xcconfig_spec_type }
+          if non_library_xcconfig?
+            target.spec_consumers.select { |sc| non_library_spec == sc.spec }
+          else
+            target.spec_consumers.select { |sc| sc.spec.spec_type == @xcconfig_spec_type }
+          end
         end
 
         #-------------------------------------------------------------------------#