cocoapods 0.13.0 → 0.14.0.rc1

data/CHANGELOG.md

@@ -1,17 +1,84 @@
+## Master
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.13.0...0.14.0.rc1) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.1...0.3.2)
+
+###### Enhancements
+
+- Improve installation process by preserving the installed versions of Pods
+  across installations and machines. A Pod is reinstalled if:
+  - the version required in the Podfile changes and becomes incompatible with
+    the installed one.
+    [#191](https://github.com/CocoaPods/CocoaPods/issues/191)
+  - the external source changes.
+  - the head status changes (from disabled to enabled or vice-versa).
+
+- Introduce `pod update` command that installs the dependencies of the Podfile
+  **ignoring** the lockfile `Podfile.lock`.
+  [#131](https://github.com/CocoaPods/CocoaPods/issues/131)
+
+- Introduce `pod outdated` command that shows the pods with known updates.
+
+- Add `:local` option for dependencies which will use the source files directly
+  from a local directory. This is usually used for libraries that are being
+  developed in parallel to the end product (application/library).
+  [#458](https://github.com/CocoaPods/CocoaPods/issues/458),
+  [#415](https://github.com/CocoaPods/CocoaPods/issues/415),
+  [#156](https://github.com/CocoaPods/CocoaPods/issues/156).
+
+- Folders of Pods which are no longer required are removed during installation.
+  [#298](https://github.com/CocoaPods/CocoaPods/issues/298)
+
+- Add meaningful error messages for when:
+  - a podspec can’t be found in the root of an external source.
+    [#385](https://github.com/CocoaPods/CocoaPods/issues/385),
+    [#338](https://github.com/CocoaPods/CocoaPods/issues/338),
+    [#337](https://github.com/CocoaPods/CocoaPods/issues/337).
+  - a subspec name is misspelled.
+    [#327](https://github.com/CocoaPods/CocoaPods/issues/327)
+  - an unrecognized command and/or argument is provided.
+
+- The subversion downloader now does an export instead of a checkout, which
+  makes it play nicer with SCMs that store metadata in each directory.
+  [#245](https://github.com/CocoaPods/CocoaPods/issues/245)
+
+###### Bug fixes
+
+- The git cache now fetches the tags from the remote if it can’t find the
+  reference.
+- Xcodeproj now builds on 10.6.8 and Travis CI without symlinking headers.
+- Only try to install, add source files to the project, and clean a Pod once.
+  [#376](https://github.com/CocoaPods/CocoaPods/issues/376)
+
+###### Notes
+
+- External Pods might be reinstalled due to the migration to the new
+  `Podfile.lock`.
+- The SCM reference of head Pods is not preserved across machines.
+- Pods whose inline specification changed are not detected as modified. As a
+  workaround, remove their folder stored in `Pods`.
+- Pods whose specification changed are not detected as modified. As a
+  workaround, remove their folder stored in `Pods`.
+
+
 ## 0.13.0
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.12.0...0.13.0)
 
 ###### Enhancements
 
-- Add Podfile `podspec` which allows to use the dependencies of a podspec file. [#162](https://github.com/CocoaPods/CocoaPods/issues/162)
-- Check if any of the build settings defined in the xcconfig files is overridden. [#92](https://github.com/CocoaPods/CocoaPods/issues/92)
+- Add Podfile `podspec` which allows to use the dependencies of a podspec file.
+  [#162](https://github.com/CocoaPods/CocoaPods/issues/162)
+- Check if any of the build settings defined in the xcconfig files is
+  overridden. [#92](https://github.com/CocoaPods/CocoaPods/issues/92)
 - The Linter now checks that there are no compiler flags that disable warnings.
 
 ###### Bug fixes
 
-- The final project isn’t affected anymore by the `inhibit_all_warnings!` option.
-- Support for redirects while using podspec from an url. [#462](https://github.com/CocoaPods/CocoaPods/issues/462)
+- The final project isn’t affected anymore by the `inhibit_all_warnings!`
+  option.
+- Support for redirects while using podspec from an url.
+  [#462](https://github.com/CocoaPods/CocoaPods/issues/462)
+
 
 ## 0.12.0
 
@@ -19,14 +86,20 @@
 
 ###### Enhancements
 
-- The documentation is generated using the public headers if they are specified.
-- In case of a download failure the installation is aborted and the error message is shown.
+- The documentation is generated using the public headers if they are
+  specified.
+- In case of a download failure the installation is aborted and the error
+  message is shown.
 - Git submodules are initialized only if requested.
-- Don’t impose a certain structure of the user’s project by raising if no ‘Frameworks’ group exists. [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
+- Don’t impose a certain structure of the user’s project by raising if no
+  ‘Frameworks’ group exists.
+  [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
 - Support for GitHub Gists in the linter.
 - Allow specifying ARC settings in subspecs.
-- Add Podfile `inhibit_all_warnings!` which will inhibit all warnings from the Pods library. [#209](https://github.com/CocoaPods/CocoaPods/issues/209)
-- Make the Pods Xcode project prettier by namespacing subspecs in nested groups. [#466](https://github.com/CocoaPods/CocoaPods/pull/466)
+- Add Podfile `inhibit_all_warnings!` which will inhibit all warnings from the
+  Pods library. [#209](https://github.com/CocoaPods/CocoaPods/issues/209)
+- Make the Pods Xcode project prettier by namespacing subspecs in nested
+  groups. [#466](https://github.com/CocoaPods/CocoaPods/pull/466)
 
 
 ## 0.11.1
@@ -36,7 +109,8 @@
 ###### Bug fixes
 
 - Fixed a crash related to subspecs without header files. [#449]
-- Git submodules are loaded after the appropriate referenced is checked out and will be not loaded anymore in the cache. [#451]
+- Git submodules are loaded after the appropriate referenced is checked out and
+  will be not loaded anymore in the cache. [#451]
 - Fixed SVN support for the head version. [#432]
 
 
@@ -49,7 +123,9 @@
 - Added support for public headers. [#440]
 - Added `pod repo lint`. [#423]
 - Improved support for `:head` option and SVN repositories.
-- When integrating Pods with a project without "Frameworks" group in root of the project, raise an informative message. [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
+- When integrating Pods with a project without "Frameworks" group in root of
+  the project, raise an informative message.
+  [#431](https://github.com/CocoaPods/CocoaPods/pull/431)
 - Dropped support for legacy `config.ios?` and `config.osx?`
 
 ###### Bug fixes
@@ -64,16 +140,21 @@
 
 ###### Enhancements
 
-- Added a `--local-only` option to `pod push` so that developers can push locally and test before pushing to a remote. [#405](http://git.io/0ILJEw)
-- Added line number information for errors generated in the Podfile. [#408](http://git.io/fWQvMg)
-- Pods stored in git repositories now initialize submodules. [#406](http://git.io/L9ssSw)
+- Added a `--local-only` option to `pod push` so that developers can push
+  locally and test before pushing to a remote. [#405](http://git.io/0ILJEw)
+- Added line number information for errors generated in the Podfile.
+  [#408](http://git.io/fWQvMg)
+- Pods stored in git repositories now initialize submodules.
+  [#406](http://git.io/L9ssSw)
 
 ###### Bug fixes
 
 - Removed note about the post install hook form the linter.
 - Improved xcodebuild error detection in the linter.
-- Ensure the git cache exists, before updating it, when trying to install the ‘bleeding edge’ of a pod. [#426](http://git.io/d4eqRA)
-- Clean downloaded external pods **after** resolving and activating (sub)specs. [#414](http://git.io/i77q_w)
+- Ensure the git cache exists, before updating it, when trying to install the
+  ‘bleeding edge’ of a pod. [#426](http://git.io/d4eqRA)
+- Clean downloaded external pods **after** resolving and activating (sub)specs.
+  [#414](http://git.io/i77q_w)
 - Support `tar.gz` as filename in a HTTP source. [#428](http://git.io/qhwKkA)
 
 

data/lib/cocoapods.rb

@@ -13,7 +13,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.13.0'
+  VERSION = '0.14.0.rc1'
 
   class PlainInformative < StandardError
   end
@@ -32,6 +32,7 @@ module Pod
   autoload :Executable,             'cocoapods/executable'
   autoload :Installer,              'cocoapods/installer'
   autoload :LocalPod,               'cocoapods/local_pod'
+  autoload :Lockfile,               'cocoapods/lockfile'
   autoload :Platform,               'cocoapods/platform'
   autoload :Podfile,                'cocoapods/podfile'
   autoload :Project,                'cocoapods/project'

data/lib/cocoapods/command.rb

@@ -6,20 +6,22 @@ module Pod
     autoload :Install,     'cocoapods/command/install'
     autoload :List,        'cocoapods/command/list'
     autoload :Linter,      'cocoapods/command/linter'
+    autoload :Outdated,    'cocoapods/command/outdated'
     autoload :Presenter,   'cocoapods/command/presenter'
     autoload :Push,        'cocoapods/command/push'
     autoload :Repo,        'cocoapods/command/repo'
     autoload :Search,      'cocoapods/command/search'
     autoload :Setup,       'cocoapods/command/setup'
     autoload :Spec,        'cocoapods/command/spec'
+    autoload :Update,      'cocoapods/command/update'
 
     class Help < Informative
-      def initialize(command_class, argv)
-        @command_class, @argv = command_class, argv
+      def initialize(command_class, argv, unrecognized_command = nil)
+        @command_class, @argv, @unrecognized_command = command_class, argv, unrecognized_command
       end
 
       def message
-        [
+        message = [
           '',
           @command_class.banner.gsub(/\$ pod (.*)/, '$ pod \1'.green),
           '',
@@ -28,6 +30,9 @@ module Pod
           options,
           "\n",
         ].join("\n")
+        message << "[!] Unrecognized command: `#{@unrecognized_command}'\n".red if @unrecognized_command
+        message << "[!] Unrecognized argument#{@argv.count > 1 ? 's' : ''}: `#{@argv.join(' - ')}'\n".red unless @argv.empty?
+        message
       end
 
       private
@@ -48,10 +53,9 @@ module Pod
     end
 
     def self.banner
-      commands = ['install', 'list', 'push', 'repo', 'search', 'setup', 'spec'].sort
-      banner   = "\nTo see help for the available commands run:\n\n"
-      commands.each {|cmd| banner << "  * $ pod #{cmd.green} --help\n"}
-      banner
+      commands = ['install', 'update', 'outdated', 'list', 'push', 'repo', 'search', 'setup', 'spec'].sort
+      banner   = "To see help for the available commands run:\n\n"
+      banner + commands.map { |cmd| "  * $ pod #{cmd.green} --help" }.join("\n")
     end
 
     def self.options
@@ -76,9 +80,9 @@ module Pod
       Config.instance.verbose? ? raise : exit(1)
 
     rescue Exception => e
-      if e.is_a?(PlainInformative) # also catches Informative
+      if e.is_a?(PlainInformative) || ENV['COCOA_PODS_ENV'] == 'development' # also catches Informative
         puts e.message
-        puts *e.backtrace if Config.instance.verbose?
+        puts *e.backtrace if Config.instance.verbose? || ENV['COCOA_PODS_ENV'] == 'development'
       else
         puts ErrorReport.report(e)
       end
@@ -98,18 +102,22 @@ module Pod
 
       String.send(:define_method, :colorize) { |string , _| string } if argv.option( '--no-color' )
 
-      command_class = case argv.shift_argument
-      when 'install' then Install
-      when 'repo'    then Repo
-      when 'search'  then Search
-      when 'list'    then List
-      when 'setup'   then Setup
-      when 'spec'    then Spec
-      when 'push'    then Push
+      command_class = case command_argument = argv.shift_argument
+      when 'install'  then Install
+      when 'list'     then List
+      when 'outdated' then Outdated
+      when 'push'     then Push
+      when 'repo'     then Repo
+      when 'search'   then Search
+      when 'setup'    then Setup
+      when 'spec'     then Spec
+      when 'update'   then Update
       end
 
-      if show_help || command_class.nil?
-        raise Help.new(command_class || self, argv)
+      if command_class.nil?
+        raise Help.new(self, argv, command_argument)
+      elsif show_help
+        raise Help.new(command_class, argv)
       else
         command_class.new(argv)
       end
@@ -123,6 +131,25 @@ module Pod
 
     private
 
+    def verify_podfile_exists!
+      unless config.podfile
+        raise Informative, "No `Podfile' found in the current working directory."
+      end
+    end
+
+    def verify_lockfile_exists!
+      unless config.lockfile
+        raise Informative, "No `Podfile.lock' found in the current working directory, run `pod install'."
+      end
+    end
+
+    def update_spec_repos_if_necessary!
+      if @update_repo
+        print_title 'Updating Spec Repositories', true
+        Repo.new(ARGV.new(["update"])).run
+      end
+    end
+
     def print_title(title, only_verbose = true)
       if config.verbose?
         puts "\n" + title.yellow

data/lib/cocoapods/command/install.rb

@@ -19,8 +19,7 @@ module Pod
 
       This will configure the project to reference the Pods static library,
       add a build configuration file, and add a post build script to copy
-      Pod resources.
-}
+      Pod resources.}
       end
 
       def self.options
@@ -40,17 +39,17 @@ module Pod
         super unless argv.empty?
       end
 
-      def run
-        unless podfile = config.podfile
-          raise Informative, "No `Podfile' found in the current working directory."
-        end
-
-        if @update_repo
-          print_title 'Updating Spec Repositories', true
-          Repo.new(ARGV.new(["update"])).run
-        end
+      def run_install_with_update(update)
+        sandbox = Sandbox.new(config.project_pods_root)
+        resolver = Resolver.new(config.podfile, config.lockfile, sandbox)
+        resolver.update_mode = update
+        Installer.new(resolver).install!
+      end
 
-        Installer.new(podfile).install!
+      def run
+        verify_podfile_exists!
+        update_spec_repos_if_necessary!
+        run_install_with_update(false)
       end
     end
   end

data/lib/cocoapods/command/linter.rb

@@ -103,7 +103,9 @@ module Pod
       def install_pod
         podfile = podfile_from_spec
         config.verbose
-        installer = Installer.new(podfile)
+        sandbox = Sandbox.new(config.project_pods_root)
+        resolver = Resolver.new(podfile, nil, sandbox)
+        installer = Installer.new(resolver)
         installer.install!
         @pod = installer.pods.find { |pod| pod.top_specification == spec }
         config.silent

data/lib/cocoapods/command/outdated.rb

@@ -0,0 +1,51 @@
+module Pod
+  class Command
+    class Outdated < Command
+      def self.banner
+%{Show outdated pods:
+
+    $ pod outdated
+
+      Shows the outdated pods in the current Podfile.lock, but only those from
+      spec repos, not those from local/external sources or `:head' versions.}
+      end
+
+      def self.options
+        [
+          ["--no-update", "Skip running `pod repo update` before install"],
+        ].concat(super)
+      end
+
+      def initialize(argv)
+        @update_repo = !argv.option('--no-update')
+        super unless argv.empty?
+      end
+
+      def run
+        verify_podfile_exists!
+        verify_lockfile_exists!
+        update_spec_repos_if_necessary!
+
+        sandbox = Sandbox.new(config.project_pods_root)
+        resolver = Resolver.new(config.podfile, config.lockfile, sandbox)
+        resolver.update_mode = true
+        resolver.update_external_specs = false
+        resolver.resolve
+
+        names = resolver.pods_to_install - resolver.pods_from_external_sources
+        specs = resolver.specs.select do |spec|
+          names.include?(spec.name) && !spec.version.head?
+        end
+
+        if specs.empty?
+          puts "No updates are available.".yellow
+        else
+          puts "The following updates are available:".green
+          puts "  - " << specs.join("\n  - ") << "\n"
+        end
+      end
+    end
+  end
+end
+
+

data/lib/cocoapods/command/push.rb

@@ -4,14 +4,14 @@ module Pod
   class Command
     class Push < Command
       def self.banner
-        %{Pushing new specifications to a spec-repo:
+%{Pushing new specifications to a spec-repo:
 
-  $ pod push REPO [NAME.podspec]
+    $ pod push REPO [NAME.podspec]
 
-    Validates NAME.podspec or `*.podspec' in the current working dir, creates
-    a directory and version folder for the pod in the local copy of 
-    REPO (~/.cocoapods/[REPO]), copies the podspec file into the version directory,
-    and finally it pushes REPO to its remote.}
+      Validates NAME.podspec or `*.podspec' in the current working dir, creates
+      a directory and version folder for the pod in the local copy of 
+      REPO (~/.cocoapods/[REPO]), copies the podspec file into the version directory,
+      and finally it pushes REPO to its remote.}
       end
 
       def self.options

data/lib/cocoapods/command/setup.rb

@@ -2,7 +2,7 @@ module Pod
   class Command
     class Setup < Command
       def self.banner
-        %{Setup CocoaPods environment:
+%{Setup CocoaPods environment:
 
     $ pod setup
 

data/lib/cocoapods/command/spec.rb

@@ -4,7 +4,7 @@ module Pod
   class Command
     class Spec < Command
       def self.banner
-        %{Managing PodSpec files:
+%{Managing PodSpec files:
 
     $ pod spec create [ NAME | https://github.com/USER/REPO ]
 

data/lib/cocoapods/command/update.rb

@@ -0,0 +1,21 @@
+module Pod
+  class Command
+    class Update < Install
+      def self.banner
+%{Updating dependencies of a project:
+
+    $ pod update
+
+      Updates all dependencies.}
+      end
+
+      def run
+        verify_podfile_exists!
+        verify_lockfile_exists!
+        update_spec_repos_if_necessary!
+        run_install_with_update(true)
+      end
+    end
+  end
+end
+