cocoapods 1.4.0.rc.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3fb1486e8a7724cc9a1ef5a1121aec8cc3b88801
-  data.tar.gz: 4f61dc7de59a46d9407f427239761da95b4cd72f
+SHA256:
+  metadata.gz: 0ef975b90a00794720b4ee7f518780d588916450692e9c8316337cb7035d0714
+  data.tar.gz: '048a8ba73eeb3b2630dca90ce7d1dd2f04f9ce68f045f025ed21249c496448d0'
 SHA512:
-  metadata.gz: 5b81780a945ded8208719682bea1db9de648a1b0373b3df6454ea1e57e2bc32e561e7bfd3c4170f343d058f949225cf995168db790dd5713e11d734335b2e587
-  data.tar.gz: 2f1f5de875bc175d019b6ec3f5312d72571708d1c380e19c6326db83071597673993a0f3bce777718eec66b5a3779b435a920ec5de8170f7e9ddeadafb7b898d
+  metadata.gz: c71ca98c34dcfac5cec43b9bb2fc16726d5d190b0a6f34d49d06f4189b86d6997b965cf04018b756324597643a35b4df6b5482dc71c06c2d45019fe722d1f676
+  data.tar.gz: 9a8521c02a86e9056bc1b8387297b95694e60e2c314cfcac2b5c8b54ccd4a1a8f575f3e6317b5301d7ff5ef94e1e1e88e8f9ea44a619bcec5f72ef03a312b903

data/CHANGELOG.md

