cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/installer/migrator.rb

@@ -12,66 +12,11 @@ module Pod
         #         The sandbox which should be migrated.
         #
         def migrate(sandbox)
-          if sandbox.manifest
-            migrate_to_0_34(sandbox) if installation_minor?('0.34', sandbox)
-            migrate_to_0_36(sandbox) if installation_minor?('0.36', sandbox)
-          end
+          return unless sandbox.manifest
         end
 
         # @!group Migration Steps
 
-        # Migrates from CocoaPods versions previous to 0.34.
-        #
-        # @param [Sandbox] sandbox
-        #
-        def migrate_to_0_34(sandbox)
-          UI.message('Migrating to CocoaPods 0.34') do
-            delete(sandbox.root + 'Headers')
-            make_path(sandbox.headers_root)
-
-            sandbox.root.children.each do |child|
-              relative = child.relative_path_from(sandbox.root)
-              case relative.to_s
-              when 'Manifest.lock', 'Pods.xcodeproj', 'Headers',
-                'Target Support Files', 'Local Podspecs'
-                next
-              when 'BuildHeaders', 'PublicHeaders'
-                delete(child)
-              else
-                if child.directory? && child.extname != '.xcodeproj'
-                  next
-                else
-                  delete(child)
-                end
-              end
-            end
-          end
-
-          delete(Pathname(File.join(ENV['HOME'], 'Library/Caches/CocoaPods/Git')))
-        end
-
-        # Migrates from CocoaPods versions prior to 0.36.
-        #
-        # @param [Sandbox] sandbox
-        #
-        def migrate_to_0_36(sandbox)
-          UI.message('Migrating to CocoaPods 0.36') do
-            move(sandbox.root + 'Headers/Build', sandbox.root + 'Headers/Private')
-
-            lockfile = sandbox.manifest.to_hash
-            sandbox.specifications_root.children.each do |child|
-              next unless child.basename.to_s =~ /\.podspec$/
-              spec = Specification.from_file(child)
-              child.delete
-              child = Pathname("#{child}.json")
-              File.open(child, 'w') { |f| f.write spec.to_pretty_json }
-              lockfile['SPEC CHECKSUMS'][spec.name] = Specification.from_file(child).checksum
-            end
-            sandbox.manifest = Lockfile.new(lockfile)
-            sandbox.manifest.write_to_disk(sandbox.manifest_path)
-          end
-        end
-
         # @!group Private helpers
 
         # Check whether a migration is required

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -17,14 +17,21 @@ module Pod
       #
       attr_reader :specs_by_platform
 
+      # @return [Boolean] Whether the installer is allowed to touch the cache.
+      #
+      attr_reader :can_cache
+      alias_method :can_cache?, :can_cache
+
       # Initialize a new instance
       #
       # @param [Sandbox] sandbox @see sandbox
       # @param [Hash{Symbol=>Array}] specs_by_platform @see specs_by_platform
+      # @param [Boolean] can_cache @see can_cache
       #
-      def initialize(sandbox, specs_by_platform)
+      def initialize(sandbox, specs_by_platform, can_cache: true)
         @sandbox = sandbox
         @specs_by_platform = specs_by_platform
+        @can_cache = can_cache
       end
 
       # @return [String] A string suitable for debugging.
@@ -110,7 +117,7 @@ module Pod
       # @return [void]
       #
       def download_source
-        download_result = Downloader.download(download_request, root)
+        download_result = Downloader.download(download_request, root, :can_cache => can_cache?)
 
         if (@specific_source = download_result.checkout_options) && specific_source != root_spec.source
           sandbox.store_checkout_source(root_spec.name, specific_source)
@@ -121,7 +128,6 @@ module Pod
         Downloader::Request.new(
           :spec => root_spec,
           :released => released?,
-          :head => head_pod?,
         )
       end
 
@@ -174,12 +180,8 @@ module Pod
         sandbox.local?(root_spec.name)
       end
 
-      def head_pod?
-        sandbox.head_pod?(root_spec.name)
-      end
-
       def released?
-        !local? && !head_pod? && !predownloaded? && sandbox.specification(root_spec.name) != root_spec
+        !local? && !predownloaded? && sandbox.specification(root_spec.name) != root_spec
       end
 
       def each_source_file(file_accessors, &blk)

