cocoapods 0.17.0.rc1 → 0.17.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6013129b296437d543853413a5ee6e835811f6e1
-  data.tar.gz: dd3f63d981dbd29df23b124c6002730de9c71745
+  metadata.gz: ec366f3412f372de76d07ff95b2b6c77d805ecb5
+  data.tar.gz: b05a660f2932e2c758489fbbd5d5aed7af4e188d
 SHA512:
-  metadata.gz: 2c7de94a11c4a79a00f46ff265e2a281058142511d671c5b284c504d8162a666bbcd2b39e807193e9dc57a36574a9e3a4d96f2650d3415e2e3a6939e50382046
-  data.tar.gz: 8c18695b3ad7b32d16f6fc4d0ae95d6295b46e7e8309c8511222560d3dfa8e0e7e1d0314243f00e7d7381641731243321b02cac727d5f56d7f6080c1b1a04173
+  metadata.gz: 498f5e5807b237c66558946b564aaac5a5e66051d231e96f696233f9368c89c3730928a1176659355d22c11eebd11b383032af94ca0758544e22cef8119ad476
+  data.tar.gz: 58422e34a9ff50dac4dd533cf9a8f7fbf7ddfa026aa2093efaabb001fc10b9a41fc260dcce44552bafd0ad9880ae39fbd642303be7ccbd2fff0fe4c3c138a6d9

data/CHANGELOG.md

@@ -1,6 +1,21 @@
+## 0.17.0.rc2
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc1...0.17.0.rc2)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.17.0.rc1...0.17.0.rc2)
+
+###### Bug fixes
+
+- Restored output coloring.
+- Fixed a crash related to subspecs
+  [#819](https://github.com/CocoaPods/CocoaPods/issues/819)
+- Git repos were not cached for dependencies with external sources.
+  [#820](https://github.com/CocoaPods/CocoaPods/issues/820)
+- Restored support for directories for the preserve_patterns specification
+  attribute.
+  [#823](https://github.com/CocoaPods/CocoaPods/issues/823)
+
 ## 0.17.0.rc1
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/master...0.17)
-• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.0...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.4...0.17.0.rc1)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.3...0.5.0)
 • [cocoapods-core](https://github.com/CocoaPods/Core)
 • [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader)
 
@@ -17,6 +32,7 @@ CocoaPods internals and need to be updated:
 - LibComponentLogging-pods/0.0.1/LibComponentLogging-pods.podspec
 - RestKit/0.9.3/RestKit.podspec
 - Three20/1.0.11/Three20.podspec
+- ARAnalytics/1.1/ARAnalytics.podspec
 
 Other specifications, might present compatibility issues for the reasons
 presented below.
@@ -53,7 +69,7 @@ presented below.
 
 ###### Enhancements
 
-- Released preview [documentation](docs.cocoapods.org).
+- Released preview [documentation](http://docs.cocoapods.org).
 - CocoaPods now has support for working in teams and not committing the Pods
   folder, as it will keep track of the status of the Pods folder.
   [#552](https://github.com/CocoaPods/CocoaPods/issues/552)

data/lib/cocoapods.rb

@@ -16,6 +16,20 @@ module Pod
     end
   end
 
+  # @return [String] The directory where CocoaPods caches the downloads.
+  #
+  # @todo   The {Installer::PodSourceInstaller} and the #{ExternalSources}
+  #         classes build and configure the downloader from scratch.
+  #
+  CACHE_ROOT = "~/Library/Caches/CocoaPods"
+
+  # @return [Fixnum] The maximum size for the cache expressed in Mb.
+  #
+  # @todo   The {Installer::PodSourceInstaller} and the #{ExternalSources}
+  #         classes build and configure the downloader from scratch.
+  #
+  MAX_CACHE_SIZE = 500
+
   require 'cocoapods-core'
   require 'xcodeproj'
   require 'cocoapods/downloader'

data/lib/cocoapods/command.rb

@@ -21,7 +21,7 @@ module Pod
 
     def self.parse(argv)
       command = super
-      unless SourcesManager.master_repo_functional? || command.is_a?(Setup) || ENV['SKIP_SETUP']
+      unless SourcesManager.master_repo_functional? || command.is_a?(Setup) || command.is_a?(Repo::Add) || ENV['SKIP_SETUP']
         Setup.new(CLAide::ARGV.new([])).run
       end
       command
@@ -52,11 +52,18 @@ module Pod
     #
     # @todo We should probably not even load colored unless needed.
     #
+    # @todo Move silent flag to CLAide.
+    #
+    # @note It is importat that the commadnds don't overide the default
+    #       settings if their flag is missing (i.e. their value is nil)
+    #
     def initialize(argv)
-      config.silent = argv.flag?('silent', config.silent)
-      config.verbose = argv.flag?('verbose', config.verbose?)
-      String.send(:define_method, :colorize) { |string , _| string } unless self.colorize_output?
       super
+      config.silent = argv.flag?('silent', config.silent)
+      config.verbose = self.verbose? unless self.verbose.nil?
+      unless self.colorize_output?
+        String.send(:define_method, :colorize) { |string , _| string }
+      end
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods/config.rb

@@ -113,7 +113,7 @@ module Pod
     # @return [Pathname] the directory where the CocoaPods sources are stored.
     #
     def repos_dir
-      @repos_dir ||= Pathname.new(ENV['HOME'] + "/.cocoapods")
+      @repos_dir ||= Pathname.new(ENV['CP_REPOS_DIR'] || "~/.cocoapods").expand_path
     end
 
     attr_writer :repos_dir
@@ -165,7 +165,7 @@ module Pod
     # @return [Pathname] The path of the file which contains the user settings.
     #
     def user_settings_file
-      Pathname.new(ENV['HOME'] + "/.cocoapods/config.yaml")
+      repos_dir + "config.yaml"
     end
 
     # Sets the values of the attributes with the given hash.

data/lib/cocoapods/external_sources.rb

@@ -122,6 +122,9 @@ module Pod
       #         marked as pre-downloaded indicating to the installer that only
       #         clean operations are needed.
       #
+      # @todo  The downloader configuration is the same of the
+      #        #{PodSourceInstaller} and it needs to be kept in sync.
+      #
       # @return [void]
       #
       def pre_download(sandbox)
@@ -129,6 +132,9 @@ module Pod
           target = sandbox.root + name
           target.rmtree if target.exist?
           downloader = Downloader.for_target(target, params)
+          downloader.cache_root = CACHE_ROOT
+          downloader.max_cache_size = MAX_CACHE_SIZE
+          downloader.aggressive_cache = false
           downloader.download
           store_podspec(sandbox, target + "#{name}.podspec")
           sandbox.store_pre_downloaded_pod(name)

data/lib/cocoapods/gem_version.rb

@@ -2,6 +2,6 @@ module Pod
 
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.17.0.rc1' unless defined? Pod::VERSION
+  VERSION = '0.17.0.rc2' unless defined? Pod::VERSION
 end
 

data/lib/cocoapods/installer/file_references_installer.rb

@@ -113,12 +113,11 @@ module Pod
             sandbox.build_headers.add_search_path(headers_sandbox)
             sandbox.public_headers.add_search_path(headers_sandbox)
 
-            consumer = file_accessor.spec_consumer
-            header_mappings(headers_sandbox, consumer, file_accessor.headers).each do |namespaced_path, files|
+            header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
               sandbox.build_headers.add_files(namespaced_path, files)
             end
 
-            header_mappings(headers_sandbox, consumer, file_accessor.public_headers).each do |namespaced_path, files|
+            header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
               sandbox.public_headers.add_files(namespaced_path, files)
             end
           end
@@ -154,7 +153,8 @@ module Pod
       #         headers folders as the keys and the absolute paths of the
       #         header files as the values.
       #
-      def header_mappings(headers_sandbox, consumer, headers)
+      def header_mappings(headers_sandbox, file_accessor, headers)
+        consumer = file_accessor.spec_consumer
         dir = headers_sandbox
         dir = dir + consumer.header_dir if consumer.header_dir
 
@@ -162,7 +162,7 @@ module Pod
         headers.each do |header|
           sub_dir = dir
           if consumer.header_mappings_dir
-            header_mappings_dir = Pathname.new(consumer.header_mappings_dir)
+            header_mappings_dir = file_accessor.path_list.root + consumer.header_mappings_dir
             relative_path = header.relative_path_from(header_mappings_dir)
             sub_dir = sub_dir + relative_path.dirname
           end

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -152,14 +152,6 @@ module Pod
 
       # @!group Dependencies
 
-      # @return [String] The directory where CocoaPods caches the downloads.
-      #
-      CACHE_ROOT = "~/Library/Caches/CocoaPods"
-
-      # @return [Fixnum] The maximum size for the cache expressed in Mb.
-      #
-      MAX_CACHE_SIZE = 500
-
       # @return [Downloader] The downloader to use for the retrieving the
       #         source.
       #

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -5,6 +5,8 @@ module Pod
     # taking into account any exclude pattern and the default extensions to use
     # for directories.
     #
+    # @note The FileAccessor always returns absolute paths.
+    #
     class FileAccessor
 
       HEADER_EXTENSIONS = Xcodeproj::Constants::HEADER_FILES_EXTENSIONS
@@ -31,6 +33,12 @@ module Pod
         end
       end
 
+      # @return [Pathname] the directory which contains the files of the Pod.
+      #
+      def root
+        path_list.root
+      end
+
       # @return [Specification] the specification.
       #
       def spec
@@ -39,14 +47,14 @@ module Pod
 
       # @return [Specification] the platform used to consume the specification.
       #
-      def platform
-        spec_consumer.platform
+      def platform_name
+        spec_consumer.platform_name
       end
 
       # @return [String] A string suitable for debugging.
       #
       def inspect
-        "<#{self.class} spec=#{spec.name} platform=#{spec_consumer.platform} root=#{path_list.root}>"
+        "<#{self.class} spec=#{spec.name} platform=#{platform_name} root=#{path_list.root}>"
       end
 
       #-----------------------------------------------------------------------#
@@ -83,17 +91,13 @@ module Pod
       #         specification grouped by destination.
       #
       def resources
-        options = {
-          :exclude_patterns => spec_consumer.exclude_files,
-          :include_dirs => true,
-        }
-        expanded_paths(spec_consumer.resources, options)
+        paths_for_attribute(:resources, true)
       end
 
       # @return [Array<Pathname>] the files of the specification to preserve.
       #
       def preserve_paths
-        paths_for_attribute(:preserve_paths)
+        paths_for_attribute(:preserve_paths, true)
       end
 
       # @return [Pathname] The of the prefix header file of the specification.
@@ -136,11 +140,12 @@ module Pod
       #
       # @return [Array<Pathname>] the paths.
       #
-      def paths_for_attribute(attribute)
+      def paths_for_attribute(attribute, include_dirs = false)
         file_patterns = spec_consumer.send(attribute)
         options = {
           :exclude_patterns => spec_consumer.exclude_files,
-          :dir_pattern => glob_for_attribute(attribute)
+          :dir_pattern => glob_for_attribute(attribute),
+          :include_dirs => include_dirs,
         }
         expanded_paths(file_patterns, options)
       end

data/lib/cocoapods/user_interface.rb

@@ -145,7 +145,7 @@ module Pod
       # return [void]
       #
       def warn(message, actions = [], verbose_only = false)
-        warnings << { :message => message, :actions => actions }
+        warnings << { :message => message, :actions => actions, :verbose_only => verbose_only }
       end
 
       # Prints the stored warnings. This method is intended to be called at the
@@ -154,9 +154,9 @@ module Pod
       # @return [void]
       #
       def print_warnings
-        return if config.silent? && verbose_only
         STDOUT.flush
         warnings.each do |warning|
+          next if warning[:verbose_only] && !config.verbose?
           STDERR.puts("\n[!] #{warning[:message]}".yellow)
           warning[:actions].each do |action|
             indented = wrap_string(action, "    - ")

data/lib/cocoapods/user_interface/error_report.rb

@@ -7,7 +7,7 @@ module Pod
   module UserInterface
     module ErrorReport
       class << self
-        def report(error)
+        def report(exception)
           return <<-EOS
 
 #{'――― MARKDOWN TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}
@@ -36,16 +36,16 @@ Repositories : #{repo_information.join("\n               ")}
 ### Error
 
 ```
-#{error.message}
-#{error.backtrace.join("\n")}
+#{exception.class} - #{exception.message}
+#{exception.backtrace.join("\n")}
 ```
 
 #{'――― TEMPLATE END ――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}
 
 #{'[!] Oh no, an error occurred.'.red}
-#{error_from_podfile(error)}
+#{error_from_podfile(exception)}
 #{'Search for existing github issues similar to yours:'.yellow}
-#{"https://github.com/CocoaPods/CocoaPods/issues/search?q=#{CGI.escape(error.message)}"}
+#{"https://github.com/CocoaPods/CocoaPods/issues/search?q=#{CGI.escape(exception.message)}"}
 
 #{'If none exists, create a ticket, with the template displayed above, on:'.yellow}
 https://github.com/CocoaPods/CocoaPods/issues/new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc1
+  version: 0.17.0.rc2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc1
+        version: 0.17.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc1
+        version: 0.17.0.rc2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement