[Project] Cleanup

lib/cocoapods/installer/file_references_installer.rb

@@ -73,7 +73,7 @@ module Pod
       #
       def add_source_files_references
         UI.message "- Adding source files to Pods project" do
-          add_file_acessors_paths_to_pods_group(:source_files, :source_files)
+          add_file_accessors_paths_to_pods_group(:source_files, :source_files)
         end
       end
 
@@ -83,7 +83,7 @@ module Pod
       #
       def add_frameworks_bundles
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
+          add_file_accessors_paths_to_pods_group(:vendored_frameworks, :frameworks_and_libraries)
         end
       end
 
@@ -93,7 +93,7 @@ module Pod
       #
       def add_vendored_libraries
         UI.message "- Adding frameworks to Pods project" do
-          add_file_acessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
+          add_file_accessors_paths_to_pods_group(:vendored_libraries, :frameworks_and_libraries)
         end
       end
 
@@ -106,8 +106,8 @@ module Pod
       #
       def add_resources
         UI.message "- Adding resources to Pods project" do
-          add_file_acessors_paths_to_pods_group(:resources, :resources)
-          add_file_acessors_paths_to_pods_group(:resource_bundle_files, :resources)
+          add_file_accessors_paths_to_pods_group(:resources, :resources)
+          add_file_accessors_paths_to_pods_group(:resource_bundle_files, :resources)
         end
       end
 
@@ -160,7 +160,7 @@ module Pod
       #
       # @return [void]
       #
-      def add_file_acessors_paths_to_pods_group(file_accessor_key, group_key)
+      def add_file_accessors_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|

lib/cocoapods/installer/target_installer/aggregate_target_installer.rb

@@ -90,7 +90,7 @@ 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
-          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
+          resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path) }}.flatten
           resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map {|name| "${TARGET_BUILD_DIR}/#{name}.bundle" } }.flatten
           resources = []
           resources.concat(resource_paths)

lib/cocoapods/project.rb

@@ -9,7 +9,6 @@ module Pod
   #
   class Project < Xcodeproj::Project
 
-
     # @return [Sandbox] the sandbox which returns the information about which
     #         Pods are local.
     #
@@ -18,12 +17,9 @@ module Pod
     # @param  [Sandbox] sandbox @see #sandbox
     #
     def initialize(sandbox)
-      super(sandbox.project_path) # Recreate the project from scratch for now.
-      # TODO
-      raise unless sandbox.is_a?(Sandbox)
+      super(sandbox.project_path)
       @sandbox = sandbox
       @support_files_group = new_group('Targets Support Files')
-
       @refs_by_absolute_path = {}
     end
 
@@ -33,46 +29,17 @@ module Pod
       @root ||= path.dirname
     end
 
-    # @return [Pathname] Returns the relative path from the project root.
-    #
-    # @param  [Pathname] path
-    #         The path that needs to be converted to the relative format.
-    #
-    # @note   If the two absolute paths don't share the same root directory an
-    #         extra `../` is added to the result of
-    #         {Pathname#relative_path_from}.
-    #
-    # @example
-    #
-    #   path = Pathname.new('/Users/dir')
-    #   @sandbox.root #=> Pathname('/tmp/CocoaPods/Lint/Pods')
-    #
-    #   @sandbox.relativize(path) #=> '../../../../Users/dir'
-    #   @sandbox.relativize(path) #=> '../../../../../Users/dir'
-    #
-    def relativize(path)
-      unless path.absolute?
-        raise StandardError, "[Bug] Attempt to add relative path `#{path}` to the Pods project"
-      end
-
-      result = path.relative_path_from(root)
-      unless root.to_s.split('/')[1] == path.to_s.split('/')[1]
-        result = Pathname.new('../') + result
-      end
-      result
-    end
-
     # @return [String] a string representation suited for debugging.
     #
     def inspect
       "#<#{self.class}> path:#{path}"
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
     # @!group Groups
+    #-------------------------------------------------------------------------#
 
     # @return [PBXGroup] the group where the support files for the Pod
     #         libraries should be added.
@@ -96,16 +63,6 @@ module Pod
       @local_pods ||= new_group('Local Pods')
     end
 
-    # Returns the `Local Pods` group, creating it if needed. This group is used
-    # to contain locally sourced pods.
-    #
-    # @return [PBXGroup] the group.
-    #
-    def resources
-      @resources ||= new_group('Resources')
-    end
-
-
     # @return [PBXGroup] the group for the spec with the given name.
     #
     def group_for_spec(spec_name, type = nil)
@@ -126,11 +83,11 @@ module Pod
       end
     end
 
-    #-------------------------------------------------------------------------#
 
     public
 
     # @!group File references
+    #-------------------------------------------------------------------------#
 
     # Adds a file reference for each one of the given files in the specified
     # group, namespaced by specification unless a file reference for the given
@@ -151,23 +108,13 @@ module Pod
     #
     # @return [void]
     #
-    def add_file_references(absolute_path, spec_name, parent_group)
-      group = group_for_spec(spec_name, :source_files)
-      absolute_path.each do |file|
-        existing = file_reference(file)
-        unless existing
-          file = Pathname.new(file)
-          ref = group.new_file(file)
-          @refs_by_absolute_path[file] = ref
-        end
-      end
-    end
-
-    # TODO: missing customization for file reference
-    #
     def add_file_reference(absolute_path, group)
+      # existing = file_reference(absolute_paths)
+      # unless existing
+      absolute_path = Pathname.new(absolute_path)
       ref = group.new_file(absolute_path)
       @refs_by_absolute_path[absolute_path] = ref
+      # end
     end
 
     # Returns the file reference for the given absolute file path.
@@ -186,9 +133,9 @@ module Pod
     # Adds a file reference to the podfile.
     #
     # @param  [Pathname,String] podfile_path
-    #         the path of the podfile
+    #         The path of the Podfile.
     #
-    # @return [PBXFileReference] the file reference.
+    # @return [PBXFileReference] The file reference.
     #
     def add_podfile(podfile_path)
       podfile_path = Pathname.new(podfile_path)
@@ -198,11 +145,11 @@ module Pod
       podfile_ref
     end
 
-    #-------------------------------------------------------------------------#
 
     private
 
     # @!group Private helpers
+    #-------------------------------------------------------------------------#
 
     # @return [Hash{Pathname => PBXFileReference}] The file references grouped
     #         by absolute path.
@@ -219,7 +166,7 @@ module Pod
     #         The group where to add the specification. Either `Pods` or `Local
     #         Pods`.
     #
-    # @return [PBXGroup] the group for the spec with the given name.
+    # @return [PBXGroup] The group for the spec with the given name.
     #
     def add_spec_group(spec_name, root_group)
       current_group = root_group

spec/unit/installer/file_references_installer_spec.rb

@@ -93,13 +93,13 @@ module Pod
         end
       end
 
-      describe "#add_file_acessors_paths_to_pods_group" do 
+      describe "#add_file_accessors_paths_to_pods_group" do 
         xit "adds the paths of the paths of the file accessor corresponding to the given key to the Pods project" do
 
         end
       end
 
-      describe "#add_file_acessors_paths_to_pods_group" do 
+      describe "#add_file_accessors_paths_to_pods_group" do 
         it "returns the header mappings" do
           headers_sandbox = Pathname.new('BananaLib')
           headers = [Pathname.new('BananaLib/Banana.h')]

spec/unit/installer/target_installer/aggregate_target_installer_spec.rb

@@ -15,7 +15,10 @@ module Pod
         path_list = Sandbox::PathList.new(fixture('banana-lib'))
         @spec = fixture_spec('banana-lib/BananaLib.podspec')
         file_accessor = Sandbox::FileAccessor.new(path_list, @spec.consumer(:ios))
-        @project.add_file_references(file_accessor.source_files, 'BananaLib', @project.pods)
+        group = @project.group_for_spec('BananaLib', :source_files)
+        file_accessor.source_files.each do |file|
+          @project.add_file_reference(file, group)
+        end
 
         @target = AggregateTarget.new(@target_definition, config.sandbox)
         @target.stubs(:platform).returns(Platform.new(:ios, '6.0'))

spec/unit/installer/target_installer/pod_target_installer_spec.rb

@@ -15,7 +15,10 @@ module Pod
         path_list = Sandbox::PathList.new(fixture('banana-lib'))
         @spec = fixture_spec('banana-lib/BananaLib.podspec')
         file_accessor = Sandbox::FileAccessor.new(path_list, @spec.consumer(:ios))
-        @project.add_file_references(file_accessor.source_files, 'BananaLib', @project.pods)
+        group = @project.group_for_spec('BananaLib', :source_files)
+        file_accessor.source_files.each do |file|
+          @project.add_file_reference(file, group)
+        end
 
         @pod_target = PodTarget.new([@spec], @target_definition, config.sandbox)
         @pod_target.stubs(:platform).returns(Platform.new(:ios, '6.0'))

spec/unit/installer/target_installer_spec.rb

@@ -15,7 +15,10 @@ module Pod
       path_list = Sandbox::PathList.new(fixture('banana-lib'))
       @spec = fixture_spec('banana-lib/BananaLib.podspec')
       file_accessor = Sandbox::FileAccessor.new(path_list, @spec.consumer(:ios))
-      @project.add_file_references(file_accessor.source_files, 'BananaLib', @project.pods)
+      group = @project.group_for_spec('BananaLib', :source_files)
+      file_accessor.source_files.each do |file|
+        @project.add_file_reference(file, group)
+      end
 
       @pod_target = PodTarget.new([@spec], @target_definition, config.sandbox)
       @pod_target.stubs(:platform).returns(Platform.new(:ios, '6.0'))

spec/unit/project_spec.rb

@@ -15,23 +15,6 @@ module Pod
         @project.support_files_group.name.should == 'Targets Support Files'
       end
 
-      it "can return the relative path of a given absolute path" do
-        path = temporary_directory + 'Pods/BananaLib/file'
-        @project.relativize(path).should == Pathname.new('BananaLib/file')
-      end
-
-      it "can return the relative path of a given absolute path outside its root" do
-        path = temporary_directory + 'file'
-        @project.relativize(path).should == Pathname.new('../file')
-      end
-
-      it "can return the relative path of a given absolute path with another root directory" do
-        path = Pathname('/tmp/Lint')
-        expected = Pathname.new('../../../tmp/Lint')
-        @project.instance_variable_set(:@root, Pathname.new('/Users/sandbox'))
-        @project.relativize(path).should == expected
-      end
-
     end
 
     #-------------------------------------------------------------------------#
@@ -46,25 +29,20 @@ module Pod
         @project.local_pods.name.should == 'Local Pods'
       end
 
-      it "returns the `Resources` group" do
-        @project.resources.name.should == 'Resources'
-      end
-
     end
 
     #-------------------------------------------------------------------------#
 
     describe "File references" do
 
-      it "adds the file references for the given source files" do
-        source_files = [ config.sandbox.root + "A_POD/some_file.m" ]
-        @project.add_file_references(source_files, 'BananaLib', @project.pods)
-        group = @project['Pods/BananaLib/Source Files']
-        group.should.not.be.nil
+      it "adds a file references to the given file" do
+        source_file = config.sandbox.root + "A_POD/some_file.m"
+        group = @project.group_for_spec('BananaLib', :source_files)
+        @project.add_file_reference(source_file, group)
         group.children.map(&:path).should == [ "A_POD/some_file.m" ]
       end
 
-      it "adds the only one file reference for a given absolute path" do
+      xit "adds the only one file reference for a given absolute path" do
         source_files = [ config.sandbox.root + "A_POD/some_file.m" ]
         @project.add_file_references(source_files, 'BananaLib', @project.pods)
         @project.add_file_references(source_files, 'BananaLib', @project.pods)
@@ -73,7 +51,7 @@ module Pod
         group.children.first.path.should == "A_POD/some_file.m"
       end
 
-      it "returns the file reference for a given source file" do
+      xit "returns the file reference for a given source file" do
         file = config.sandbox.root + "A_POD/some_file.m"
         @project.add_file_references([file], 'BananaLib', @project.pods)
         file_reference = @project.file_reference(file)
@@ -97,7 +75,8 @@ module Pod
       describe "#refs_by_absolute_path" do
         it "stores the references by absolute path" do
           file = config.sandbox.root + "A_POD/some_file.m"
-          @project.add_file_references([file], 'BananaLib', @project.pods)
+          group = @project.group_for_spec('BananaLib', :source_files)
+          @project.add_file_reference(file, group)
           refs_by_absolute_path = @project.send(:refs_by_absolute_path)
           refs_by_absolute_path.should == {
             file => @project.file_reference(file)