@@ -4,6 +4,33 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.4.0 (2018-01-18)
+
+##### Enhancements
+
+* Show warning when Pod source uses unencrypted HTTP  
+  [KrauseFx](https://github.com/KrauseFx)
+  [#7293](https://github.com/CocoaPods/CocoaPods/issues/7293)
+
+##### Bug Fixes
+
+* Do not include test spec resources and framework paths of dependent targets into test scripts  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7318](https://github.com/CocoaPods/CocoaPods/pull/7318)
+
+* Restore `development_pod_targets` public method in installer  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#7292](https://github.com/CocoaPods/CocoaPods/pull/7292)
+
+* Fix resolution when multiple sources provide the same pods, and there are 
+  (potential) dependencies between the sources.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#7031](https://github.com/CocoaPods/CocoaPods/issues/7031)
+
+* Ensure that externally-sourced (e.g. local & git) pods are allowed to resolve
+  to prerelease versions.  
+  [segiddins](https://github.com/segiddins)
+
 ## 1.4.0.rc.1 (2017-12-16)
 
 ##### Enhancements

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the CocoaPods command line tool.
   #
-  VERSION = '1.4.0.rc.1'.freeze unless defined? Pod::VERSION
+  VERSION = '1.4.0'.freeze unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/xcconfig/pod_xcconfig.rb

@@ -75,8 +75,8 @@ module Pod
           if @test_xcconfig
             test_dependent_targets = [target, *target.recursive_test_dependent_targets].uniq
             @xcconfig.merge! XCConfigHelper.search_paths_for_dependent_targets(target, test_dependent_targets - recursive_dependent_targets, @test_xcconfig)
-            XCConfigHelper.generate_vendored_build_settings(nil, target.all_test_dependent_targets, @xcconfig, true, @test_xcconfig)
-            XCConfigHelper.generate_other_ld_flags(nil, target.all_test_dependent_targets, @xcconfig)
+            XCConfigHelper.generate_vendored_build_settings(nil, target.all_dependent_targets, @xcconfig, true, @test_xcconfig)
+            XCConfigHelper.generate_other_ld_flags(nil, target.all_dependent_targets, @xcconfig)
             XCConfigHelper.generate_ld_runpath_search_paths(target, false, true, @xcconfig)
           end
           @xcconfig

data/lib/cocoapods/installer.rb

@@ -644,6 +644,19 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
+    public
+
+    # @return [Array<PodTarget>] The targets of the development pods generated by
+    #         the installation process. This can be used as a convenience method for external scripts.
+    #
+    def development_pod_targets
+      pod_targets.select do |pod_target|
+        sandbox.development_pods.keys.include?(pod_target.pod_name)
+      end
+    end
+
+    #-------------------------------------------------------------------------#
+
     private
 
     # @!group Private helpers

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -117,6 +117,7 @@ module Pod
       # @return [void]
       #
       def download_source
+        verify_source_is_secure(root_spec)
         download_result = Downloader.download(download_request, root, :can_cache => can_cache?)
 
         if (@specific_source = download_result.checkout_options) && specific_source != root_spec.source
@@ -124,6 +125,21 @@ module Pod
         end
       end
 
+      # Verify the source of the spec is secure, which is used to
+      # show a warning to the user if that isn't the case
+      # This method doesn't verify all protocols, but currently
+      # only prohibits unencrypted http:// connections
+      #
+      def verify_source_is_secure(root_spec)
+        return if root_spec.source.nil? || root_spec.source[:http].nil?
+        http_source = root_spec.source[:http]
+        return if http_source.downcase.start_with?('https://')
+
+        UI.warn "'#{root_spec.name}' uses the unencrypted http protocol to transfer the Pod. " \
+                'Please be sure you\'re in a safe network with only trusted hosts in there. ' \
+                'Please reach out to the library author to notify them of this security issue.'
+      end
+
       def download_request
         Downloader::Request.new(
           :spec => root_spec,

data/lib/cocoapods/installer/xcode/pods_project_generator.rb

@@ -288,7 +288,7 @@ module Pod
         private
 
         def add_pod_target_test_dependencies(pod_target, frameworks_group)
-          test_dependent_targets = pod_target.all_test_dependent_targets
+          test_dependent_targets = pod_target.all_dependent_targets
           pod_target.test_specs_by_native_target.each do |test_native_target, test_specs|
             test_dependent_targets.reject(&:should_build?).each do |test_dependent_target|
               add_resource_bundles_to_native_target(test_dependent_target, test_native_target)

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_installer.rb

@@ -242,7 +242,7 @@ module Pod
               product_type = target.product_type_for_test_type(test_type)
               name = target.test_target_label(test_type)
               platform_name = target.platform.name
-              language = target.all_test_dependent_targets.any?(&:uses_swift?) ? :swift : :objc
+              language = target.all_dependent_targets.any?(&:uses_swift?) ? :swift : :objc
               native_test_target = project.new_target(product_type, name, platform_name, deployment_target, nil, language)
               native_test_target.product_reference.name = name
 
@@ -401,9 +401,12 @@ module Pod
           #
           def create_test_target_copy_resources_script(test_type)
             path = target.copy_resources_script_path_for_test_type(test_type)
-            pod_targets = target.all_test_dependent_targets
+            pod_targets = target.all_dependent_targets
             resource_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
-              resources_by_config[config] = pod_targets.flat_map(&:resource_paths)
+              resources_by_config[config] = pod_targets.flat_map do |pod_target|
+                include_test_spec_paths = pod_target == target
+                pod_target.resource_paths(include_test_spec_paths)
+              end
             end
             generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
             update_changed_file(generator, path)
@@ -419,9 +422,12 @@ module Pod
           #
           def create_test_target_embed_frameworks_script(test_type)
             path = target.embed_frameworks_script_path_for_test_type(test_type)
-            pod_targets = target.all_test_dependent_targets
+            pod_targets = target.all_dependent_targets
             framework_paths_by_config = target.user_build_configurations.keys.each_with_object({}) do |config, paths_by_config|
-              paths_by_config[config] = pod_targets.flat_map(&:framework_paths)
+              paths_by_config[config] = pod_targets.flat_map do |pod_target|
+                include_test_spec_paths = pod_target == target
+                pod_target.framework_paths(include_test_spec_paths)
+              end
             end
             generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
             update_changed_file(generator, path)
@@ -435,7 +441,7 @@ module Pod
           #
           def test_target_swift_debug_hack(test_target_bc)
             return unless test_target_bc.debug?
-            return unless target.all_test_dependent_targets.any?(&:uses_swift?)
+            return unless target.all_dependent_targets.any?(&:uses_swift?)
             ldflags = test_target_bc.build_settings['OTHER_LDFLAGS'] ||= '$(inherited)'
             ldflags << ' -lswiftSwiftOnoneSupport'
           end

data/lib/cocoapods/installer/xcode/pods_project_generator/pod_target_integrator.rb

@@ -52,7 +52,7 @@ module Pod
           def add_copy_resources_script_phase(native_target)
             test_type = target.test_type_for_product_type(native_target.symbol_type)
             script_path = "${PODS_ROOT}/#{target.copy_resources_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            resource_paths = target.all_test_dependent_targets.flat_map(&:resource_paths)
+            resource_paths = target.all_dependent_targets.flat_map(&:resource_paths)
             input_paths = []
             output_paths = []
             unless resource_paths.empty?
@@ -74,7 +74,7 @@ module Pod
           def add_embed_frameworks_script_phase(native_target)
             test_type = target.test_type_for_product_type(native_target.symbol_type)
             script_path = "${PODS_ROOT}/#{target.embed_frameworks_script_path_for_test_type(test_type).relative_path_from(target.sandbox.root)}"
-            framework_paths = target.all_test_dependent_targets.flat_map(&:framework_paths)
+            framework_paths = target.all_dependent_targets.flat_map(&:framework_paths)
             input_paths = []
             output_paths = []
             unless framework_paths.empty?

data/lib/cocoapods/resolver.rb

@@ -261,6 +261,7 @@ module Pod
         name = name_for(dependency)
         [
           activated.vertex_named(name).payload ? 0 : 1,
+          dependency.external_source ? 0 : 1,
           dependency.prerelease? ? 0 : 1,
           conflicts[name] ? 0 : 1,
           search_for(dependency).count,
@@ -351,8 +352,7 @@ module Pod
         all_specifications(installation_options.warn_for_multiple_pod_sources).
         select { |s| requirement.satisfied_by? s.version }.
         map { |s| s.subspec_by_name(dependency.name, false, true) }.
-        compact.
-        reverse
+        compact
     end
 
     # @return [Set] Loads or returns a previously initialized set for the Pod
@@ -508,7 +508,7 @@ module Pod
           end,
         )
       end
-      raise type, message
+      raise type.new(message).tap { |e| e.set_backtrace(error.backtrace) }
     end
 
     # Returns whether the given spec is platform-compatible with the dependency

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -37,12 +37,12 @@ module Pod
         end
       end
 
+      # returns the highest versioned spec last
       def all_specifications(warn_for_multiple_pod_sources)
         @all_specifications ||= begin
           sources_by_version = {}
           versions_by_source.each do |source, versions|
             versions.each { |v| (sources_by_version[v] ||= []) << source }
-            sources_by_version
           end
 
           if warn_for_multiple_pod_sources
@@ -56,8 +56,11 @@ module Pod
             end
           end
 
-          versions_by_source.flat_map do |source, versions|
-            versions.map { |version| LazySpecification.new(name, version, source) }
+          # sort versions from high to low
+          sources_by_version.sort_by(&:first).flat_map do |version, sources|
+            # within each version, we want the prefered (first-specified) source
+            # to be the _last_ one
+            sources.reverse_each.map { |source| LazySpecification.new(name, version, source) }
           end
         end
       end

data/lib/cocoapods/target/pod_target.rb

@@ -468,10 +468,10 @@ module Pod
       end
     end
 
-    # @return [Array<PodTarget>] the canonical list of test dependent targets this target has a dependency upon.
-    #         This includes the parent target as well as its transitive dependencies.
+    # @return [Array<PodTarget>] the canonical list of dependent targets this target has a dependency upon.
+    #         This list includes the target itself as well as its recursive dependent and test dependent targets.
     #
-    def all_test_dependent_targets
+    def all_dependent_targets
       [self, *recursive_dependent_targets, *recursive_test_dependent_targets].uniq
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.4.0.rc.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -63,7 +63,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -524,9 +524,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 3
 summary: The Cocoa library package manager.
 test_files: []
-has_rdoc: