cocoapods 0.34.0.rc2 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 114f09917e2a16defbb7b61d654759d6815ca920
-  data.tar.gz: 87793bf336aabe63903e45d1ecb2e3fc680ce68d
+  metadata.gz: 1e3f9247d1861693b949301b9ce508e9fd7ccd0a
+  data.tar.gz: 552a01f721ebbb407d651c3081132be962453ea5
 SHA512:
-  metadata.gz: 7ea6d616848f34f4c377fa69c71c16c0e3bf241ba82e3e044f5342c14bf891af6b3e80624a6d6e6b10af6ef80b6ef7400d25552b5c8412ba46bf9e59de94af64
-  data.tar.gz: f2239e5f72d377dccb46de1a17c35100128f6556290d33fdd19b29558d5caad74582e973a69afeca3781ab12f4436a00581cbb08e6009f743c5fde89672be1be
+  metadata.gz: 23e31603631c405854d4a4f5f9d14c5c391126200950c630ee3d5608e2ff61023f8f4f4710812e184f38a4111d603e2ae7951932057018aafbb1b9a33f8e5932
+  data.tar.gz: 62a7fe7c9e7b10eb9b39deac6b2d8a82daefcdf0cf83ab37260d350843f4837db254e1804bd4059f85b07cabb1ef6599b21e7187f6ae05ec1792589d1ccbdccb

data/CHANGELOG.md

