cocoapods 0.22.3 → 0.23.0.rc1

data/lib/cocoapods/installer.rb

@@ -285,7 +285,7 @@ module Pod
     #
     def prepare_pods_project
       UI.message "- Creating Pods project" do
-        @pods_project = Pod::Project.new(sandbox.project_path)
+        @pods_project = Pod::Project.new(sandbox)
         if config.podfile_path
           @pods_project.add_podfile(config.podfile_path)
         end
@@ -337,7 +337,7 @@ module Pod
     def set_target_dependencies
       aggregate_targets.each do |aggregate_target|
         aggregate_target.pod_targets.each do |pod_target|
-          add_dependency(aggregate_target, pod_target)
+          aggregate_target.target.add_dependency(pod_target.target)
           pod_target.dependencies.each do |dep|
 
             unless dep == pod_target.pod_name
@@ -346,30 +346,13 @@ module Pod
               unless pod_dependency_target
                 puts "[BUG] DEP: #{dep}"
               end
-              add_dependency(pod_target, pod_dependency_target)
+              pod_target.target.add_dependency(pod_dependency_target.target)
             end
           end
         end
       end
     end
 
-    # TODO: tmp - move
-    #
-    def add_dependency(dependent_target, dependency_target)
-      container_proxy = pods_project.new(Xcodeproj::Project::PBXContainerItemProxy)
-      container_proxy.container_portal = pods_project.root_object.uuid
-      container_proxy.proxy_type = '1'
-      container_proxy.remote_global_id_string = dependency_target.target.uuid
-      container_proxy.remote_info = dependency_target.target.name
-
-      dependency = pods_project.new(Xcodeproj::Project::PBXTargetDependency)
-      dependency.target = dependency_target.target
-      dependency.targetProxy = container_proxy
-
-      dependent_target.target.dependencies << dependency
-    end
-
-
     # Links the aggregate targets with all the dependent libraries.
     #
     # @note   This is run in the integration step to ensure that targets

data/lib/cocoapods/installer/file_references_installer.rb

@@ -35,7 +35,9 @@ module Pod
       def install!
         refresh_file_accessors
         add_source_files_references
-        add_resources_references
+        add_frameworks_bundles
+        add_vendored_libraries
+        add_resources
         link_headers
       end
 
@@ -71,13 +73,27 @@ module Pod
       #
       def add_source_files_references
         UI.message "- Adding source files to Pods project" do
-          file_accessors.each do |file_accessor|
-            files = file_accessor.source_files
-            spec_name = file_accessor.spec.name
-            local = sandbox.local?(file_accessor.spec.root.name)
-            parent_group = local ? pods_project.local_pods : pods_project.pods
-            pods_project.add_file_references(files, spec_name, parent_group)
-          end
+          add_file_acessors_paths_to_pods_group(:source_files, :source_files)
+        end
+      end
+
+      # Adds the bundled frameworks to the Pods project
+      #
+      # @return [void]
+      #
+      def add_frameworks_bundles
+        UI.message "- Adding frameworks to Pods project" do
+          add_file_acessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
+        end
+      end
+
+      # Adds the bundled libraries to the Pods project
+      #
+      # @return [void]
+      #
+      def add_vendored_libraries
+        UI.message "- Adding frameworks to Pods project" do
+          add_file_acessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
         end
       end
 
@@ -88,16 +104,10 @@ module Pod
       #
       # @return [void]
       #
-      def add_resources_references
+      def add_resources
         UI.message "- Adding resources to Pods project" do
-          file_accessors.each do |file_accessor|
-            file_accessor.resources.each do |resources|
-              files = file_accessor.resources
-              spec_name = file_accessor.spec.name
-              parent_group = pods_project.resources
-              pods_project.add_file_references(files, spec_name, parent_group)
-            end
-          end
+          add_file_acessors_paths_to_pods_group(:resources, :resources)
+          add_file_acessors_paths_to_pods_group(:resource_bundle_files, :resources)
         end
       end
 
@@ -138,6 +148,28 @@ module Pod
         @file_accessors ||= libraries.map(&:file_accessors).flatten.compact
       end
 