data/lib/cocoapods/installer/podfile_validator.rb

@@ -12,6 +12,10 @@ module Pod
       #
       attr_reader :errors
 
+      # @return [Array<String>] any warnings that have occured during the validation
+      #
+      attr_reader :warnings
+
       # Initialize a new instance
       # @param [Podfile] podfile
       #        The podfile to validate
@@ -19,6 +23,7 @@ module Pod
       def initialize(podfile)
         @podfile = podfile
         @errors = []
+        @warnings = []
         @validated = false
       end
 
@@ -27,6 +32,8 @@ module Pod
       #
       def validate
         validate_pod_directives
+        validate_no_abstract_only_pods!
+        validate_dependencies_are_present!
 
         @validated = true
       end
@@ -38,7 +45,7 @@ module Pod
       def valid?
         validate unless @validated
 
-        @validated && errors.size == 0
+        @validated && errors.empty?
       end
 
       # A message describing any errors in the
@@ -54,6 +61,10 @@ module Pod
         errors << error
       end
 
+      def add_warning(warning)
+        warnings << warning
+      end
+
       def validate_pod_directives
         dependencies = podfile.target_definitions.flat_map do |_, target|
           target.dependencies
@@ -81,6 +92,36 @@ module Pod
             ' download strategies. This is not allowed'
         end
       end
+
+      # Warns the user if the podfile is empty.
+      #
+      # @note   The workspace is created in any case and all the user projects
+      #         are added to it, however the projects are not integrated as
+      #         there is no way to discern between target definitions which are
+      #         empty and target definitions which just serve the purpose to
+      #         wrap other ones. This is not an issue because empty target
+      #         definitions generate empty libraries.
+      #
+      # @return [void]
+      #
+      def validate_dependencies_are_present!
+        if podfile.target_definitions.values.all?(&:empty?)
+          add_warning 'The Podfile does not contain any dependencies.'
+        end
+      end
+
+      # Verifies that no dependencies in the Podfile will end up not being built
+      # at all. In other words, all dependencies _must_ belong to a non-abstract
+      # target, or be inherited by a target where `inheritance == complete`.
+      #
+      def validate_no_abstract_only_pods!
+        all_dependencies = podfile.dependencies
+        concrete_dependencies = podfile.target_definition_list.reject(&:abstract?).flat_map(&:dependencies).uniq
+        abstract_only_dependencies = all_dependencies - concrete_dependencies
+        abstract_only_dependencies.each do |dep|
+          add_error "The dependency `#{dep}` is not used in any concrete target."
+        end
+      end
     end
   end
 end

data/lib/cocoapods/installer/post_install_hooks_context.rb

@@ -8,6 +8,14 @@ module Pod
       #
       attr_accessor :sandbox_root
 
+      # @return [Project] The Pods Xcode project.
+      #
+      attr_accessor :pods_project
+
+      # @return [Sandbox] The Sandbox for the project.
+      #
+      attr_accessor :sandbox
+
       # @return [Array<UmbrellaTargetDescription>] The list of
       #         the CocoaPods umbrella targets generated by the installer.
       #
@@ -29,7 +37,7 @@ module Pod
         umbrella_targets_descriptions = []
         aggregate_targets.each do |umbrella|
           desc = UmbrellaTargetDescription.new
-          desc.user_project_path = umbrella.user_project_path
+          desc.user_project = umbrella.user_project
           desc.user_target_uuids = umbrella.user_target_uuids
           desc.specs = umbrella.specs
           desc.platform_name = umbrella.platform.name
@@ -40,6 +48,8 @@ module Pod
 
         result = new
         result.sandbox_root = sandbox.root.to_s
+        result.pods_project = sandbox.project
+        result.sandbox = sandbox
         result.umbrella_targets = umbrella_targets_descriptions
         result
       end
@@ -47,10 +57,17 @@ module Pod
       # Pure data class which describes and umbrella target.
       #
       class UmbrellaTargetDescription
+        # @return [Xcodeproj::Project] The user project into which this target
+        #         is integrated.
+        #
+        attr_accessor :user_project
+
         # @return [String] The path of the user project
         #         integrated by this target.
         #
-        attr_accessor :user_project_path
+        def user_project_path
+          user_project.path if user_project
+        end
 
         # @return [Array<String>] The list of the UUIDs of the
         #         user targets integrated by this umbrella

data/lib/cocoapods/installer/target_installer.rb

@@ -39,14 +39,12 @@ module Pod
         product_type = target.product_type
         name = target.label
         platform = target.platform.name
-        deployment_target = target.platform.deployment_target.to_s
         language = target.uses_swift? ? :swift : :objc
         @native_target = project.new_target(product_type, name, platform, deployment_target, nil, language)
 
         product_name = target.product_name
         product = @native_target.product_reference
         product.name = product_name
-        product.path = product_name
 
         target.user_build_configurations.each do |bc_name, type|
           @native_target.add_build_configuration(bc_name, type)
@@ -59,6 +57,12 @@ module Pod
         target.native_target = @native_target
       end
 
+      # @return [String] The deployment target.
+      #
+      def deployment_target
+        target.platform.deployment_target.to_s
+      end
+
       # Returns the customized build settings which are overridden in the build
       # settings of the user target.
       #

data/lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -43,11 +43,12 @@ module Pod
       #
       def custom_build_settings
         settings = {
-          'OTHER_LDFLAGS'      => '',
-          'OTHER_LIBTOOLFLAGS' => '',
-          'PODS_ROOT'          => '$(SRCROOT)',
-          'SKIP_INSTALL'       => 'YES',
-          'MACH_O_TYPE'        => 'staticlib',
+          'MACH_O_TYPE'               => 'staticlib',
+          'OTHER_LDFLAGS'             => '',
+          'OTHER_LIBTOOLFLAGS'        => '',
+          'PODS_ROOT'                 => '$(SRCROOT)',
+          'PRODUCT_BUNDLE_IDENTIFIER' => 'org.cocoapods.${PRODUCT_NAME:rfc1034identifier}',
+          'SKIP_INSTALL'              => 'YES',
         }
         super.merge(settings)
       end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -22,11 +22,15 @@ module Pod
           create_xcconfig_file
           if target.requires_frameworks?
             create_info_plist_file
-            create_module_map do |generator|
-              generator.private_headers += target.file_accessors.flat_map(&:private_headers).map(&:basename)
-            end
+            create_module_map
             create_umbrella_header do |generator|
-              generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+              if header_mappings_dir
+                generator.imports += target.file_accessors.flat_map(&:public_headers).map do |pathname|
+                  pathname.relative_path_from(header_mappings_dir)
+                end
+              else
+                generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+              end
             end
           end
           create_prefix_header
@@ -60,6 +64,11 @@ module Pod
       # @note   The Frameworks are used only for presentation purposes as the
       #         xcconfig is the authoritative source about their information.
       #
+      # @note   Core Data model directories (.xcdatamodeld) defined in the `resources`
+      #         property are currently added to the `Copy Resources` build phase like
+      #         all other resources. The Xcode UI adds these to the `Compile Sources`
+      #         build phase, but they will compile correctly either way.
+      #
       # @return [void]
       #
       def add_files_to_build_phases
@@ -83,15 +92,7 @@ module Pod
 
           header_file_refs = headers.map { |sf| project.reference_for_path(sf) }
           native_target.add_file_references(header_file_refs) do |build_file|
-            # Set added headers as public if needed
-            build_file.settings ||= {}
-            if public_headers.include?(build_file.file_ref.real_path)
-              build_file.settings['ATTRIBUTES'] = ['Public']
-            elsif private_headers.include?(build_file.file_ref.real_path)
-              build_file.settings['ATTRIBUTES'] = ['Private']
-            else
-              build_file.settings['ATTRIBUTES'] = ['Project']
-            end
+            add_header(build_file, public_headers, private_headers)
           end
 
           other_file_refs = other_source_files.map { |sf| project.reference_for_path(sf) }
@@ -103,6 +104,10 @@ module Pod
             project.reference_for_path(res)
           end
 
+          # Some nested files are not directly present in the Xcode project, such as the contents
+          # of an .xcdatamodeld directory. These files will return nil file references.
+          resource_refs.compact!
+
           native_target.add_resources(resource_refs)
         end
       end
@@ -112,12 +117,31 @@ module Pod
       # @note   The source files are grouped by Pod and in turn by subspec
       #         (recursively) in the resources group.
       #
+      # @note   Core Data model directories (.xcdatamodeld) are currently added to the
+      #         `Copy Resources` build phase like all other resources. The Xcode UI adds
+      #         these to the `Compile Sources` build phase, but they will compile
+      #         correctly either way.
+      #
       # @return [void]
       #
       def add_resources_bundle_targets
         target.file_accessors.each do |file_accessor|
           file_accessor.resource_bundles.each do |bundle_name, paths|
-            file_references = paths.map { |sf| project.reference_for_path(sf) }
+            file_references = paths.map do |path|
+              ref = project.reference_for_path(path)
+
+              # Some nested files are not directly present in the Xcode project, such as the contents
+              # of an .xcdatamodeld directory. These files are implicitly included by including their
+              # parent directory.
+              next if ref.nil?
+
+              # For variant groups, the variant group itself is added, not its members.
+              next ref.parent if ref.parent.is_a?(Xcodeproj::Project::Object::PBXVariantGroup)
+
+              ref
+            end
+            file_references = file_references.uniq.compact
+
             label = target.resources_bundle_target_label(bundle_name)
             bundle_target = project.new_resources_bundle(label, file_accessor.spec_consumer.platform_name)
             bundle_target.product_reference.tap do |bundle_product|
@@ -130,6 +154,7 @@ module Pod
             target.user_build_configurations.each do |bc_name, type|
               bundle_target.add_build_configuration(bc_name, type)
             end
+            bundle_target.deployment_target = deployment_target
 
             target.resource_bundle_targets << bundle_target
 
@@ -140,8 +165,18 @@ module Pod
               end
             end
 
+            # Create Info.plist file for bundle
+            path = target.info_plist_path
+            path.dirname.mkdir unless path.dirname.exist?
+            info_plist_path = path.dirname + "ResourceBundle-#{bundle_name}-#{path.basename}"
+            generator = Generator::InfoPlistFile.new(target)
+            generator.save_as(info_plist_path)
+            add_file_to_support_group(info_plist_path)
+
             bundle_target.build_configurations.each do |c|
               c.build_settings['PRODUCT_NAME'] = bundle_name
+              relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
+              c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
               if target.requires_frameworks? && target.scoped?
                 c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
               end
@@ -285,6 +320,39 @@ module Pod
         @custom_module_map ||= target.file_accessors.first.module_map
       end
 
+      def header_mappings_dir
+        return @header_mappings_dir if defined?(@header_mappings_dir)
+        file_accessor = target.file_accessors.first
+        @header_mappings_dir = if dir = file_accessor.spec_consumer.header_mappings_dir
+                                 file_accessor.path_list.root + dir
+                               end
+      end
+
+      def add_header(build_file, public_headers, private_headers)
+        file_ref = build_file.file_ref
+        acl = if public_headers.include?(file_ref.real_path)
+                'Public'
+              elsif private_headers.include?(file_ref.real_path)
+                'Private'
+              else
+                'Project'
+              end
+
+        if target.requires_frameworks? && header_mappings_dir
+          relative_path = file_ref.real_path.relative_path_from(header_mappings_dir)
+          sub_dir = relative_path.dirname
+          copy_phase_name = "Copy #{sub_dir} #{acl} Headers"
+          copy_phase = native_target.copy_files_build_phases.find { |bp| bp.name == copy_phase_name } ||
+            native_target.new_copy_files_build_phase(copy_phase_name)
+          copy_phase.symbol_dst_subfolder_spec = :products_directory
+          copy_phase.dst_path = "$(#{acl.upcase}_HEADERS_FOLDER_PATH)/#{sub_dir}"
+          copy_phase.add_file_reference(file_ref, true)
+        else
+          build_file.settings ||= {}
+          build_file.settings['ATTRIBUTES'] = [acl]
+        end
+      end
+
       #-----------------------------------------------------------------------#
     end
   end