@@ -2,6 +2,61 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.34.0
+
+##### Breaking
+
+* Add support for loading podspecs from *only* specific spec-repos via
+  `sources`. By default, when there are no sources specified in a Podfile all
+  source repos will be used. This has always been the case. However, this
+  implicit use of sources is now deprecated. Once you specify specific sources,
+  **no** repos wil be included by default. For example:
+
+        source 'https://github.com/artsy/Specs.git'
+        source 'https://github.com/CocoaPods/Specs.git'
+
+  Any source URLs specified that have not yet been added will be cloned before
+  resolution begins.  
+  [François Benaiteau](https://github.com/netbe)
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [Samuel Giddins](https://github.com/segiddins)
+  [#1143](https://github.com/CocoaPods/CocoaPods/pull/1143)
+  [Core#19](https://github.com/CocoaPods/Core/pull/19)
+  [Core#170](https://github.com/CocoaPods/Core/issues/170)
+  [#2515](https://github.com/CocoaPods/CocoaPods/issues/2515)
+
+##### Enhancements
+
+* Added the `pod repo list` command which lists all the repositories.  
+  [Luis Ascorbe](https://github.com/lascorbe)
+  [#1455](https://github.com/CocoaPods/CocoaPods/issues/1455)
+
+##### Bug Fixes
+
+* Works around an Xcode issue where linting would fail even though `xcodebuild`
+  actually succeeds. Xcode.app also doesn't fail when this issue occurs, so it's
+  safe for us to do the same.  
+  [Kra Larivain](https://github.com/olarivain)
+  [Boris Bügling](https://github.com/neonichu)
+  [Eloy Durán](https://github.com/alloy)
+  [Samuel E. Giddins](https://github.com/segiddins)
+  [#2394](https://github.com/CocoaPods/CocoaPods/issues/2394)
+  [#2395](https://github.com/CocoaPods/CocoaPods/pull/2395)
+
+* Fixes the detection of JSON podspecs included via `:path`.  
+  [laiso](https://github.com/laiso)
+  [#2489](https://github.com/CocoaPods/CocoaPods/pull/2489)
+
+* Fixes an issue where `pod install` would crash during Plist building if any
+  pod has invalid UTF-8 characters in their title or description.  
+  [Ladislav Martincik](https://github.com/martincik)
+  [#2482](https://github.com/CocoaPods/CocoaPods/issues/2482)
+
+* Fix crash when the URL of a private GitHub repo is passed to `pod spec
+  create` as an argument.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [#1543](https://github.com/CocoaPods/CocoaPods/issues/1543)
+
 
 ## 0.34.0.rc2
 
@@ -12,7 +67,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Kyle Fuller](https://github.com/kylef)
   [#2147](https://github.com/CocoaPods/CocoaPods/issues/2147)
 
-* Fixes an issue where `pod init` would not add `source 'master'` to newly 
+* Fixes an issue where `pod init` would not add `source 'master'` to newly
   created Podfiles.  
   [Ash Furrow](https://github.com/AshFurrow)
   [#2473](https://github.com/CocoaPods/CocoaPods/issues/2473)
@@ -35,9 +90,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
         source 'master'
 
   [François Benaiteau](https://github.com/netbe)
+  [Fabio Pelosin](https://github.com/fabiopelosin)
   [#1143](https://github.com/CocoaPods/CocoaPods/pull/1143)
   [Core#19](https://github.com/CocoaPods/Core/pull/19)
-  
+
 * The `Pods` directory has been reorganized. This might require manual
   intervention in projects where files generated by CocoaPods have manually been
   imported into the user's project (common with the acknowledgements files).  
@@ -45,6 +101,14 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [Michele Titolo](https://github.com/mtitolo)
 
+* Plugins are now expected to include the `cocoapods-plugin.rb` file in
+  `./lib`.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [CLAide#28](https://github.com/CocoaPods/CLAide/pull/28)
+
+* The specification `requires_arc` attribute now defaults to true.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [CocoaPods#267](https://github.com/CocoaPods/CocoaPods/issues/267)
 
 ##### Enhancements
 
@@ -60,6 +124,17 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [#1668](https://github.com/CocoaPods/CocoaPods/pull/1668)
   [#731](https://github.com/CocoaPods/CocoaPods/pull/731)
 
+* Improved performance of git downloads using shallow clone.  
+  [Marin Usalj](https://github.com/supermarin)
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [cocoapods-downloader#29](https://github.com/CocoaPods/cocoapods-downloader/pull/29)
+
+* Simplify installation: CocoaPods no longer requires the
+  compilation of the troublesome native extensions.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [Xcodeproj#168](https://github.com/CocoaPods/Xcodeproj/pull/168)
+  [Xcodeproj#167](https://github.com/CocoaPods/Xcodeproj/issues/167)
+
 * Add hooks for plugins. Currently only the installer hook is supported.
   A plugin can register itself to be activated after the installation with the
   following syntax:
@@ -73,12 +148,15 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [Core#132](https://github.com/CocoaPods/Core/pull/1755)
 
-* Display indication for deprecated pods when searching for Pods.  
-  [Hugo Tunius][k0nserv]
+* Add a support for migrating the sandbox to new versions of CocoaPods.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+
+* Display an indication for deprecated Pods in the command line search.  
+  [Hugo Tunius](https://github.com/k0nserv)
   [#2180](https://github.com/CocoaPods/CocoaPods/issues/2180)
 
 * Use the CLIntegracon gem for the integration tests.  
-  [Marius Rackwitz][mrackwitz]
+  [Marius Rackwitz](https://github.com/mrackwitz)
   [#2371](https://github.com/CocoaPods/CocoaPods/issues/2371)
 
 * Include configurations that a user explicitly specifies, in their Podfile,
@@ -88,24 +166,41 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 * Properly quote the `-isystem` values in the xcconfig files.  
   [Eloy Durán](https://github.com/alloy)
 
-* The post install message with the CHANGELOG has been removed from the
-  gemspec.  
+* Remove the installation post install message which presents the CHANGELOG.  
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [Eloy Durán](https://github.com/alloy)
 
 * Add support for user-specified project directories with the
   `--project-directory` option.  
-  [Samuel Giddins](segiddins)
+  [Samuel E. Giddins](https://github.com/segiddins)
   [#2183](https://github.com/CocoaPods/CocoaPods/issues/2183)
 
+* Now the `plutil` tool is used when available to produce
+  output consistent with Xcode.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+
+* Indicate the name of the pod whose requirements cannot be satisfied.  
+  [Seivan Heidari](https://github.com/seivan)
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+  [#1938](https://github.com/CocoaPods/CocoaPods/issues/1938)
+
+* Add support for JSON specs to external sources (`:path`, `:git`, etc)
+  options.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2320](https://github.com/CocoaPods/CocoaPods/issues/2320)
+
+* Generate the workspaces using the same output of Xcode.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+
+
 ##### Bug Fixes
 
-* Fixes `pod repo push` to first check if a Specs directory exists and if so
+* Fix `pod repo push` to first check if a Specs directory exists and if so
   push there.  
   [Edward Valentini](edwardvalentini)
   [#2060](https://github.com/CocoaPods/CocoaPods/issues/2060)
 
-* Fixes `pod outdated` to not include subspecs.  
+* Fix `pod outdated` to not include subspecs.  
   [Ash Furrow](ashfurrow)
   [#2136](https://github.com/CocoaPods/CocoaPods/issues/2136)
 
@@ -115,37 +210,41 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Kyle Fuller](kylef)
   [pod-template#50](https://github.com/CocoaPods/pod-template/issues/50)
 
-* Fixes spec linting to not warn for missing license file in subspecs.  
+* Fix spec linting to not warn for missing license file in subspecs.  
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [Core#132](https://github.com/CocoaPods/Core/issues/132)
 
-* Fixes `pod init` so that it doesn't recurse when checking for Podfiles.  
+* Fix `pod init` so that it doesn't recurse when checking for Podfiles.  
   [Paddy O'Brien](https://github.com/tapi)
   [#2181](https://github.com/CocoaPods/CocoaPods/issues/2181)
 
-* Fixes missing XCTest framework in Xcode 6.  
+* Fix missing XCTest framework in Xcode 6.  
   [Paul Williamson](squarefrog)
   [#2296](https://github.com/CocoaPods/CocoaPods/issues/2296)
 
-* Support multiple values in ARCHS.  
+* Support multiple values in `ARCHS`.  
   [Robert Zuber](https://github.com/z00b)
   [#1904](https://github.com/CocoaPods/CocoaPods/issues/1904)
 
-* Fixes static analysis in Xcode 6.  
-  [Samuel Giddins](segiddins)
+* Fix static analysis in Xcode 6.  
+  [Samuel E. Giddins](https://github.com/segiddins)
   [#2402](https://github.com/CocoaPods/CocoaPods/issues/2402)
 
-* Fixes an issue where a version of a spec will not be locked when using
+* Fix an issue where a version of a spec will not be locked when using
   multiple subspecs of a podspec.  
   [Kyle Fuller](https://github.com/kylef)
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [#2135](https://github.com/CocoaPods/CocoaPods/issues/2135)
 
-* Fixes an issue using JSON podspecs installed directly from a lib's
+* Fix an issue using JSON podspecs installed directly from a lib's
   repository.  
   [Kyle Fuller](https://github.com/kylef)
   [#2320](https://github.com/CocoaPods/CocoaPods/issues/2320)
 
+* Support and use quotes in the `OTHER_LDFLAGS` of xcconfigs to avoid
+  issues with targets containing a space character in their name.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+
 
 ## 0.33.1
 
@@ -234,17 +333,17 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 ##### Bug Fixes
 
 * Show the actual executable when external commands fail.  
-  [Boris Bügling][neonichu]
+  [Boris Bügling](https://github.com/neonichu)
   [#2102](https://github.com/CocoaPods/CocoaPods/issues/2102)
 
 * Fixed support for file references in the workspace generated by CocoaPods.  
-  [Kyle Fuller][kylef]
+  [Kyle Fuller](https://github.com/kylef)
   [Fabio Pelosin](https://github.com/fabiopelosin)
   [Xcodeproj#105](https://github.com/CocoaPods/Xcodeproj/pull/150)
 
 * Show a helpful error message when reading version information with merge
   conflict.  
-  [Samuel E. Giddins][segiddins]
+  [Samuel E. Giddins](https://github.com/segiddins)
   [#1853](https://github.com/CocoaPods/CocoaPods/issues/1853)
 
 * Show deprecated specs when invoking `pod outdated`.  
@@ -252,7 +351,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [#2003](https://github.com/CocoaPods/CocoaPods/issues/2003)
 
 * Fixes an issue where `pod repo update` may start an un-committed merge.  
-  [Kyle Fuller][kylef]
+  [Kyle Fuller](https://github.com/kylef)
   [#2024](https://github.com/CocoaPods/CocoaPods/issues/2024)
 
 ## 0.32.1
@@ -318,7 +417,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
     [CocoaPods#2005](https://github.com/CocoaPods/CocoaPods/issues/2005)
   * The linter no longer considers empty a Specification if it only specifies the
     `resource_bundle` attribute.  
-    [Joshua Kalpin][Kapin]
+    [Joshua Kalpin](https://github.com/Kapin)
     [#63](https://github.com/CocoaPods/Core/issues/63)
     [#95](https://github.com/CocoaPods/Core/pull/95)
 
@@ -2567,8 +2666,3 @@ allowing you to automate Xcode related tasks.
 [5]: https://github.com/tomaz/appledoc
 [6]: https://github.com/CocoaPods/CocoaPods/compare/0.5.1...0.6.0
 [7]: https://github.com/CocoaPods/CocoaPods/compare/0.3.10...0.5.0
-
-[kylef]: (https://github.com/kylef)
-[neonichu]: (https://github.com/neonichu)
-[mrackwitz]: https://github.com/mrackwitz
-[k0nserv]: https://github.com/k0nserv

data/lib/cocoapods/command/init.rb

@@ -59,7 +59,7 @@ module Pod
           # Uncomment this line to define a global platform for your project
           # platform :ios, "6.0"
 
-          source 'master'
+          source '#{Command::Setup.read_only_url}'
         PLATFORM
 
         project.targets.each do |target|

data/lib/cocoapods/command/repo.rb

@@ -9,6 +9,7 @@ module Pod
       # @todo should not show a usage banner!
       #
       self.summary = 'Manage spec-repositories'
+      self.default_subcommand = 'list'
 
       class Add < Repo
         self.summary = 'Add a spec repo.'
@@ -185,12 +186,137 @@ module Pod
         end
       end
 
+      #-----------------------------------------------------------------------#
+
+      class List < Repo
+        self.summary = 'List repos'
+
+        self.description = <<-DESC
+            List the repos from the local spec-repos directory at `~/.cocoapods/repos/.`
+        DESC
+
+        def self.options
+          [["--count-only", "Show the total number of repos"]].concat(super)
+        end
+
+        def initialize(argv)
+          @count_only = argv.flag?('count-only')
+          super
+        end
+
+        # @output  Examples:
+        #
+        #          master
+        #          - type: git (origin)
+        #          - URL:  https://github.com/CocoaPods/Specs.git
+        #          - path: /Users/lascorbe/.cocoapods/repos/master
+        #
+        #          test
+        #          - type: local copy
+        #          - path: /Users/lascorbe/.cocoapods/repos/test
+        #
+        def run
+          sources = SourcesManager.all
+          print_sources(sources) unless @count_only
+          print_count_of_sources(sources)
+        end
+
+        private
+
+        # Pretty-prints the source at the given path.
+        #
+        # @param  [String,Pathname] path
+        #         The path of the source to be printed.
+        #
+        # @return [void]
+        #
+        def print_source_at_path(path)
+          Dir.chdir(path) do
+            if SourcesManager.git_repo?(path)
+              remote_name = branch_remote_name(branch_name)
+              if remote_name
+                UI.puts "- Type: git (#{remote_name})"
+                url = url_of_git_repo(remote_name)
+                UI.puts "- URL:  #{url}"
+              else
+                UI.puts "- Type: git (no remote information available)"
+              end
+            else
+              UI.puts "- Type: local copy"
+            end
+            UI.puts "- Path: #{path}"
+          end
+        end
+
+        # Pretty-prints the given sources.
+        #
+        # @param  [Array<Source>] sources
+        #         The sources that should be printed.
+        #
+        # @return [void]
+        #
+        def print_sources(sources)
+          sources.each do |source|
+            UI.title source.name do
+              print_source_at_path source.data_provider.repo
+            end
+          end
+          UI.puts "\n"
+        end
+
+        # Pretty-prints the number of sources.
+        #
+        # @param  [Array<Source>] sources
+        #         The sources whose count should be printed.
+        #
+        # @return [void]
+        #
+        def print_count_of_sources(sources)
+          number_of_repos = sources.length
+          repo_string = number_of_repos != 1 ? 'repos' : 'repo'
+          UI.puts "#{number_of_repos} #{repo_string}".green
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
       extend Executable
       executable :git
 
       def dir
         config.repos_dir + @name
       end
+
+      # Returns the branch name (i.e. master).
+      #
+      # @return [String] The name of the current branch.
+      #
+      def branch_name
+        `git name-rev --name-only HEAD`.strip
+      end
+
+      # Returns the branch remote name (i.e. origin).
+      #
+      # @param  [#to_s] branch_name
+      #         The branch name to look for the remote name.
+      #
+      # @return [String] The given branch's remote name.
+      #
+      def branch_remote_name(branch_name)
+        `git config branch.#{branch_name}.remote`.strip
+      end
+
+      # Returns the url of the given remote name
+      # (i.e. git@github.com:CocoaPods/Specs.git).
+      #
+      # @param  [#to_s] remote_name
+      #         The branch remote name to look for the url.
+      #
+      # @return [String] The URL of the given remote.
+      #
+      def url_of_git_repo(remote_name)
+        `git config remote.#{remote_name}.url`.strip
+      end
     end
   end
 end

data/lib/cocoapods/command/setup.rb

@@ -116,18 +116,18 @@ module Pod
       #         be enabled.
       #
       def url
-        push? ? read_write_url : read_only_url
+        push? ? self.class.read_write_url : self.class.read_only_url
       end
 
       # @return [String] the read only url of the master repo.
       #
-      def read_only_url
+      def self.read_only_url
         'https://github.com/CocoaPods/Specs.git'
       end
 
       # @return [String] the read-write url of the master repo.
       #
-      def read_write_url
+      def self.read_write_url
         'git@github.com:CocoaPods/Specs.git'
       end
 
@@ -146,7 +146,7 @@ module Pod
         return false unless master_repo_dir.exist?
         Dir.chdir(master_repo_dir) do
           url = git('config --get remote.origin.url')
-          url.chomp == read_write_url
+          url.chomp == self.class.read_write_url
         end
       end
 

data/lib/cocoapods/command/spec.rb

@@ -426,7 +426,9 @@ module Pod
 
       def github_data_for_template(repo_id)
         repo = GitHub.repo(repo_id)
+        raise Informative, "Unable to fetch data for `#{repo_id}`" unless repo
         user = GitHub.user(repo['owner']['login'])
+        raise Informative, "Unable to fetch data for `#{repo['owner']['login']}`" unless user
         data = {}
 
         data[:name]          = repo['name']

data/lib/cocoapods/external_sources/path_source.rb

@@ -16,7 +16,7 @@ module Pod
             raise Informative, "No podspec found for `#{name}` in " \
               "`#{declared_path}`"
           end
-          store_podspec(sandbox, podspec)
+          store_podspec(sandbox, podspec, podspec.extname == '.json')
           is_absolute = absolute?(declared_path)
           sandbox.store_local_path(name, podspec.dirname, is_absolute)
         end
@@ -42,7 +42,8 @@ module Pod
       # @return [Pathname] The absolute path of the podspec.
       #
       def podspec_path
-        Pathname(normalized_podspec_path(declared_path))
+        path = Pathname(normalized_podspec_path(declared_path))
+        path.exist? ? path : Pathname("#{path}.json")
       end
 
       # @return [Bool]

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/acknowledgements/plist.rb

@@ -36,8 +36,8 @@ module Pod
         if (license = license_text(spec))
           {
             :Type => 'PSGroupSpecifier',
-            :Title => spec.name,
-            :FooterText => license,
+            :Title => sanitize_encoding(spec.name),
+            :FooterText => sanitize_encoding(license),
           }
         end
       end
@@ -45,18 +45,42 @@ module Pod
       def header_hash
         {
           :Type => 'PSGroupSpecifier',
-          :Title => header_title,
-          :FooterText => header_text,
+          :Title => sanitize_encoding(header_title),
+          :FooterText => sanitize_encoding(header_text),
         }
       end
 
       def footnote_hash
         {
           :Type => 'PSGroupSpecifier',
-          :Title => footnote_title,
-          :FooterText => footnote_text,
+          :Title => sanitize_encoding(footnote_title),
+          :FooterText => sanitize_encoding(footnote_text),
         }
       end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # !@group Private methods
+
+      # Returns the sanitized text with UTF-8 eliminating invalid characters if
+      # Ruby version >=1.9 else will return the text.
+      #
+      # @param  [String] text
+      #         the text we want to sanitize.
+      #
+      # @return [String] The sanitized text if Ruby >=1.9 else text.
+      #
+      def sanitize_encoding(text)
+        if RUBY_VERSION >= '1.9'
+          text.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => '')
+        else
+          text
+        end
+      end
+
+      #-----------------------------------------------------------------------#
     end
   end
 end

data/lib/cocoapods/installer.rb

@@ -95,7 +95,7 @@ module Pod
     end
 
     def prepare
-      UI.section 'Preparing' do
+      UI.message 'Preparing' do
         sandbox.prepare
         Migrator.migrate(sandbox)
       end

data/lib/cocoapods/installer/analyzer.rb

@@ -94,7 +94,7 @@ module Pod
       #
       attr_accessor :update
 
-      # @return [Bool] Whether the version of the dependencies which did non
+      # @return [Bool] Whether the version of the dependencies which did not
       #         change in the Podfile should be locked.
       #
       def update_mode?
@@ -169,7 +169,7 @@ module Pod
       def update_repositories_if_needed
         unless config.skip_repo_update?
           UI.section 'Updating spec repositories' do
-            SourcesManager.update
+            sources.each { |source| SourcesManager.update(source.name) }
           end
         end
       end
@@ -318,12 +318,6 @@ module Pod
       def resolve_dependencies
         specs_by_target = nil
         UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
-          if podfile.sources.empty?
-            sources = SourcesManager.master
-          else
-            sources = SourcesManager.sources(podfile.sources)
-          end
-
           resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
           specs_by_target = resolver.resolve
         end
@@ -367,6 +361,33 @@ module Pod
 
       private
 
+      # Returns the sources used to query for specifications
+      #
+      # @note Currently, this defaults to {SourcesManager.all} when no
+      #       Podfile sources are defined, but this implicit declaration of
+      #       sources is deprecated.
+      #
+      # @return [Array<Source>] the sources to be used in finding
+      #         specifications, as specified by the {#podfile}.
+      #
+      def sources
+        @sources ||= begin
+          sources = podfile.sources
+          if sources.empty?
+            SourcesManager.all.tap do |all|
+              UI.warn all.reduce("The use of implicit sources has been " \
+                "deprecated. To continue using all of the sources currently " \
+                "on your machine, add the following to the top of your " \
+                "Podfile:\n") { |w, s| w << "\n    source '#{s.url}'" } + "\n"
+            end
+          else
+            sources.map do |url|
+              SourcesManager.find_or_create_source_with_url(url)
+            end
+          end
+        end
+      end
+
       # @!group Analysis sub-steps
 
       # Returns the path of the user project that the {TargetDefinition}

data/lib/cocoapods/resolver.rb

@@ -74,7 +74,6 @@ module Pod
         end
       end
 
-      cached_specs.values.sort_by(&:name)
       specs_by_target
     end
 

data/lib/cocoapods/sources_manager.rb

@@ -23,6 +23,37 @@ module Pod
         dirs.map { |repo| Source.new(repo) }
       end
 
+      # 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.
+      #
+      # @raise  If no source with the given `url` could be created,
+      #
+      # @return [Source] The source whose {Source#url} is equal to `url`,
+      #
+      # @param  [String] url
+      #         The URL of the source.
+      #
+      def find_or_create_source_with_url(url)
+        unless source = source_with_url(url)
+          name = name_for_url(url)
+          # Hack to ensure that `repo add` output is shown.
+          previous_title_level = UI.title_level
+          UI.title_level = 0
+          begin
+            Command::Repo::Add.new(CLAide::ARGV.new([name, url])).run
+          rescue Informative => e
+            raise Informative, "Unable to add a source with url `#{url}` " \
+              "named `#{name}`.\nYou can try adding it manually in " \
+              '`~/.cocoapods/repos` or via `pod repo add`.'
+          ensure
+            UI.title_level = previous_title_level
+          end
+          source = source_with_url(url)
+        end
+
+        source
+      end
+
       # @return [Array<Source>] The list of all the sources known to this
       #         installation of CocoaPods.
       #
@@ -31,7 +62,7 @@ module Pod
         dirs.map { |repo| Source.new(repo) }
       end
 
-      # @return [Source] The CocoaPods Master Repo source.
+      # @return [Array<Source>] The CocoaPods Master Repo source.
       #
       def master
         sources(['master'])
@@ -215,7 +246,7 @@ module Pod
           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}`\n".green
+            "To update use: `#{install_message}`".green + "\n"
         end
       end
 
@@ -343,6 +374,57 @@ module Pod
           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
+        aggregate.sources.find { |s| s.url.downcase == url }
+      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
+      #
+      # @param  [#to_s] url
+      #         The URL of the source.
+      #
+      # @return [String] A suitable repository name for `url`.
+      #
+      def name_for_url(url)
+        case url.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
+          url = URI(url.downcase)
+          base = url.host.split('.')[-2] +
+            url.path.gsub(/.git$/, '').split('/').join('-')
+        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
 end

data/lib/cocoapods/user_interface.rb

@@ -170,7 +170,7 @@ module Pod
           end
 
           title(colored_title, '', 1) do
-            puts_indented pod.summary
+            puts_indented pod.summary if pod.summary
             puts_indented "pod '#{pod.name}', '~> #{pod.version}'"
             labeled('Homepage', pod.homepage)
             labeled('Source',   pod.source_url)

data/lib/cocoapods/validator.rb

@@ -325,7 +325,14 @@ module Pod
           UI.puts output
           parsed_output  = parse_xcodebuild_output(output)
           parsed_output.each do |message|
-            if message.include?('error: ')
+            # Checking the error for `InputFile` is to work around an Xcode
+            # issue where linting would fail even though `xcodebuild` actually
+            # succeeds. Xcode.app also doesn't fail when this issue occurs, so
+            # it's safe for us to do the same.
+            #
+            # For more details see https://github.com/CocoaPods/CocoaPods/issues/2394#issuecomment-56658587
+            #
+            if message.include?('error: ') && !message.include?("'InputFile' should have")
               error "[xcodebuild] #{message}"
             else
               note "[xcodebuild] #{message}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.34.0.rc2
+  version: 0.34.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-26 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.0.rc2
+        version: 0.34.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.0.rc2
+        version: 0.34.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.19.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -256,13 +256,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- LICENSE
-- README.md
-- bin/pod
-- bin/sandbox-pod
-- lib/cocoapods.rb
-- lib/cocoapods/command.rb
 - lib/cocoapods/command/init.rb
 - lib/cocoapods/command/inter_process_communication.rb
 - lib/cocoapods/command/lib.rb
@@ -270,64 +263,71 @@ files:
 - lib/cocoapods/command/outdated.rb
 - lib/cocoapods/command/project.rb
 - lib/cocoapods/command/push.rb
-- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/repo/push.rb
+- lib/cocoapods/command/repo.rb
 - lib/cocoapods/command/search.rb
 - lib/cocoapods/command/setup.rb
 - lib/cocoapods/command/spec.rb
+- lib/cocoapods/command.rb
 - lib/cocoapods/config.rb
 - lib/cocoapods/downloader.rb
 - lib/cocoapods/executable.rb
-- lib/cocoapods/external_sources.rb
 - lib/cocoapods/external_sources/abstract_external_source.rb
 - lib/cocoapods/external_sources/downloader_source.rb
 - lib/cocoapods/external_sources/path_source.rb
 - lib/cocoapods/external_sources/podspec_source.rb
+- lib/cocoapods/external_sources.rb
 - lib/cocoapods/gem_version.rb
-- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/acknowledgements/markdown.rb
 - lib/cocoapods/generator/acknowledgements/plist.rb
+- lib/cocoapods/generator/acknowledgements.rb
 - lib/cocoapods/generator/bridge_support.rb
 - lib/cocoapods/generator/copy_resources_script.rb
 - lib/cocoapods/generator/dummy_source.rb
 - lib/cocoapods/generator/prefix_header.rb
 - lib/cocoapods/generator/target_environment_header.rb
-- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/private_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/public_pod_xcconfig.rb
 - lib/cocoapods/generator/xcconfig/xcconfig_helper.rb
+- lib/cocoapods/generator/xcconfig.rb
 - lib/cocoapods/hooks/installer_representation.rb
 - lib/cocoapods/hooks/library_representation.rb
 - lib/cocoapods/hooks/pod_representation.rb
 - lib/cocoapods/hooks_manager.rb
-- lib/cocoapods/installer.rb
-- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/analyzer/sandbox_analyzer.rb
+- lib/cocoapods/installer/analyzer.rb
 - lib/cocoapods/installer/file_references_installer.rb
 - lib/cocoapods/installer/hooks_context.rb
 - lib/cocoapods/installer/migrator.rb
 - lib/cocoapods/installer/pod_source_installer.rb
-- lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/target_installer/aggregate_target_installer.rb
 - lib/cocoapods/installer/target_installer/pod_target_installer.rb
-- lib/cocoapods/installer/user_project_integrator.rb
-- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/target_installer.rb
 - lib/cocoapods/installer/user_project_integrator/target_integrator/xcconfig_integrator.rb
+- lib/cocoapods/installer/user_project_integrator/target_integrator.rb
+- lib/cocoapods/installer/user_project_integrator.rb
+- lib/cocoapods/installer.rb
 - lib/cocoapods/open_uri.rb
 - lib/cocoapods/project.rb
 - lib/cocoapods/resolver.rb
-- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sandbox/file_accessor.rb
 - lib/cocoapods/sandbox/headers_store.rb
 - lib/cocoapods/sandbox/path_list.rb
+- lib/cocoapods/sandbox.rb
 - lib/cocoapods/sources_manager.rb
-- lib/cocoapods/target.rb
 - lib/cocoapods/target/aggregate_target.rb
 - lib/cocoapods/target/pod_target.rb
-- lib/cocoapods/user_interface.rb
+- lib/cocoapods/target.rb
 - lib/cocoapods/user_interface/error_report.rb
+- lib/cocoapods/user_interface.rb
 - lib/cocoapods/validator.rb
+- lib/cocoapods.rb
+- bin/pod
+- bin/sandbox-pod
+- README.md
+- LICENSE
+- CHANGELOG.md
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
@@ -348,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: An Objective-C library package manager.