+      # Adds file references to the list of the paths returned by the file
+      # accessor with the given key to the given group of the Pods project.
+      #
+      # @param  [Symbol] file_accessor_key
+      #         The method of the file accessor which would return the list of
+      #         the paths.
+      #
+      # @param  [Symbol] group_key
+      #         The key of the group of the Pods project.
+      #
+      # @return [void]
+      #
+      def add_file_acessors_paths_to_pods_group(file_accessor_key, group_key)
+        file_accessors.each do |file_accessor|
+          paths = file_accessor.send(file_accessor_key)
+          paths.each do |path|
+            group = pods_project.group_for_spec(file_accessor.spec.name, group_key)
+            pods_project.add_file_reference(path, group)
+          end
+        end
+      end
+
       # Computes the destination sub-directory in the sandbox
       #
       # @param  [Pathname] headers_sandbox

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/strip'
+
 module Pod
   class Installer
 
@@ -60,6 +62,7 @@ module Pod
       #
       def install!
         download_source unless predownloaded? || local?
+        run_prepare_command
       end
 
       # Cleans the installations if appropriate.
@@ -106,6 +109,24 @@ module Pod
         end
       end
 
+      extend Executable
+      executable :bash
+
+      # Runs the prepare command bash script of the spec.
+      #
+      # @return [void]
+      #
+      def run_prepare_command
+        return unless root_spec.prepare_command
+        UI.section(" > Running prepare command", '', 1) do
+          Dir.chdir(root) do
+            prepare_command = root_spec.prepare_command.strip_heredoc.chomp
+            full_command = "\nset -e\n" + prepare_command
+            bash!(full_command)
+          end
+        end
+      end
+
       # Removes all the files not needed for the installation according to the
       # specs by platform.
       #
@@ -229,12 +250,15 @@ module Pod
       #
       def used_files
         files = [
-          file_accessors.map(&:source_files),
-          file_accessors.map(&:resources),
-          file_accessors.map(&:preserve_paths),
+          file_accessors.map(&:vendored_frameworks),
+          file_accessors.map(&:vendored_libraries),
+          file_accessors.map(&:resource_bundle_files),
+          file_accessors.map(&:license),
           file_accessors.map(&:prefix_header),
+          file_accessors.map(&:preserve_paths),
           file_accessors.map(&:readme),
-          file_accessors.map(&:license),
+          file_accessors.map(&:resources),
+          file_accessors.map(&:source_files),
         ]
 
         files.flatten.compact.map{ |path| path.to_s }.uniq

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

@@ -34,7 +34,7 @@ module Pod
       def create_xcconfig_file
         path = library.xcconfig_path
         UI.message "- Generating xcconfig file at #{UI.path(path)}" do
-          gen = Generator::AggregateXCConfig.new(library)
+          gen = Generator::XCConfig::AggregateXCConfig.new(library)
           gen.save_as(path)
           library.xcconfig = gen.xcconfig
           xcconfig_file_ref = add_file_to_support_group(path)
@@ -90,7 +90,11 @@ module Pod
         path = library.copy_resources_script_path
         UI.message "- Generating copy resources script at #{UI.path(path)}" do
           file_accessors = library.pod_targets.map(&:file_accessors).flatten
-          resources = file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
+          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
+          resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${BUILD_DIR}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/#{name}.bundle" } }.flatten
+          resources = []
+          resources.concat(resource_paths)
+          resources.concat(resource_bundles)
           resources << bridge_support_file if bridge_support_file
           generator = Generator::CopyResourcesScript.new(resources, library.platform)
           generator.save_as(path)

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

@@ -14,6 +14,7 @@ module Pod
         UI.message "- Installing target `#{library.name}` #{library.platform}" do
           add_target
           add_files_to_build_phases
+          add_resources_bundle_targets
           create_suport_files_group
           create_xcconfig_file
           create_prefix_header
@@ -21,10 +22,10 @@ module Pod
         end
       end
 
-      #-----------------------------------------------------------------------#
-
       private
 
+      #-----------------------------------------------------------------------#
+
       # Adds the build files of the pods to the target and adds a reference to
       # the frameworks of the Pods.
       #
@@ -49,20 +50,48 @@ module Pod
         end
       end
 
+      # Adds the resources of the Pods to the Pods project.
+      #
+      # @note   The source files are grouped by Pod and in turn by subspec
+      #         (recursively) in the resources group.
+      #
+      # @return [void]
+      #
+      def add_resources_bundle_targets
+        UI.message "- Adding resource bundles to Pods project" do
+          library.file_accessors.each do |file_accessor|
+            file_accessor.resource_bundles.each do |bundle_name, paths|
+              file_references = paths.map { |sf| project.file_reference(sf) }
+              group = project.group_for_spec(file_accessor.spec.name, :resources)
+              product_group = project.group_for_spec(file_accessor.spec.name, :resources)
+              bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name, product_group)
+              bundle_target.add_resources(file_references)
+
+              target.add_dependency(bundle_target)
+            end
+          end
+        end
+      end
+
       # Generates the contents of the xcconfig file and saves it to disk.
       #
       # @return [void]
       #
       def create_xcconfig_file
         path = library.xcconfig_path
-        public_gen = Generator::PublicPodXCConfig.new(library)
+        public_gen = Generator::XCConfig::PublicPodXCConfig.new(library)
         UI.message "- Generating public xcconfig file at #{UI.path(path)}" do
           public_gen.save_as(path)
+          #
+          # TODO
           add_file_to_support_group(path)
+          # relative_path = path.relative_path_from(sandbox.root)
+          # group = project.group_for_spec(library.root_spec.name, :support_files)
+          # group.new_file(relative_path)
         end
 
         path = library.xcconfig_private_path
-        private_gen = Generator::PrivatePodXCConfig.new(library, public_gen.xcconfig)
+        private_gen = Generator::XCConfig::PrivatePodXCConfig.new(library, public_gen.xcconfig)
         UI.message "- Generating private xcconfig file at #{UI.path(path)}" do
           private_gen.save_as(path)
           xcconfig_file_ref = add_file_to_support_group(path)

data/lib/cocoapods/project.rb

@@ -9,16 +9,20 @@ module Pod
   #
   class Project < Xcodeproj::Project
 
-    # @return [Pathname] the path of the xcodeproj file which stores the
-    #         project.
+
+    # @return [Sandbox] the sandbox which returns the information about which
+    #         Pods are local.
     #
-    attr_reader :path
+    attr_reader :sandbox
 
     # @param  [Sandbox] sandbox @see #sandbox
     #
-    def initialize(path = nil)
+    def initialize(sandbox)
       super(nil) # Recreate the project from scratch for now.
-      @path = path
+      # TODO
+      raise unless sandbox.is_a?(Sandbox)
+      @sandbox = sandbox
+      @path = sandbox.project_path
       @support_files_group = new_group('Targets Support Files')
 
       @refs_by_absolute_path = {}
@@ -107,25 +111,25 @@ module Pod
       @resources ||= new_group('Resources')
     end
 
-    # Adds a group as child to the `Pods` group namespacing subspecs.
-    #
-    # @param  [String] spec_name
-    #         The full name of the specification.
-    #
-    # @param  [PBXGroup] root_group
-    #         The group where to add the specification. Either `Pods` or `Local
-    #         Pods`.
-    #
+
     # @return [PBXGroup] the group for the spec with the given name.
     #
-    def add_spec_group(spec_name, root_group)
-      current_group = root_group
-      group = nil
-      spec_name.split('/').each do |name|
-        group = current_group[name] || current_group.new_group(name)
-        current_group = group
+    def group_for_spec(spec_name, type = nil)
+      local = sandbox.local?(spec_name)
+      parent_group = local ? local_pods : pods
+      spec_group = add_spec_group(spec_name, parent_group)
+      if type
+        case type
+        when :source_files then sub_group = 'Source Files'
+        when :resources then sub_group = 'Resources'
+        when :frameworks_and_libraries then sub_group = 'Frameworks & Libraries'
+        when :support_files then sub_group = 'Support Files'
+        else raise "[BUG]"
+        end
+        spec_group.find_subpath(sub_group, true)
+      else
+        spec_group
       end
-      group
     end
 
     #-------------------------------------------------------------------------#
@@ -154,7 +158,7 @@ module Pod
     # @return [void]
     #
     def add_file_references(absolute_path, spec_name, parent_group)
-      group = add_spec_group(spec_name, parent_group)
+      group = group_for_spec(spec_name, :source_files)
       absolute_path.each do |file|
         existing = file_reference(file)
         unless existing
@@ -165,6 +169,13 @@ module Pod
       end
     end
 
+    # TODO: missing customization for file reference
+    #
+    def add_file_reference(absolute_path, group)
+      ref = group.new_file(relativize(absolute_path))
+      @refs_by_absolute_path[absolute_path] = ref
+    end
+
     # Returns the file reference for the given absolute file path.
     #
     # @param  [Pathname,String] absolute_path
@@ -204,6 +215,28 @@ module Pod
     #
     attr_reader :refs_by_absolute_path
 
+    # Returns a subgroup of the give group for the given spec creating it if
+    # needed.
+    #
+    # @param  [String] spec_name
+    #         The full name of the specification.
+    #
+    # @param  [PBXGroup] root_group
+    #         The group where to add the specification. Either `Pods` or `Local
+    #         Pods`.
+    #
+    # @return [PBXGroup] the group for the spec with the given name.
+    #
+    def add_spec_group(spec_name, root_group)
+      current_group = root_group
+      group = nil
+      spec_name.split('/').each do |name|
+        group = current_group[name] || current_group.new_group(name)
+        current_group = group
+      end
+      group
+    end
+
     #-------------------------------------------------------------------------#
 
   end

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -21,11 +21,15 @@ module Pod
       #
       attr_reader :spec_consumer
 
-      # @param [Sandbox::PathList] path_list @see path_list
+      # @param [Sandbox::PathList, Pathname] path_list @see path_list
       # @param [Specification::Consumer] spec_consumer @see spec_consumer
       #
       def initialize(path_list, spec_consumer)
-        @path_list = path_list
+        if path_list.is_a?(PathList)
+          @path_list = path_list
+        else
+          @path_list = PathList.new(path_list)
+        end
         @spec_consumer = spec_consumer
 
         unless @spec_consumer
@@ -36,7 +40,7 @@ module Pod
       # @return [Pathname] the directory which contains the files of the Pod.
       #
       def root
-        path_list.root
+        path_list.root if path_list
       end
 
       # @return [Specification] the specification.
@@ -54,7 +58,7 @@ module Pod
       # @return [String] A string suitable for debugging.
       #
       def inspect
-        "<#{self.class} spec=#{spec.name} platform=#{platform_name} root=#{path_list.root}>"
+        "<#{self.class} spec=#{spec.name} platform=#{platform_name} root=#{root}>"
       end
 
       #-----------------------------------------------------------------------#
@@ -102,6 +106,40 @@ module Pod
         paths_for_attribute(:preserve_paths, true)
       end
 
+      # @return [Array<Pathname>] The paths of the framework bundles that come
+      #         shipped with the Pod.
+      #
+      def vendored_frameworks
+        paths_for_attribute(:vendored_frameworks, true)
+      end
+
+      # @return [Array<Pathname>] The paths of the library bundles that come
+      #         shipped with the Pod.
+      #
+      def vendored_libraries
+        paths_for_attribute(:vendored_libraries)
+      end
+
+      # @return [Hash{String => Array<Pathname>}] A hash that describes the
+      #         resource bundles of the Pod. The keys reppresent the name of
+      #         the bundle while the values the path of the resources.
+      #
+      def resource_bundles
+        result = {}
+        spec_consumer.resource_bundles.each do |name, file_patterns|
+          paths = expanded_paths(file_patterns, :include_dirs => true)
+          result[name] = paths
+        end
+        result
+      end
+
+      # @return [Array<Pathname>] The paths of the files which should be
+      #         included in resources bundles by the Pod.
+      #
+      def resource_bundle_files
+        resource_bundles.values.flatten
+      end
+
       # @return [Pathname] The of the prefix header file of the specification.
       #
       def prefix_header
@@ -159,8 +197,6 @@ module Pod
       #
       # @return [String] the glob pattern.
       #
-      # @todo   Move to the cocoapods-core so it appears in the docs?
-      #
       def glob_for_attribute(attrbute)
         globs = {
           :source_files => '*.{h,hpp,hh,m,mm,c,cpp}'.freeze,
@@ -185,8 +221,6 @@ module Pod
       #
       # @return [Array<Pathname>] A list of the paths.
       #
-      # @todo   Implement case insensitive search
-      #
       def expanded_paths(patterns, options = {})
         return [] if patterns.empty?
         result = []