cocoapods 1.0.0.beta.6 → 1.0.0.beta.7

data/lib/cocoapods/generator/embed_frameworks_script.rb

@@ -96,8 +96,8 @@ module Pod
             if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
               # Use the current code_sign_identitiy
               echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
-              echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \\"$1\\""
-              /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1"
+              echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \\"$1\\""
+              /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
             fi
           }
 

data/lib/cocoapods/generator/info_plist_file.rb

@@ -116,6 +116,7 @@ module Pod
         }
 
         info['CFBundleExecutable'] = '${EXECUTABLE_NAME}' if bundle_package_type != :bndl
+        info['CFBundleVersion'] = '1' if bundle_package_type == :bndl
         info['UIRequiredDeviceCapabilities'] = %w(arm64) if target.platform.name == :tvos
 
         info

data/lib/cocoapods/installer.rb

@@ -249,7 +249,9 @@ module Pod
 
       remainder = whitelisted_configs - all_user_configurations
       unless remainder.empty?
-        raise Informative, "Unknown #{'configuration'.pluralize(remainder.size)} whitelisted: #{remainder.sort.to_sentence}."
+        raise Informative,
+              "Unknown #{'configuration'.pluralize(remainder.size)} whitelisted: #{remainder.sort.to_sentence}. " \
+              "CocoaPods found #{all_user_configurations.sort.to_sentence}, did you mean one of these?"
       end
     end
 

data/lib/cocoapods/installer/analyzer.rb

@@ -216,8 +216,8 @@ module Pod
       #
       def update_repositories
         sources.each do |source|
-          if SourcesManager.git_repo?(source.repo)
-            SourcesManager.update(source.name)
+          if source.git?
+            config.sources_manager.update(source.name)
           else
             UI.message "Skipping `#{source.name}` update because the repository is not a git source repository."
           end
@@ -628,7 +628,7 @@ module Pod
       #
       # When no explicit Podfile sources are defined, this defaults to the
       # master spec repository.
-      # available sources ({SourcesManager.all}).
+      # available sources ({config.sources_manager.all}).
       #
       # @return [Array<Source>] the sources to be used in finding
       #         specifications, as specified by the {#podfile} or all sources.
@@ -650,7 +650,7 @@ module Pod
           end
 
           sources.uniq.map do |source_url|
-            SourcesManager.find_or_create_source_with_url(source_url)
+            config.sources_manager.find_or_create_source_with_url(source_url)
           end
         end
       end

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -177,7 +177,7 @@ module Pod
               c.build_settings['PRODUCT_NAME'] = bundle_name
               relative_info_plist_path = info_plist_path.relative_path_from(sandbox.root)
               c.build_settings['INFOPLIST_FILE'] = relative_info_plist_path.to_s
-              c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
+              c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir('$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)')
 
               # Set the correct device family for this bundle, based on the platform
               device_family_by_platform = {

data/lib/cocoapods/resolver.rb

@@ -350,7 +350,7 @@ module Pod
     #
     def aggregate_for_dependency(dependency)
       if dependency && dependency.podspec_repo
-        return SourcesManager.aggregate_for_dependency(dependency)
+        return Config.instance.sources_manager.aggregate_for_dependency(dependency)
       else
         @aggregate ||= Source::Aggregate.new(sources)
       end
@@ -420,11 +420,14 @@ module Pod
           elsif !conflict.existing
             conflict.requirements.values.flatten.each do |r|
               if search_for(r).empty?
-                # There is no existing specification inside any of the spec repos with given requirements.
-                message << "\n\nNone of the spec sources contain a spec satisfying the `#{r}` dependency." \
-                  "\nYou have either; mistyped the name or version," \
-                  ' not added the source repo that hosts the Podspec to your Podfile,' \
-                  ' or not got the latest versions of your source repos.'
+                # There are no existing specification inside any of the spec repos with given requirements.
+                message << "\n\nNone of your spec sources contain a spec satisfying the dependency: `#{r}`." \
+                  "\n\nYou have either:" \
+                  "\n * out-of-date source repos which you can update with `pod repo update`." \
+                  "\n * mistyped the name or version." \
+                  "\n * not added the source repo that hosts the Podspec to your Podfile." \
+                  "\n\nNote: as of CocoaPods 1.0, `pod repo update` does not happen on `pod install` by default."
+
               else
                 message << "\n\nSpecs satisfying the `#{r}` dependency were found, " \
                   'but they required a higher minimum deployment target.'

data/lib/cocoapods/sandbox/path_list.rb

@@ -49,7 +49,7 @@ module Pod
         end
         root_length  = root.to_s.length + 1
         escaped_root = escape_path_for_glob(root)
-        paths = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH)
+        paths = Dir.glob(escaped_root + '**/*', File::FNM_DOTMATCH).sort_by(&:upcase)
         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}/.." }

data/lib/cocoapods/sources_manager.rb

@@ -1,49 +1,8 @@
-module Pod
-  # Manages all the sources known to the running CocoaPods Instance.
-  #
-  class SourcesManager
-    class << self
-      include Config::Mixin
-
-      # @return [Source::Aggregate] The aggregate of all the sources with the
-      #         known Pods.
-      #
-      def aggregate
-        return Source::Aggregate.new([]) unless config.repos_dir.exist?
-        dirs = config.repos_dir.children.select(&:directory?)
-        aggregate_with_repos(dirs)
-      end
-
-      # @return [Source::Aggregate] The aggregate of the sources from repos.
-      #
-      # @param  [Dependency] dependency
-      #         The dependency for which to find or build the appropriate.
-      #         aggregate. If the dependency specifies a source podspec repo
-      #         then only that source will be used, otherwise all sources
-      #         will be used.
-      #
-      def aggregate_for_dependency(dependency)
-        if dependency.podspec_repo
-          source = source_with_url(dependency.podspec_repo)
-          raise StandardError, '[Bug] Failed to find known source with the URL ' \
-            "#{dependency.podspec_repo.inspect}" if source.nil?
-
-          aggregate_with_repos([source_dir(source.name)])
-        else
-          aggregate
-        end
-      end
-
-      # @return [Array<Source>] The list of the sources with the given names.
-      #
-      # @param  [Array<#to_s>] names
-      #         The names of the sources.
-      #
-      def sources(names)
-        dirs = names.map { |name| source_dir(name) }
-        dirs.map { |repo| source_from_path(repo) }
-      end
+require 'cocoapods-core/source'
 
+module Pod
+  class Source
+    class Manager
       # Returns the source whose {Source#url} is equal to `url`, adding the repo
       # in a manner similarly to `pod repo add` if it is not found.
       #
@@ -66,16 +25,21 @@ module Pod
             else
               Command::Repo::Add.parse([name, url]).run
             end
-          rescue Informative
-            raise Informative, "Unable to add a source with url `#{url}` " \
-              "named `#{name}`.\nYou can try adding it manually in " \
+          rescue Informative => e
+            message = "Unable to add a source with url `#{url}` " \
+              "named `#{name}`.\n"
+            message << "(#{e})\n" if Config.instance.verbose?
+            message << 'You can try adding it manually in ' \
               '`~/.cocoapods/repos` or via `pod repo add`.'
+            raise Informative, message
           ensure
             UI.title_level = previous_title_level
           end
           source = source_with_url(url)
         end
 
+        raise "Unable to create a source with URL #{url}" unless source
+
         source
       end
 
@@ -93,219 +57,14 @@ module Pod
           find_or_create_source_with_url(name_or_url)
       end
 
-      # @return [Array<Source>] The list of all the sources known to this
-      #         installation of CocoaPods.
-      #
-      def all
-        return [] unless config.repos_dir.exist?
-        dirs = config.repos_dir.children.select(&:directory?)
-        dirs.map { |repo| source_from_path(repo) }
-      end
-
-      # @return [Array<Source>] The CocoaPods Master Repo source.
-      #
-      def master
-        sources(['master']).select { |s| s.repo.directory? }
-      end
-
-      # Search the appropriate sources to match the set for the given dependency.
-      #
-      # @return [Set, nil] a set for a given dependency including all the
-      #         {Source} that contain the Pod. If no sources containing the
-      #         Pod where found it returns nil.
-      #
-      # @raise  If no source can be found that includes the dependency.
-      #
-      def search(dependency)
-        aggregate_for_dependency(dependency).search(dependency)
-      end
-
-      # Search all the sources with the given search term.
-      #
-      # @param  [String] query
-      #         The search term.
-      #
-      # @param  [Bool] full_text_search
-      #         Whether the search should be limited to the name of the Pod or
-      #         should include also the author, the summary, and the
-      #         description.
-      #
-      # @raise  If no source including the set can be found.
-      #
-      # @return [Array<Set>]  The sets that contain the search term.
-      #
-      def search_by_name(query, full_text_search = false)
-        query_word_regexps = query.split.map { |word| /#{word}/i }
-        if full_text_search
-          query_word_results_hash = {}
-          updated_search_index.each_value do |word_spec_hash|
-            word_spec_hash.each_pair do |word, spec_symbols|
-              query_word_regexps.each do |query_word_regexp|
-                set = (query_word_results_hash[query_word_regexp] ||= Set.new)
-                set.merge(spec_symbols) if word =~ query_word_regexp
-              end
-            end
-          end
-          found_set_symbols = query_word_results_hash.values.reduce(:&)
-          found_set_symbols ||= []
-          sets = found_set_symbols.map do |symbol|
-            aggregate.representative_set(symbol.to_s)
-          end
-          # Remove nil values because representative_set return nil if no pod is found in any of the sources.
-          sets.compact!
-        else
-          sets = aggregate.search_by_name(query, false)
-        end
-        if sets.empty?
-          extra = ', author, summary, or description' if full_text_search
-          raise Informative, "Unable to find a pod with name#{extra}" \
-            "matching `#{query}`"
-        end
-        sorted_sets(sets, query_word_regexps)
-      end
-
-      # Returns given set array by sorting it in-place.
-      #
-      # @param  [Array<Set>] sets
-      #         Array of sets to be sorted.
-      #
-      # @param  [Array<Regexp>] query_word_regexps
-      #         Array of regexp objects for user query.
-      #
-      # @return [Array<Set>]  Given sets parameter itself after sorting it in-place.
-      #
-      def sorted_sets(sets, query_word_regexps)
-        sets.sort_by! do |set|
-          pre_match_length = nil
-          found_query_index = nil
-          found_query_count = 0
-          query_word_regexps.each_with_index do |q, idx|
-            if (m = set.name.match(/#{q}/i))
-              pre_match_length ||= (m.pre_match.length)
-              found_query_index ||= idx
-              found_query_count += 1
-            end
-          end
-          pre_match_length ||= 1000
-          found_query_index ||= 1000
-          [-found_query_count, pre_match_length, found_query_index, set.name.downcase]
-        end
-        sets
-      end
-
-      # Returns the search data. If a saved search data exists, retrieves it from file and returns it.
-      # Else, creates the search data from scratch, saves it to file system, and returns it.
-      # Search data is grouped by source repos. For each source, it contains a hash where keys are words
-      # and values are the pod names containing corresponding word.
-      #
-      # For each source, list of unique words are generated from the following spec information.
-      #   - version
-      #   - summary
-      #   - description
-      #   - authors
-      #
-      # @return [Hash{String => Hash{String => Array<String>}}] The up to date search data.
-      #
-      def updated_search_index
-        index = stored_search_index || {}
-        all.each do |source|
-          source_name = source.name
-          unless index[source_name]
-            UI.print "Creating search index for spec repo '#{source_name}'.."
-            index[source_name] = aggregate.generate_search_index_for_source(source)
-            UI.puts ' Done!'
-          end
-        end
-        save_search_index(index)
-        index
-      end
-
-      # Returns the search data stored in the file system.
-      # If existing data in the file system is not valid, returns nil.
-      #
-      def stored_search_index
-        unless @updated_search_index
-          if search_index_path.exist?
-            require 'json'
-            index = JSON.parse(search_index_path.read)
-            if index && index.is_a?(Hash) # TODO: should we also check if hash has correct hierarchy?
-              return @updated_search_index = index
-            end
-          end
-          @updated_search_index = nil
-        end
-        @updated_search_index
-      end
-
-      # Stores given search data in the file system.
-      # @param [Hash] index
-      #        Index to be saved in file system
-      #
-      def save_search_index(index)
-        require 'json'
-        @updated_search_index = index
-        search_index_path.open('w') do |io|
-          io.write(@updated_search_index.to_json)
-        end
-      end
-
-      # Allows to clear the search index.
-      #
-      attr_writer :updated_search_index
-
       # @return [Pathname] The path where the search index should be stored.
       #
       def search_index_path
-        Config.instance.search_index_file
+        @search_index_path ||= Config.instance.search_index_file
       end
 
       # @!group Updating Sources
 
-      extend Executable
-      executable :git
-
-      # Updates the stored search index if there are changes in spec repos while updating them.
-      # Update is performed incrementally. Only the changed pods' search data is re-generated and updated.
-      # @param  [Hash{Source => Array<String>}] changed_spec_paths
-      #                  A hash containing changed specification paths for each source.
-      #
-      def update_search_index_if_needed(changed_spec_paths)
-        search_index = stored_search_index
-        return unless search_index
-        changed_spec_paths.each_pair do |source, spec_paths|
-          index_for_source = search_index[source.name]
-          next unless index_for_source && spec_paths.length > 0
-          updated_pods = source.pods_for_specification_paths(spec_paths)
-
-          new_index = aggregate.generate_search_index_for_changes_in_source(source, spec_paths)
-          # First traverse search_index and update existing words
-          # Removed traversed words from new_index after adding to search_index,
-          # so that only non existing words will remain in new_index after enumeration completes.
-          index_for_source.each_pair do |word, _|
-            if new_index[word]
-              index_for_source[word] |= new_index[word]
-            else
-              index_for_source[word] -= updated_pods
-            end
-          end
-          # Now add non existing words remained in new_index to search_index
-          index_for_source.merge!(new_index)
-        end
-        save_search_index(search_index)
-      end
-
-      # Updates search index for changed pods in background
-      # @param  [Hash{Source => Array<String>}] changed_spec_paths
-      #                  A hash containing changed specification paths for each source.
-      #
-      def update_search_index_if_needed_in_background(changed_spec_paths)
-        Process.fork do
-          Process.daemon
-          update_search_index_if_needed(changed_spec_paths)
-          exit
-        end
-      end
-
       # Updates the local clone of the spec-repo with the given name or of all
       # the git repos if the name is omitted.
       #
@@ -327,298 +86,14 @@ module Pod
           UI.section "Updating spec repo `#{source.name}`" do
             changed_source_paths = source.update(show_output)
             changed_spec_paths[source] = changed_source_paths if changed_source_paths.count > 0
-            check_version_information(source.repo)
+            source.verify_compatibility!
           end
         end
         # Perform search index update operation in background.
         update_search_index_if_needed_in_background(changed_spec_paths)
       end
-
-      # Returns whether a source is a GIT repo.
-      #
-      # @param  [Pathname] dir
-      #         The directory where the source is stored.
-      #
-      # @return [Bool] Whether the given source is a GIT repo.
-      #
-      def git_repo?(dir)
-        Dir.chdir(dir) do
-          Executable.capture_command('git', %w(rev-parse), :capture => :none).success?
-        end
-      end
-
-      # Checks the version information of the source with the given directory.
-      # It raises if the source is not compatible and if there is CocoaPods
-      # update it informs the user.
-      #
-      # @param  [Pathname] dir
-      #         The directory where the source is stored.
-      #
-      # @raise  If the source is not compatible.
-      #
-      # @return [void]
-      #
-      def check_version_information(dir)
-        versions = version_information(dir)
-        unless repo_compatible?(dir)
-          min = versions['min']
-          max = versions['max']
-          version_msg = (min == max) ? min : "#{min} - #{max}"
-          raise Informative, "The `#{dir.basename}` repo requires " \
-          "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
-            'Update CocoaPods, or checkout the appropriate tag in the repo.'
-        end
-
-        if config.new_version_message? && cocoapods_update?(versions)
-          last = versions['last']
-          rc = Gem::Version.new(last).prerelease?
-          install_message = needs_sudo? ? 'sudo ' : ''
-          install_message << 'gem install cocoapods'
-          install_message << ' --pre' if rc
-          message = [
-            "CocoaPods #{last} is available.".green,
-            "To update use: `#{install_message}`".green,
-            ("[!] This is a test version we'd love you to try.".yellow if rc),
-            ("Until we reach version 1.0 the features of CocoaPods can and will change.\n" \
-             'We strongly recommend that you use the latest version at all times.'.yellow unless rc),
-            '',
-            'For more information, see https://blog.cocoapods.org ' \
-            'and the CHANGELOG for this version at ' \
-            "https://github.com/CocoaPods/CocoaPods/releases/tag/#{last}".green,
-            '',
-          ].compact.join("\n")
-          UI.puts("\n#{message}\n")
-        end
-      end
-
-      # Returns whether a source is compatible with the current version of
-      # CocoaPods.
-      #
-      # @param  [Pathname] dir
-      #         The directory where the source is stored.
-      #
-      # @return [Bool] whether the source is compatible.
-      #
-      def repo_compatible?(dir)
-        versions = version_information(dir)
-
-        min = versions['min']
-        max = versions['max']
-        bin_version  = Gem::Version.new(Pod::VERSION)
-        supports_min = !min || bin_version >= Gem::Version.new(min)
-        supports_max = !max || bin_version <= Gem::Version.new(max)
-        supports_min && supports_max
-      end
-
-      # Checks whether there is a CocoaPods given the version information of a
-      # repo.
-      #
-      # @param  [Hash] version_information
-      #         The version information of a repository.
-      #
-      # @return [Bool] whether there is an update.
-      #
-      def cocoapods_update?(version_information)
-        version = version_information['last']
-        version && Gem::Version.new(version) > Gem::Version.new(Pod::VERSION)
-      end
-
-      # Returns the contents of the `CocoaPods-version.yml` file, which stores
-      # information about CocoaPods versions.
-      #
-      # This file is a hash with the following keys:
-      #
-      # - last: the last version of CocoaPods known to the source.
-      # - min: the minimum version of CocoaPods supported by the source.
-      # - max: the maximum version of CocoaPods supported by the source.
-      #
-      # @param  [Pathname] dir
-      #         The directory where the source is stored.
-      #
-      # @return [Hash] the versions information from the repo.
-      #
-      def version_information(dir)
-        require 'yaml'
-        yaml_file = dir + 'CocoaPods-version.yml'
-        return {} unless yaml_file.exist?
-        begin
-          YAMLHelper.load_file(yaml_file)
-        rescue Informative
-          raise Informative, "There was an error reading '#{yaml_file}'.\n" \
-            'Please consult https://blog.cocoapods.org/' \
-            'Repairing-Our-Broken-Specs-Repository/ ' \
-            'for more information.'
-        end
-      end
-
-      # @!group Master repo
-
-      # @return [Pathname] The path of the master repo.
-      #
-      def master_repo_dir
-        config.repos_dir + 'master'
-      end
-
-      # @return [Bool] Checks if the master repo is usable.
-      #
-      # @note   Note this is used to automatically setup the master repo if
-      #         needed.
-      #
-      def master_repo_functional?
-        master_repo_dir.exist? && repo_compatible?(master_repo_dir)
-      end
-
-      private
-
-      # @return [Source] The Source at a given path.
-      #
-      # @param [Pathname] path
-      #        The local file path to one podspec repo.
-      #
-      def source_from_path(path)
-        return Source.new(path) unless path.basename.to_s == 'master'
-        MasterSource.new(path)
-      end
-
-      # @return [Source::Aggregate] The aggregate of the sources from repos.
-      #
-      # @param  [Array<Pathname>] repos
-      #         The local file paths to one or more podspec repo caches.
-      #
-      def aggregate_with_repos(repos)
-        sources = repos.map { |path| source_from_path(path) }
-        @aggregates_by_repos ||= {}
-        @aggregates_by_repos[repos] ||= Source::Aggregate.new(sources)
-      end
-
-      # @return [Bool] Whether the given path is writable by the current user.
-      #
-      # @param  [#to_s] path
-      #         The path.
-      #
-      def path_writable?(path)
-        Pathname(path).dirname.writable?
-      end
-
-      # @return [Bool] Whether `gem install` probably needs `sudo` to succeed.
-      #
-      def needs_sudo?
-        !path_writable?(__FILE__)
-      end
-
-      # @return [Source] The git source with the given name. If no git source
-      #         with given name is found it raises.
-      #
-      # @param  [String] name
-      #         The name of the source.
-      #
-      def git_source_named(name)
-        specified_source = aggregate.sources.find { |s| s.name == name }
-        unless specified_source
-          raise Informative, "Unable to find the `#{name}` repo."
-        end
-        unless git_repo?(specified_source.repo)
-          raise Informative, "The `#{name}` repo is not a git repo."
-        end
-        specified_source
-      end
-
-      # @return [Source] The list of the git sources.
-      #
-      def git_sources
-        all.select do |source|
-          git_repo?(source.repo)
-        end
-      end
-
-      # @return [Pathname] The path of the source with the given name.
-      #
-      # @param  [String] name
-      #         The name of the source.
-      #
-      def source_dir(name)
-        if dir = config.repos_dir + name
-          dir
-        else
-          raise Informative, "Unable to find the `#{name}` repo."
-        end
-      end
-
-      # @return [Source] The source whose {Source#url} is equal to `url`.
-      #
-      # @param  [String] url
-      #         The URL of the source.
-      #
-      def source_with_url(url)
-        url = url.downcase.gsub(/.git$/, '')
-        aggregate.sources.find do |source|
-          source.url && source.url.downcase.gsub(/.git$/, '') == url
-        end
-      end
-
-      # Returns a suitable repository name for `url`.
-      #
-      # @example A GitHub.com URL
-      #
-      #          name_for_url('https://github.com/Artsy/Specs.git')
-      #            # "artsy"
-      #          name_for_url('https://github.com/Artsy/Specs.git')
-      #            # "artsy-1"
-      #
-      # @example A non-Github.com URL
-      #
-      #          name_for_url('https://sourceforge.org/Artsy/Specs.git')
-      #            # sourceforge-artsy-specs
-      #
-      # @example A file URL
-      #
-      #           name_for_url('file:///Artsy/Specs.git')
-      #             # artsy-specs
-      #
-      # @param  [#to_s] url
-      #         The URL of the source.
-      #
-      # @return [String] A suitable repository name for `url`.
-      #
-      def name_for_url(url)
-        base_from_host_and_path = lambda do |host, path|
-          if host
-            base = host.split('.')[-2] || host
-            base += '-'
-          else
-            base = ''
-          end
-
-          base + path.gsub(/.git$/, '').gsub(/^\//, '').split('/').join('-')
-        end
-
-        case url.to_s.downcase
-        when %r{github.com[:/]+cocoapods/specs}
-          base = 'master'
-        when %r{github.com[:/]+(.+)/(.+)}
-          base = Regexp.last_match[1]
-        when /^\S+@(\S+)[:\/]+(.+)$/
-          host, path = Regexp.last_match.captures
-          base = base_from_host_and_path[host, path]
-        when URI.regexp
-          url = URI(url.downcase)
-          base = base_from_host_and_path[url.host, url.path]
-        else
-          base = url.to_s.downcase
-        end
-
-        name = base
-        infinity = 1.0 / 0
-        (1..infinity).each do |i|
-          break unless source_dir(name).exist?
-          name = "#{base}-#{i}"
-        end
-        name
-      end
     end
-  end
 
-  class Source
     extend Executable
     executable :git
 
@@ -649,5 +124,33 @@ module Pod
       end
       super
     end
+
+    def verify_compatibility!
+      super
+      latest_cocoapods_version = metadata.latest_cocoapods_version && Gem::Version.create(metadata.latest_cocoapods_version)
+      return unless Config.instance.new_version_message? &&
+        latest_cocoapods_version &&
+        latest_cocoapods_version > Gem::Version.new(Pod::VERSION)
+
+      rc = latest_cocoapods_version.prerelease?
+      install_message = !Pathname(__FILE__).dirname.writable? ? 'sudo ' : ''
+      install_message << 'gem install cocoapods'
+      install_message << ' --pre' if rc
+      message = [
+        '',
+        "CocoaPods #{latest_cocoapods_version} is available.".green,
+        "To update use: `#{install_message}`".green,
+        ("[!] This is a test version we'd love you to try.".yellow if rc),
+        ("Until we reach version 1.0 the features of CocoaPods can and will change.\n" \
+         'We strongly recommend that you use the latest version at all times.'.yellow unless rc),
+        '',
+        'For more information, see https://blog.cocoapods.org ' \
+        'and the CHANGELOG for this version at ' \
+        "https://github.com/CocoaPods/CocoaPods/releases/tag/#{latest_cocoapods_version}".green,
+        '',
+        '',
+      ].compact.join("\n")
+      UI.puts(message)
+    end
   end
 end