cocoapods 0.15.1 → 0.15.2

data/CHANGELOG.md

@@ -1,6 +1,29 @@
 ## Master
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.1...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.1...master) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.4...master)
+
+## 0.15.2
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.1...0.15.2)
+
+###### Enhancements
+
+- Added support for `.hh` headers.
+  [#576](https://github.com/CocoaPods/CocoaPods/pull/576)
+
+###### Bug fixes
+
+- Restored support for running CocoaPods without a terminal.
+  [#575](https://github.com/CocoaPods/CocoaPods/issues/575)
+  [#577](https://github.com/CocoaPods/CocoaPods/issues/577)
+- The git cache now always uses a barebones repo preventing a number of related issues.
+  [#581](https://github.com/CocoaPods/CocoaPods/issues/581)
+  [#569](https://github.com/CocoaPods/CocoaPods/issues/569)
+- Improved fix for the issue that lead to empty directories for Pods.
+  [#572](https://github.com/CocoaPods/CocoaPods/issues/572)
+  [#602](https://github.com/CocoaPods/CocoaPods/issues/602)
+- Xcodeproj robustness against invalid values, such as malformed UTF8.
+  [#592](https://github.com/CocoaPods/CocoaPods/issues/592)
 
 ## 0.15.1
 

data/lib/cocoapods.rb

@@ -12,7 +12,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 
   class PlainInformative < StandardError
   end
@@ -57,13 +57,6 @@ module Pod
   end
 end
 
-class Pathname
-  def glob(pattern = '')
-    Dir.glob((self + pattern).to_s).map { |f| Pathname.new(f) }
-  end
-end
-
 if ENV['COCOA_PODS_ENV'] == 'development'
-  require 'letters'
   require 'awesome_print'
 end

data/lib/cocoapods/command/push.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'active_support/core_ext/string/inflections'
 
 module Pod
   class Command
@@ -66,12 +67,18 @@ module Pod
 
       def podspec_files
         files = Pathname.glob(@podspec || "*.podspec")
-        raise Informative, "[!] Couldn't find .podspec file in current directory".red if files.empty?
+        raise Informative, "[!] Couldn't find any .podspec file in current directory".red if files.empty?
         files
       end
 
+      # @return [Integer] The number of the podspec files to push.
+      #
+      def count
+        podspec_files.count
+      end
+
       def validate_podspec_files
-        UI.puts "\nValidating specs".yellow unless config.silent
+        UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow unless config.silent
         lint_argv = ["lint"]
         lint_argv << "--only-errors" if @allow_warnings
         lint_argv << "--silent" if config.silent
@@ -82,7 +89,7 @@ module Pod
       end
 
       def add_specs_to_repo
-        UI.puts "\nAdding the specs to the #{@repo} repo\n".yellow unless config.silent
+        UI.puts "\nAdding the #{'spec'.pluralize(count)} to the `#{@repo}' repo\n".yellow unless config.silent
         podspec_files.each do |spec_file|
           spec = Pod::Specification.from_file(spec_file)
           output_path = File.join(repo_dir, spec.name, spec.version.to_s)

data/lib/cocoapods/command/repo.rb

@@ -90,7 +90,7 @@ module Pod
         dirs.each do |dir|
           check_versions(dir)
           UI.puts "\nLinting spec repo `#{dir.realpath.basename}'\n".yellow
-          podspecs = dir.glob('**/*.podspec')
+          podspecs = Pathname.glob( dir + '**/*.podspec')
           invalid_count = 0
 
           podspecs.each do |podspec|

data/lib/cocoapods/command/spec.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'active_support/core_ext/string/inflections'
+
 module Pod
   class Command
     class Spec < Command
@@ -104,8 +106,8 @@ module Pod
           UI.puts unless config.silent?
         end
 
-        UI.puts "Analyzed #{podspecs_to_lint.count} podspecs files.\n\n" unless config.silent?
         count = podspecs_to_lint.count
+        UI.puts "Analyzed #{count} #{'podspec'.pluralize(count)}.\n\n" unless config.silent?
         if invalid_count == 0
           lint_passed_message = count == 1 ? "#{podspecs_to_lint.first.basename} passed validation." : "All the specs passed validation."
           UI.puts lint_passed_message.green << "\n\n" unless config.silent?
@@ -136,7 +138,7 @@ module Pod
               end
               files << output_path
             else if (pathname = Pathname.new(path)).directory?
-              files += pathname.glob('**/*.podspec')
+              files += Pathname.glob(pathname + '**/*.podspec')
               raise Informative, "No specs found in the current directory." if files.empty?
             else
               files << (pathname = Pathname.new(path))

data/lib/cocoapods/downloader/git.rb

@@ -1,17 +1,19 @@
 require 'open-uri'
-require 'tempfile'
+# require 'tempfile'
 require 'zlib'
 require 'digest/sha1'
 
 module Pod
   class Downloader
+
+    # Concreted Downloader class that provides support for specifications with
+    # git sources.
+    #
     class Git < Downloader
       include Config::Mixin
 
       executable :git
 
-      MAX_CACHE_SIZE = 500
-
       def download
         create_cache unless cache_exist?
         UI.section(' > Cloning git repo', '', 1) do
@@ -29,89 +31,26 @@ module Pod
         prune_cache
       end
 
-      def create_cache
-        UI.section(" > Creating cache git repo (#{cache_path})",'',1) do
-          cache_path.rmtree if cache_path.exist?
-          cache_path.mkpath
-          git! %Q|clone  --mirror "#{url}" "#{cache_path}"|
-        end
-      end
-
-      def prune_cache
-        return unless caches_dir.exist?
-        Dir.chdir(caches_dir) do
-          repos = Pathname.new(caches_dir).children.select { |c| c.directory? }.sort_by(&:ctime)
-          while caches_size >= MAX_CACHE_SIZE && !repos.empty?
-            dir = repos.shift
-            UI.message "#{'->'.yellow} Removing git cache for `#{origin_url(dir)}'"
-            dir.rmtree
-          end
-        end
-      end
-
-      def cache_path
-        @cache_path ||= caches_dir + "#{Digest::SHA1.hexdigest(url.to_s)}"
-      end
-
-      def cache_exist?
-        cache_path.exist? && origin_url(cache_path).to_s == url.to_s
-      end
-
-      def origin_url(dir)
-        Dir.chdir(dir) { `git config remote.origin.url`.chomp }
-      end
 
-      def caches_dir
-        Pathname.new(File.expand_path("~/Library/Caches/CocoaPods/Git"))
-      end
+      # @!group Download implementations
 
+      # @return [Pathname] The clone URL, which resolves to the cache path.
+      #
       def clone_url
         cache_path
       end
 
-      def caches_size
-        # expressed in Mb
-        `du -cm`.split("\n").last.to_i
-      end
-
-      def update_cache
-        UI.section(" > Updating cache git repo (#{cache_path})",'',1) do
-          Dir.chdir(cache_path) do
-            if git("config core.bare").chomp == "true"
-              git! "remote update"
-            else
-              git! "reset --hard HEAD"
-              git! "clean -d -x -f"
-              git! "pull origin master"
-              git! "fetch --tags"
-            end
-          end
+      # @return [void] Convenience method to perform clones operations.
+      #
+      def clone(from, to)
+        UI.section(" > Cloning to Pods folder",'',1) do
+          git! %Q|clone "#{from}" "#{to}"|
         end
       end
 
-      def ref_exists?(ref)
-        Dir.chdir(cache_path) { git "rev-list --max-count=1 #{ref}" }
-        $? == 0
-      end
-
-      def ensure_ref_exists(ref)
-        return if ref_exists?(ref)
-        # Skip pull if not needed
-        update_cache
-        raise Informative, "[!] Cache unable to find git reference `#{ref}' for `#{url}'.".red unless ref_exists?(ref)
-      end
-
-      def branch_exists?(branch)
-        Dir.chdir(cache_path) { git "branch --all | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
-        $? == 0
-      end
-
-      def ensure_remote_branch_exists(branch)
-        return if branch_exists?(branch)
-        update_cache
-        raise Informative, "[!] Cache unable to find git reference `#{branch}' for `#{url}' (#{$?}).".red unless branch_exists?(branch)
-      end
-
+      # @return [void] Checkouts the HEAD of the git source in the destination
+      # path.
+      #
       def download_head
         if cache_exist?
           update_cache
@@ -123,6 +62,9 @@ module Pod
         Dir.chdir(target_path) { git! "submodule update --init"  } if options[:submodules]
       end
 
+      # @return [void] Checkouts a specific tag of the git source in the
+      # destination path.
+      #
       def download_tag
         ensure_ref_exists(options[:tag])
         Dir.chdir(target_path) do
@@ -134,6 +76,9 @@ module Pod
         end
       end
 
+      # @return [void] Checkouts a specific commit of the git source in the
+      # destination path.
+      #
       def download_commit
         ensure_ref_exists(options[:commit])
         clone(clone_url, target_path)
@@ -142,6 +87,9 @@ module Pod
         end
       end
 
+      # @return [void] Checkouts the HEAD of a specific branch of the git
+      # source in the destination path.
+      #
       def download_branch
         ensure_remote_branch_exists(options[:branch])
         clone(clone_url, target_path)
@@ -153,13 +101,135 @@ module Pod
         end
       end
 
-      def clone(from, to)
-        UI.section(" > Cloning to Pods folder",'',1) do
-          git! %Q|clone "#{from}" "#{to}"|
+
+
+      # @!group Checking references
+
+      # @return [Bool] Wether a reference (commit SHA or tag)
+      #
+      def ref_exists?(ref)
+        Dir.chdir(cache_path) { git "rev-list --max-count=1 #{ref}" }
+        $? == 0
+      end
+
+      # @return [void] Checks if a reference exists in the cache and updates
+      # only if necessary.
+      #
+      # @raises if after the update the reference can't be found.
+      #
+      def ensure_ref_exists(ref)
+        return if ref_exists?(ref)
+        update_cache
+        raise Informative, "[!] Cache unable to find git reference `#{ref}' for `#{url}'.".red unless ref_exists?(ref)
+      end
+
+      # @return [Bool] Wether a branch exists in the cache.
+      #
+      def branch_exists?(branch)
+        Dir.chdir(cache_path) { git "branch --all | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
+        $? == 0
+      end
+
+      # @return [void] Checks if a branch exists in the cache and updates
+      # only if necessary.
+      #
+      # @raises if after the update the branch can't be found.
+      #
+      def ensure_remote_branch_exists(branch)
+        return if branch_exists?(branch)
+        update_cache
+        raise Informative, "[!] Cache unable to find git reference `#{branch}' for `#{url}' (#{$?}).".red unless branch_exists?(branch)
+      end
+
+
+      # @!group Cache
+
+      # The maximum allowed size for the cache expressed in Mb.
+      #
+      MAX_CACHE_SIZE = 500
+
+      # @return [Pathname] The directory where the cache for the current git
+      # repo is stored.
+      #
+      # @note The name of the directory is the SHA1 hash value of the URL of
+      #       the git repo.
+      #
+      def cache_path
+        @cache_path ||= caches_root + "#{Digest::SHA1.hexdigest(url.to_s)}"
+      end
+
+      # @return [Pathname] The directory where the git caches are stored.
+      #
+      def caches_root
+        Pathname.new(File.expand_path("~/Library/Caches/CocoaPods/Git"))
+      end
+
+      # @return [Integer] The global size of the git cache expressed in Mb.
+      #
+      def caches_size
+        `du -cm`.split("\n").last.to_i
+      end
+
+      # @return [Bool] Wether the cache exits.
+      #
+      # @note The previous implementation of the cache didn't use a barebone
+      #       git repo. This method takes into account this fact and checks
+      #       that the cache is actually a barebone repo. If the cache was not
+      #       barebone it will be deleted and recreated.
+      #
+      def cache_exist?
+        cache_path.exist? &&
+          cache_origin_url(cache_path).to_s == url.to_s &&
+          Dir.chdir(cache_path) { git("config core.bare").chomp == "true" }
+      end
+
+      # @return [String] The origin URL of the cache with the given directory.
+      #
+      # @param [String] dir The directory of the cache.
+      #
+      def cache_origin_url(dir)
+        Dir.chdir(dir) { `git config remote.origin.url`.chomp }
+      end
+
+      # @return [void] Creates the barebone repo that will serve as the cache
+      # for the current repo.
+      #
+      def create_cache
+        UI.section(" > Creating cache git repo (#{cache_path})",'',1) do
+          cache_path.rmtree if cache_path.exist?
+          cache_path.mkpath
+          git! %Q|clone  --mirror "#{url}" "#{cache_path}"|
+        end
+      end
+
+      # @return [void] Updates the barebone repo used as a cache against its
+      # remote.
+      #
+      def update_cache
+        UI.section(" > Updating cache git repo (#{cache_path})",'',1) do
+          Dir.chdir(cache_path) { git! "remote update" }
+        end
+      end
+
+      # @return [void] Deletes the oldest caches until they the global size is
+      # below the maximum allowed.
+      #
+      def prune_cache
+        return unless caches_root.exist?
+        Dir.chdir(caches_root) do
+          repos = Pathname.new(caches_root).children.select { |c| c.directory? }.sort_by(&:ctime)
+          while caches_size >= MAX_CACHE_SIZE && !repos.empty?
+            dir = repos.shift
+            UI.message "#{'->'.yellow} Removing git cache for `#{cache_origin_url(dir)}'"
+            dir.rmtree
+          end
         end
       end
     end
 
+    # This class allows to download tarballs from GitHub and is not currently
+    # being used by CocoaPods as the git cache is preferable.
+    #
     class GitHub < Git
       def download_head
         download_only? ? download_and_extract_tarball('master') : super

data/lib/cocoapods/local_pod.rb

@@ -163,14 +163,15 @@ module Pod
     #
     # @return [Array<Strings>] The paths that can be deleted.
     #
-    # @note The Paths are downcased to prevent issues. See #568.
+    # @note Implementation detail: Don't use Dir#glob as there is an
+    #       unexplained issue (#568, #572 and #602).
     #
     def clean_paths
-      used = used_files.map(&:downcase)
-      files = Dir.glob(root + "**/*", File::FNM_DOTMATCH).map(&:downcase)
+      cached_used = used_files
+      files = Pathname.glob(root + "**/*", File::FNM_DOTMATCH | File::FNM_CASEFOLD).map(&:to_s)
 
       files.reject! do |candidate|
-        candidate.end_with?('.', '..') || used.any? do |path|
+        candidate.end_with?('.', '..') || cached_used.any? do |path|
           path.include?(candidate) || candidate.include?(path)
         end
       end
@@ -240,7 +241,7 @@ module Pod
     #   {Specification}.
     #
     def source_files_by_spec
-      options = {:glob => '*.{h,hpp,m,mm,c,cpp}'}
+      options = {:glob => '*.{h,hpp,hh,m,mm,c,cpp}'}
       paths_by_spec(:source_files, options)
     end
 
@@ -262,7 +263,7 @@ module Pod
     def header_files_by_spec
       result = {}
       source_files_by_spec.each do |spec, paths|
-        headers = paths.select { |f| f.extname == '.h' || f.extname == '.hpp' }
+        headers = paths.select { |f| f.extname == '.h' || f.extname == '.hpp' || f.extname == '.hh' }
         result[spec] = headers unless headers.empty?
       end
       result
@@ -276,7 +277,7 @@ module Pod
     #   header files (i.e. the build ones) are intended to be public.
     #
     def public_header_files_by_spec
-      public_headers = paths_by_spec(:public_header_files, :glob => '*.{h,hpp}')
+      public_headers = paths_by_spec(:public_header_files, :glob => '*.{h,hpp,hh}')
       build_headers  = header_files_by_spec
 
       result = {}
@@ -379,7 +380,7 @@ module Pod
         if (public_h = public_headers[spec]) && !public_h.empty?
           result += public_h
         elsif (source_f = source_files[spec]) && !source_f.empty?
-          build_h = source_f.select { |f| f.extname == '.h' || f.extname == '.hpp' }
+          build_h = source_f.select { |f| f.extname == '.h' || f.extname == '.hpp' || f.extname == '.hh' }
           result += build_h unless build_h.empty?
         end
       end
@@ -433,7 +434,7 @@ module Pod
     # (the files the need to compiled) of the pod.
     #
     def implementation_files
-      relative_source_files.reject { |f| f.extname == '.h' ||  f.extname == '.hpp' }
+      relative_source_files.reject { |f| f.extname == '.h' ||  f.extname == '.hpp' || f.extname == '.hh' }
     end
 
     # @return [Pathname] The path of the pod relative from the sandbox.
@@ -476,7 +477,7 @@ module Pod
     # included in the linker search paths.
     #
     def headers_excluded_from_search_paths
-      options = { :glob => '*.{h,hpp}' }
+      options = { :glob => '*.{h,hpp,hh}' }
       paths = paths_by_spec(:exclude_header_search_paths, options)
       paths.values.compact.uniq
     end

data/lib/cocoapods/podfile.rb

@@ -35,7 +35,7 @@ module Pod
         if @path
           @path
         else
-          xcodeprojs = config.project_root.glob('*.xcodeproj')
+          xcodeprojs = Pathname.glob(config.project_root + '*.xcodeproj')
           if xcodeprojs.size == 1
             @path = xcodeprojs.first
           end

data/lib/cocoapods/user_interface.rb

@@ -196,8 +196,9 @@ module Pod
 
       # @!group Helpers
 
-      # Wraps a string taking into account the width of the terminal and an
-      # option indent. Adapted from http://blog.macromates.com/2006/wrapping-text-with-regular-expressions/
+      # @return [String] Wraps a string taking into account the width of the
+      # terminal and an option indent. Adapted from
+      # http://blog.macromates.com/2006/wrapping-text-with-regular-expressions/
       #
       # @param [String] txt     The string to wrap
       #
@@ -205,8 +206,12 @@ module Pod
       #
       # @return [String]        The formatted string.
       #
+      # @note If CocoaPods is not being run in a terminal or the width of the
+      # terminal is too small a width of 80 is assumed.
+      #
       def wrap_string(txt, indent = '')
         width = `stty size`.split(' ')[1].to_i - indent.length
+        width = 80 unless width >= 10
         txt.strip.gsub(/(.{1,#{width}})( +|$)\n?|(.{#{width}})/, indent + "\\1\\3\n")
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3399336200991652352
+      hash: -1344889839066477359
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: