cocoapods 0.3.1 → 0.3.2

data/lib/cocoapods.rb

@@ -1,5 +1,5 @@
 module Pod
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 
   class Informative < StandardError
   end
@@ -19,6 +19,7 @@ module Pod
   autoload :Version,                'cocoapods/version'
 
   autoload :Pathname,               'pathname'
+  autoload :FileList,               'cocoapods/file_list'
 end
 
 module Xcodeproj

data/lib/cocoapods/downloader.rb

@@ -54,11 +54,8 @@ module Pod
 
       def clean(clean_paths = [])
         (@pod_root + '.git').rmtree
-        clean_paths.each do |pattern|
-          pattern = @pod_root + pattern
-          pattern.glob.each do |path|
-            path.rmtree
-          end
+        clean_paths.each do |path|
+          path.rmtree
         end if clean_paths
       end
     end

data/lib/cocoapods/file_list.rb

@@ -0,0 +1,34 @@
+require 'rake'
+
+# This makes Rake::FileList usable with the Specification attributes
+# source_files, clean_paths, and resources.
+
+module Rake
+  class FileList
+    def prepend_patterns(pathname)
+      @pending_add.map! { |pattern| (pathname + pattern).to_s }
+    end
+
+    def directory?
+      false
+    end
+
+    def glob
+      to_a.map { |path| Pathname.new(path) }
+    end
+  end
+end
+
+class Pathname
+  alias_method :_original_sum, :+
+  def +(other)
+    if other.is_a?(Rake::FileList)
+      other.prepend_patterns(self)
+      other
+    else
+      _original_sum(other)
+    end
+  end
+end
+
+

data/lib/cocoapods/specification.rb

@@ -21,7 +21,7 @@ module Pod
     attr_accessor :defined_in_file
 
     def initialize
-      @dependencies = []
+      @dependencies, @resources, @clean_paths = [], [], []
       @xcconfig = Xcodeproj::Config.new
       yield self if block_given?
     end
@@ -67,21 +67,22 @@ module Pod
       @part_of = dependency(*name_and_version_requirements)
     end
 
-    def source_files=(*patterns)
-      @source_files = patterns.flatten
+    def source_files=(patterns)
+      @source_files = pattern_list(patterns)
     end
     attr_reader :source_files
 
-    def resources=(*patterns)
-      @resources = patterns.flatten
+    def resources=(patterns)
+      @resources = pattern_list(patterns)
     end
     attr_reader :resources
     alias_method :resource=, :resources=
 
-    def clean_paths=(*patterns)
-      @clean_paths = patterns.flatten.map { |p| Pathname.new(p) }
+    def clean_paths=(patterns)
+      @clean_paths = pattern_list(patterns)
     end
     attr_reader :clean_paths
+    alias_method :clean_path=, :clean_paths=
 
     def xcconfig=(hash)
       @xcconfig.merge!(hash)
@@ -178,13 +179,20 @@ module Pod
       false
     end
 
+    def pattern_list(patterns)
+      if patterns.is_a?(Array) && (!defined?(Rake) || !patterns.is_a?(Rake::FileList))
+        patterns
+      else
+        [patterns]
+      end
+    end
+
     # Returns all resource files of this pod, but relative to the
     # project pods root.
     def expanded_resources
       files = []
-      [*resources].each do |pattern|
+      resources.each do |pattern|
         pattern = pod_destroot + pattern
-        pattern = pattern + '*' if pattern.directory?
         pattern.glob.each do |file|
           files << file.relative_path_from(config.project_pods_root)
         end
@@ -192,11 +200,27 @@ module Pod
       files
     end
 
+    # Returns full paths to clean for this pod.
+    def expanded_clean_paths
+      files = []
+      clean_paths.each do |pattern|
+        pattern = pod_destroot + pattern
+        pattern.glob.each do |file|
+          files << file
+        end
+      end
+      files
+    end
+
     # Returns all source files of this pod including header files,
     # but relative to the project pods root.
+    #
+    # If the pattern is the path to a directory, the pattern will
+    # automatically glob for c, c++, Objective-C, and Objective-C++
+    # files.
     def expanded_source_files
       files = []
-      [*source_files].each do |pattern|
+      source_files.each do |pattern|
         pattern = pod_destroot + pattern
         pattern = pattern + '*.{h,m,mm,c,cpp}' if pattern.directory?
         pattern.glob.each do |file|
@@ -320,7 +344,7 @@ module Pod
     def download!
       downloader = Downloader.for_source(pod_destroot, source)
       downloader.download
-      downloader.clean(clean_paths) if config.clean
+      downloader.clean(expanded_clean_paths) if config.clean
     end
 
     # This is a convenience method which gets called after all pods have been

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Eloy Duran
@@ -56,6 +56,7 @@ files:
 - lib/cocoapods/dependency.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
+- lib/cocoapods/file_list.rb
 - lib/cocoapods/installer.rb
 - lib/cocoapods/podfile.rb
 - lib/cocoapods/resolver.rb