cocoapods 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0283bc5d1d675094d9e6fffacee1574fa3a56f77
-  data.tar.gz: 38a932083669d5f27b6aa630cfec338e0f43651d
+  metadata.gz: ff40392dc1f5d3bf6a6bb31da9a0682506d65859
+  data.tar.gz: 044a9e333d0eeee8ddf5b3334e1879d22dfc1322
 SHA512:
-  metadata.gz: 603ecc9670839b8fde00cc46496cfa18353c39e92ae2b74759d273845cbf2e5b63d6c9f2e9bce0fc75af6905a939da2560d88601f32e748a81d22978e02d5e0b
-  data.tar.gz: d972cdfc6986cd08328099a46df07e29feafec94e0befa36a0aab9991e516e840a35c812564bdcd7b0c13c3228cb8b247b4afc5ae8cb21757802cc8b92a85309
+  metadata.gz: dad9e16a494562952e401a0c350aaa0225707cea4314e870aa314cc7b5283d66d7d662c01eb8f07d17a2c9e2e27b7a770c6f9b38e5741dfaaee208e6f9b33b9c
+  data.tar.gz: 8ebab7ed68083acd1c4d52f988a120ab920e1b70ce878dc11b5104cf66309a6d4335b3a2e3b88cfb99e06ced4e18d59888c7cc8165656e89cfb2a2733401f5ea

data/CHANGELOG.md

@@ -2,6 +2,97 @@
 
 To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides/installing_cocoapods.html).
 
+## 0.33.0
+
+##### Breaking
+
+* The deprecated `pre_install` and the `pod_install` hooks of the specification
+  class have been removed.  
+  [Fabio Pelosin][irrationalfab]
+  [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)
+  [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)
+
+##### Enhancements
+
+* Added the `cocoapods-trunk` plugin which introduces the `trunk` subcommand.  
+  [Fabio Pelosin][irrationalfab]
+  [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)
+  [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)
+
+* The `pod push` sub-command has been moved to the `pod repo push` sub-command.
+  Moreover pushing to the master repo from it has been disabled.  
+  [Fabio Pelosin][irrationalfab]
+  [#2151](https://github.com/CocoaPods/CocoaPods/issues/2151)
+  [#2153](https://github.com/CocoaPods/CocoaPods/pull/2153)
+
+* Overhauled command line interface. Add support for auto-completion script
+  (d). If auto-completion is enabled for your shell you can configure it for
+  CocoaPods with the following command:
+
+      rm -f /usr/local/share/zsh/site-functions/_pod
+      dpod --completion-script > /usr/local/share/zsh/site-functions/_pod
+      exec zsh
+
+  Currently only the Z shell is supported.  
+  [Fabio Pelosin][irrationalfab]
+  [CLAide#25](https://github.com/CocoaPods/CLAide/issues/25)
+  [CLAide#20](https://github.com/CocoaPods/CLAide/issues/20)
+  [CLAide#19](https://github.com/CocoaPods/CLAide/issues/19)
+  [CLAide#17](https://github.com/CocoaPods/CLAide/issues/17)
+  [CLAide#12](https://github.com/CocoaPods/CLAide/issues/12)
+
+* The `--version` flag is now only supported for the root `pod` command. If
+  used in conjunction with the `--verbose` flag the version of the detected
+  plugins will be printed as well.  
+  [Fabio Pelosin][irrationalfab]
+  [CLAide#13](https://github.com/CocoaPods/CLAide/issues/13)
+  [CLAide#14](https://github.com/CocoaPods/CLAide/issues/14)
+
+* The extremely meta `cocoaPods-plugins` is now installed by default providing
+  information about the available and the installed plug-ins.  
+  [David Grandinetti](https://github.com/dbgrandi)
+  [Olivier Halligon](https://github.com/AliSoftware)
+  [Fabio Pelosin][irrationalfab]
+  [#2092](https://github.com/CocoaPods/CocoaPods/issues/2092)
+
+* Validate the reachability of `social_media_url`, `documentation_url` and
+  `docset_url` in podspecs we while linting a specification.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#2025](https://github.com/CocoaPods/CocoaPods/issues/2025)
+
+* Print the current version when the repo/lockfile requires a higher version.  
+  [Samuel E. Giddins](https://github.com/segiddins)
+  [#2049](https://github.com/CocoaPods/CocoaPods/issues/2049)
+
+* Show `help` when running the `pod` command instead of defaulting to `pod
+  install`.  
+  [Kyle Fuller](https://github.com/kylef)
+  [#1771](https://github.com/CocoaPods/CocoaPods/issues/1771)
+
+##### Bug Fixes
+
+* Show the actual executable when external commands fail.  
+  [Boris Bügling][neonichu]
+  [#2102](https://github.com/CocoaPods/CocoaPods/issues/2102)
+
+* Fixed support for file references in the workspace generated by CocoaPods.  
+  [Kyle Fuller][kylef]
+  [Fabio Pelosin][irrationalfab]
+  [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]
+  [#1853](https://github.com/CocoaPods/CocoaPods/issues/1853)
+
+* Show deprecated specs when invoking `pod outdated`.  
+  [Samuel E. Giddins](https://github.com/segiddins)
+  [#2003](https://github.com/CocoaPods/CocoaPods/issues/2003)
+
+* Fixes an issue where `pod repo update` may start an un-committed merge.  
+  [Kyle Fuller][kylef]
+  [#2024](https://github.com/CocoaPods/CocoaPods/issues/2024)
+
 ## 0.32.1
 
 ##### Bug Fixes
@@ -10,7 +101,6 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
   [Fabio Pelosin][irrationalfab]
   [#2050](https://github.com/CocoaPods/CocoaPods/issues/2050)
 
-
 ## 0.32.0
 
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/master...0.31.1)
@@ -103,6 +193,10 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 
 
+* Warn when including deprecated pods
+  [Samuel E. Giddins](https://github.com/segiddins)
+  [#2003](https://github.com/CocoaPods/CocoaPods/issues/2003)
+
 ## 0.31.1
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.31.1...0.31.0)
 • [CocoaPods-Core](https://github.com/CocoaPods/Core/compare/0.31.1...0.31.0)
@@ -2314,4 +2408,6 @@ allowing you to automate Xcode related tasks.
 [7]: https://github.com/CocoaPods/CocoaPods/compare/0.3.10...0.5.0
 
 [irrationalfab]: https://github.com/irrationalfab
+[kylef]: (https://github.com/kylef)
+[neonichu]: (https://github.com/neonichu)
 

data/lib/cocoapods/command.rb

@@ -14,23 +14,24 @@ module Pod
     require 'cocoapods/command/list'
     require 'cocoapods/command/outdated'
     require 'cocoapods/command/project'
-    require 'cocoapods/command/push'
     require 'cocoapods/command/repo'
     require 'cocoapods/command/search'
     require 'cocoapods/command/setup'
     require 'cocoapods/command/spec'
     require 'cocoapods/command/init'
 
+    # TODO: remove
+    require 'cocoapods/command/push'
+
     self.abstract_command = true
-    self.default_subcommand = 'install'
     self.command = 'pod'
+    self.version = VERSION
     self.description = 'CocoaPods, the Objective-C library package manager.'
     self.plugin_prefix = 'cocoapods'
 
     def self.options
       [
         ['--silent',   'Show nothing'],
-        ['--version',  'Show the version of CocoaPods'],
       ].concat(super)
     end
 
@@ -44,13 +45,6 @@ module Pod
 
     def self.run(argv)
       help! "You cannot run CocoaPods as root." if Process.uid == 0
-
-      argv = CLAide::ARGV.new(argv)
-      if argv.flag?('version')
-        UI.puts VERSION
-        exit 0
-      end
-
       super(argv)
       UI.print_warnings
     end

data/lib/cocoapods/command/help.rb

@@ -2,7 +2,9 @@ module Pod
   class Command
     class Help < Command
       self.summary = 'Show help for the given command.'
-      self.arguments = '[COMMAND]'
+      self.arguments = [
+          ['COMMAND', :optional]
+      ]
 
       def initialize(argv)
         @help_command = Pod::Command.parse(argv)

data/lib/cocoapods/command/init.rb

@@ -17,7 +17,9 @@ module Pod
         (test targets) files which should be stored in the
         `~/.cocoapods/templates` folder.
       DESC
-      self.arguments = '[XCODEPROJ]'
+      self.arguments = [
+          ['XCODEPROJ', :optional]
+      ]
 
       def initialize(argv)
         @podfile_path = Pathname.pwd + "Podfile"

data/lib/cocoapods/command/inter_process_communication.rb

@@ -15,7 +15,9 @@ module Pod
 
         self.summary = 'Converts a podspec to JSON.'
         self.description = 'Converts a podspec to JSON and prints it to STDOUT.'
-        self.arguments = 'PATH'
+        self.arguments = [
+            ['PATH', :required]
+        ]
 
         def initialize(argv)
           @path = argv.shift_argument
@@ -40,7 +42,9 @@ module Pod
 
         self.summary = 'Converts a Podfile to YAML.'
         self.description = 'Converts a Podfile to YAML and prints it to STDOUT.'
-        self.arguments = 'PATH'
+        self.arguments = [
+            ['PATH', :required]
+        ]
 
         def initialize(argv)
           @path = argv.shift_argument
@@ -63,11 +67,11 @@ module Pod
 
       class List < IPC
 
-        self.summary = 'Lists the specifications know to CocoaPods.'
+        self.summary = 'Lists the specifications known to CocoaPods.'
         self.description = <<-DESC
           Prints to STDOUT a YAML dictionary where the keys are the name of the
-          specifications and the values are a dictionary with the following
-          keys.
+          specifications and each corresponding value is a dictionary with
+          the following keys:
 
           - defined_in_file
           - version

data/lib/cocoapods/command/lib.rb

@@ -14,7 +14,10 @@ module Pod
           If a `TEMPLATE_URL`, pointing to a git repo containing a compatible template, is specified, it will be used in place of the default one.
         DESC
 
-        self.arguments = 'NAME [TEMPLATE_URL]'
+        self.arguments = [
+            ['NAME',         :required],
+            ['TEMPLATE_URL', :optional]
+        ]
 
         def initialize(argv)
           @name = argv.shift_argument

data/lib/cocoapods/command/outdated.rb

@@ -23,21 +23,6 @@ module Pod
       # @todo fix.
       #
       def run
-        verify_podfile_exists!
-        verify_lockfile_exists!
-
-        lockfile = config.lockfile
-        pods = lockfile.pod_names
-        updates = []
-        pods.each do |pod_name|
-          set = SourcesManager.search(Dependency.new(pod_name))
-          next unless set
-          source_version = set.versions.first
-          lockfile_version = lockfile.version(pod_name)
-          if source_version > lockfile_version
-            updates << [pod_name, lockfile_version, source_version]
-          end
-        end
 
         if updates.empty?
           UI.puts "No updates are available.".yellow
@@ -48,7 +33,71 @@ module Pod
             end
           end
         end
+
+        if deprecated_pods.any?
+          UI.section 'The following pods are deprecated:' do
+            deprecated_pods.each do |spec|
+              if spec.deprecated_in_favor_of
+                UI.puts "- #{spec.name}" \
+                  " (in favor of #{spec.deprecated_in_favor_of})"
+              else
+                UI.puts "- #{spec.name}"
+              end
+            end
+          end
+        end
+
+      end
+
+      private
+
+      def updates
+        @updates ||= begin
+          spec_sets.map do |set|
+            spec = set.specification
+            source_version = set.versions.first
+            pod_name = spec.name
+            lockfile_version = lockfile.version(pod_name)
+            if source_version > lockfile_version
+              [pod_name, lockfile_version, source_version]
+            else
+              nil
+            end
+          end.compact.uniq
+        end
+      end
+
+      def deprecated_pods
+        @deprecated_pods ||= begin
+          spec_sets.map(&:specification).select do |spec|
+            spec.deprecated || spec.deprecated_in_favor_of
+          end.compact.uniq
+        end
       end
+
+      def spec_sets
+        @spec_sets ||= begin
+          installed_pods.map do |pod_name|
+            SourcesManager.search(Dependency.new(pod_name))
+          end.compact.uniq
+        end
+      end
+
+      def installed_pods
+        @installed_pods ||= begin
+          verify_podfile_exists!
+
+          lockfile.pod_names
+        end
+      end
+
+      def lockfile
+        @lockfile ||= begin
+          verify_lockfile_exists!
+          config.lockfile
+        end
+      end
+
     end
   end
 end

data/lib/cocoapods/command/project.rb

@@ -8,7 +8,7 @@ module Pod
       module Options
         def options
           [
-            ["--no-clean",       "Leave SCM dirs like `.git' and `.svn' intact after downloading"],
+            ["--no-clean",       "Leave SCM dirs like `.git` and `.svn` intact after downloading"],
             ["--no-integrate",   "Skip integration of the Pods libraries in the Xcode project(s)"],
             ["--no-repo-update", "Skip running `pod repo update` before install"],
           ].concat(super)
@@ -49,15 +49,15 @@ module Pod
       self.summary = 'Install project dependencies'
 
       self.description = <<-DESC
-        Downloads all dependencies defined in `Podfile' and creates an Xcode
-        Pods library project in `./Pods'.
+        Downloads all dependencies defined in `Podfile` and creates an Xcode
+        Pods library project in `./Pods`.
 
         The Xcode project file should be specified in your `Podfile` like this:
 
-          xcodeproj 'path/to/XcodeProject'
+            xcodeproj 'path/to/XcodeProject'
 
         If no xcodeproj is specified, then a search for an Xcode project will
-        be made.  If more than one Xcode project is found, the command will
+        be made. If more than one Xcode project is found, the command will
         raise an error.
 
         This will configure the project to reference the Pods static library,
@@ -85,7 +85,9 @@ module Pod
         be used to install changes to the Podfile.
       DESC
 
-      self.arguments = '[POD_NAMES...]'
+      self.arguments = [
+          ['POD_NAMES...', :optional]
+      ]
 
       def initialize(argv)
         @pods = argv.arguments! unless argv.arguments.empty?
@@ -104,7 +106,7 @@ module Pod
             raise Informative, (missing_pods.length > 1 \
               ? "Pods %s are not installed and cannot be updated" \
               : "Pod %s is not installed and cannot be updated"
-            ) % missing_pods.map { |p| "`#{p}'" }.join(', ')
+            ) % missing_pods.map { |p| "`#{p}`" }.join(', ')
           end
 
           run_install_with_update(:pods => @pods)

data/lib/cocoapods/command/push.rb

@@ -1,177 +1,22 @@
-require 'fileutils'
-require 'active_support/core_ext/string/inflections'
-
 module Pod
   class Command
     class Push < Command
-      self.summary = 'Push new specifications to a spec-repo'
-
-      self.description = <<-DESC
-        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/repos/[REPO]), copies the podspec file into the version
-        directory, and finally it pushes REPO to its remote.
-      DESC
+      self.summary = 'Temporary alias for the `pod repo push` command'
 
-      self.arguments = 'REPO [NAME.podspec]'
-
-      def self.options
-        [ ["--allow-warnings", "Allows pushing even if there are warnings"],
-          ["--local-only", "Does not perform the step of pushing REPO to its remote"] ].concat(super)
-      end
 
       def initialize(argv)
-        @allow_warnings = argv.flag?('allow-warnings')
-        @local_only = argv.flag?('local-only')
-        @repo = argv.shift_argument
-        if @repo.nil?
-          @repo = "master"
-        elsif @repo.end_with? ".podspec"
-          @podspec = @repo
-          @repo = "master"
-        else
-          @podspec = argv.shift_argument
-        end
+        @push_command = Repo::Push.new(argv)
         super
       end
 
       def validate!
-        super
-        help! "A spec-repo name is required." unless @repo
+        UI.puts '[!] The `pod push` command has been moved to `pod repo push`.'.ansi.yellow
+        @push_command.validate!
       end
 
       def run
-        validate_podspec_files
-        check_repo_status
-        update_repo
-        add_specs_to_repo
-        push_repo unless @local_only
-      end
-
-      #-----------------------------------------------------------------------#
-
-      private
-
-      # @!group Push sub-steps
-
-      extend Executable
-      executable :git
-
-      # Performs a full lint against the podspecs.
-      #
-      def validate_podspec_files
-        UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow
-        podspec_files.each do |podspec|
-          validator = Validator.new(podspec)
-          validator.only_errors = @allow_warnings
-          begin
-            validator.validate
-          rescue Exception
-            raise Informative, "The `#{podspec}` specification does not validate."
-          end
-          raise Informative, "The `#{podspec}` specification does not validate." unless validator.validated?
-        end
-      end
-
-      # Checks that the repo is clean.
-      #
-      # @raise  If the repo is not clean.
-      #
-      # @todo   Add specs for staged and unstaged files.
-      #
-      # @todo   Gracefully handle the case where source is not under git
-      #         source control.
-      #
-      # @return [void]
-      #
-      def check_repo_status
-        clean = Dir.chdir(repo_dir) { `git status --porcelain  2>&1` } == ''
-        raise Informative, "The repo `#{@repo}` is not clean" unless clean
-      end
-
-      # Updates the git repo against the remote.
-      #
-      # @return [void]
-      #
-      def update_repo
-        UI.puts "Updating the `#{@repo}' repo\n".yellow
-        Dir.chdir(repo_dir) { UI.puts `git pull 2>&1` }
+        @push_command.run
       end
-
-      # Commits the podspecs to the source, which should be a git repo.
-      #
-      # @note   The pre commit hook of the repo is skipped as the podspecs have
-      #         already been linted.
-      #
-      # @return [void]
-      #
-      def add_specs_to_repo
-        UI.puts "\nAdding the #{'spec'.pluralize(count)} to the `#{@repo}' repo\n".yellow
-        podspec_files.each do |spec_file|
-          spec = Pod::Specification.from_file(spec_file)
-          output_path = File.join(repo_dir, spec.name, spec.version.to_s)
-          if Pathname.new(output_path).exist?
-            message = "[Fix] #{spec}"
-          elsif Pathname.new(File.join(repo_dir, spec.name)).exist?
-            message = "[Update] #{spec}"
-          else
-            message = "[Add] #{spec}"
-          end
-
-          FileUtils.mkdir_p(output_path)
-          FileUtils.cp(spec_file, output_path)
-          Dir.chdir(repo_dir) do
-            # only commit if modified
-            if git!("status --porcelain 2>&1").include?(spec.name)
-              UI.puts " - #{message}"
-              git!("add #{spec.name}")
-              git!("commit --no-verify -m '#{message}'")
-            else
-              UI.puts " - [No change] #{spec}"
-            end
-          end
-        end
-      end
-
-      # Pushes the git repo against the remote.
-      #
-      # @return [void]
-      #
-      def push_repo
-        UI.puts "\nPushing the `#{@repo}' repo\n".yellow
-        Dir.chdir(repo_dir) { UI.puts `git push origin master 2>&1` }
-      end
-
-      #-----------------------------------------------------------------------#
-
-      private
-
-      # @!group Private helpers
-
-      # @return [Pathname] The directory of the repository.
-      #
-      def repo_dir
-        dir = config.repos_dir + @repo
-        raise Informative, "`#{@repo}` repo not found" unless dir.exist?
-        dir
-      end
-
-      # @return [Array<Pathname>] The path of the specifications to push.
-      #
-      def podspec_files
-        files = Pathname.glob(@podspec || "*.podspec")
-        raise Informative, "Couldn't find any .podspec file in current directory" if files.empty?
-        files
-      end
-
-      # @return [Integer] The number of the podspec files to push.
-      #
-      def count
-        podspec_files.count
-      end
-
-      #-----------------------------------------------------------------------#
-
     end
   end
 end