cocoapods 0.17.0.rc5 → 0.17.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f14fbda04711919eafcc049bfea4e5b80fa8c5b
-  data.tar.gz: 7a6d233fffe9ba5b93275cd1b70809ad0dee4ff1
+  metadata.gz: 4593fa5489cb510c03b7d419c4d25d6d98cad904
+  data.tar.gz: fa182a319e9eb11c70c114fa4d0ac88ce36024e6
 SHA512:
-  metadata.gz: c87cfa4d804a1bd92a07b0b4988d2677aaecf2c11b58b3225d0c19ec051598e90d29909c4f102a90561db1e2059eca35b96d70624026567ce9bbdadf134e7bcc
-  data.tar.gz: 43fad267dcd2b7596c77180406ecf8b022a6b20548f1c5000166cda45e74bc7bf800bb2d7f9e9ac24620995701059e0c028e8cec2d9888482c9c7eccec2007aa
+  metadata.gz: 3329cd7b41702f1f7a8cc2b09a3d72145f2a274c1add4104ba227ceda6939b218967b3b863f105dc0c631be3e762c06ce84a5bf85625e513c5afecc10368bee9
+  data.tar.gz: 3f712191ed8c6a12713265e144db4ba5120bc2e63530aa94657d5ca29a94e47d99ab909ef7b0c6725e7c1e877be1c6c42bfb23c88f76b5384de5ebb49cb08d9e

data/CHANGELOG.md

@@ -1,4 +1,44 @@
-## 0.17.0.rc4
+## 0.17.0
+
+#### rc6
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc5...0.17.0.rc6)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.17.0.rc5...0.17.0.rc6)
+
+###### Bug fixes
+
+- CocoaPods updates the repositories by default.
+  [#872](https://github.com/CocoaPods/CocoaPods/issues/872)
+- Fixed a crash which was present when the Podfile specifies a workspace.
+  [#871](https://github.com/CocoaPods/CocoaPods/issues/871)
+- Fix for a bug which lead to a broken installation in paths containing
+  brackets and other glob metacharacters.
+  [#862](https://github.com/CocoaPods/CocoaPods/issues/862)
+- Fix for a bug related to the case of the paths which lead to clean all files
+  in the directories of the Pods.
+
+
+###### Ancillary enhancements
+
+- CocoaPods now maintains a search index which is updated incrementally instead
+  of analyzing all the specs every time. The search index can be updated
+  manually with the `pod ipc update-search-index` command.
+- Enhancements to the `pod repo lint` command.
+- CocoaPods will not create anymore the pre commit hook in the master repo
+  during setup. If already created it is possible remove it deleting the 
+  `~/.cocoapods/master/.git/hooks/pre-commit` path.
+- Improved support for linting and validating specs repo.
+
+#### rc5
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc4...0.17.0.rc5)
+• [cocoapods-core](https://github.com/CocoaPods/Core/compare/0.17.0.rc4...0.17.0.rc5)
+
+###### Bug fixes
+
+- The `--no-clean` argument is not ignored anymore by the installer.
+- Proper handling of file patterns ending with a slash.
+- More user errors are raised as an informative.
+
+#### rc4
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc3...0.17.0.rc4)
 
 ###### Bug fixes
@@ -23,7 +63,7 @@
 - The `podspec` option of the `pod` directive of the Podfile DSL now accepts
   folders.
 
-## 0.17.0.rc3
+#### rc3
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.17.0.rc2...0.17.0.rc3
 • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.5.0...0.5.1))
 
@@ -46,7 +86,7 @@
 - General improvements to `pod ipc`.
 - Added `pod ipc repl` subcommand.
 
-## 0.17.0.rc2
+#### 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)
 
@@ -61,7 +101,7 @@
   attribute.
   [#823](https://github.com/CocoaPods/CocoaPods/issues/823)
 
-## 0.17.0.rc1
+#### rc1
 [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)

data/README.md

@@ -1,8 +1,8 @@
 # CocoaPods – an Objective-C library manager
 
 [![Gem Version](https://badge.fury.io/rb/cocoapods.png)](http://badge.fury.io/rb/cocoapods)
-[![Build Status](https://travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://travis-ci.org/CocoaPods/CocoaPods)
 [![Dependency Status](https://gemnasium.com/CocoaPods/CocoaPods.png)](https://gemnasium.com/CocoaPods/CocoaPods)
+[![Build Status](https://travis-ci.org/CocoaPods/CocoaPods.png?branch=master)](https://travis-ci.org/CocoaPods/CocoaPods)
 
 CocoaPods manages library dependencies for your Xcode project.
 

data/lib/cocoapods/command/inter_process_communication.rb

@@ -100,6 +100,30 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      class UpdateSearchIndex < IPC
+
+        self.summary = 'Updates the search index.'
+        self.description = <<-DESC
+          Updates the search index and prints its path to standard output.
+          The search index is a YAML encoded dictionary where the keys
+          are the names of the Pods and the values are a dictionary containing
+          the following information:
+
+          - version
+          - summary
+          - description
+          - authors
+        DESC
+
+        def run
+          SourcesManager.updated_search_index
+          output_pipe.puts(SourcesManager.search_index_path)
+        end
+
+      end
+
+      #-----------------------------------------------------------------------#
+
       class Repl < IPC
 
         END_OF_OUTPUT_SIGNAL = "\n\r"

data/lib/cocoapods/command/repo.rb

@@ -100,54 +100,32 @@ module Pod
           dirs.each do |dir|
             SourcesManager.check_version_information(dir)
             UI.puts "\nLinting spec repo `#{dir.realpath.basename}`\n".yellow
-            podspecs = Pathname.glob( dir + '**/*.podspec')
-            invalid_count = 0
-
-            messages_by_type = {}
-            podspecs.each do |podspec|
-              # print "\033[K -> #{podspec.relative_path_from(dir)}\r" unless config.silent?
-              validator = Validator.new(podspec)
-              validator.quick       = true
-              validator.repo_path   = dir
-              validator.only_errors = @only_errors
-              validator.disable_ui_output = true
-
-              validator.validate
-              invalid_count += 1 if validator.result_type == :error
-              unless validator.validated?
-                if @only_errors
-                  results = validator.results.select { |r| r.type.to_s == "error" }
-                else
-                  results = validator.results
-                end
-                sorted_results = results.sort_by { |r| [r.type.to_s, r.message] }
-                sorted_results.each do |result|
-                  name = validator.spec ? validator.spec.name : podspec.relative_path_from(dir)
-                  version = validator.spec ? validator.spec.version : 'unknown'
-                  messages_by_type[result.type] ||= {}
-                  messages_by_type[result.type][result.message] ||= {}
-                  messages_by_type[result.type][result.message][name] ||= []
-                  messages_by_type[result.type][result.message][name] << version
-                end
-              end
-            end
 
-            # print "\033[K" unless config.silent?
-            messages_by_type.each do |type, names_by_message|
-              names_by_message.each do |message, versions_by_names|
-                color = type == :error ? :red : :yellow
-                UI.puts "[#{type}] #{message}".send(color)
-                versions_by_names.each { |name, versions| UI.puts "  - #{name} (#{versions * ', '})" }
-                UI.puts
-              end
+            validator = Source::HealthReporter.new(dir)
+            validator.pre_check do |name, version|
+              UI.print '.'
+            end
+            report = validator.analyze
+            UI.puts
+            UI.puts
+
+            report.pods_by_warning.each do |message, versions_by_name|
+              UI.puts "-> #{message}".yellow
+              versions_by_name.each { |name, versions| UI.puts "  - #{name} (#{versions * ', '})" }
+              UI.puts
             end
 
-            UI.puts "Analyzed #{podspecs.count} podspecs files.\n\n"
+            report.pods_by_error.each do |message, versions_by_name|
+              UI.puts "-> #{message}".red
+              versions_by_name.each { |name, versions| UI.puts "  - #{name} (#{versions * ', '})" }
+              UI.puts
+            end
 
-            if invalid_count == 0
+            UI.puts "Analyzed #{report.analyzed_paths.count} podspecs files.\n\n"
+            if report.pods_by_error.count.zero?
               UI.puts "All the specs passed validation.".green << "\n\n"
             else
-              raise Informative, "#{invalid_count} podspecs failed validation."
+              raise Informative, "#{report.pods_by_error.count} podspecs failed validation."
             end
           end
         end

data/lib/cocoapods/command/setup.rb

@@ -33,7 +33,6 @@ module Pod
           else
             add_master_repo
           end
-          enable_pre_commit_hooks
         end
 
         access_type = push? ? "push" : "read-only"
@@ -83,21 +82,6 @@ module Pod
         end
       end
 
-      # Enables the pre-commit hook of the master repo.
-      #
-      # @note   The hook is enabled in this way because the specs run with the
-      #         master repo as a submodule.
-      #
-      # @return [void]
-      #
-      def enable_pre_commit_hooks
-        if (master_repo_dir + '.git/hooks').exist?
-          hook = master_repo_dir + '.git/hooks/pre-commit'
-          hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
-          `chmod +x '#{hook}'`
-        end
-      end
-
       #--------------------------------------#
 
       # @!group Private helpers
@@ -106,7 +90,7 @@ module Pod
       #         be enabled.
       #
       def url
-        url = (push?) ? read_write_url : read_only_url
+        (push?) ? read_write_url : read_only_url
       end
 
       # @return [String] the read only url of the master repo.

data/lib/cocoapods/config.rb

@@ -24,7 +24,6 @@ module Pod
       :generate_docs       => true,
       :install_docs        => true,
       :integrate_targets   => true,
-      :skip_repo_update    => true,
       :new_version_message => true,
     }
 

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -240,6 +240,10 @@ module Pod
       # @note   Implementation detail: Don't use `Dir#glob` as there is an
       #         unexplained issue (#568, #572 and #602).
       #
+      # @todo   The paths are down-cased for the comparison as issues similar
+      #         to #602 lead the files not being matched and so cleaning all
+      #         the files. This solution might create side effects.
+      #
       # @return [Array<Strings>] The paths that can be deleted.
       #
       def clean_paths
@@ -248,7 +252,9 @@ module Pod
         files = Pathname.glob(root + "**/*", glob_options).map(&:to_s)
 
         files.reject! do |candidate|
+          candidate = candidate.downcase
           candidate.end_with?('.', '..') || cached_used.any? do |path|
+            path = path.downcase
             path.include?(candidate) || candidate.include?(path)
           end
         end
@@ -259,7 +265,6 @@ module Pod
       #         specifications (according to their platform) of this Pod.
       #
       def used_files
-
         files = [
           file_accessors.map(&:source_files),
           file_accessors.map(&:resources),

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -132,18 +132,17 @@ module Pod
         end
       end
 
-      #-----------------------------------------------------------------------#
-
       private
 
-      # @!group Helpers.
+      # @!group Private Helpers
+      #-----------------------------------------------------------------------#
 
       # @return [Pathname] the path where the workspace containing the Pods
       #         project and the user projects should be saved.
       #
       def workspace_path
         if podfile.workspace_path
-          podfile.workspace_path
+          Pathname.new(podfile.workspace_path)
         elsif user_project_paths.count == 1
           project = user_project_paths.first.basename('.xcodeproj')
           installation_root + "#{project}.xcworkspace"

data/lib/cocoapods/sandbox/path_list.rb

@@ -47,7 +47,8 @@ module Pod
           raise Informative, "Attempt to read non existent folder `#{root}`."
         end
         root_length  = root.to_s.length+1
-        paths  = Dir.glob(root + "**/*", File::FNM_DOTMATCH)
+        escaped_root = escape_path_for_glob(root)
+        paths  = Dir.glob(escaped_root + "**/*", File::FNM_DOTMATCH)
         absolute_dirs  = paths.select { |path| File.directory?(path) }
         relative_dirs  = absolute_dirs.map  { |p| p[root_length..-1] }
         absolute_paths = paths.reject { |p| p == "#{root}/." || p == "#{root}/.." }
@@ -174,6 +175,25 @@ module Pod
         end
       end
 
+      # Escapes the glob metacharacters from a given path so it can used in
+      # Dir#glob and similar methods.
+      #
+      # @note   See CocoaPods/CocoaPods#862.
+      #
+      # @param  [String, Pathname] path
+      #         The path to escape.
+      #
+      # @return [Pathname] The escaped path.
+      #
+      def escape_path_for_glob(path)
+        result = path.to_s
+        characters_to_escape = ['[', ']', '{', '}', '?', '*']
+        characters_to_escape.each do |character|
+          result.gsub!(character, "\\#{character}" )
+        end
+        Pathname.new(result)
+      end
+
       #-----------------------------------------------------------------------#
 
     end

data/lib/cocoapods/sources_manager.rb

@@ -63,17 +63,58 @@ module Pod
       # @return [Array<Set>]  The sets that contain the search term.
       #
       def search_by_name(query, full_text_search = false)
-        result = aggregate.search_by_name(query, full_text_search)
-        if result.empty?
+        set_names = []
+        updated_search_index.each do |name, set_data|
+          text = name.dup
+          if full_text_search
+            text << set_data['authors'].to_s if set_data['authors']
+            text << set_data['summary']      if set_data['summary']
+            text << set_data['description']  if set_data['description']
+          end
+          set_names << name if text.downcase.include?(query.downcase)
+        end
+
+        sets = set_names.map { |name| aggregate.represenative_set(name) }
+        if sets.empty?
           extra = ", author, summary, or description" if full_text_search
-          raise Informative "Unable to find a pod with name#{extra} matching `#{query}`"
+          raise Informative, "Unable to find a pod with name#{extra} matching `#{query}`"
         end
-        result
+        sets
       end
 
-      #-----------------------------------------------------------------------#
+      # Creates or updates the search data and returns it. The search data
+      # groups by name the following information for each set:
+      #
+      #   - version
+      #   - summary
+      #   - description
+      #   - authors
+      #
+      # @return [Hash{String => String}] The up to date search data.
+      #
+      def updated_search_index
+        if search_index_path.exist?
+          stored_index = YAML.load(search_index_path.read)
+          search_index = aggregate.update_search_index(stored_index)
+        else
+          search_index = aggregate.generate_search_index
+        end
+
+        File.open(search_index_path, 'w') {|f| f.write(search_index.to_yaml) }
+        search_index
+      end
+
+      # @return [Pathname] The path where the search index should be stored.
+      #
+      def search_index_path
+        caches_path = Pathname.new(File.expand_path(CACHE_ROOT))
+        caches_path + 'search_index.yaml'
+      end
+
+      public
 
       # @!group Updating Sources
+      #-----------------------------------------------------------------------#
 
       extend Executable
       executable :git
@@ -87,10 +128,10 @@ module Pod
       #
       def update(source_name = nil, show_output = false)
         if source_name
-          source = aggregate.all.find { |s| s.name == source_name }
-          raise Informative, "Unable to find the `#{source_name}` repo."    unless source
-          raise Informative, "The `#{source_name}` repo is not a git repo." unless git_repo?(source.repo)
-          sources = [source]
+          specified_source = aggregate.all.find { |s| s.name == source_name }
+          raise Informative, "Unable to find the `#{source_name}` repo."    unless specified_source
+          raise Informative, "The `#{source_name}` repo is not a git repo." unless git_repo?(specified_source.repo)
+          sources = [specified_source]
         else
           sources = aggregate.all.select { |source| git_repo?(source.repo) }
         end
@@ -195,9 +236,10 @@ module Pod
         yaml_file.exist? ? YAML.load_file(yaml_file) : {}
       end
 
-      #-----------------------------------------------------------------------#
+      public
 
       # @!group Master repo
+      #-----------------------------------------------------------------------#
 
       # @return [Pathname] The path of the master repo.
       #
@@ -213,6 +255,10 @@ module Pod
       def master_repo_functional?
         master_repo_dir.exist? && repo_compatible?(master_repo_dir)
       end
+
+      #-----------------------------------------------------------------------#
+
     end
   end
 end
+

data/lib/cocoapods/user_interface.rb

@@ -142,35 +142,6 @@ module Pod
         puts("\n[!] #{message}".green)
       end
 
-      # Stores important warning to the user optionally followed by actions
-      # that the user should take. To print them use #{print_warnings}
-      #
-      # @param [String]  message The message to print.
-      # @param [Array]   actions The actions that the user should take.
-      #
-      # return [void]
-      #
-      def warn(message, actions = [], verbose_only = false)
-        warnings << { :message => message, :actions => actions, :verbose_only => verbose_only }
-      end
-
-      # Prints the stored warnings. This method is intended to be called at the
-      # end of the execution of the binary.
-      #
-      # @return [void]
-      #
-      def print_warnings
-        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, "    - ")
-            puts(indented)
-          end
-        end
-      end
-
       # Returns a string containing relative location of a path from the Podfile.
       # The returned path is quoted. If the argument is nit it returns the
       # empty string.
@@ -226,14 +197,6 @@ module Pod
         end
       end
 
-      # @!group Basic printing
-
-      # Prints a message unless config is silent.
-      #
-      def puts(message = '')
-        super(message) unless config.silent?
-      end
-
       # Prints a message respecting the current indentation level and
       # wrapping it to the terminal width if necessary.
       #
@@ -242,9 +205,56 @@ module Pod
         puts(indented)
       end
 
+      # Prints the stored warnings. This method is intended to be called at the
+      # end of the execution of the binary.
+      #
+      # @return [void]
+      #
+      def print_warnings
+        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, "    - ")
+            puts(indented)
+          end
+        end
+      end
+
+      public
+
+      # @!group Basic methods
+      #-----------------------------------------------------------------------#
+
+      # prints a message followed by a new line unless config is silent.
+      #
+      def puts(message = '')
+        STDOUT.puts(message) unless config.silent?
+      end
+
+      # prints a message followed by a new line unless config is silent.
+      #
+      def print(message)
+        STDOUT.print(message) unless config.silent?
+      end
+
+      # Stores important warning to the user optionally followed by actions
+      # that the user should take. To print them use {#print_warnings}.
+      #
+      # @param [String]  message The message to print.
+      # @param [Array]   actions The actions that the user should take.
+      #
+      # return [void]
+      #
+      def warn(message, actions = [], verbose_only = false)
+        warnings << { :message => message, :actions => actions, :verbose_only => verbose_only }
+      end
+
       private
 
       # @!group Helpers
+      #-----------------------------------------------------------------------#
 
       # @return [String] Wraps a string taking into account the width of the
       # terminal and an option indent. Adapted from

data/lib/cocoapods/validator.rb

@@ -56,19 +56,14 @@ module Pod
     #
     def validate
       @results  = []
-      unless disable_ui_output
-        print " -> #{spec ? spec.name : file.basename}\r" unless config.silent?
-        $stdout.flush
-      end
+      UI.print " -> #{spec ? spec.name : file.basename}\r" unless config.silent?
+      $stdout.flush
 
       perform_linting
-      check_repo_path if spec && repo_path
       perform_extensive_analysis if spec && !quick
 
-      unless disable_ui_output
-        UI.puts " -> ".send(result_color) << (spec ? spec.to_s : file.basename.to_s)
-        print_results
-      end
+      UI.puts " -> ".send(result_color) << (spec ? spec.to_s : file.basename.to_s)
+      print_results
       validated?
     end
 
@@ -98,16 +93,6 @@ module Pod
 
     # @!group Configuration
 
-    # @return [Bool] Whether the validator should print the results of the
-    #         validation. This is useful for clients which want to customize
-    #         output.
-    #
-    attr_accessor :disable_ui_output
-
-    # @return [Pathname] whether the validation should be performed against a repo.
-    #
-    attr_accessor :repo_path
-
     # @return [Bool] whether the validation should skip the checks that
     #         requires the download of the library.
     #
@@ -182,16 +167,6 @@ module Pod
       @results.concat(linter.results)
     end
 
-    #
-    #
-    def check_repo_path
-      expected_path = "#{spec.name}/#{spec.version}/#{spec.name}.podspec"
-      path = file.relative_path_from(repo_path).to_s
-      unless path == expected_path
-        error "Incorrect path, the path is `#{file}` and should be `#{expected_path}`"
-      end
-    end
-
     #
     #
     def perform_extensive_analysis

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.17.0.rc5
+  version: 0.17.0.rc6
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-20 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.rc5
+        version: 0.17.0.rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0.rc5
+        version: 0.17.0.rc6
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement