cocoapods 0.34.1 → 0.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174371936987af5ebf634f8938b27a6e7a1cae0a
-  data.tar.gz: e8cd374fd60fae5c74abadcaf57a42dd55f56d39
+  metadata.gz: 03befb1a6d0cf06ee2e98b1481e48b0bb52a51bf
+  data.tar.gz: ab7cf2b6bae37b12bebca53f6fb40075d3d9c4c1
 SHA512:
-  metadata.gz: 6cbeb3597d3f77e5805a9effaf094c84d49907db8d2584b98ca57bd93af8a271a06ad4bd6f26d410c2fbd38211df33cf012e83a0eae8300e08d565f97033ec3e
-  data.tar.gz: 7e47cd82d59b7fbf5a784ebfedd44148f54c0d2eb6ce787161c97a027bcbf61b260a7c4bd421c58dec06453690fc3e013ec335d896c1d178f32757e52a74ac48
+  metadata.gz: f3ab1e18fa19d113c2e6dad3e550da01e79fe806de57b7cf193e579b8cf11d68cccafb209af289f2f69705413652c504d6acd890e974387d31a64893e6879fb2
+  data.tar.gz: 00fc7c1ee370f63d52433411419640b26f32b69c2f98dafad30ae982d685048f72d6d4cd7631cb1dbf8cc8e04be8f042fbbae5cc16040255b0aff37ce769d536

data/CHANGELOG.md

@@ -2,6 +2,74 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.34.2
+
+##### Enhancements
+
+* Make the output of `pod outdated` show what running `pod update` will do.
+  Takes into account the sources specified in the `Podfile`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2470](https://github.com/CocoaPods/CocoaPods/issues/2470)
+
+* Allows the use of the `GCC_PREPROCESSOR_DEFINITION` flag `${inherited}`
+  without emitting a warning.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2577](https://github.com/CocoaPods/CocoaPods/issues/2577)
+
+* Integration with user project will no longer replace an existing
+  base build configuration.  
+  [Robert Jones](https://github.com/redshirtrob)
+  [#1736](https://github.com/CocoaPods/CocoaPods/issues/1736)
+
+##### Bug Fixes
+
+* Improved sanitizing of configuration names to avoid generating invalid
+  preprocessor definitions.  
+  [Boris Bügling](https://github.com/neonichu)
+  [#2542](https://github.com/CocoaPods/CocoaPods/issues/2542)
+
+* More robust generation of source names from URLs.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2534](https://github.com/CocoaPods/CocoaPods/issues/2534)
+
+* Allow the `Validator` to only use specific sources.
+  Allows customizable source for `pod spec lint` and `pod lib lint`,
+  with both defaulting to `master`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2543](https://github.com/CocoaPods/CocoaPods/issues/2543)
+  [cocoapods-trunk#28](https://github.com/CocoaPods/cocoapods-trunk/issues/28)
+
+* Takes into account the sources specified in `Podfile` running
+  `pod outdated`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2553](https://github.com/CocoaPods/CocoaPods/issues/2553)
+
+* Ensures that the master repo is shallow cloned when added via a Podfile
+  `source` directive.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3586](https://github.com/CocoaPods/CocoaPods/issues/2586)
+
+* Ensures that the user project is not saved when there are no
+  user targets integrated.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2561](https://github.com/CocoaPods/CocoaPods/issues/2561)
+  [#2593](https://github.com/CocoaPods/CocoaPods/issues/2593)
+
+* Fix a crash when running `pod install` with an empty target that inherits a
+  pod from a parent target.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2591](https://github.com/CocoaPods/CocoaPods/issues/2591)
+
+* Take into account versions of a Pod from all specified sources when
+  resolving dependencies.  
+  [Thomas Visser](https://github.com/Thomvis)
+  [#2556](https://github.com/CocoaPods/CocoaPods/issues/2556)
+
+* Sanitize build configuration names in target environment header macros.  
+  [Kra Larivain](https://github.com/olarivain)
+  [#2532](https://github.com/CocoaPods/CocoaPods/pull/2532)
+
+
 ## 0.34.1
 
 ##### Bug Fixes

data/lib/cocoapods/command/init.rb

@@ -57,7 +57,7 @@ module Pod
         podfile << "xcodeproj '#{@project_path}'\n\n" if @project_path
         podfile << <<-PLATFORM.strip_heredoc
           # Uncomment this line to define a global platform for your project
-          # platform :ios, "6.0"
+          # platform :ios, '6.0'
 
           source '#{Command::Setup.read_only_url}'
         PLATFORM
@@ -74,7 +74,7 @@ module Pod
       # @return [String] the text for the target module
       #
       def target_module(target)
-        target_module = "\ntarget \"#{target.name}\" do\n"
+        target_module = "\ntarget '#{target.name}' do\n"
 
         if target.name =~ /tests?/i
           target_module << template_contents(config.default_test_podfile_path)

data/lib/cocoapods/command/inter_process_communication.rb

@@ -77,7 +77,7 @@ module Pod
         DESC
 
         def run
-          sets = SourcesManager.all_sets
+          sets = SourcesManager.aggregate.all_sets
           result = {}
           sets.each do |set|
             begin

data/lib/cocoapods/command/lib.rb

@@ -112,7 +112,9 @@ module Pod
            ['--only-errors', 'Lint validates even if warnings are present'],
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
-           ['--no-clean',    'Lint leaves the build directory intact for inspection']].concat(super)
+           ['--no-clean',    'Lint leaves the build directory intact for inspection'],
+           ['--sources=https://github.com/artsy/Specs', 'The sources to pull dependant pods from ' \
+            '(defaults to https://github.com/CocoaPods/Specs.git)']].concat(super)
         end
 
         def initialize(argv)
@@ -121,6 +123,7 @@ module Pod
           @clean        = argv.flag?('clean', true)
           @subspecs     = argv.flag?('subspecs', true)
           @only_subspec = argv.option('subspec')
+          @source_urls  = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @podspecs_paths = argv.arguments!
           super
         end
@@ -133,7 +136,7 @@ module Pod
           UI.puts
           podspecs_to_lint.each do |podspec|
 
-            validator             = Validator.new(podspec)
+            validator             = Validator.new(podspec, @source_urls)
             validator.local       = true
             validator.quick       = @quick
             validator.no_clean    = !@clean

data/lib/cocoapods/command/outdated.rb

@@ -27,8 +27,9 @@ module Pod
           UI.puts 'No updates are available.'.yellow
         else
           UI.section 'The following updates are available:' do
-            updates.each do |(name, from_version, to_version)|
-              UI.puts "- #{name} #{from_version} -> #{to_version}"
+            updates.each do |(name, from_version, matching_version, to_version)|
+              UI.puts "- #{name} #{from_version} -> #{matching_version} " \
+                "(latest version #{to_version})"
             end
           end
         end
@@ -49,6 +50,13 @@ module Pod
 
       private
 
+      def analyzer
+        @analyzer ||= begin
+          verify_podfile_exists!
+          Installer::Analyzer.new(config.sandbox, config.podfile, config.lockfile)
+        end
+      end
+
       def updates
         @updates ||= begin
           spec_sets.map do |set|
@@ -57,7 +65,10 @@ module Pod
             pod_name = spec.root.name
             lockfile_version = lockfile.version(pod_name)
             if source_version > lockfile_version
-              [pod_name, lockfile_version, source_version]
+              matching_spec = unlocked_pods.find { |s| s.name == pod_name }
+              matching_version =
+                matching_spec ? matching_spec.version : "(unused)"
+              [pod_name, lockfile_version, matching_version, source_version]
             else
               nil
             end
@@ -65,6 +76,18 @@ module Pod
         end
       end
 
+      def unlocked_pods
+        @unlocked_pods ||= begin
+          pods = []
+          UI.titled_section('Analyzing dependencies') do
+            pods = Installer::Analyzer.new(config.sandbox, config.podfile).
+              analyze(false).
+              specs_by_target.values.flatten.uniq
+          end
+          pods
+        end
+      end
+
       def deprecated_pods
         @deprecated_pods ||= begin
           spec_sets.map(&:specification).select do |spec|
@@ -75,8 +98,9 @@ module Pod
 
       def spec_sets
         @spec_sets ||= begin
+          aggregate = Source::Aggregate.new(analyzer.sources)
           installed_pods.map do |pod_name|
-            SourcesManager.search(Dependency.new(pod_name))
+            aggregate.search(Dependency.new(pod_name))
           end.compact.uniq
         end
       end

data/lib/cocoapods/command/repo.rb

@@ -258,7 +258,7 @@ module Pod
         def print_sources(sources)
           sources.each do |source|
             UI.title source.name do
-              print_source_at_path source.data_provider.repo
+              print_source_at_path source.repo
             end
           end
           UI.puts "\n"

data/lib/cocoapods/command/repo/push.rb

@@ -82,7 +82,7 @@ module Pod
         def validate_podspec_files
           UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow
           podspec_files.each do |podspec|
-            validator = Validator.new(podspec)
+            validator = Validator.new(podspec, SourcesManager.all.map(&:url))
             validator.only_errors = @allow_warnings
             begin
               validator.validate

data/lib/cocoapods/command/spec.rb

@@ -67,7 +67,9 @@ module Pod
            ['--only-errors', 'Lint validates even if warnings are present'],
            ['--subspec=NAME', 'Lint validates only the given subspec'],
            ['--no-subspecs', 'Lint skips validation of subspecs'],
-           ['--no-clean',    'Lint leaves the build directory intact for inspection']].concat(super)
+           ['--no-clean',    'Lint leaves the build directory intact for inspection'],
+           ['--sources=https://github.com/artsy/Specs', 'The sources to pull dependant pods from ' \
+            '(defaults to https://github.com/CocoaPods/Specs.git)']].concat(super)
         end
 
         def initialize(argv)
@@ -76,6 +78,7 @@ module Pod
           @clean        = argv.flag?('clean', true)
           @subspecs     = argv.flag?('subspecs', true)
           @only_subspec = argv.option('subspec')
+          @source_urls  = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @podspecs_paths = argv.arguments!
           super
         end
@@ -84,7 +87,7 @@ module Pod
           UI.puts
           invalid_count = 0
           podspecs_to_lint.each do |podspec|
-            validator             = Validator.new(podspec)
+            validator             = Validator.new(podspec, @source_urls)
             validator.quick       = @quick
             validator.no_clean    = !@clean
             validator.only_errors = @only_errors

data/lib/cocoapods/downloader.rb

@@ -1,12 +1,17 @@
 require 'cocoapods-downloader'
+require 'claide/informative_error'
 
 module Pod
   module Downloader
+    class DownloaderError; include CLAide::InformativeError; end
+
     class Base
       override_api do
 
         def execute_command(executable, command, raise_on_failure = false)
           Executable.execute_command(executable, command, raise_on_failure)
+        rescue CLAide::InformativeError => e
+          raise DownloaderError, e.message
         end
 
         # Indicates that an action will be performed. The action is passed as a

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.34.1' unless defined? Pod::VERSION
+  VERSION = '0.34.2' unless defined? Pod::VERSION
 end

data/lib/cocoapods/generator/target_environment_header.rb

@@ -49,7 +49,7 @@ module Pod
         specs_by_config = specs_scoped_by_configuration(common_specs, specs_by_configuration)
         specs_by_config.each do |config, specs|
           result << "// #{config} build configuration\n"
-          result << "#ifdef #{config.gsub(' ', '_').upcase}\n\n"
+          result << "#ifdef #{config.gsub(/[^a-zA-Z0-9_]/, '_').upcase}\n\n"
           specs.each { |spec| result << spec_defines(spec, 1) }
           result << "#endif\n"
         end

data/lib/cocoapods/installer.rb

@@ -402,13 +402,13 @@ module Pod
     def install_libraries
       UI.message '- Installing targets' do
         pod_targets.sort_by(&:name).each do |pod_target|
-          next if pod_target.target_definition.empty?
+          next if pod_target.target_definition.dependencies.empty?
           target_installer = PodTargetInstaller.new(sandbox, pod_target)
           target_installer.install!
         end
 
         aggregate_targets.sort_by(&:name).each do |target|
-          next if target.target_definition.empty?
+          next if target.target_definition.dependencies.empty?
           target_installer = AggregateTargetInstaller.new(sandbox, target)
           target_installer.install!
         end

data/lib/cocoapods/installer/analyzer.rb

@@ -359,7 +359,7 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      private
+      public
 
       # Returns the sources used to query for specifications
       #
@@ -388,6 +388,10 @@ module Pod
         end
       end
 
+      #-----------------------------------------------------------------------#
+
+      private
+
       # @!group Analysis sub-steps
 
       # Returns the path of the user project that the {TargetDefinition}

data/lib/cocoapods/installer/analyzer/sandbox_analyzer.rb

@@ -40,6 +40,8 @@ module Pod
         #
         attr_reader :update_mode
 
+        alias_method :update_mode?, :update_mode
+
         # @return [Lockfile] The lockfile of the installation as a fall-back if
         #         there is no sandbox manifest. This is indented as a temporary
         #         solution to prevent the full re-installation from users which

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -132,6 +132,8 @@ module Pod
         end
       end
 
+      INHERITED_FLAGS = ['$(inherited)', '${inherited}']
+
       # Checks whether the settings of the CocoaPods generated xcconfig are
       # overridden by the build configuration of a target and prints a
       # warning to inform the user if needed.
@@ -143,8 +145,9 @@ module Pod
               xcconfig = aggregate_target.xcconfigs[config.name]
               if xcconfig
                 xcconfig.to_hash.keys.each do |key|
-                  target_value = config.build_settings[key]
-                  if target_value && !target_value.include?('$(inherited)')
+                  target_values = config.build_settings[key]
+                  if target_values &&
+                      !INHERITED_FLAGS.any? { |flag| target_values.include?(flag) }
                     print_override_warning(aggregate_target, user_target, config, key)
                   end
                 end

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -27,15 +27,15 @@ module Pod
         #
         def integrate!
           UI.section(integration_message) do
-            XCConfigIntegrator.integrate(target, native_targets)
-            update_to_cocoapods_0_34
+            user_project.save if XCConfigIntegrator.integrate(target, native_targets)
+            user_project.save if update_to_cocoapods_0_34
 
             unless native_targets_to_integrate.empty?
               add_pods_library
               add_copy_resources_script_phase
               add_check_manifest_lock_script_phase
+              user_project.save
             end
-            user_project.save
           end
         end
 
@@ -52,6 +52,8 @@ module Pod
 
         # Fixes the paths of the copy resource scripts.
         #
+        # @return [Bool] whether any changes to the project were made.
+        #
         # @todo   This can be removed for CocoaPods 1.0
         #
         def update_to_cocoapods_0_34
@@ -62,9 +64,15 @@ module Pod
           end.flatten
 
           script_path = target.copy_resources_script_relative_path
+          shell_script = %("#{script_path}"\n)
+          changes = false
           phases.each do |phase|
-            phase.shell_script = %("#{script_path}"\n)
+            unless phase.shell_script == shell_script
+              phase.shell_script = shell_script
+              changes = true
+            end
           end
+          changes
         end
 
         # Adds spec libraries to the frameworks build phase of the

data/lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb

@@ -15,13 +15,17 @@ module Pod
           #         The native targets associated which should be integrated
           #         with the Pod bundle.
           #
+          # @return [Bool] whether any changes to the project were made.
+          #
           def self.integrate(pod_bundle, targets)
+            changes = false
             targets.each do |target|
               target.build_configurations.each do |config|
-                update_to_cocoapods_0_34(pod_bundle, targets)
-                set_target_xcconfig(pod_bundle, config)
+                changes = true if update_to_cocoapods_0_34(pod_bundle, targets)
+                changes = true if set_target_xcconfig(pod_bundle, target, config)
               end
             end
+            changes
           end
 
           private
@@ -35,13 +39,16 @@ module Pod
           # @param  [Target::AggregateTarget] pod_bundle
           #         The Pods bundle.
           #
-          # @param  [XcodeProj::PBXNativeTarget] target
+          # @param  [Array<XcodeProj::PBXNativeTarget>] targets
           #         The native targets.
           #
+          # @return [Bool] whether any changes to the project were made.
+          #
           # @todo   This can be removed for CocoaPods 1.0
           #
           def self.update_to_cocoapods_0_34(pod_bundle, targets)
             sandbox = pod_bundle.sandbox
+            changes = false
             targets.map(&:project).uniq.each do |project|
               file_refs = project.files.select do |file_ref|
                 path = file_ref.path.to_s
@@ -57,7 +64,10 @@ module Pod
                   file_ref.remove_from_project
                 end
               end
+
+              changes = true unless file_refs.empty?
             end
+            changes
           end
 
           # Creates a file reference to the xcconfig generated by
@@ -67,15 +77,28 @@ module Pod
           # @param  [Target::AggregateTarget] pod_bundle
           #         The Pods bundle.
           #
-          # @param  [[Xcodeproj::XCBuildConfiguration] config
+          # @param  [PBXNativeTarget] target
+          #         The native target.
+          #
+          # @param  [Xcodeproj::XCBuildConfiguration] config
           #         The build configuration.
           #
-          def self.set_target_xcconfig(pod_bundle, config)
+          def self.set_target_xcconfig(pod_bundle, target, config)
             path = pod_bundle.xcconfig_relative_path(config.name)
             group = config.project['Pods'] || config.project.new_group('Pods')
             file_ref = group.files.find { |f| f.path == path }
-            file_ref ||= group.new_file(path)
-            config.base_configuration_reference = file_ref
+            if config.base_configuration_reference != file_ref
+              UI.warn 'CocoaPods did not set the base configuration of your ' \
+              'project because because your project already has a custom ' \
+              'config set. In order for CocoaPods integration to work at ' \
+              'all, please either set the base configurations of the target ' \
+              "#{target.name}` to `#{path}` or include the `#{path}` in your " \
+              'build configuration.'
+              false
+            elsif !file_ref
+              file_ref ||= group.new_file(path)
+              config.base_configuration_reference = file_ref
+            end
           end
 
           private

data/lib/cocoapods/project.rb

@@ -209,7 +209,7 @@ module Pod
     #
     def add_build_configuration(name, type)
       build_configuration = super
-      values = ["#{name.gsub(' ', '_').upcase}=1"]
+      values = ["#{name.gsub(/[^a-zA-Z0-9_]/, '_').upcase}=1"]
       settings = build_configuration.build_settings
       definitions = Array(settings['GCC_PREPROCESSOR_DEFINITIONS'])
       values.each do |value|

data/lib/cocoapods/resolver.rb

@@ -150,6 +150,11 @@ module Pod
           set = find_cached_set(dependency, dependent_spec)
           set.required_by(dependency, dependent_spec.to_s)
 
+          if (paths = set.specification_paths_for_version(set.required_version)).length > 1
+            UI.warn "Found multiple specifications for #{dependency}:\n" \
+              "- #{paths.join("\n")}"
+          end
+
           unless @loaded_specs.include?(dependency.name)
             spec = set.specification.subspec_by_name(dependency.name)
             @loaded_specs << spec.name
@@ -190,7 +195,7 @@ module Pod
           end
           set = Specification::Set::External.new(spec)
         else
-          set = find_set_from_sources(dependency)
+          set = create_set_from_sources(dependency)
         end
         cached_sets[name] = set
         unless set
@@ -201,19 +206,21 @@ module Pod
       cached_sets[name]
     end
 
-    # @return [Set] Loads a set for the Pod of the given dependency from the
-    #         sources. The set will be limited to the versions of the first
-    #         source which includes the Pod.
+    # @return [Set] Creates a set for the Pod of the given dependency from the
+    #         sources. The set will contain all versions from all sources that
+    #         include the Pod.
     #
     # @param  [Dependency] dependency
     #         The dependency for which the set is needed.
     #
-    def find_set_from_sources(dependency)
-      sources.each do |source|
-        set = source.search(dependency)
-        return set if set
-      end
-      nil
+    def create_set_from_sources(dependency)
+      aggregate.search(dependency)
+    end
+
+    # @return [Source::Aggregate] The aggregate of the {#sources}.
+    #
+    def aggregate
+      @aggregate ||= Source::Aggregate.new(sources.map(&:repo))
     end
 
     # Ensures that a specification is compatible with the platform of a target.

data/lib/cocoapods/sources_manager.rb

@@ -40,7 +40,9 @@ module Pod
           previous_title_level = UI.title_level
           UI.title_level = 0
           begin
-            Command::Repo::Add.new(CLAide::ARGV.new([name, url])).run
+            argv = [name, url]
+            argv << '--shallow' if name =~ /^master(-\d+)?$/
+            Command::Repo::Add.new(CLAide::ARGV.new(argv)).run
           rescue Informative => e
             raise Informative, "Unable to add a source with url `#{url}` " \
               "named `#{name}`.\nYou can try adding it manually in " \
@@ -189,7 +191,7 @@ module Pod
 
         sources.each do |source|
           UI.section "Updating spec repo `#{source.name}`" do
-            Dir.chdir(source.data_provider.repo) do
+            Dir.chdir(source.repo) do
               begin
                 output = git!('pull --ff-only')
                 UI.puts output if show_output && !config.verbose?
@@ -200,7 +202,7 @@ module Pod
                   '`pod repo update --verbose`'
               end
             end
-            check_version_information(source.data_provider.repo)
+            check_version_information(source.repo)
           end
         end
       end
@@ -242,11 +244,20 @@ module Pod
 
         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 Gem::Version.new(last).prerelease?
-          UI.puts "\nCocoaPods #{versions['last']} is available.\n" \
-            "To update use: `#{install_message}`".green + "\n"
+          install_message << ' --pre' if rc
+          message = [
+            "CocoaPods #{versions['last']} is available.".green,
+            "To update use: `#{install_message}`".green,
+            ("[!] This is a test version we'd love you to try.".yellow if rc),
+            '',
+            'For more information see http://blog.cocoapods.org'.green,
+            'and the CHANGELOG for this version http://git.io/BaH8pQ.'.green,
+            '',
+          ].compact.join("\n")
+          UI.puts("\n#{message}\n")
         end
       end
 
@@ -348,7 +359,7 @@ module Pod
         unless specified_source
           raise Informative, "Unable to find the `#{name}` repo."
         end
-        unless git_repo?(specified_source.data_provider.repo)
+        unless git_repo?(specified_source.repo)
           raise Informative, "The `#{name}` repo is not a git repo."
         end
         specified_source
@@ -358,7 +369,7 @@ module Pod
       #
       def git_sources
         all.select do |source|
-          git_repo?(source.data_provider.repo)
+          git_repo?(source.repo)
         end
       end
 
@@ -405,18 +416,27 @@ module Pod
       # @return [String] A suitable repository name for `url`.
       #
       def name_for_url(url)
-        case url.downcase
+        base_from_host_and_path = lambda do |host, path|
+          base = host.split('.')[-2] || host
+          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[2]
-        else
-          raise Informative,
-                "`#{url}` is not a valid URL." unless url =~ URI.regexp
+        when URI.regexp
           url = URI(url.downcase)
-          base = url.host.split('.')[-2] +
-            url.path.gsub(/.git$/, '').split('/').join('-')
+          base = base_from_host_and_path[url.host, url.path]
+        when %r{^\S+@(\S+)[:/](.+)$}
+          host, path = Regexp.last_match.captures
+          base = base_from_host_and_path[host, path]
+        else
+          base = url.to_s.downcase
         end
+
         name = base
         infinity = 1.0 / 0
         (1..infinity).each do |i|

data/lib/cocoapods/user_interface/error_report.rb

@@ -121,7 +121,7 @@ EOS
         def repo_information
           SourcesManager.all.map do |source|
             next unless source.type == 'file system'
-            repo = source.data_provider.repo
+            repo = source.repo
             Dir.chdir(repo) do
               url = `git config --get remote.origin.url 2>&1`.strip
               sha = `git rev-parse HEAD 2>&1`.strip

data/lib/cocoapods/validator.rb

@@ -19,7 +19,11 @@ module Pod
     # @param  [Specification, Pathname, String] spec_or_path
     #         the Specification or the path of the `podspec` file to lint.
     #
-    def initialize(spec_or_path)
+    # @param  [Array<String>] source_urls
+    #         the Source URLs to use in creating a {Podfile}.
+    #
+    def initialize(spec_or_path, source_urls)
+      @source_urls = source_urls
       @linter = Specification::Linter.new(spec_or_path)
     end
 
@@ -332,7 +336,11 @@ module Pod
             #
             # For more details see https://github.com/CocoaPods/CocoaPods/issues/2394#issuecomment-56658587
             #
-            if message.include?('error: ') && !message.include?("'InputFile' should have")
+            if message.include?("'InputFile' should have")
+              next
+            end
+
+            if message.include?('error: ')
               error "[xcodebuild] #{message}"
             else
               note "[xcodebuild] #{message}"
@@ -408,6 +416,11 @@ module Pod
 
     # !@group Helpers
 
+    # @return [Array<String>] an array of source URLs used to create the
+    #         {Podfile} used in the linting process
+    #
+    attr_reader :source_urls
+
     # @return [Podfile] a podfile that requires the specification on the
     # current platform.
     #
@@ -418,7 +431,9 @@ module Pod
       name     = subspec_name ? subspec_name : spec.name
       podspec  = file.realpath
       local    = local?
+      urls     = source_urls
       podfile  = Pod::Podfile.new do
+        urls.each { |u| source(u) }
         platform(platform_name, deployment_target)
         if local
           pod name, :path => podspec.dirname.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-10-08 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.34.1
+        version: 0.34.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.1
+        version: 0.34.2
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.7.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
@@ -101,14 +101,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement