cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -61,8 +61,8 @@ module Pod
       def integrate!
         create_workspace
         integrate_user_targets
-        warn_about_empty_podfile
         warn_about_xcconfig_overrides
+        save_projects
       end
 
       #-----------------------------------------------------------------------#
@@ -91,7 +91,7 @@ module Pod
           workspace = Xcodeproj::Workspace.new_from_xcworkspace(workspace_path)
           new_file_references = file_references - workspace.file_references
           unless new_file_references.empty?
-            workspace.file_references.concat(new_file_references)
+            new_file_references.each { |fr| workspace << fr }
             workspace.save_as(workspace_path)
           end
 
@@ -112,25 +112,42 @@ module Pod
       # @return [void]
       #
       def integrate_user_targets
-        targets_to_integrate.sort_by(&:name).each do |target|
-          TargetIntegrator.new(target).integrate!
+        target_integrators = targets_to_integrate.sort_by(&:name).map do |target|
+          TargetIntegrator.new(target)
         end
+
+        Config.instance.with_changes(:silent => true) do
+          deintegrator = Deintegrator.new
+          all_project_targets = user_projects.flat_map(&:native_targets).uniq
+          all_native_targets = targets_to_integrate.flat_map(&:user_targets).uniq
+          targets_to_deintegrate = all_project_targets - all_native_targets
+          targets_to_deintegrate.each do |target|
+            deintegrator.deintegrate_target(target)
+          end
+        end
+
+        target_integrators.each(&:integrate!)
       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.
+      # Save all user projects.
       #
       # @return [void]
       #
-      def warn_about_empty_podfile
-        if podfile.target_definitions.values.all?(&:empty?)
-          UI.warn '[!] The Podfile does not contain any dependencies.'
+      def save_projects
+        user_projects.each do |project|
+          if project.dirty?
+            project.save
+          else
+            # There is a bug in Xcode where the process of deleting and
+            # re-creating the xcconfig files used in the build
+            # configuration cause building the user project to fail until
+            # Xcode is relaunched.
+            #
+            # Touching/saving the project causes Xcode to reload these.
+            #
+            # https://github.com/CocoaPods/CocoaPods/issues/2665
+            FileUtils.touch(project.path + 'project.pbxproj')
+          end
         end
       end
 
@@ -194,8 +211,12 @@ module Pod
         targets.map(&:user_project_path).compact.uniq
       end
 
+      def user_projects
+        targets.map(&:user_project).compact.uniq
+      end
+
       def targets_to_integrate
-        targets.reject { |target| target.target_definition.empty? }
+        targets.reject { |target| target.target_definition.abstract? }
       end
 
       # Prints a warning informing the user that a build configuration of

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -38,34 +38,12 @@ module Pod
         #
         def integrate!
           UI.section(integration_message) do
-            # TODO: refactor into Xcodeproj https://github.com/CocoaPods/Xcodeproj/issues/202
-            project_is_dirty = [
-              XCConfigIntegrator.integrate(target, native_targets),
-              update_to_cocoapods_0_34,
-              update_to_cocoapods_0_37_1,
-              update_to_cocoapods_0_39,
-              unless native_targets_to_integrate.empty?
-                add_pods_library
-                add_embed_frameworks_script_phase
-                add_copy_resources_script_phase
-                add_check_manifest_lock_script_phase
-                true
-              end,
-            ].any?
+            XCConfigIntegrator.integrate(target, native_targets)
 
-            if project_is_dirty
-              user_project.save
-            else
-              # There is a bug in Xcode where the process of deleting and
-              # re-creating the xcconfig files used in the build
-              # configuration cause building the user project to fail until
-              # Xcode is relaunched.
-              #
-              # Touching/saving the project causes Xcode to reload these.
-              #
-              # https://github.com/CocoaPods/CocoaPods/issues/2665
-              FileUtils.touch(user_project.path + 'project.pbxproj')
-            end
+            add_pods_library
+            add_embed_frameworks_script_phase
+            add_copy_resources_script_phase
+            add_check_manifest_lock_script_phase
           end
         end
 
@@ -80,85 +58,6 @@ module Pod
         # @!group Integration steps
         #---------------------------------------------------------------------#
 
-        # Fixes the paths of the copy resource scripts.
-        #
-        # @return [Bool] whether any changes to the project were made.
-        #
-        # @todo   This can be removed for CocoaPods 1.0
-        #
-        def update_to_cocoapods_0_34
-          phases = native_targets.map do |target|
-            target.shell_script_build_phases.select do |bp|
-              bp.name == 'Copy Pods Resources'
-            end
-          end.flatten
-
-          script_path = target.copy_resources_script_relative_path
-          shell_script = %("#{script_path}"\n)
-          changes = false
-          phases.each do |phase|
-            unless phase.shell_script == shell_script
-              phase.shell_script = shell_script
-              changes = true
-            end
-          end
-          changes
-        end
-
-        # Removes the embed frameworks phase for target types.
-        #
-        # @return [Bool] whether any changes to the project were made.
-        #
-        # @todo   This can be removed for CocoaPods 1.0
-        #
-        def update_to_cocoapods_0_37_1
-          targets_to_embed = native_targets.select do |target|
-            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
-          end
-          (native_targets - targets_to_embed).any? do |native_target|
-            remove_embed_frameworks_script_phase(native_target)
-          end
-        end
-
-        # Adds the embed frameworks script when integrating as a static library.
-        #
-        # @return [Bool] whether any changes to the project were made.
-        #
-        # @todo   This can be removed for CocoaPods 1.0
-        #
-        def update_to_cocoapods_0_39
-          targets_to_embed = native_targets.select do |target|
-            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
-          end
-          requires_update = targets_to_embed.any? do |target|
-            !target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
-          end
-          if requires_update
-            targets_to_embed.each do |native_target|
-              add_embed_frameworks_script_phase_to_target(native_target)
-            end
-          end
-
-          frameworks = user_project.frameworks_group
-          native_targets.each do |native_target|
-            build_phase = native_target.frameworks_build_phase
-
-            product_ref = frameworks.files.find { |f| f.path == target.product_name }
-            if product_ref
-              build_file = build_phase.build_file(product_ref)
-              if build_file &&
-                  build_file.settings.is_a?(Hash) &&
-                  build_file.settings['ATTRIBUTES'].is_a?(Array) &&
-                  build_file.settings['ATTRIBUTES'].include?('Weak')
-                build_file.settings = nil
-                requires_update = true
-              end
-            end
-          end
-
-          requires_update
-        end
-
         # Adds spec product reference to the frameworks build phase of the
         # {TargetDefinition} integration libraries. Adds a file reference to
         # the frameworks group of the project and adds it to the frameworks
@@ -168,7 +67,7 @@ module Pod
         #
         def add_pods_library
           frameworks = user_project.frameworks_group
-          native_targets_to_integrate.each do |native_target|
+          native_targets.each do |native_target|
             build_phase = native_target.frameworks_build_phase
 
             # Find and delete possible reference for the other product type
@@ -209,13 +108,10 @@ module Pod
         #
         # @param [PBXNativeTarget] native_target
         #
-        # @return [Bool] whether any changes to the project were made.
-        #
         def remove_embed_frameworks_script_phase(native_target)
           embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
-          return false unless embed_build_phase.present?
+          return unless embed_build_phase.present?
           native_target.build_phases.delete(embed_build_phase)
-          true
         end
 
         # Adds a shell script build phase responsible to copy the resources
@@ -226,7 +122,7 @@ module Pod
         #
         def add_copy_resources_script_phase
           phase_name = 'Copy Pods Resources'
-          native_targets_to_integrate.each do |native_target|
+          native_targets.each do |native_target|
             phase = create_or_update_build_phase(native_target, phase_name)
             script_path = target.copy_resources_script_relative_path
             phase.shell_script = %("#{script_path}"\n)
@@ -244,9 +140,9 @@ module Pod
         #
         def add_check_manifest_lock_script_phase
           phase_name = 'Check Pods Manifest.lock'
-          native_targets_to_integrate.each do |native_target|
+          native_targets.each do |native_target|
             phase = create_or_update_build_phase(native_target, phase_name)
-            native_target.build_phases.unshift(phase).uniq!
+            native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
             phase.shell_script = <<-SH.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
@@ -261,14 +157,14 @@ module Pod
 
         private
 
-        # @!group Private helpers
+        # @!group Private Helpers
         #---------------------------------------------------------------------#
 
         # @return [Array<PBXNativeTarget>] The list of all the targets that
         #         match the given target.
         #
         def native_targets
-          @native_targets ||= target.user_targets(user_project)
+          @native_targets ||= target.user_targets
         end
 
         # @return [Array<PBXNativeTarget>] The list of all the targets that
@@ -276,36 +172,18 @@ module Pod
         #         directory / product bundle.
         #
         def native_targets_to_embed_in
-          native_targets_to_integrate.select do |target|
+          native_targets.select do |target|
             EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
           end
         end
 
-        # @return [Array<PBXNativeTarget>] The list of the targets
-        #         that have not been integrated by past installations
-        #         of
-        #
-        def native_targets_to_integrate
-          unless @native_targets_to_integrate
-            @native_targets_to_integrate = native_targets.reject do |native_target|
-              native_target.frameworks_build_phase.files.any? do |build_file|
-                file_ref = build_file.file_ref
-                file_ref &&
-                  file_ref.isa == 'PBXFileReference' &&
-                  file_ref.display_name == target.product_name
-              end
-            end
-          end
-          @native_targets_to_integrate
-        end
-
         # Read the project from the disk to ensure that it is up to date as
         # other TargetIntegrators might have modified it.
         #
         # @return [Project]
         #
         def user_project
-          @user_project ||= Xcodeproj::Project.open(target.user_project_path)
+          target.user_project
         end
 
         # @return [Specification::Consumer] the consumer for the specifications.

data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb

@@ -15,17 +15,13 @@ module Pod
           #         The native targets associated which should be integrated
           #         with the Pod bundle.
           #
-          # @return [Bool] whether any changes to the project were made.
-          #
           def self.integrate(pod_bundle, targets)
-            changes = false
             targets.each do |target|
               target.build_configurations.each do |config|
-                changes = true if update_to_cocoapods_0_34(pod_bundle, targets)
-                changes = true if set_target_xcconfig(pod_bundle, target, config)
+                update_to_cocoapods_0_34(pod_bundle, targets)
+                set_target_xcconfig(pod_bundle, target, config)
               end
             end
-            changes
           end
 
           private
@@ -42,13 +38,10 @@ module Pod
           # @param  [Array<XcodeProj::PBXNativeTarget>] targets
           #         The native targets.
           #
-          # @return [Bool] whether any changes to the project were made.
-          #
           # @todo   This can be removed for CocoaPods 1.0
           #
           def self.update_to_cocoapods_0_34(pod_bundle, targets)
             sandbox = pod_bundle.sandbox
-            changes = false
             targets.map(&:project).uniq.each do |project|
               file_refs = project.files.select do |file_ref|
                 path = file_ref.path.to_s
@@ -64,10 +57,7 @@ module Pod
                   file_ref.remove_from_project
                 end
               end
-
-              changes = true unless file_refs.empty?
             end
-            changes
           end
 
           # Creates a file reference to the xcconfig generated by
@@ -83,28 +73,31 @@ module Pod
           # @param  [Xcodeproj::XCBuildConfiguration] config
           #         The build configuration.
           #
-          # @return [Boolean] Indicates whether or not any changes were made.
-          #
           def self.set_target_xcconfig(pod_bundle, target, config)
             path = pod_bundle.xcconfig_relative_path(config.name)
             group = config.project['Pods'] || config.project.new_group('Pods')
             file_ref = group.files.find { |f| f.path == path }
-            if config.base_configuration_reference &&
-                config.base_configuration_reference != file_ref
-              unless xcconfig_includes_target_xcconfig?(config.base_configuration_reference, path)
+            existing = config.base_configuration_reference
+
+            set_base_configuration_reference = ->() do
+              file_ref ||= group.new_file(path)
+              config.base_configuration_reference = file_ref
+            end
+
+            if existing && existing != file_ref
+              if existing.real_path.to_path.start_with?(pod_bundle.sandbox.root.to_path << '/')
+                set_base_configuration_reference.call
+              elsif !xcconfig_includes_target_xcconfig?(config.base_configuration_reference, path)
                 UI.warn 'CocoaPods did not set the base configuration of your ' \
                 'project because your project already has a custom ' \
                 'config set. In order for CocoaPods integration to work at ' \
                 'all, please either set the base configurations of the target ' \
                 "`#{target.name}` to `#{path}` or include the `#{path}` in your " \
-                'build configuration.'
+                "build configuration (#{UI.path(existing.real_path)})."
               end
             elsif config.base_configuration_reference.nil? || file_ref.nil?
-              file_ref ||= group.new_file(path)
-              config.base_configuration_reference = file_ref
-              return true
+              set_base_configuration_reference.call
             end
-            false
           end
 
           private

data/lib/cocoapods/project.rb

@@ -1,4 +1,5 @@
 require 'xcodeproj'
+require 'active_support/core_ext/string/inflections'
 
 module Pod
   # The Pods project.
@@ -20,6 +21,7 @@ module Pod
       super(path, skip_initialization, object_version)
       @support_files_group = new_group('Targets Support Files')
       @refs_by_absolute_path = {}
+      @variant_groups_by_path_and_name = {}
       @pods = new_group('Pods')
       @development_pods = new_group('Development Pods')
       self.symroot = LEGACY_BUILD_ROOT
@@ -178,24 +180,13 @@ module Pod
     # @return [PBXFileReference] The new file reference.
     #
     def add_file_reference(absolute_path, group, reflect_file_system_structure = false)
-      file_path_name = Pathname.new(absolute_path)
-      unless file_path_name.absolute?
-        raise ArgumentError, "Paths must be absolute #{absolute_path}"
-      end
+      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)
 
-      if reflect_file_system_structure
-        relative_path = file_path_name.relative_path_from(group.real_path)
-        relative_dir = relative_path.dirname
-        relative_dir.each_filename do|name|
-          next if name == '.'
-          group = group[name] || group.new_group(name, name)
-        end
-      end
-
-      if ref = reference_for_path(absolute_path)
+      if ref = reference_for_path(file_path_name.realpath)
         ref
       else
-        ref = group.new_file(absolute_path)
+        ref = group.new_file(file_path_name.realpath)
         @refs_by_absolute_path[absolute_path.to_s] = ref
       end
     end
@@ -250,18 +241,29 @@ module Pod
     #
     def add_build_configuration(name, type)
       build_configuration = super
-      values = ["#{name.gsub(/[^a-zA-Z0-9_]/, '_').sub(/(^[0-9])/, '_\1').upcase}=1"]
       settings = build_configuration.build_settings
-      definitions = Array(settings['GCC_PREPROCESSOR_DEFINITIONS'])
-      values.each do |value|
+      definitions = settings['GCC_PREPROCESSOR_DEFINITIONS'] || ['$(inherited)']
+      defines = [defininition_for_build_configuration(name)]
+      defines << 'DEBUG' if type == :debug
+      defines.each do |define|
+        value = "#{define}=1"
         unless definitions.include?(value)
-          definitions << value
+          definitions.unshift(value)
         end
       end
       settings['GCC_PREPROCESSOR_DEFINITIONS'] = definitions
       build_configuration
     end
 
+    # @param  [String] name
+    #         The name of the build configuration.
+    #
+    # @return [String] The preprocessor definition to set for the configuration.
+    #
+    def defininition_for_build_configuration(name)
+      "POD_CONFIGURATION_#{name.underscore}".gsub(/[^a-zA-Z0-9_]/, '_').upcase
+    end
+
     private
 
     # @!group Private helpers
@@ -272,6 +274,94 @@ module Pod
     #
     attr_reader :refs_by_absolute_path
 
+    # @return [Hash{[Pathname, String] => PBXVariantGroup}] The variant groups
+    #         grouped by absolute path of parent dir and name.
+    #
+    attr_reader :variant_groups_by_path_and_name
+
+    # Returns the group for an absolute file path in another group.
+    # Creates subgroups to reflect the file system structure if
+    # reflect_file_system_structure is set to true.
+    # Makes a variant group if the path points to a localized file inside a
+    # *.lproj directory. To support Apple Base Internationalization, the same
+    # variant group is returned for interface files and strings files with
+    # the same name.
+    #
+    # @param  [Pathname] absolute_pathname
+    #         The pathname of the file to get the group for.
+    #
+    # @param  [PBXGroup] group
+    #         The parent group used as the base of the relative path.
+    #
+    # @param  [Bool] reflect_file_system_structure
+    #         Whether group structure should reflect the file system structure.
+    #         If yes, where needed, intermediate groups are created, similar to
+    #         how mkdir -p operates.
+    #
+    # @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)
+      unless absolute_pathname.absolute?
+        raise ArgumentError, "Paths must be absolute #{absolute_pathname}"
+      end
+
+      relative_pathname = absolute_pathname.relative_path_from(group.real_path)
+      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|
+          break if name.to_s =~ lproj_regex
+          next if name == '.'
+          group = group[name] || group.new_group(name, name)
+        end
+      end
+
+      # Turn files inside .lproj directories into a variant group
+      if relative_dir.basename.to_s =~ lproj_regex
+        group_name = variant_group_name(absolute_pathname)
+        lproj_parent_dir = absolute_pathname.dirname.dirname
+        group = @variant_groups_by_path_and_name[[lproj_parent_dir, group_name]] ||
+          group.new_variant_group(group_name, lproj_parent_dir)
+        @variant_groups_by_path_and_name[[lproj_parent_dir, group_name]] ||= group
+      end
+
+      group
+    end
+
+    # Returns the name to be used for a the variant group for a file at a given path.
+    # The path must be localized (within an *.lproj directory).
+    #
+    # @param  [Pathname] The localized path to get a variant group name for.
+    #
+    # @return [String] The variant group name.
+    #
+    def variant_group_name(path)
+      unless path.to_s.downcase.include?('.lproj/')
+        raise ArgumentError, 'Only localized resources can be added to variant groups.'
+      end
+
+      # When using Base Internationalization for XIBs and Storyboards a strings
+      # file is generated with the same name as the XIB/Storyboard in each .lproj
+      # directory:
+      #   Base.lproj/MyViewController.xib
+      #   fr.lproj/MyViewController.strings
+      #
+      # In this scenario we want the variant group to be the same as the XIB or Storyboard.
+      #
+      # Base Internationalization: https://developer.apple.com/library/ios/documentation/MacOSX/Conceptual/BPInternational/InternationalizingYourUserInterface/InternationalizingYourUserInterface.html
+      if path.extname.downcase == '.strings'
+        %w(.xib .storyboard).each do |extension|
+          possible_interface_file = path.dirname.dirname + 'Base.lproj' + path.basename.sub_ext(extension)
+          return possible_interface_file.basename.to_s if possible_interface_file.exist?
+        end
+      end
+
+      path.basename.to_s
+    end
+
     #-------------------------------------------------------------------------#
   end
 end