cocoapods 1.3.0.beta.2 → 1.3.0.beta.3

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

@@ -47,7 +47,7 @@ module Pod
               file_accessors = pod_targets.flat_map(&:file_accessors)
 
               frameworks = file_accessors.flat_map(&:vendored_frameworks).uniq.map(&:basename)
-              frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name)
+              frameworks += pod_targets.select { |pt| pt.should_build? && pt.requires_frameworks? }.map(&:product_module_name).uniq
               verify_no_duplicate_names(frameworks, aggregate_target.label, 'frameworks')
 
               libraries = file_accessors.flat_map(&:vendored_libraries).uniq.map(&:basename)

data/lib/cocoapods/project.rb

@@ -177,12 +177,15 @@ module Pod
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.
     #
+    # @param  [Pathname] base_path
+    #         The base path for newly created groups when reflect_file_system_structure is true.
+    #         If nil, the provided group's real_path is used.
+    #
     # @return [PBXFileReference] The new file reference.
     #
-    def add_file_reference(absolute_path, group, reflect_file_system_structure = false)
+    def add_file_reference(absolute_path, group, reflect_file_system_structure = false, base_path = nil)
       file_path_name = absolute_path.is_a?(Pathname) ? absolute_path : Pathname.new(absolute_path)
-      group = group_for_path_in_group(file_path_name, group, reflect_file_system_structure)
-
+      group = group_for_path_in_group(file_path_name, group, reflect_file_system_structure, base_path)
       if ref = reference_for_path(file_path_name.realpath)
         @refs_by_absolute_path[absolute_path.to_s] = ref
         ref
@@ -305,24 +308,35 @@ module Pod
     #         If yes, where needed, intermediate groups are created, similar to
     #         how mkdir -p operates.
     #
+    # @param  [Pathname] base_path
+    #         The base path for the newly created group. If nil, the provided group's real_path is used.
+    #
     # @return [PBXGroup] The appropriate group for the filepath.
     #         Can be PBXVariantGroup, if the file is localized.
     #
-    def group_for_path_in_group(absolute_pathname, group, reflect_file_system_structure)
+    def group_for_path_in_group(absolute_pathname, group, reflect_file_system_structure, base_path = nil)
       unless absolute_pathname.absolute?
         raise ArgumentError, "Paths must be absolute #{absolute_pathname}"
       end
+      unless base_path.nil? || base_path.absolute?
+        raise ArgumentError, "Paths must be absolute #{base_path}"
+      end
 
-      relative_pathname = absolute_pathname.relative_path_from(group.real_path)
+      relative_base = base_path.nil? ? group.real_path : base_path.realdirpath
+      relative_pathname = absolute_pathname.relative_path_from(relative_base)
       relative_dir = relative_pathname.dirname
       lproj_regex = /\.lproj/i
 
       # Add subgroups for directories, but treat .lproj as a file
       if reflect_file_system_structure
-        relative_dir.each_filename do|name|
+        path = relative_base
+        relative_dir.each_filename do |name|
           break if name.to_s =~ lproj_regex
           next if name == '.'
-          group = group[name] || group.new_group(name, name)
+          # Make sure groups have the correct absolute path set, as intermittent
+          # directories may not be included in the group structure
+          path += name
+          group = group[name] || group.new_group(name, path)
         end
       end
 

data/lib/cocoapods/sandbox.rb

@@ -89,8 +89,8 @@ module Pod
         path = pod_dir(name)
         path.rmtree if path.exist?
       end
-      podspe_path = specification_path(name)
-      podspe_path.rmtree if podspe_path
+      podspec_path = specification_path(name)
+      podspec_path.rmtree if podspec_path
     end
 
     # Prepares the sandbox for a new installation removing any file that will
@@ -98,7 +98,6 @@ module Pod
     #
     def prepare
       FileUtils.rm_rf(headers_root)
-      FileUtils.rm_rf(target_support_files_root)
 
       FileUtils.mkdir_p(headers_root)
       FileUtils.mkdir_p(sources_root)

data/lib/cocoapods/target/aggregate_target.rb

@@ -184,7 +184,7 @@ module Pod
       pod_targets.any?(&:uses_swift?)
     end
 
-    # @return [Hash{String => Array<Hash{Symbol => [String]}>] The vendored dynamic artifacts and framework target
+    # @return [Hash{String => Array<Hash{Symbol => [String]}>}] The vendored dynamic artifacts and framework target
     #         input and output paths grouped by config
     #
     def framework_paths_by_config
@@ -193,51 +193,21 @@ module Pod
         relevant_pod_targets = pod_targets.select do |pod_target|
           pod_target.include_in_build_config?(target_definition, config)
         end
-        framework_paths_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
-          frameworks = []
-          pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
-            relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
-            framework = { :name => framework_path.basename.to_s,
-                          :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
-                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
-            # Until this can be configured, assume the dSYM file uses the file name as the framework.
-            # See https://github.com/CocoaPods/CocoaPods/issues/1698
-            dsym_name = "#{framework_path.basename}.dSYM"
-            dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
-            if dsym_path.exist?
-              framework[:dsym_name] = dsym_name
-              framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
-              framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
-            end
-            frameworks << framework
-          end
-          if pod_target.should_build? && pod_target.requires_frameworks?
-            frameworks << { :name => pod_target.product_name,
-                            :input_path => pod_target.build_product_path('${BUILT_PRODUCTS_DIR}'),
-                            :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{pod_target.product_name}" }
-          end
-          frameworks
-        end
+        framework_paths_by_config[config] = relevant_pod_targets.flat_map(&:framework_paths)
       end
       framework_paths_by_config
     end
 
-    # @return [Hash{ String => Array<String> }] Uniqued Resources grouped by config
+    # @return [Hash{String => Array<String>}] Uniqued Resources grouped by config
     #
     def resource_paths_by_config
-      library_targets = pod_targets.reject do |pod_target|
+      relevant_pod_targets = pod_targets.reject do |pod_target|
         pod_target.should_build? && pod_target.requires_frameworks?
       end
       user_build_configurations.keys.each_with_object({}) do |config, resources_by_config|
-        resources_by_config[config] = library_targets.flat_map do |library_target|
-          next [] unless library_target.include_in_build_config?(target_definition, config)
-          resource_paths = library_target.file_accessors.flat_map do |accessor|
-            accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
-          end
-          resource_bundles = library_target.file_accessors.flat_map do |accessor|
-            accessor.resource_bundles.keys.map { |name| "#{library_target.configuration_build_dir}/#{name.shellescape}.bundle" }
-          end
-          (resource_paths + resource_bundles + [bridge_support_file].compact).uniq
+        resources_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
+          next [] unless pod_target.include_in_build_config?(target_definition, config)
+          (pod_target.resource_paths + [bridge_support_file].compact).uniq
         end
       end
     end

data/lib/cocoapods/target/pod_target.rb

@@ -7,7 +7,7 @@ module Pod
     #
     attr_reader :specs
 
-    # @return [Array<PBXNativeTarget>] the target definitions of the Podfile
+    # @return [Array<TargetDefinition>] the target definitions of the Podfile
     #         that generated this target.
     #
     attr_reader :target_definitions
@@ -56,6 +56,7 @@ module Pod
       @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Private')
       @file_accessors = []
       @resource_bundle_targets = []
+      @test_resource_bundle_targets = []
       @test_native_targets = []
       @dependent_targets = []
       @test_dependent_targets = []
@@ -149,6 +150,10 @@ module Pod
     #         to this target.
     attr_reader :resource_bundle_targets
 
+    # @return [Array<PBXNativeTarget>] the resource bundle test targets belonging
+    #         to this target.
+    attr_reader :test_resource_bundle_targets
+
     # @return [Bool] Whether or not this target should be build.
     #
     # A target should not be build if it has no source files.
@@ -192,6 +197,53 @@ module Pod
       specs.select(&:test_specification?).map(&:test_type).uniq
     end
 
+    # @return [Array<Hash{Symbol => [String]}>] The vendored and non vendored framework paths
+    #         this target depends upon.
+    #
+    def framework_paths
+      @framework_paths ||= begin
+        frameworks = []
+        file_accessors.flat_map(&:vendored_dynamic_artifacts).map do |framework_path|
+          relative_path_to_sandbox = framework_path.relative_path_from(sandbox.root)
+          framework = { :name => framework_path.basename.to_s,
+                        :input_path => "${PODS_ROOT}/#{relative_path_to_sandbox}",
+                        :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{framework_path.basename}" }
+          # Until this can be configured, assume the dSYM file uses the file name as the framework.
+          # See https://github.com/CocoaPods/CocoaPods/issues/1698
+          dsym_name = "#{framework_path.basename}.dSYM"
+          dsym_path = Pathname.new("#{framework_path.dirname}/#{dsym_name}")
+          if dsym_path.exist?
+            framework[:dsym_name] = dsym_name
+            framework[:dsym_input_path] = "${PODS_ROOT}/#{relative_path_to_sandbox}.dSYM"
+            framework[:dsym_output_path] = "${DWARF_DSYM_FOLDER_PATH}/#{dsym_name}"
+          end
+          frameworks << framework
+        end
+        if should_build? && requires_frameworks?
+          frameworks << { :name => product_name,
+                          :input_path => build_product_path('${BUILT_PRODUCTS_DIR}'),
+                          :output_path => "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/#{product_name}" }
+        end
+        frameworks
+      end
+    end
+
+    # @return [Array<String>] The resource and resource bundle paths this target depends upon.
+    #
+    def resource_paths
+      @resource_paths ||= begin
+        resource_paths = file_accessors.flat_map do |accessor|
+          accessor.resources.flat_map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project.path.dirname)}" }
+        end
+        resource_bundles = file_accessors.flat_map do |accessor|
+          prefix = Generator::XCConfig::XCConfigHelper::CONFIGURATION_BUILD_DIR_VARIABLE
+          prefix = configuration_build_dir unless accessor.spec.test_specification?
+          accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
+        end
+        resource_paths + resource_bundles
+      end
+    end
+
     # Returns the corresponding native target to use based on the provided specification.
     # This is used to figure out whether to add a source file into the library native target or any of the
     # test native targets.
@@ -226,6 +278,22 @@ module Pod
       end
     end
 
+    # Returns the corresponding test type given the product type.
+    #
+    # @param  [Symbol] product_type
+    #         The product type to map to a test type.
+    #
+    # @return [Symbol] The native product type to use.
+    #
+    def test_type_for_product_type(product_type)
+      case product_type
+      when :unit_test_bundle
+        :unit
+      else
+        raise Informative, "Unknown product type `#{product_type}`."
+      end
+    end
+
     # @return [Specification] The root specification for the target.
     #
     def root_spec
@@ -256,6 +324,24 @@ module Pod
       "#{label}-#{test_type.capitalize}-Tests"
     end
 
+    # @param  [Symbol] test_type
+    #         The test type this embed frameworks script path is for.
+    #
+    # @return [Pathname] The absolute path of the copy resources script for the given test type.
+    #
+    def copy_resources_script_path_for_test_type(test_type)
+      support_files_dir + "#{test_target_label(test_type)}-resources.sh"
+    end
+
+    # @param  [Symbol] test_type
+    #         The test type this embed frameworks script path is for.
+    #
+    # @return [Pathname] The absolute path of the embed frameworks script for the given test type.
+    #
+    def embed_frameworks_script_path_for_test_type(test_type)
+      support_files_dir + "#{test_target_label(test_type)}-frameworks.sh"
+    end
+
     # @return [Array<String>] The names of the Pods on which this target
     #         depends.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta.2
+  version: 1.3.0.beta.3
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-07-19 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.beta.2
+        version: 1.3.0.beta.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.3.0.beta.2
+        version: 1.3.0.beta.3
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -471,6 +471,7 @@ files:
 - lib/cocoapods/installer/pod_source_installer.rb
 - lib/cocoapods/installer/pod_source_preparer.rb
 - lib/cocoapods/installer/podfile_validator.rb
+- lib/cocoapods/installer/pods_project_integrator/pod_target_integrator.rb
 - lib/cocoapods/installer/post_install_hooks_context.rb
 - lib/cocoapods/installer/pre_install_hooks_context.rb
 - lib/cocoapods/installer/source_provider_hooks_context.rb