cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/installer/analyzer/sandbox_analyzer.rb

@@ -1,7 +1,6 @@
 module Pod
   class Installer
     class Analyzer
-
       # Analyze the sandbox to detect which Pods should be removed, and which
       # ones should be reinstalled.
       #
@@ -28,7 +27,6 @@ module Pod
       # - If none of the above conditions match.
       #
       class SandboxAnalyzer
-
         # @return [Sandbox] The sandbox to analyze.
         #
         attr_reader :sandbox
@@ -98,7 +96,7 @@ module Pod
           return :added   if pod_added?(pod)
           return :deleted if pod_deleted?(pod)
           return :changed if pod_changed?(pod)
-          return :unchanged
+          :unchanged
         end
 
         # Returns whether the Pod with the given name should be installed.
@@ -112,8 +110,8 @@ module Pod
         #
         def pod_added?(pod)
           return true if resolved_pods.include?(pod) && !sandbox_pods.include?(pod)
-          return true if !folder_exist?(pod)
-          return false
+          return true unless folder_exist?(pod)
+          false
         end
 
         # Returns whether the Pod with the given name should be removed from
@@ -126,7 +124,7 @@ module Pod
         #
         def pod_deleted?(pod)
           return true if !resolved_pods.include?(pod) && sandbox_pods.include?(pod)
-          return false
+          false
         end
 
         # Returns whether the Pod with the given name should be considered
@@ -154,7 +152,7 @@ module Pod
           if update_mode
             return true if sandbox.head_pod?(pod)
           end
-          return false
+          false
         end
 
         #---------------------------------------------------------------------#
@@ -254,7 +252,6 @@ module Pod
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

data/lib/cocoapods/installer/file_references_installer.rb

@@ -1,11 +1,9 @@
 module Pod
   class Installer
-
     # Controller class responsible of installing the file references of the
     # specifications in the Pods project.
     #
     class FileReferencesInstaller
-
       # @return [Sandbox] The sandbox of the installation.
       #
       attr_reader :sandbox
@@ -68,7 +66,7 @@ module Pod
       # @return [void]
       #
       def add_source_files_references
-        UI.message "- Adding source files to Pods project" do
+        UI.message '- Adding source files to Pods project' do
           add_file_accessors_paths_to_pods_group(:source_files)
         end
       end
@@ -78,7 +76,7 @@ module Pod
       # @return [void]
       #
       def add_frameworks_bundles
-        UI.message "- Adding frameworks to Pods project" do
+        UI.message '- Adding frameworks to Pods project' do
           add_file_accessors_paths_to_pods_group(:vendored_frameworks, :frameworks)
         end
       end
@@ -88,7 +86,7 @@ module Pod
       # @return [void]
       #
       def add_vendored_libraries
-        UI.message "- Adding libraries to Pods project" do
+        UI.message '- Adding libraries to Pods project' do
           add_file_accessors_paths_to_pods_group(:vendored_libraries, :frameworks)
         end
       end
@@ -101,7 +99,7 @@ module Pod
       # @return [void]
       #
       def add_resources
-        UI.message "- Adding resources to Pods project" do
+        UI.message '- Adding resources to Pods project' do
           add_file_accessors_paths_to_pods_group(:resources, :resources)
           add_file_accessors_paths_to_pods_group(:resource_bundle_files, :resources)
         end
@@ -112,7 +110,7 @@ module Pod
       # @return [void]
       #
       def link_headers
-        UI.message "- Linking headers" do
+        UI.message '- Linking headers' do
           libraries.each do |library|
             library.file_accessors.each do |file_accessor|
               headers_sandbox = Pathname.new(file_accessor.spec.root.name)
@@ -185,7 +183,7 @@ module Pod
       def header_mappings(headers_sandbox, file_accessor, headers)
         consumer = file_accessor.spec_consumer
         dir = headers_sandbox
-        dir = dir + consumer.header_dir if consumer.header_dir
+        dir += consumer.header_dir if consumer.header_dir
 
         mappings = {}
         headers.each do |header|
@@ -193,7 +191,7 @@ module Pod
           if consumer.header_mappings_dir
             header_mappings_dir = file_accessor.path_list.root + consumer.header_mappings_dir
             relative_path = header.relative_path_from(header_mappings_dir)
-            sub_dir = sub_dir + relative_path.dirname
+            sub_dir += relative_path.dirname
           end
           mappings[sub_dir] ||= []
           mappings[sub_dir] << header
@@ -202,7 +200,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/installer/hooks_context.rb

@@ -0,0 +1,74 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer.
+    #
+    class HooksContext
+      # @return [String] The path to the sandbox root (`Pods` directory).
+      #
+      attr_accessor :sandbox_root
+
+      # @return [Array<UmbrellaTargetDescription>] The list of
+      #         the CocoaPods umbrella targets generated by the installer.
+      #
+      attr_accessor :umbrella_targets
+
+      # @return [HooksContext] Convenience class method to generate the
+      #         static context.
+      #
+      def self.generate(sandbox, aggregate_targets)
+        umbrella_targets_descriptions = []
+        aggregate_targets.each do |umbrella|
+          desc = UmbrellaTargetDescription.new
+          desc.user_project_path = umbrella.user_project_path
+          desc.user_target_uuids = umbrella.user_target_uuids
+          desc.specs = umbrella.specs
+          desc.platform_name = umbrella.platform.name
+          desc.platform_deployment_target = umbrella.platform.deployment_target.to_s
+          desc.cocoapods_target_label = umbrella.label
+          umbrella_targets_descriptions << desc
+        end
+
+        result = new
+        result.sandbox_root = sandbox.root.to_s
+        result.umbrella_targets = umbrella_targets_descriptions
+        result
+      end
+
+      # Pure data class which describes and umbrella target.
+      #
+      class UmbrellaTargetDescription
+        # @return [String] The path of the user project
+        #         integrated by this target.
+        #
+        attr_accessor :user_project_path
+
+        # @return [Array<String>] The list of the UUIDs of the
+        #         user targets integrated by this umbrella
+        #         target.  They can be used to find the
+        #         targets opening the project They can be used
+        #         to find the targets opening the project with
+        #         Xcodeproj.
+        #
+        attr_accessor :user_target_uuids
+
+        # @return [Array<Specification>] The list of the
+        #         specifications of the target.
+        #
+        attr_accessor :specs
+
+        # @return [Symbol] The platform (either `:ios` or `:osx`).
+        #
+        attr_accessor :platform_name
+
+        # @return [String] The deployment target.
+        #
+        attr_accessor :platform_deployment_target
+
+        # @return [String] The label for the target.
+        #
+        attr_accessor :cocoapods_target_label
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/migrator.rb

@@ -0,0 +1,99 @@
+require 'fileutils'
+
+module Pod
+  class Installer
+    # Migrates installations performed by previous versions of CocoaPods.
+    #
+    class Migrator
+      class << self
+        # Performs the migration.
+        #
+        # @param  [Sandbox] The sandbox which should be migrated.
+        #
+        def migrate(sandbox)
+          if sandbox.manifest
+            migrate_to_0_34(sandbox) if installation_minor?('0.34', sandbox)
+          end
+        end
+
+        # @!group Migration Steps
+
+        # Migrates from CocoaPods versions previous to 0.34.
+        #
+        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
+
+        # @!group Private helpers
+
+        def installation_minor?(target_version, sandbox)
+          sandbox.manifest.cocoapods_version < Version.new(target_version)
+        end
+
+        # Makes a path creating any intermediate directory and printing an UI
+        # message.
+        #
+        # @path [#to_s] path
+        #       The path.
+        #
+        def make_path(path)
+          return if path.exist?
+          UI.message "- Making path #{UI.path(path)}" do
+            path.mkpath
+          end
+        end
+
+        # Moves a path to another one printing an UI message.
+        #
+        # @path [#to_s] source
+        #       The path to move.
+        #
+        # @path [#to_s] destination
+        #       The destination path.
+        #
+        def move(source, destination)
+          return unless source.exist?
+          make_path(destination.dirname)
+          UI.message "- Moving #{UI.path(source)} to #{UI.path(destination)}" do
+            FileUtils.mv(source.to_s, destination.to_s)
+          end
+        end
+
+        # Deletes a path, including non empty directories, printing an UI
+        # message.
+        #
+        # @path [#to_s] path
+        #       The path.
+        #
+        def delete(path)
+          return unless path.exist?
+          UI.message "- Deleting #{UI.path(path)}" do
+            FileUtils.rm_rf(path)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -2,14 +2,12 @@ require 'active_support/core_ext/string/strip'
 
 module Pod
   class Installer
-
     # Controller class responsible of installing the activated specifications
     # of a single Pod.
     #
     # @note This class needs to consider all the activated specs of a Pod.
     #
     class PodSourceInstaller
-
       # @return [Sandbox]
       #
       attr_reader :sandbox
@@ -25,8 +23,6 @@ module Pod
       def initialize(sandbox, specs_by_platform)
         @sandbox = sandbox
         @specs_by_platform = specs_by_platform
-
-        @aggressive_cache = false
       end
 
       # @return [String] A string suitable for debugging.
@@ -39,21 +35,6 @@ module Pod
 
       public
 
-      # @!group Configuration
-
-      # @return [Bool] whether the downloader should always check against the
-      #         remote if issues might be generated (mostly useful to speed up
-      #         testing).
-      #
-      # @note   This might be removed in future.
-      #
-      attr_accessor :aggressive_cache
-      alias_method  :aggressive_cache?, :aggressive_cache
-
-      #-----------------------------------------------------------------------#
-
-      public
-
       # @!group Installation
 
       # Creates the target in the Pods project and the relative support files.
@@ -79,7 +60,7 @@ module Pod
       # @return [void]
       #
       def clean!
-        clean_installation  if !local?
+        clean_installation  unless local?
       end
 
       # @return [Hash]
@@ -106,9 +87,9 @@ module Pod
             @specific_source = downloader.checkout_options
           rescue RuntimeError => e
             if e.message == 'Abstract method'
-              raise Informative, "The pod '" + root_spec.name + "' does not " + 
-                "support the :head option, as it uses a " + downloader.name + 
-                " source. Remove that option to use this pod."
+              raise Informative, "The pod '" + root_spec.name + "' does not " \
+                'support the :head option, as it uses a ' + downloader.name +
+                ' source. Remove that option to use this pod.'
             else
               raise
             end
@@ -121,7 +102,7 @@ module Pod
         end
 
         if specific_source
-        sandbox.store_checkout_source(root_spec.name, specific_source)
+          sandbox.store_checkout_source(root_spec.name, specific_source)
         end
       end
 
@@ -138,7 +119,7 @@ module Pod
       #
       def run_prepare_command
         return unless root_spec.prepare_command
-        UI.section(" > Running prepare command", '', 1) do
+        UI.section(' > Running prepare command', '', 1) do
           Dir.chdir(root) do
             ENV.delete('CDPATH')
             prepare_command = root_spec.prepare_command.strip_heredoc.chomp
@@ -167,7 +148,7 @@ module Pod
       #         source.
       #
       def downloader
-        @downloader ||= Config.instance.downloader(root, root_spec.source.dup)
+        @downloader ||= Downloader.for_target(root, root_spec.source.dup)
       end
 
       #-----------------------------------------------------------------------#
@@ -254,7 +235,7 @@ module Pod
       def clean_paths
         cached_used = used_files
         glob_options = File::FNM_DOTMATCH | File::FNM_CASEFOLD
-        files = Pathname.glob(root + "**/*", glob_options).map(&:to_s)
+        files = Pathname.glob(root + '**/*', glob_options).map(&:to_s)
 
         files.reject! do |candidate|
           candidate = candidate.downcase
@@ -282,11 +263,10 @@ module Pod
           file_accessors.map(&:source_files),
         ]
 
-        files.flatten.compact.map{ |path| path.to_s }.uniq
+        files.flatten.compact.map(&:to_s).uniq
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

data/lib/cocoapods/installer/target_installer.rb

@@ -1,12 +1,10 @@
 module Pod
   class Installer
-
     # Controller class responsible of creating and configuring the static
     # library target in Pods project. It also creates the support file needed
     # by the target.
     #
     class TargetInstaller
-
       # @return [Sandbox] sandbox the sandbox where the support files should
       #         be generated.
       #
@@ -47,7 +45,6 @@ module Pod
           configuration = @target.add_build_configuration(bc_name, type)
         end
 
-
         settings = {}
         if library.archs
           settings['ARCHS'] = library.archs
@@ -60,13 +57,10 @@ module Pod
         library.target = @target
       end
 
-      # Creates the group that holds the references to the support files
-      # generated by this installer.
-      #
-      # @return [void]
+      # Creates the directory where to store the support files of the target.
       #
-      def create_suport_files_group
-        @support_files_group = project.support_files_group.new_group(library.name)
+      def create_support_files_dir
+        library.support_files_dir.mkdir
       end
 
       # Generates a dummy source file for each target so libraries that contain
@@ -76,12 +70,10 @@ module Pod
       #
       def create_dummy_source
         path = library.dummy_source_path
-        UI.message "- Generating dummy source file at #{UI.path(path)}" do
-          generator = Generator::DummySource.new(library.label)
-          generator.save_as(path)
-          file_reference = add_file_to_support_group(path)
-          target.source_build_phase.add_file_reference(file_reference)
-        end
+        generator = Generator::DummySource.new(library.label)
+        generator.save_as(path)
+        file_reference = add_file_to_support_group(path)
+        target.source_build_phase.add_file_reference(file_reference)
       end
 
       # @return [PBXNativeTarget] the target generated by the installation
@@ -126,8 +118,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end
-