cocoapods 0.34.4 → 0.35.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f3abb2d3de142a65e9ee1f6f6aa56f207b049ff
-  data.tar.gz: 3c0e8b8c8051aaf81e528ed63b6e2677a4d0ccb9
+  metadata.gz: 0f722fd7a025af675271c7e2e190028e95dfe302
+  data.tar.gz: 147981dc0fd9fd643e8de728c51a046e40e8f3e8
 SHA512:
-  metadata.gz: 12b256248b4daee4938865e5f94fa85df245592b712d4877c8cb4385a81dd22511fcc6789477ad2d0eb760c58c037256f5b87d2b1e16fe8da466e31a483cd889
-  data.tar.gz: fb256b64d4ad70edbefcff2a4c8f37e746c13dfcaf43b75ae95854f05dc4af7e71b13f9b8066dd1a32528a35f69a56aa3f04dac518b0cf6c8a347276509e2658
+  metadata.gz: f669a688c5aecf46ffc90979c34ef0d1fbd52be0c0b474d950955b8d3aa47180d930e208ca316e30d2bde568fe68dbf470f54c6de939c4c1deac5c4be00d113c
+  data.tar.gz: eea96ff3d30d6e05006d5fd31e7e705875b6914a541663b201b3094c333dd297f2a157f8ab853cba61b808570041e35c0ec07a3f3fac4b209559c61d0f32cd10

data/CHANGELOG.md

@@ -2,6 +2,113 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.35.0.rc1
+
+##### Highlighted Enhancements That Need Testing
+
+* The `Resolver` has been completely rewritten to use
+  [Molinillo](https://github.com/CocoaPods/Molinillo), an iterative dependency
+  resolution algorithm that automatically resolves version conflicts.
+  The order in which dependencies are declared in the `Podfile` no longer has
+  any effect on the resolution process.
+
+  You should ensure that `pod install`, `pod update` and `pod update [NAME]`
+  work as expected and install the correct versions of your pods during
+  this RC1 release.
+  [Samuel Giddins](https://github.com/segiddins)
+  [#978](https://github.com/CocoaPods/CocoaPods/issues/978)
+  [#2002](https://github.com/CocoaPods/CocoaPods/issues/2002)
+
+##### Breaking
+
+* Support for older versions of Ruby has been dropped and CocoaPods now depends
+  on Ruby 2.0.0 or greater. This is due to the release of Xcode 6.0 which has
+  dropped support for OS X 10.8, which results in the minimum version of
+  Ruby pre-installed on OS X now being 2.0.0.
+
+  If you are using a custom installation of Ruby  older than 2.0.0, you
+  will need to update. Or even better, migrate to system Ruby.  
+  [Kyle Fuller](https://github.com/kylef)
+
+* Attempts to resolve circular dependencies will now raise an exception.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [Molinillo#6](https://github.com/CocoaPods/Molinillo/issues/6)
+
+##### Enhancements
+
+* The use of implicit sources has been un-deprecated. By default, all available
+  spec-repos will be used. There should only be a need to specify explicit
+  sources if you want to specifically _exclude_ certain spec-repos, such as the
+  `master` spec-repo, if you want to declare the order of spec look-up
+  precedence, or if you want other users of a Podfile to automatically have a
+  spec-repo cloned on `pod install`.  
+  [Eloy Durán](https://github.com/alloy)
+
+* The `pod push` command has been removed as it has been deprecated in favour of
+  `pod repo push` in CocoaPods 0.33.  
+  [Fabio Pelosin](https://github.com/fabiopelosin)
+
+* Refactorings in preparation to framework support, which could break usage
+  of the Hooks API.  
+  [Marius Rackwitz](https://github.com/mrackwitz)
+  [#2461](https://github.com/CocoaPods/CocoaPods/issues/2461)
+
+* Implicit dependencies are now locked, so simply running `pod install` will not
+  cause them to be updated when they shouldn't be.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2318](https://github.com/CocoaPods/CocoaPods/issues/2318)
+  [#2506](https://github.com/CocoaPods/CocoaPods/issues/2506)
+
+* Pre-release versions are only considered in the resolution process when there
+  are dependencies that explicitly reference pre-release requirements.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#1489](https://github.com/CocoaPods/CocoaPods/issues/1489)
+
+* Only setup the master specs repo if required.  
+  [Daniel Tomlinson](https://github.com/DanielTomlinson)
+  [#2562](https://github.com/CocoaPods/CocoaPods/issues/2562)
+
+* `Sandbox::FileAccessor` now optionally includes expanded paths of headers of
+  vendored frameworks in `public_headers`.  
+  [Eloy Durán](https://github.com/alloy)
+  [#2722](https://github.com/CocoaPods/CocoaPods/pull/2722)
+
+* Analysis is now halted and the user informed when there are multiple different
+  external sources for dependencies with the same root name.
+  The user is also now warned when there are duplicate dependencies in the
+  Podfile.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2738](https://github.com/CocoaPods/CocoaPods/issues/2738)
+
+* Multiple subspecs that point to the same external dependency will now only
+  cause that external source to be fetched once.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#2743](https://github.com/CocoaPods/CocoaPods/issues/2743)
+
+##### Bug Fixes
+
+* Fixes an issue in the `XCConfigIntegrator` where not all targets that need
+  integration were being integrated, but were getting incorrect warnings about
+  the user having specified a custom base configuration.  
+  [Eloy Durán](https://github.com/alloy)
+  [2752](https://github.com/CocoaPods/CocoaPods/issues/2752)
+
+* Do not try to clone spec-repos in `/`.  
+  [Eloy Durán](https://github.com/alloy)
+  [#2723](https://github.com/CocoaPods/CocoaPods/issues/2723)
+
+* Improved sanitizing of configuration names which have a numeric prefix.  
+  [Steffen Matthischke](https://github.com/HeEAaD)
+  [#2700](https://github.com/CocoaPods/CocoaPods/pull/2700)
+
+* Fixes an issues where headers from a podspec with one platform are exposed to
+  targets with a different platform. The headers are now only exposed to the
+  targets with the same platform.  
+  [Michael Melanson](https://github.com/michaelmelanson)
+  [Kyle Fuller](https://github.com/kylef)
+  [#1249](https://github.com/CocoaPods/CocoaPods/issues/1249)
+
+
 ## 0.34.4
 
 ##### Bug Fixes
@@ -80,7 +187,7 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 * Allow the `Validator` to only use specific sources.
   Allows customizable source for `pod spec lint` and `pod lib lint`,
-  with both defaulting to `master`.  
+  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)

data/bin/pod

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-if RUBY_VERSION > '1.8.7' && Encoding.default_external != Encoding::UTF_8
+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
@@ -30,4 +30,22 @@ end
 STDOUT.sync = true if ENV['CP_STDOUT_SYNC'] == 'TRUE'
 
 require 'cocoapods'
-Pod::Command.run(ARGV)
+
+if profile_filename = ENV['PROFILE']
+  require 'ruby-prof'
+  reporter = case (profile_extname = File.extname(profile_filename))
+  when '.txt'
+    RubyProf::FlatPrinterWithLineNumbers
+  when '.html'
+    RubyProf::GraphHtmlPrinter
+  when '.callgrind'
+    RubyProf::CallTreePrinter
+  else
+    raise "Unknown profiler format indicated by extension: #{profile_extname}"
+  end
+  File.open(profile_filename, 'w') do |io|
+    reporter.new(RubyProf.profile { Pod::Command.run(ARGV) }).print(io)
+  end
+else
+  Pod::Command.run(ARGV)
+end

data/lib/cocoapods.rb

@@ -56,6 +56,7 @@ module Pod
     autoload :BridgeSupport,           'cocoapods/generator/bridge_support'
     autoload :CopyResourcesScript,     'cocoapods/generator/copy_resources_script'
     autoload :DummySource,             'cocoapods/generator/dummy_source'
+    autoload :Header,                  'cocoapods/generator/header'
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :TargetEnvironmentHeader, 'cocoapods/generator/target_environment_header'
     autoload :XCConfig,                'cocoapods/generator/xcconfig'

data/lib/cocoapods/command.rb

@@ -1,5 +1,12 @@
 require 'colored'
 require 'claide'
+require 'molinillo/errors'
+
+module Molinillo
+  class ResolverError
+    include CLAide::InformativeError
+  end
+end
 
 module Pod
   class PlainInformative
@@ -18,9 +25,6 @@ module Pod
     require 'cocoapods/command/spec'
     require 'cocoapods/command/init'
 
-    # TODO: remove
-    require 'cocoapods/command/push'
-
     self.abstract_command = true
     self.command = 'pod'
     self.version = VERSION
@@ -35,14 +39,6 @@ module Pod
       ].concat(super)
     end
 
-    def self.parse(argv)
-      command = super
-      unless SourcesManager.master_repo_functional? || command.is_a?(Setup) || command.is_a?(Repo::Add) || ENV['SKIP_SETUP']
-        Setup.new(CLAide::ARGV.new([])).run
-      end
-      command
-    end
-
     def self.run(argv)
       help! 'You cannot run CocoaPods as root.' if Process.uid == 0
       verify_git_version!
@@ -87,6 +83,16 @@ module Pod
       end
     end
 
+    # Ensure that the master spec repo exists
+    #
+    # @return [void]
+    #
+    def ensure_master_spec_repo_exists!
+      unless SourcesManager.master_repo_functional?
+        Setup.new(CLAide::ARGV.new([])).run
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     include Config::Mixin

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

@@ -106,7 +106,7 @@ module Pod
         #
         def check_repo_status
           clean = Dir.chdir(repo_dir) { `git status --porcelain  2>&1` } == ''
-          raise Informative, "The repo `#{@repo}` is not clean" unless clean
+          raise Informative, "The repo `#{@repo}` at #{UI.path repo_dir} is not clean" unless clean
         end
 
         # Updates the git repo against the remote.

data/lib/cocoapods/command/search.rb

@@ -48,6 +48,7 @@ module Pod
       end
 
       def run
+        ensure_master_spec_repo_exists!
         if @web
           web_search
         else

data/lib/cocoapods/gem_version.rb

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

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

@@ -6,8 +6,7 @@ module Pod
       end
 
       def save_as(path)
-        require 'xcodeproj/ext'
-        Xcodeproj.write_plist(plist, path)
+        Xcodeproj::PlistHelper.write(plist, path)
       end
 
       def plist
@@ -64,20 +63,15 @@ module Pod
 
       # !@group Private methods
 
-      # Returns the sanitized text with UTF-8 eliminating invalid characters if
-      # Ruby version >=1.9 else will return the text.
+      # Returns the sanitized text with UTF-8 invalid characters eliminated.
       #
       # @param  [String] text
       #         the text we want to sanitize.
       #
-      # @return [String] The sanitized text if Ruby >=1.9 else text.
+      # @return [String] The sanitized UTF-8 text.
       #
       def sanitize_encoding(text)
-        if RUBY_VERSION >= '1.9'
-          text.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => '')
-        else
-          text
-        end
+        text.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => '')
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/generator/header.rb

@@ -0,0 +1,75 @@
+module Pod
+  module Generator
+    # Generates a header file.
+    #
+    # According to the platform the header imports `UIKit/UIKit.h` or
+    # `Cocoa/Cocoa.h`.
+    #
+    class Header
+      # @return [Symbol] the platform for which the prefix header will be
+      #         generated.
+      #
+      attr_reader :platform
+
+      # @return [Array<String>] The list of the headers to import.
+      #
+      attr_reader :imports
+
+      # @param  [Symbol] platform
+      #         @see platform
+      #
+      def initialize(platform)
+        @platform = platform
+        @imports = []
+      end
+
+      # Generates the contents of the header according to the platform.
+      #
+      # @note   If the platform is iOS an import call to `UIKit/UIKit.h` is
+      #         added to the top of the prefix header. For OS X `Cocoa/Cocoa.h`
+      #         is imported.
+      #
+      # @return [String]
+      #
+      def generate
+        result = ""
+        result << generate_platform_import_header
+
+        result << "\n"
+
+        imports.each do |import|
+          result << %|#import "#{import}"\n|
+        end
+
+        result
+      end
+
+      # Generates and saves the header to the given path.
+      #
+      # @param  [Pathname] path
+      #         The path where the header should be stored.
+      #
+      # @return [void]
+      #
+      def save_as(path)
+        path.open('w') { |header| header.write(generate) }
+      end
+
+      #-----------------------------------------------------------------------#
+
+      protected
+
+      # Generates the contents of the header according to the platform.
+      #
+      # @note   If the platform is iOS an import call to `UIKit/UIKit.h` is
+      #         added to the top of the header. For OS X `Cocoa/Cocoa.h` is
+      #         imported.
+      #
+      # @return [String]
+      #
+      def generate_platform_import_header
+        "#import #{platform == :ios ? '<UIKit/UIKit.h>' : '<Cocoa/Cocoa.h>'}\n"
+      end
+    end
+  end
+end

data/lib/cocoapods/generator/prefix_header.rb

@@ -6,38 +6,26 @@ module Pod
     # According to the platform the prefix header imports `UIKit/UIKit.h` or
     # `Cocoa/Cocoa.h`.
     #
-    class PrefixHeader
+    class PrefixHeader < Header
       # @return [Array<FileAccessor>] The file accessors for which to generate
       #         the prefix header.
       #
       attr_reader :file_accessors
 
-      # @return [Platform] the platform for which the prefix header will be
-      #         generated.
+      # @param  [Array<FileAccessor>] file_accessors
+      #         @see file_accessors
       #
-      attr_reader :platform
-
-      # @return [Array<String>] The list of the headers to import (with
-      #         quotes).
-      #
-      attr_reader :imports
-
-      # @param  [Platform] platform     @see platform
-      # @param  [Array<LocalPod>] consumers  @see consumers
+      # @param  [Platform] platform
+      #         @see platform
       #
       def initialize(file_accessors, platform)
         @file_accessors = file_accessors
-        @platform = platform
-        @imports = []
+        super platform
       end
 
       # Generates the contents of the prefix header according to the platform
       # and the pods.
       #
-      # @note   If the platform is iOS an import call to `UIKit/UIKit.h` is
-      #         added to the top of the prefix header. For OS X `Cocoa/Cocoa.h`
-      #         is imported.
-      #
       # @note   Only unique prefix_header_contents are added to the prefix
       #         header.
       #
@@ -48,20 +36,12 @@ module Pod
       #         file_accessor.prefix_header.
       #
       def generate
-        result =  "#ifdef __OBJC__\n"
-        result << "#import #{platform == :ios ? '<UIKit/UIKit.h>' : '<Cocoa/Cocoa.h>'}\n"
-        result << "#endif\n"
-
-        imports.each do |import|
-          result << %(\n#import "#{import}")
-        end
+        result = super
 
         unique_prefix_header_contents = file_accessors.map do |file_accessor|
           file_accessor.spec_consumer.prefix_header_contents
         end.compact.uniq
 
-        result << "\n"
-
         unique_prefix_header_contents.each do |prefix_header_contents|
           result << prefix_header_contents
           result << "\n"
@@ -75,15 +55,16 @@ module Pod
         result
       end
 
-      # Generates and saves the prefix header to the given path.
-      #
-      # @param  [Pathname] path
-      #         the path where the prefix header should be stored.
+      protected
+
+      # Generates the contents of the header according to the platform.
       #
-      # @return [void]
+      # @return [String]
       #
-      def save_as(path)
-        path.open('w') { |header| header.write(generate) }
+      def generate_platform_import_header
+        result =  "#ifdef __OBJC__\n"
+        result << super
+        result << "#endif\n"
       end
     end
   end