cocoapods 0.35.0.rc2 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 195891db68a277163d28c78e08b75e0ddfc852bd
-  data.tar.gz: 8c79a991661ebff9f5b1c363e1234becd3ab78f8
+  metadata.gz: ddc8b79f35ff52c1e7bea24f5f20c7f2e1c9008c
+  data.tar.gz: 935b3efb59e8d0bfbc7b0e1fcd8b391e2d1dfb54
 SHA512:
-  metadata.gz: 29c891e01ead5efc883d6521ef5ea6071d8dc5877fe2a8130f56ce7bce50e0f8d87b7cb1562508eec984457e805c36da25e32dc1eb934e35bee6b268cbb4ba02
-  data.tar.gz: cf21e26e241ca8060c16be2ecc74e19c6e134803b0a1b141de382f450e593a5cb60597c41fa15a9b83960734e48a9c0ff023ec2e39d36058aecceceedc5f81e9
+  metadata.gz: da671838317175baf103a1cc34467b2ee641f8d4fae9ce7a7e7fd59696854bd1023e7b6cd19f9c1695fd25a0d6a0f1944775454ed2c6fcceffcc43715fa569e4
+  data.tar.gz: 5b80c94fdee8e54e23989e44fd39f56c24eec9275d81a9dadae523e8388eb544417ad579bf6037ffeb66579fbc07d2d3490965bc043da0598c3f44c829456325

data/CHANGELOG.md

@@ -4,6 +4,74 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.35.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.34.4...0.35.0)
+• [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/0.34.4...0.35.0)
+• [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.19.4...0.20.2)
+• [cocoapods-downloader](https://github.com/CocoaPods/cocoapods-downloader/compare/0.7.2...0.8.0)
+
+##### Enhancements
+
+* Allow the specification of file patterns for the Podspec's `requires_arc`
+  attribute.  
+  [Kyle Fuller](https://github.com/kylef)
+  [Samuel Giddins](https://github.com/segiddins)
+  [#532](https://github.com/CocoaPods/CocoaPods/issues/532)
+
+* From now on, pods installed directly from their repositories will be recorded
+  in the `Podfile.lock` file and will be guaranteed to be checked-out using the
+  same revision on subsequent installations. Examples of this are when using
+  the `:git`, `:svn`, or `:hg` options in your `Podfile`.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#1058](https://github.com/CocoaPods/CocoaPods/issues/1058)
+
+##### Bug Fixes
+
+* Fix an output formatting issue with various commands like `pod search`
+  and `pod trunk`.
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [#2603](https://github.com/CocoaPods/CocoaPods/issues/2603)
+
+* Show a helpful error message if the old resolver incorrectly activated a
+  pre-release version that now leads to a version conflict.  
+  [Samuel Giddins](https://github.com/segiddins)
+
+* Provides a user friendly message when using `pod spec create` with a
+  repository that doesn't yet have any commits.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2803](https://github.com/CocoaPods/CocoaPods/issues/2803)
+
+* Fixes an issue with integrating into projects where there is a slash in the
+  build configuration name.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2767](https://github.com/CocoaPods/CocoaPods/issues/2767)
+
+* Pods will use `CLANG_ENABLE_OBJC_ARC = 'YES'` instead of
+  `CLANG_ENABLE_OBJC_ARC = 'NO'`. For pods with `requires_arc = false` the
+  `-fno-objc-arc` flag will be specified for the all source files.  
+  [Hugo Tunius](https://github.com/K0nserv)
+  [#2262](https://github.com/CocoaPods/CocoaPods/issues/2262)
+
+* Fixed an issue that Core Data mapping models where not compiled when
+  copying resources to main application bundle.  
+  [Yan Rabovik](https://github.com/rabovik)
+
+##### Enhancements
+
+* `pod search`, `pod spec which`, `pod spec cat` and `pod spec edit`
+  now use plain text search by default instead of a regex. Especially
+  `pod search UIView+UI` now searches for pods containing exactly `UIView+UI`
+  in their name, not trying to interpret the `+` as a regular expression.
+  _Note: You can still use a regular expression with the new `--regex` flag that has
+  been added to these commands, e.g. `pod search --regex "(NS|UI)Color"`._
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [Core#188](https://github.com/CocoaPods/Core/issues/188)
+
+* Use `--allow-warnings` rather than `--error-only` for pod spec validation
+  [Daniel Tomlinson](https://github.com/DanielTomlinson)
+  [#2820](https://github.com/CocoaPods/CocoaPods/issues/2820)
+
 ## 0.35.0.rc2
 
 ##### Enhancements

data/README.md

@@ -28,8 +28,8 @@ Lovingly sponsored by [Fingertips](http://www.fngtps.com),
 
 ## Collaborate
 
-All CocoaPods development happens on GitHub, contributions make good karma and
-we welcome with joy new contributors.
+All CocoaPods development happens on GitHub. Contributions make for good karma and
+we welcome new contributors with joy.
 
 ## Links
 
@@ -39,7 +39,7 @@ we welcome with joy new contributors.
 [@CocoaPods](http://twitter.com/CocoaPods) | Follow CocoaPods on Twitter to stay up to date.
 [Blog](http://blog.cocoapods.org) | The CocoaPods blog.
 [Mailing List](http://groups.google.com/group/cocoapods) | Feel free to ask any kind of question.
-[Documentation](http://docs.cocoapods.org) | Everything you want to know about CocoaPods.
+[Guides](http://guides.cocoapods.org) | Everything you want to know about CocoaPods.
 [Changelog](https://github.com/CocoaPods/CocoaPods/blob/master/CHANGELOG.md) | See the changes introduced in each CocoaPods version.
 [New Pods RSS](http://feeds.cocoapods.org/new-pods.rss) | Don't miss any new Pods.
 
@@ -49,10 +49,10 @@ CocoaPods is composed of the following projects:
 
 | Status | Project | Description | Info |
 | :----- | :------ | :--- | :--- |
-| [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](http://travis-ci.org/CocoaPods/CocoaPods) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [docs](http://docs.cocoapods.org/cocoapods)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/CocoaPods/master.svg?style=flat)](http://travis-ci.org/CocoaPods/CocoaPods) | [CocoaPods](https://github.com/CocoaPods/CocoaPods) | The CocoaPods command line tool. | [guides](http://guides.cocoapods.org)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/Core/master.svg?style=flat)](http://travis-ci.org/CocoaPods/Core) | [CocoaPods Core](https://github.com/CocoaPods/Core) | Support for working with specifications and podfiles. | [docs](http://docs.cocoapods.org/cocoapods_core)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg?style=flat)](http://travis-ci.org/CocoaPods/cocoapods-downloader) |[CocoaPods Downloader](https://github.com/CocoaPods/cocoapods-downloader) |  Downloaders for various source types. |  [docs](http://docs.cocoapods.org/cocoapods_downloader/index.html)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/Xcodeproj/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Xcodeproj) | [Xcodeproj](https://github.com/CocoaPods/Xcodeproj) | Create and modify Xcode projects from Ruby. |  [docs](http://docs.cocoapods.org/xcodeproj/index.html)
 | [![Build Status](http://img.shields.io/travis/CocoaPods/CLAide/master.svg?style=flat)](https://travis-ci.org/CocoaPods/CLAide) | [CLAide](https://github.com/CocoaPods/CLAide) | A small command-line interface framework.  | [docs](http://docs.cocoapods.org/claide/index.html)
+| [![Build Status](http://img.shields.io/travis/CocoaPods/Molinillo/master.svg?style=flat)](https://travis-ci.org/CocoaPods/Molinillo) | [Molinillo](https://github.com/CocoaPods/Molinillo) | A powerful generic dependency resolver.  | [docs](http://www.rubydoc.info/gems/molinillo)
 |  | [Master Repo ](https://github.com/CocoaPods/Specs) | Master repository of specifications. | [guide](http://docs.cocoapods.org/guides/contributing_to_the_master_repo.html)
-

data/bin/pod

@@ -1,20 +1,13 @@
 #!/usr/bin/env ruby
 
 if Encoding.default_external != Encoding::UTF_8
-  puts "\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding."
-  if ENV['TRAVIS']
-    puts <<-DOC
-Consider adding the following settings to .travis.yml
+  puts <<-DOC
+\e[33mWARNING: CocoaPods requires your terminal to be using UTF-8 encoding.
+Consider adding the following to ~/.profile:
 
-before_script:
-  - export LANG=en_US.UTF-8\e[0m\n
-    DOC
-  else
-    puts <<-DOC
-See https://github.com/CocoaPods/guides.cocoapods.org/issues/26 for
-possible solutions.\e[0m\n
-    DOC
-  end
+export LANG=en_US.UTF-8
+\e[0m
+DOC
 end
 
 if $PROGRAM_NAME == __FILE__ && !ENV['COCOAPODS_NO_BUNDLER']

data/lib/cocoapods/command/init.rb

@@ -58,8 +58,6 @@ module Pod
         podfile << <<-PLATFORM.strip_heredoc
           # Uncomment this line to define a global platform for your project
           # platform :ios, '6.0'
-
-          source '#{Command::Setup.read_only_url}'
         PLATFORM
 
         project.targets.each do |target|

data/lib/cocoapods/command/lib.rb

@@ -109,23 +109,23 @@ module Pod
 
         def self.options
           [['--quick',       'Lint skips checks that would require to download and build the spec'],
-           ['--only-errors', 'Lint validates even if warnings are present'],
+           ['--allow-warnings', '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'],
+           ['--no-clean', 'Lint leaves the build directory intact for inspection'],
            ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
         end
 
         def initialize(argv)
-          @quick        = argv.flag?('quick')
-          @only_errors  = argv.flag?('only-errors')
-          @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!
+          @quick           = argv.flag?('quick')
+          @allow_warnings  = argv.flag?('allow-warnings')
+          @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
 
@@ -137,13 +137,13 @@ module Pod
           UI.puts
           podspecs_to_lint.each do |podspec|
 
-            validator             = Validator.new(podspec, @source_urls)
-            validator.local       = true
-            validator.quick       = @quick
-            validator.no_clean    = !@clean
-            validator.only_errors = @only_errors
-            validator.no_subspecs = !@subspecs || @only_subspec
-            validator.only_subspec = @only_subspec
+            validator                = Validator.new(podspec, @source_urls)
+            validator.local          = true
+            validator.quick          = @quick
+            validator.no_clean       = !@clean
+            validator.allow_warnings = @allow_warnings
+            validator.no_subspecs    = !@subspecs || @only_subspec
+            validator.only_subspec   = @only_subspec
             validator.validate
 
             unless @clean

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

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

data/lib/cocoapods/command/search.rb

@@ -15,6 +15,7 @@ module Pod
 
       def self.options
         [
+          ['--regex', 'Interpret the `QUERY` as a regular expression'],
           ['--full',  'Search by name, summary, and description'],
           ['--stats', 'Show additional stats (like GitHub watchers and forks)'],
           ['--ios',   'Restricts the search to Pods supported on iOS'],
@@ -24,6 +25,7 @@ module Pod
       end
 
       def initialize(argv)
+        @use_regex = argv.flag?('regex')
         @full_text_search = argv.flag?('full')
         @stats = argv.flag?('stats')
         @supported_on_ios = argv.flag?('ios')
@@ -38,7 +40,7 @@ module Pod
         super
         help! 'A search query is required.' unless @query
 
-        unless @web
+        unless @web || !@use_regex
           begin
             /#{@query.join(' ').strip}/
           rescue RegexpError
@@ -71,7 +73,10 @@ module Pod
       end
 
       def local_search
-        sets = SourcesManager.search_by_name(@query.join(' ').strip, @full_text_search)
+        query_regex = @query.join(' ').strip
+        query_regex = Regexp.escape(query_regex) unless @use_regex
+
+        sets = SourcesManager.search_by_name(query_regex, @full_text_search)
         if @supported_on_ios
           sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:ios) }
         end

data/lib/cocoapods/command/spec.rb

@@ -63,23 +63,23 @@ module Pod
         ]
 
         def self.options
-          [['--quick',       'Lint skips checks that would require to download and build the spec'],
-           ['--only-errors', 'Lint validates even if warnings are present'],
+          [['--quick', 'Lint skips checks that would require to download and build the spec'],
+           ['--allow-warnings', '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'],
+           ['--no-clean', 'Lint leaves the build directory intact for inspection'],
            ['--sources=https://github.com/artsy/Specs', 'The sources from which to pull dependant pods ' \
             '(defaults to https://github.com/CocoaPods/Specs.git). '\
             'Multiple sources must be comma-delimited.']].concat(super)
         end
 
         def initialize(argv)
-          @quick        = argv.flag?('quick')
-          @only_errors  = argv.flag?('only-errors')
-          @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(',')
+          @quick           = argv.flag?('quick')
+          @allow_warnings  = argv.flag?('allow-warnings')
+          @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
@@ -88,12 +88,12 @@ module Pod
           UI.puts
           invalid_count = 0
           podspecs_to_lint.each do |podspec|
-            validator             = Validator.new(podspec, @source_urls)
-            validator.quick       = @quick
-            validator.no_clean    = !@clean
-            validator.only_errors = @only_errors
-            validator.no_subspecs = !@subspecs || @only_subspec
-            validator.only_subspec = @only_subspec
+            validator                = Validator.new(podspec, @source_urls)
+            validator.quick          = @quick
+            validator.no_clean       = !@clean
+            validator.allow_warnings = @allow_warnings
+            validator.no_subspecs    = !@subspecs || @only_subspec
+            validator.only_subspec   = @only_subspec
             validator.validate
             invalid_count += 1 unless validator.validated?
 
@@ -118,29 +118,28 @@ module Pod
 
         def podspecs_to_lint
           @podspecs_to_lint ||= begin
-          files = []
-          @podspecs_paths << '.' if @podspecs_paths.empty?
-          @podspecs_paths.each do |path|
-            if path =~ /https?:\/\//
-              require 'open-uri'
-              output_path = podspecs_tmp_dir + File.basename(path)
-              output_path.dirname.mkpath
-              open(path) do |io|
-                output_path.open('w') { |f| f << io.read }
+            files = []
+            @podspecs_paths << '.' if @podspecs_paths.empty?
+            @podspecs_paths.each do |path|
+              if path =~ /https?:\/\//
+                require 'open-uri'
+                output_path = podspecs_tmp_dir + File.basename(path)
+                output_path.dirname.mkpath
+                open(path) do |io|
+                  output_path.open('w') { |f| f << io.read }
+                end
+                files << output_path
+              elsif (pathname = Pathname.new(path)).directory?
+                files += Pathname.glob(pathname + '**/*.podspec{.json,}')
+                raise Informative, 'No specs found in the current directory.' if files.empty?
+              else
+                files << (pathname = Pathname.new(path))
+                raise Informative, "Unable to find a spec named `#{path}'." unless pathname.exist? && path.include?('.podspec')
               end
-              files << output_path
-            else if (pathname = Pathname.new(path)).directory?
-                   files += Pathname.glob(pathname + '**/*.podspec{.json,}')
-                   raise Informative, 'No specs found in the current directory.' if files.empty?
-            else
-              files << (pathname = Pathname.new(path))
-              raise Informative, "Unable to find a spec named `#{path}'." unless pathname.exist? && path.include?('.podspec')
             end
+            files
           end
-          end
-          files
         end
-      end
 
         def podspecs_tmp_dir
           Pathname(File.join(Pathname.new('/tmp').realpath, '/CocoaPods/Lint_podspec'))
@@ -153,33 +152,37 @@ module Pod
         self.summary = 'Prints the path of the given spec.'
 
         self.description = <<-DESC
-          Prints the path of 'NAME.podspec'
+          Prints the path of the .podspec file(s) whose name matches `QUERY`
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('NAME', false),
+          CLAide::Argument.new('QUERY', false),
         ]
 
         def self.options
           [
+            ['--regex', 'Interpret the `QUERY` as a regular expression'],
             ['--show-all', 'Print all versions of the given podspec'],
           ].concat(super)
         end
 
         def initialize(argv)
+          @use_regex = argv.flag?('regex')
           @show_all = argv.flag?('show-all')
-          @spec = argv.shift_argument
-          @spec = @spec.gsub('.podspec', '') unless @spec.nil?
+          @query = argv.shift_argument
+          @query = @query.gsub('.podspec', '') unless @query.nil?
           super
         end
 
         def validate!
           super
-          help! 'A podspec name is required.' unless @spec
+          help! 'A podspec name is required.' unless @query
+          validate_regex!(@query) if @use_regex
         end
 
         def run
-          UI.puts get_path_of_spec(@spec, @show_all)
+          query = @use_regex ? @query : Regexp.escape(@query)
+          UI.puts get_path_of_spec(query, @show_all)
         end
       end
 
@@ -189,37 +192,43 @@ module Pod
         self.summary = 'Prints a spec file.'
 
         self.description = <<-DESC
-          Prints 'NAME.podspec' to standard output.
+          Prints the content of the podspec(s) whose name matches `QUERY` to standard output.
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('NAME', false),
+          CLAide::Argument.new('QUERY', false),
         ]
 
         def self.options
-          [['--show-all', 'Pick from all versions of the given podspec']].concat(super)
+          [
+            ['--regex', 'Interpret the `QUERY` as a regular expression'],
+            ['--show-all', 'Pick from all versions of the given podspec']
+          ].concat(super)
         end
 
         def initialize(argv)
+          @use_regex = argv.flag?('regex')
           @show_all = argv.flag?('show-all')
-          @spec = argv.shift_argument
-          @spec = @spec.gsub('.podspec', '') unless @spec.nil?
+          @query = argv.shift_argument
+          @query = @query.gsub('.podspec', '') unless @query.nil?
           super
         end
 
         def validate!
           super
-          help! 'A podspec name is required.' unless @spec
+          help! 'A podspec name is required.' unless @query
+          validate_regex!(@query) if @use_regex
         end
 
         def run
+          query = @use_regex ? @query : Regexp.escape(@query)
           filepath = if @show_all
-                       specs = get_path_of_spec(@spec, @show_all).split(/\n/)
+                       specs = get_path_of_spec(query, @show_all).split(/\n/)
                        index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
                        specs[index]
-          else
-            get_path_of_spec(@spec)
-          end
+                     else
+                       get_path_of_spec(query)
+                     end
 
           UI.puts File.read(filepath)
         end
@@ -231,38 +240,43 @@ module Pod
         self.summary = 'Edit a spec file.'
 
         self.description = <<-DESC
-          Opens 'NAME.podspec' to be edited.
+          Opens the podspec matching `QUERY` to be edited.
         DESC
 
         self.arguments = [
-          CLAide::Argument.new('NAME', false),
+          CLAide::Argument.new('QUERY', false),
         ]
 
         def self.options
-          [['--show-all', 'Pick which spec to edit from all available' \
-            'versions of the given podspec']].concat(super)
+          [
+            ['--regex', 'Interpret the `QUERY` as a regular expression'],
+            ['--show-all', 'Pick from all versions of the given podspec']
+          ].concat(super)
         end
 
         def initialize(argv)
+          @use_regex = argv.flag?('regex')
           @show_all = argv.flag?('show-all')
-          @spec = argv.shift_argument
-          @spec = @spec.gsub('.podspec', '') unless @spec.nil?
+          @query = argv.shift_argument
+          @query = @query.gsub('.podspec', '') unless @query.nil?
           super
         end
 
         def validate!
           super
-          help! 'A podspec name is required.' unless @spec
+          help! 'A podspec name is required.' unless @query
+          validate_regex!(@query) if @use_regex
         end
 
         def run
+          query = @use_regex ? @query : Regexp.escape(@query)
           if @show_all
-            specs = get_path_of_spec(@spec, @show_all).split(/\n/)
+            specs = get_path_of_spec(query, @show_all).split(/\n/)
             message = "Which spec would you like to edit [1-#{specs.count}]? "
             index = choose_from_array(specs, message)
             filepath = specs[index]
           else
-            filepath = get_path_of_spec(@spec)
+            filepath = get_path_of_spec(query)
           end
 
           exec_editor(filepath.to_s) if File.exist? filepath
@@ -311,6 +325,16 @@ module Pod
 
       private
 
+      # @param [String] query the regular expression string to validate
+      #
+      # @raise if the query is not a valid regular expression
+      #
+      def validate_regex!(query)
+        /#{query}/
+      rescue RegexpError
+        help! 'A valid regular expression is required.'
+      end
+
       # @return [Fixnum] the index of the chosen array item
       #
       def choose_from_array(array, message)
@@ -458,6 +482,7 @@ module Pod
           branches        = GitHub.branches(repo['html_url'])
           master_name     = repo['master_branch'] || 'master'
           master          = branches.find { |branch| branch['name'] == master_name }
+          raise Informative, "Unable to find any commits on the master branch for the repository `#{repo['html_url']}`" unless master
           data[:ref_type] = ':commit'
           data[:ref]      = master['commit']['sha']
         else

data/lib/cocoapods/external_sources.rb

@@ -13,9 +13,11 @@ module Pod
     #         hash.
     #
     def self.from_dependency(dependency, podfile_path)
-      name   = dependency.root_name
-      params = dependency.external_source
+      from_params(dependency.external_source, dependency, podfile_path)
+    end
 
+    def self.from_params(params, dependency, podfile_path)
+      name = dependency.root_name
       if klass = concrete_class_from_params(params)
         klass.new(name, params, podfile_path)
       else

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -110,6 +110,10 @@ install_resource()
       echo "xcrun momc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\\""
       xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd"
       ;;
+    *.xcmappingmodel)
+      echo "xcrun mapc \\"${PODS_ROOT}/$1\\" \\"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\\""
+      xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm"
+      ;;
     *.xcassets)
       ;;
     /*)

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -27,7 +27,7 @@ module Pod
         def self.default_ld_flags(target)
           ld_flags = '-ObjC'
           if target.target_definition.podfile.set_arc_compatibility_flag? &&
-            target.spec_consumers.any?(&:requires_arc?)
+              target.spec_consumers.any?(&:requires_arc?)
             ld_flags << ' -fobjc-arc'
           end
           ld_flags

data/lib/cocoapods/installer.rb

@@ -378,7 +378,7 @@ module Pod
           build_configuration.build_settings['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target.to_s if osx_deployment_target
           build_configuration.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target.to_s if ios_deployment_target
           build_configuration.build_settings['STRIP_INSTALLED_PRODUCT'] = 'NO'
-          build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'NO'
+          build_configuration.build_settings['CLANG_ENABLE_OBJC_ARC'] = 'YES'
         end
       end
     end
@@ -465,8 +465,9 @@ module Pod
     # @return [void]
     #
     def write_lockfiles
-      # checkout_options = sandbox.checkout_options
-      @lockfile = Lockfile.generate(podfile, analysis_result.specifications)
+      external_source_pods = podfile.dependencies.select(&:external_source).map(&:root_name).uniq
+      checkout_options = sandbox.checkout_sources.select { |root_name, _| external_source_pods.include? root_name }
+      @lockfile = Lockfile.generate(podfile, analysis_result.specifications, checkout_options)
 
       UI.message "- Writing Lockfile in #{UI.path config.lockfile_path}" do
         @lockfile.write_to_disk(config.lockfile_path)

data/lib/cocoapods/installer/analyzer.rb

@@ -53,6 +53,7 @@ module Pod
         @result.podfile_state = generate_podfile_state
         @locked_dependencies  = generate_version_locking_dependencies
 
+        store_existing_checkout_options
         fetch_external_sources if allow_fetches
         @result.specs_by_target = resolve_dependencies
         @result.specifications  = generate_specifications
@@ -264,33 +265,81 @@ module Pod
       #
       def fetch_external_sources
         return unless allow_pre_downloads?
-        deps_to_fetch = []
-        deps_to_fetch_if_needed = []
-        deps_with_external_source = podfile.dependencies.select(&:external_source)
 
-        deps_with_different_sources = podfile.dependencies.group_by(&:root_name).select { |_root_name, dependencies| dependencies.map(&:external_source).uniq.count > 1 }
+        verify_no_pods_with_different_sources!
+        unless dependencies_to_fetch.empty?
+          UI.section 'Fetching external sources' do
+            dependencies_to_fetch.sort.each do |dependency|
+              fetch_external_source(dependency, !pods_to_fetch.include?(dependency.name))
+            end
+          end
+        end
+      end
+
+      def verify_no_pods_with_different_sources!
+        deps_with_different_sources = podfile.dependencies.group_by(&:root_name).
+          select { |_root_name, dependencies| dependencies.map(&:external_source).uniq.count > 1 }
         deps_with_different_sources.each do |root_name, dependencies|
-          raise Informative, "There are multiple dependencies with different sources for `#{root_name}` in #{UI.path podfile.defined_in_file}:\n\n- #{dependencies.map(&:to_s).join("\n- ")}"
+          raise Informative, "There are multiple dependencies with different " \
+          "sources for `#{root_name}` in #{UI.path podfile.defined_in_file}:" \
+          "\n\n- #{dependencies.map(&:to_s).join("\n- ")}"
         end
+      end
 
-        if update_mode == :all
-          deps_to_fetch = deps_with_external_source
+      def fetch_external_source(dependency, use_lockfile_options)
+        checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name) if lockfile
+        if checkout_options && use_lockfile_options
+          source = ExternalSources.from_params(checkout_options, dependency, podfile.defined_in_file)
         else
+          source = ExternalSources.from_dependency(dependency, podfile.defined_in_file)
+        end
+        source.fetch(sandbox)
+      end
+
+      def dependencies_to_fetch
+        @deps_to_fetch ||= begin
+          deps_to_fetch = []
+          deps_to_fetch_if_needed = []
+          deps_with_external_source = podfile.dependencies.select(&:external_source)
+
+          if update_mode == :all
+            deps_to_fetch = deps_with_external_source
+          else
+            deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.name) }
+            deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.name) }
+            deps_to_fetch += deps_to_fetch_if_needed.select do |dep|
+              sandbox.specification(dep.name).nil? ||
+                !dep.external_source[:local].nil? ||
+                !dep.external_source[:path].nil? ||
+                !sandbox.pod_dir(dep.root_name).directory? ||
+                checkout_requires_update?(dep)
+            end
+          end
+          deps_to_fetch.uniq(&:root_name)
+        end
+      end
+
+      def checkout_requires_update?(dependency)
+        return true unless lockfile && sandbox.manifest
+        locked_checkout_options = lockfile.checkout_options_for_pod_named(dependency.root_name)
+        sandbox_checkout_options = sandbox.manifest.checkout_options_for_pod_named(dependency.root_name)
+        locked_checkout_options != sandbox_checkout_options
+      end
+
+      def pods_to_fetch
+        @pods_to_fetch ||= begin
           pods_to_fetch = result.podfile_state.added + result.podfile_state.changed
           if update_mode == :selected
             pods_to_fetch += update[:pods]
           end
-          deps_to_fetch = deps_with_external_source.select { |dep| pods_to_fetch.include?(dep.name) }
-          deps_to_fetch_if_needed = deps_with_external_source.select { |dep| result.podfile_state.unchanged.include?(dep.name) }
-          deps_to_fetch += deps_to_fetch_if_needed.select { |dep| sandbox.specification(dep.name).nil? || !dep.external_source[:local].nil? || !dep.external_source[:path].nil? || !sandbox.pod_dir(dep.name).directory? }
+          pods_to_fetch
         end
+      end
 
-        unless deps_to_fetch.empty?
-          UI.section 'Fetching external sources' do
-            deps_to_fetch.uniq(&:root_name).sort.each do |dependency|
-              source = ExternalSources.from_dependency(dependency, podfile.defined_in_file)
-              source.fetch(sandbox)
-            end
+      def store_existing_checkout_options
+        podfile.dependencies.select(&:external_source).each do |dep|
+          if checkout_options = lockfile && lockfile.checkout_options_for_pod_named(dep.root_name)
+            sandbox.store_checkout_source(dep.root_name, checkout_options)
           end
         end
       end

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

@@ -35,12 +35,20 @@ module Pod
       def add_files_to_build_phases
         target.file_accessors.each do |file_accessor|
           consumer = file_accessor.spec_consumer
-          flags = compiler_flags_for_consumer(consumer)
-          all_source_files = file_accessor.source_files
-          regular_source_files = all_source_files.reject { |sf| sf.extname == '.d' }
-          regular_file_refs = regular_source_files.map { |sf| project.reference_for_path(sf) }
-          native_target.add_file_references(regular_file_refs, flags)
-          other_file_refs = (all_source_files - regular_source_files).map { |sf| project.reference_for_path(sf) }
+
+          other_source_files = file_accessor.source_files.select { |sf| sf.extname == '.d' }
+
+          {
+            true => file_accessor.arc_source_files,
+            false => file_accessor.non_arc_source_files,
+          }.each do |arc, files|
+            files = files - other_source_files
+            flags = compiler_flags_for_consumer(consumer, arc)
+            regular_file_refs = files.map { |sf| project.reference_for_path(sf) }
+            native_target.add_file_references(regular_file_refs, flags)
+          end
+
+          other_file_refs = other_source_files.map { |sf| project.reference_for_path(sf) }
           native_target.add_file_references(other_file_refs, nil)
         end
       end
@@ -152,10 +160,11 @@ module Pod
       #
       # @return [String] The compiler flags.
       #
-      def compiler_flags_for_consumer(consumer)
+      def compiler_flags_for_consumer(consumer, arc)
         flags = consumer.compiler_flags.dup
-        if consumer.requires_arc
-          flags << '-fobjc-arc'
+        if !arc
+          flags << '-fno-objc-arc'
+        else
           platform_name = consumer.platform_name
           spec_deployment_target = consumer.spec.deployment_target(platform_name)
           if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name]

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

@@ -102,7 +102,7 @@ module Pod
           frameworks = user_project.frameworks_group
           native_targets_to_integrate.each do |native_target|
             library = frameworks.files.select { |f| f.path == target.product_name }.first ||
-                      frameworks.new_product_ref_for_target(target.name, :static_library)
+              frameworks.new_product_ref_for_target(target.name, :static_library)
             unless native_target.frameworks_build_phase.files_references.include?(library)
               native_target.frameworks_build_phase.add_file_reference(library)
             end

data/lib/cocoapods/open_uri.rb

@@ -18,6 +18,6 @@ module OpenURI
   #
   def self.redirectable?(uri1, uri2)
     uri1.scheme.downcase == uri2.scheme.downcase ||
-    (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
+      (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
   end
 end

data/lib/cocoapods/resolver.rb

@@ -55,7 +55,7 @@ module Pod
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
       specs_by_target
     rescue Molinillo::ResolverError => e
-      raise Informative, e.message
+      handle_resolver_error(e)
     end
 
     # @return [Hash{Podfile::TargetDefinition => Array<Specification>}]
@@ -221,8 +221,6 @@ module Pod
 
     include Molinillo::UI
 
-    include Config::Mixin
-
     # The UI object the resolver should use for displaying user-facing output.
     #
     # @return [UserInterface] the normal CocoaPods UI object.
@@ -231,32 +229,43 @@ module Pod
       UI
     end
 
-    # Called before resolution starts. We print out `Resolving dependencies` in
-    # the analyzer, so here we just want to print out a starting `.` in verbose
-    # mode.
+    # Called before resolution starts.
+    #
+    # Completely silence this, as we show nothing in normal mode and debug
+    # information in verbose mode.
     #
     # @return [Void]
     #
     def before_resolution
-      UI.print '.' if config.verbose
     end
 
-    # Called after resolution ends. We don't want to {#indicate_progress}
-    # unless in verbose mode, so we only use the default implementation then.
+    # Called after resolution ends.
+    #
+    # Completely silence this, as we show nothing in normal mode and debug
+    # information in verbose mode.
     #
     # @return [Void]
     #
     def after_resolution
-      super if config.verbose
     end
 
     # Called during resolution to indicate progress.
-    # We only use the default implementation in verbose mode.
+    #
+    # Completely silence this, as we show nothing in normal mode and debug
+    # information in verbose mode.
     #
     # @return [Void]
     #
     def indicate_progress
-      super if config.verbose
+    end
+
+    # Conveys debug information to the user.
+    # By default, prints to `STDERR` instead of {#output}.
+    #
+    # @param [Integer] depth the current depth of the resolution process.
+    # @return [void]
+    def debug?
+      Config.instance.verbose?
     end
 
     #-------------------------------------------------------------------------#
@@ -360,6 +369,36 @@ module Pod
       end
     end
 
+    # Handles errors that come out of a {Molinillo::Resolver}.
+    #
+    # @todo   The check for version conflicts coming from the {Lockfile}
+    #         requiring a pre-release version can be deleted for version 1.0,
+    #         as it is a migration step for Lockfiles coming from CocoaPods
+    #         versions before `0.35.0`.
+    #
+    # @return [void]
+    #
+    # @param  [Molinillo::ResolverError] error
+    #
+    def handle_resolver_error(error)
+      case error
+      when Molinillo::VersionConflict
+        error.conflicts.each do |name, conflict|
+          lockfile_reqs = conflict.requirements[name_for_locking_dependency_source]
+          if lockfile_reqs && lockfile_reqs.last && lockfile_reqs.last.prerelease? && !conflict.existing
+            raise Informative, 'Due to the previous naïve CocoaPods resolver, ' \
+              "you were using a pre-release version of `#{name}`, " \
+              'without explicitly asking for a pre-release version, which now leads to a conflict. ' \
+              'Please decide to either use that pre-release version by adding the ' \
+              'version requirement to your Podfile ' \
+              "(e.g. `pod '#{name}', '#{lockfile_reqs.map(&:requirement).join("', '")}'`) " \
+              "or revert to a stable version by running `pod update #{name}`."
+          end
+        end
+      end
+      raise Informative, error.message
+    end
+
     # Returns the target-appropriate nodes that are `successors` of `node`,
     # rejecting those that are scoped by target platform and have incompatible
     # targets.

data/lib/cocoapods/sandbox.rb

@@ -64,8 +64,12 @@ module Pod
     # @return [Lockfile] the manifest which contains the information about the
     #         installed pods.
     #
+    attr_accessor :manifest
+
     def manifest
-      Lockfile.from_file(manifest_path) if manifest_path.exist?
+      @manifest ||= begin
+        Lockfile.from_file(manifest_path) if manifest_path.exist?
+      end
     end
 
     # @return [Project] the Pods project.

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -78,6 +78,27 @@ module Pod
         paths_for_attribute(:source_files)
       end
 
+      # @return [Array<Pathname>] the source files of the specification that
+      #                           use ARC.
+      #
+      def arc_source_files
+        case spec_consumer.requires_arc
+        when TrueClass
+          source_files
+        when FalseClass
+          []
+        else
+          paths_for_attribute(:requires_arc) & source_files
+        end
+      end
+
+      # @return [Array<Pathname>] the source files of the specification that
+      #                           do not use ARC.
+      #
+      def non_arc_source_files
+        source_files - arc_source_files
+      end
+
       # @return [Array<Pathname>] the headers of the specification.
       #
       def headers

data/lib/cocoapods/sources_manager.rb

@@ -237,7 +237,7 @@ module Pod
           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.'
+            'Update CocoaPods, or checkout the appropriate tag in the repo.'
         end
 
         needs_sudo = path_writable?(__FILE__)

data/lib/cocoapods/target.rb

@@ -83,7 +83,7 @@ module Pod
     #
     def xcconfig_path(variant = nil)
       if variant
-        support_files_dir + "#{label}.#{variant.downcase}.xcconfig"
+        support_files_dir + "#{label}.#{variant.gsub(File::SEPARATOR, '-').downcase}.xcconfig"
       else
         support_files_dir + "#{label}.xcconfig"
       end

data/lib/cocoapods/user_interface.rb

@@ -191,17 +191,22 @@ module Pod
 
       # Prints a message with a label.
       #
-      def labeled(label, value, justification = 16)
+      def labeled(label, value, justification = 12)
         if value
-          ''.tap do |t|
-            t << "    - #{label}:".ljust(justification)
+          title = "- #{label}:".ljust(justification)
+          output = begin
             if value.is_a?(Array)
-              separator = "\n  - "
-              puts_indented t << separator << value.join(separator)
+              lines = [wrap_string(title, self.indentation_level)]
+              value.each do |v|
+                lines << wrap_string("- #{v}", self.indentation_level + 2)
+              end
+              lines.join("\n")
             else
-              puts_indented t << value.to_s << "\n"
-            end
+              wrap_string(title + "#{value}", self.indentation_level)
+            end + "\n"
           end
+          puts output
+          output
         end
       end
 

data/lib/cocoapods/validator.rb

@@ -131,10 +131,9 @@ module Pod
     attr_accessor :local
     alias_method :local?, :local
 
-    # @return [Bool] Whether the validator should fail only on errors or also
-    #         on warnings.
+    # @return [Bool] Whether the validator should fail on warnings, or only on errors.
     #
-    attr_accessor :only_errors
+    attr_accessor :allow_warnings
 
     # @return [String] name of the subspec to check, if nil all subspecs are checked.
     #
@@ -155,7 +154,7 @@ module Pod
     # @return [Boolean]
     #
     def validated?
-      result_type != :error && (result_type != :warning || only_errors)
+      result_type != :error && (result_type != :warning || allow_warnings)
     end
 
     # @return [Symbol]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.35.0.rc2
+  version: 0.35.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-19 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.35.0.rc2
+        version: 0.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.0.rc2
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -45,28 +45,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.20.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.20.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: cocoapods-plugins
   requirement: !ruby/object:Gem::Requirement
@@ -101,28 +101,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement