cocoapods 1.3.0.rc.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b7f59b4c0c994860e2d5a181acaa9f6afd0e0c2
-  data.tar.gz: f8ca3195626762fe8867db815b01936429b91976
+  metadata.gz: 5f6244748bfc3f969fcc793ec3334896af97bd5d
+  data.tar.gz: 3ae66b4c08893dc13fa0acad1fc5c4ec67719d4b
 SHA512:
-  metadata.gz: f8a03b60c0a4d3d31f1349ad7c107a456ef9ccad276db521552621ab4493540d04e93ed381c82f5cebafb3c46c33eaf98a1b1e2aeba78e8205970cc370e43099
-  data.tar.gz: 33a29f568edddeca5ba65901269565784e0830a37548ba7a21123392201782c2a1af9bf081b28c2d6c8acd9937c4fa534d86877c588dbc90595e55b015319a79
+  metadata.gz: caae7644d08c46b119981dd8579666934e185728e5da12614f6c57188a8f2e9b33dbba64c49ec977be9fed9a8a1f181165c48ad78decb412e97b415c288372e9
+  data.tar.gz: 0d29a3ed010d12a8550cbe9f0f7c04da1c92aacdd7c75996cc2a7203b6969f38566fdcd8ed7f5a523fc8d1ede01a34a5e62795b2fa40f6ba0e6ce96c92738803

data/CHANGELOG.md

@@ -4,6 +4,26 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 1.3.0 (2017-08-02)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Ensure transitive dependencies are linked to test targets  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6917](https://github.com/CocoaPods/CocoaPods/pull/6917)
+
+* Properly install pod targets with test specs within subspecs  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6915](https://github.com/CocoaPods/CocoaPods/pull/6915)
+
+* Add `--skip-tests` support `push` to push command  
+  [Dimitris Koutsogiorgas](https://github.com/dnkoutso)
+  [#6893](https://github.com/CocoaPods/CocoaPods/pull/6893)
+
 ## 1.3.0.rc.1 (2017-07-27)
 
 ##### Enhancements

data/lib/cocoapods/command/repo/push.rb

@@ -30,6 +30,7 @@ module Pod
             ['--local-only', 'Does not perform the step of pushing REPO to its remote'],
             ['--no-private', 'Lint includes checks that apply only to public repos'],
             ['--skip-import-validation', 'Lint skips validating that the pod can be imported'],
+            ['--skip-tests', 'Lint skips building and running tests during validation'],
             ['--commit-message="Fix bug in pod"', 'Add custom commit message. ' \
             'Opens default editor if no commit message is specified.'],
             ['--use-json', 'Push JSON spec to repo'],
@@ -52,6 +53,7 @@ module Pod
           @use_json = argv.flag?('use-json')
           @swift_version = argv.option('swift-version', nil)
           @skip_import_validation = argv.flag?('skip-import-validation', false)
+          @skip_tests = argv.flag?('skip-tests', false)
           super
         end
 
@@ -130,6 +132,7 @@ module Pod
             validator.ignore_public_only_results = @private
             validator.swift_version = @swift_version
             validator.skip_import_validation = @skip_import_validation
+            validator.skip_tests = @skip_tests
             begin
               validator.validate
             rescue => e

data/lib/cocoapods/gem_version.rb

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

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

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

data/lib/cocoapods/installer/analyzer.rb

@@ -429,17 +429,28 @@ module Pod
           end
         end
 
-        target.pod_targets = pod_targets.select do |pod_target|
-          target_definition_included = pod_target.target_definitions.include?(target_definition)
-          explicitly_defined_in_target_definition = target_definition.non_inherited_dependencies.map(&:name).include?(pod_target.name)
-          next false unless target_definition_included
-          next true if explicitly_defined_in_target_definition
-          !pod_target_test_only?(pod_target, pod_targets)
-        end
+        target.pod_targets = filter_pod_targets_for_target_definition(pod_targets, target_definition)
 
         target
       end
 
+      # Returns a filtered list of pod targets that should or should not be part of the target definition. Pod targets
+      # used by tests only are filtered.
+      #
+      # @param [Array<PodTarget>] pod_targets
+      #        the array of pod targets to check against
+      #
+      # @param [TargetDefinition] target_definition
+      #        the target definition to use as the base for filtering
+      #
+      # @return [Array<PodTarget>] the filtered list of pod targets.
+      #
+      def filter_pod_targets_for_target_definition(pod_targets, target_definition)
+        pod_targets.select do |pod_target|
+          pod_target.target_definitions.include?(target_definition) && !pod_target_test_only?(pod_target, pod_targets)
+        end
+      end
+
       # Returns true if a pod target is only used by other pod targets as a test dependency and therefore should
       # not be included as part of the aggregate target.
       #
@@ -457,8 +468,12 @@ module Pod
         if @test_pod_target_analyzer_cache.key?(key)
           return @test_pod_target_analyzer_cache[key]
         end
-        source = pod_targets.any? { |pt| pt.dependent_targets.map(&:name).include?(name) }
-        test = pod_targets.any? { |pt| pt.test_dependent_targets.map(&:name).include?(name) }
+        source = pod_targets.any? do |pt|
+          pt.dependent_targets.map(&:name).include?(name)
+        end
+        test = pod_targets.any? do |pt|
+          pt.test_dependent_targets.reject { |dpt| dpt.name == pt.name }.map(&:name).include?(name)
+        end
         @test_pod_target_analyzer_cache[key] = !source && test
       end
 
@@ -498,6 +513,7 @@ module Pod
           pod_targets.each do |target|
             dependencies = transitive_dependencies_for_specs(target.specs.reject(&:test_specification?), target.platform, all_specs).group_by(&:root)
             test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, all_specs).group_by(&:root)
+            test_dependencies.delete_if { |k| dependencies.key? k }
             target.dependent_targets = filter_dependencies(dependencies, pod_targets_by_name, target)
             target.test_dependent_targets = filter_dependencies(test_dependencies, pod_targets_by_name, target)
           end
@@ -512,6 +528,7 @@ module Pod
             pod_targets.each do |target|
               dependencies = transitive_dependencies_for_specs(target.specs, target.platform, specs).group_by(&:root)
               test_dependencies = transitive_dependencies_for_specs(target.specs.select(&:test_specification?), target.platform, all_specs).group_by(&:root)
+              test_dependencies.delete_if { |k| dependencies.key? k }
               target.dependent_targets = pod_targets.reject { |t| dependencies[t.root_spec].nil? }
               target.test_dependent_targets = pod_targets.reject { |t| test_dependencies[t.root_spec].nil? }
             end

data/lib/cocoapods/installer/pods_project_integrator/pod_target_integrator.rb

@@ -47,7 +47,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, *target.test_dependent_targets].flat_map(&:resource_paths)
+        resource_paths = target.all_test_dependent_targets.flat_map(&:resource_paths)
         input_paths = []
         output_paths = []
         unless resource_paths.empty?
@@ -64,7 +64,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, *target.test_dependent_targets].flat_map(&:framework_paths)
+        framework_paths = target.all_test_dependent_targets.flat_map(&:framework_paths)
         input_paths = []
         output_paths = []
         unless framework_paths.empty?

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

@@ -266,7 +266,7 @@ module Pod
         private
 
         def add_pod_target_test_dependencies(pod_target, frameworks_group)
-          test_dependent_targets = [pod_target, *pod_target.test_dependent_targets]
+          test_dependent_targets = pod_target.all_test_dependent_targets
           pod_target.test_native_targets.each do |test_native_target|
             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

@@ -333,7 +333,7 @@ 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, *target.test_dependent_targets]
+            pod_targets = target.all_test_dependent_targets
             resource_paths_by_config = { 'Debug' => pod_targets.flat_map(&:resource_paths) }
             generator = Generator::CopyResourcesScript.new(resource_paths_by_config, target.platform)
             update_changed_file(generator, path)
@@ -349,7 +349,7 @@ 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, *target.test_dependent_targets]
+            pod_targets = target.all_test_dependent_targets
             framework_paths_by_config = { 'Debug' => pod_targets.flat_map(&:framework_paths) }
             generator = Generator::EmbedFrameworksScript.new(framework_paths_by_config)
             update_changed_file(generator, path)

data/lib/cocoapods/target/pod_target.rb

@@ -355,15 +355,41 @@ module Pod
     #         dependency upon.
     #
     def recursive_dependent_targets
-      targets = dependent_targets.clone
+      @recursive_dependent_targets ||= begin
+        targets = dependent_targets.clone
 
-      targets.each do |target|
-        target.dependent_targets.each do |t|
-          targets.push(t) unless t == self || targets.include?(t)
+        targets.each do |target|
+          target.dependent_targets.each do |t|
+            targets.push(t) unless t == self || targets.include?(t)
+          end
         end
+
+        targets
       end
+    end
 
-      targets
+    # @return [Array<PodTarget>] the recursive targets that this target has a
+    #         test dependency upon.
+    #
+    def recursive_test_dependent_targets
+      @recursive_test_dependent_targets ||= begin
+        targets = test_dependent_targets.clone
+
+        targets.each do |target|
+          target.test_dependent_targets.each do |t|
+            targets.push(t) unless t == self || targets.include?(t)
+          end
+        end
+
+        targets
+      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.
+    #
+    def all_test_dependent_targets
+      [self, *recursive_dependent_targets, *recursive_test_dependent_targets].uniq
     end
 
     # Checks if the target should be included in the build configuration with

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.3.0.rc.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-02 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.3.0.rc.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.rc.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement