cocoapods 0.0.6 → 0.0.7

data/README.md

@@ -1,10 +1,10 @@
 # CocoaPods
 
-CocoaPods is an Objective-C library package manager. It tries to take away all
-hard work of maintaining your dependencies, but in a lean and flexible way.
+CocoaPods is an Objective-C library dependency/package manager. It tries to take
+away all hard work of maintaining your dependencies.
 
 Its goal is to create a more centralized overview of open-source libraries and
-unify the way in which we deal with them, like RubyGems[http://rubygems.org]
+unify the way in which we deal with them, like [RubyGems](http://rubygems.org)
 does for the Ruby community.
 
 CocoaPods will:

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   class Informative < StandardError
   end

data/lib/cocoapods/command/spec.rb

@@ -42,7 +42,7 @@ module Pod
             s.description = 'An optional longer description of #{@name}.'
 
             # A list of file patterns. If the pattern is a directory then the path will
-            # automatically have '*.{h,m,mm,c,cpp' appended.
+            # automatically have '*.{h,m,mm,c,cpp}' appended.
             s.source_files = 'Classes', 'Classes/**/*.{h,m}'
 
             s.xcconfig = { 'OTHER_LDFLAGS' => '-framework SomeRequiredFramework' }

data/lib/cocoapods/installer.rb

@@ -17,14 +17,15 @@ module Pod
     end
 
     def source_files
-      source_files = []
+      source_files = {}
       build_specification_sets.each do |set|
         spec = set.specification
+        source_files[spec.name] = []
         spec.source_files.each do |pattern|
           pattern = spec.pod_destroot + pattern
           pattern = pattern + '*.{h,m,mm,c,cpp}' if pattern.directory?
           pattern.glob.each do |file|
-            source_files << file.relative_path_from(config.project_pods_root)
+            source_files[spec.name] << file.relative_path_from(config.project_pods_root)
           end
         end
       end
@@ -35,7 +36,7 @@ module Pod
       @xcconfig ||= Xcode::Config.new({
         # In a workspace this is where the static library headers should be found
         # We could also make this recursive, but let's let the user decide on that.
-        'USER_HEADER_SEARCH_PATHS' => '$(BUILT_PRODUCTS_DIR)/Pods',
+        'USER_HEADER_SEARCH_PATHS' => '"$(BUILT_PRODUCTS_DIR)/Pods"',
         # search the user headers
         'ALWAYS_SEARCH_USER_PATHS' => 'YES',
       })
@@ -46,17 +47,40 @@ module Pod
     end
 
     def generate_project
-      source_files.each { |file| xcodeproj.add_source_file(file) }
+      puts "==> Generating Xcode project and xcconfig" unless config.silent?
+      user_header_search_paths = []
       build_specification_sets.each do |set|
-        xcconfig << set.specification.xcconfig
+        spec = set.specification
+        xcconfig.merge!(spec.xcconfig)
+        xcodeproj.add_group(spec.name)
+
+        # Only add implementation files to the compile phase
+        spec.implementation_files.each do |file|
+          xcodeproj.add_source_file(file, spec.name)
+        end
+
+        # Add header files to a `copy header build phase` for each destination
+        # directory in the pod's header directory.
+        set.specification.copy_header_mappings.each do |header_dir, files|
+          copy_phase_uuid = xcodeproj.add_copy_header_build_phase(spec.name, header_dir)
+          files.each do |file|
+            xcodeproj.add_source_file(file, spec.name, copy_phase_uuid)
+          end
+        end
+
+        # Collect all header search paths
+        user_header_search_paths.concat(spec.user_header_search_paths)
       end
+      xcconfig.merge!('USER_HEADER_SEARCH_PATHS' => user_header_search_paths.sort.uniq.join(" "))
     end
 
     # TODO we need a spec that tests that all dependencies are first downloaded/installed
     # before #generate_project is called!
     def install!
       puts "Installing dependencies of: #{@specification.defined_in_file}" unless config.silent?
-      build_specification_sets.each { |set| set.specification.install! }
+      build_specification_sets.each do |set|
+         set.specification.install!
+      end
       generate_project
       xcodeproj.create_in(config.project_pods_root)
       xcconfig.create_in(config.project_pods_root)

data/lib/cocoapods/source.rb

@@ -20,8 +20,8 @@ module Pod
       result = all.map { |s| s.search_by_name(query, full_text_search) }.flatten
       if result.empty?
         extra = ", summary, or description" if full_text_search
-        raise(Informative, "Unable to find a pod who's name" \
-                           "#{extra} matches `#{query}'")
+        raise(Informative, "Unable to find a pod with name" \
+                           "#{extra} matching `#{query}'")
       end
       result
     end

data/lib/cocoapods/specification.rb

@@ -1,5 +1,9 @@
 module Pod
-  class Specification
+  def self._eval_podspec(path)
+    eval(path.read, nil, path.to_s)
+  end
+
+ class Specification
     autoload :Set, 'cocoapods/specification/set'
 
     def self.from_podfile(path)
@@ -12,7 +16,7 @@ module Pod
     end
 
     def self.from_podspec(path)
-      spec = eval(path.read, nil, path.to_s)
+      spec = Pod._eval_podspec(path)
       spec.defined_in_file = path
       spec
     end
@@ -95,6 +99,13 @@ module Pod
     end
     alias_method :library=, :libraries=
 
+    def header_dir=(dir)
+      @header_dir = Pathname.new(dir)
+    end
+    def header_dir
+      @header_dir || pod_destroot_name
+    end
+
     # Not attributes
 
     include Config::Mixin
@@ -125,7 +136,13 @@ module Pod
       if part_of_other_pod?
         part_of_specification.pod_destroot
       else
-        config.project_pods_root + "#{@name}-#{@version}"
+        config.project_pods_root + @name
+      end
+    end
+
+    def pod_destroot_name
+      if root = pod_destroot
+        root.basename
       end
     end
 
@@ -137,6 +154,57 @@ module Pod
       @name.nil? && @version.nil?
     end
 
+    # Returns all source files of this pod including header files.
+    def expanded_source_files
+      files = []
+      source_files.each do |pattern|
+        pattern = pod_destroot + pattern
+        pattern = pattern + '*.{h,m,mm,c,cpp}' if pattern.directory?
+        pattern.glob.each do |file|
+          files << file.relative_path_from(config.project_pods_root)
+        end
+      end
+      files
+    end
+
+    def implementation_files
+      expanded_source_files.select { |f| f.extname != '.h' }
+    end
+
+    # Returns only the header files of this pod.
+    def header_files
+      expanded_source_files.select { |f| f.extname == '.h' }
+    end
+
+    # This method takes a header path and returns the location it should have
+    # in the pod's header dir.
+    #
+    # By default all headers are copied to the pod's header dir without any
+    # namespacing. You can, however, override this method in the podspec, or
+    # copy_header_mappings for full control.
+    def copy_header_mapping(from)
+      from.basename
+    end
+
+    # See copy_header_mapping.
+    def copy_header_mappings
+      header_files.inject({}) do |mappings, from|
+        from_without_prefix = from.relative_path_from(pod_destroot_name)
+        to = header_dir + copy_header_mapping(from_without_prefix)
+        (mappings[to.dirname] ||= []) << from
+        mappings
+      end
+    end
+
+    # Returns a list of search paths where the pod's headers can be found. This
+    # includes the pod's header dir root and any other directories that might
+    # have been added by overriding the copy_header_mapping/copy_header_mappings
+    # methods.
+    def user_header_search_paths
+      dirs = [header_dir] + copy_header_mappings.keys
+      dirs.map { |dir| %{"$(BUILT_PRODUCTS_DIR)/Pods/#{dir}"} }
+    end
+
     def to_s
       if from_podfile?
         "podfile at `#{@defined_in_file}'"

data/lib/cocoapods/specification/set.rb

@@ -75,7 +75,10 @@ module Pod
       # Returns Pod::Version instances, for each version directory, sorted from
       # highest version to lowest.
       def versions
-        @pod_dir.children.map { |v| Version.new(v.basename) }.sort.reverse
+        @pod_dir.children.map do |v|
+          basename = v.basename.to_s
+          Version.new(basename) if v.directory? && basename[0,1] != '.'
+        end.compact.sort.reverse
       end
     end
   end

data/lib/cocoapods/xcode/project.rb

@@ -41,21 +41,27 @@ module Pod
         find_objects(conditions).first
       end
 
+      IGNORE_GROUPS = ['Pods', 'Frameworks', 'Products', 'Supporting Files']
       def source_files
-        conditions = { 'isa' => 'PBXFileReference', 'sourceTree' => 'SOURCE_ROOT' }
-        find_objects(conditions).map do |_, object|
-          if %w{ .h .m .mm .c .cpp }.include?(File.extname(object['path']))
-            Pathname.new(object['path'])
-          end 
-        end.compact
+        source_files = {}
+        find_objects('isa' => 'PBXGroup').each do |_, object|
+          next if object['name'].nil? || IGNORE_GROUPS.include?(object['name'])
+          source_files[object['name']] = object['children'].map do |uuid|
+            Pathname.new(objects[uuid]['path'])
+          end
+        end
+        source_files
       end
 
-      def add_source_file(file, compiler_flags = nil)
+      def add_source_file(file, group, phase_uuid = nil, compiler_flags = nil)
         file_ref_uuid = add_file_reference(file, 'SOURCE_ROOT')
-        add_file_to_group(file_ref_uuid, 'Pods')
+        add_object_to_group(file_ref_uuid, group)
         if file.extname == '.h'
           build_file_uuid = add_build_file(file_ref_uuid, "settings" => { "ATTRIBUTES" => ["Public"] })
-          add_file_to_list('PBXHeadersBuildPhase', build_file_uuid)
+          # Working around a bug in Xcode 4.2 betas, remove this once the Xcode bug is fixed:
+          # https://github.com/alloy/cocoapods/issues/13
+          #add_file_to_list('PBXHeadersBuildPhase', build_file_uuid)
+          add_file_to_list('PBXCopyFilesBuildPhase', build_file_uuid, phase_uuid)
         else
           extra = compiler_flags ? {"settings" => { "COMPILER_FLAGS" => compiler_flags }} : {}
           build_file_uuid = add_build_file(file_ref_uuid, extra)
@@ -63,6 +69,17 @@ module Pod
         end
         file_ref_uuid
       end
+      
+      def add_group(name)
+        group_uuid = add_object({
+          "name" => name,
+          "isa" => "PBXGroup",
+          "sourceTree" => "<group>",
+          "children" => []
+        })
+        add_object_to_group(group_uuid, 'Pods')
+        group_uuid
+      end
 
       def create_in(pods_root)
         puts "  * Copying contents of template directory `#{@template_dir}' to `#{pods_root}'" if config.verbose?
@@ -72,6 +89,27 @@ module Pod
         @template.writeToFile(pbxproj.to_s, atomically:true)
       end
 
+      # TODO add comments, or even constants, describing what these magic numbers are.
+      def add_copy_header_build_phase(name, path)
+        phase_uuid = add_object({
+           "isa" => "PBXCopyFilesBuildPhase",
+           "buildActionMask" => "2147483647",
+           "dstPath" => "$(PUBLIC_HEADERS_FOLDER_PATH)/#{path}",
+           "dstSubfolderSpec" => "16",
+           "files" => [],
+           "name" => "Copy #{name} Public Headers",
+           "runOnlyForDeploymentPostprocessing" => "0",
+        })
+        
+        object_uuid, object = objects_by_isa('PBXNativeTarget').first
+        object['buildPhases'] << phase_uuid
+        phase_uuid
+      end
+
+      def objects_by_isa(isa)
+        objects.select { |_, object| object['isa'] == isa }
+      end
+
       private
 
       def add_object(object)
@@ -88,34 +126,37 @@ module Pod
           "path" => path.to_s,
         })
       end
-
+      
       def add_build_file(file_ref_uuid, extra = {})
         add_object(extra.merge({
           "isa" => "PBXBuildFile",
           "fileRef" => file_ref_uuid
         }))
       end
-
-      def add_file_to_list(isa, build_file_uuid)
-        object_uuid, object = objects_by_isa(isa).first
+      
+      # TODO refactor to create PBX object classes and make this take aither a uuid or a class instead of both.
+      def add_file_to_list(isa, build_file_uuid, phase_uuid = nil)
+        objects = objects_by_isa(isa)
+        _ = object = nil
+        if phase_uuid.nil?
+          _, object = objects.first
+        else
+          object = objects[phase_uuid]
+        end
         object['files'] << build_file_uuid
       end
 
-      def add_file_to_group(file_ref_uuid, name)
+      def add_object_to_group(object_ref_uuid, name)
         object_uuid, object = objects.find do |_, object|
           object['isa'] == 'PBXGroup' && object['name'] == name
         end
-        object['children'] << file_ref_uuid
+        object['children'] << object_ref_uuid
       end
 
       def objects
         @template['objects']
       end
 
-      def objects_by_isa(isa)
-        objects.select { |_, object| object['isa'] == isa }
-      end
-
       def generate_uuid
         _uuid = CFUUIDCreate(nil)
         uuid = CFUUIDCreateString(nil, _uuid)

data/xcode-project-templates/cocoa-touch-static-library/Pods.xcodeproj/project.pbxproj

@@ -10,6 +10,19 @@
 		515B0FB9141D52E0001DC3E6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 515B0FB8141D52E0001DC3E6 /* Foundation.framework */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		82A8B61C142F7EC7006897C9 /* Copy Public Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "$(PUBLIC_HEADERS_FOLDER_PATH)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			name = "Copy Public Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
 		515160D0141EC5D100EBB823 /* Pods.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Pods.xcconfig; sourceTree = "<group>"; };
 		515B0FB5141D52E0001DC3E6 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -92,6 +105,7 @@
 				515B0FB1141D52E0001DC3E6 /* Sources */,
 				515B0FB2141D52E0001DC3E6 /* Frameworks */,
 				515B0FB3141D52E0001DC3E6 /* Headers */,
+				82A8B61C142F7EC7006897C9 /* Copy Public Headers */,
 			);
 			buildRules = (
 			);

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Eloy Duran
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-17 00:00:00 -05:00
+date: 2011-09-17 00:00:00 +02:00
 default_executable: 
 dependencies: []