cocoapods 0.32.1 → 0.33.0

data/lib/cocoapods/command/repo.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'cocoapods/command/repo/push'
 
 module Pod
   class Command
@@ -17,7 +18,11 @@ module Pod
           remote can later be referred to by `NAME`.
         DESC
 
-        self.arguments = 'NAME URL [BRANCH]'
+        self.arguments = [
+            ['NAME',   :required],
+            ['URL',    :required],
+            ['BRANCH', :optional]
+        ]
 
         def self.options
           [
@@ -63,7 +68,9 @@ module Pod
           this will update all spec-repos in `~/.cocoapods/repos`.
         DESC
 
-        self.arguments = '[NAME]'
+        self.arguments = [
+            ['NAME', :optional]
+        ]
 
         def initialize(argv)
           @name = argv.shift_argument
@@ -86,7 +93,9 @@ module Pod
           will lint all the spec-repos known to CocoaPods.
         DESC
 
-        self.arguments = '[ NAME | DIRECTORY ]'
+        self.arguments = [
+            ['NAME | DIRECTORY', :optional]
+        ]
 
         def self.options
           [["--only-errors", "Lint presents only the errors"]].concat(super)
@@ -152,7 +161,9 @@ module Pod
           Deletes the remote named `NAME` from the local spec-repos directory at `~/.cocoapods/repos/.`
         DESC
 
-        self.arguments = 'NAME'
+        self.arguments = [
+            ['NAME', :required]
+        ]
 
         def initialize(argv)
           @name = argv.shift_argument

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

@@ -0,0 +1,199 @@
+require 'fileutils'
+require 'active_support/core_ext/string/inflections'
+
+module Pod
+  class Command
+    class Repo < Command
+      class Push < Repo
+        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.arguments = [
+          ['REPO',         :required],
+          ['NAME.podspec', :optional]
+        ]
+
+        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
+          @podspec = argv.shift_argument
+          super
+        end
+
+        def validate!
+          super
+          help! "A spec-repo name is required." unless @repo
+        end
+
+        def run
+          check_if_master_repo
+          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
+
+        # Temporary check to ensure that users do not push accidentally private
+        # specs to the master repo.
+        #
+        def check_if_master_repo
+          remotes = Dir.chdir(repo_dir) { `git remote -v 2>&1` }
+          master_repo_urls = [
+            'git@github.com:CocoaPods/Specs.git',
+            'https://github.com/CocoaPods/Specs.git',
+          ]
+          is_master_repo = master_repo_urls.any? do |url|
+            remotes.include?(url)
+          end
+
+          if is_master_repo
+            raise Informative, "To push to the CocoaPods master repo use " \
+              "the `pod trunk push` command.\n\nIf you are using a fork of " \
+              "the master repo for private purposes we recommend to migrate " \
+              "to a clean private repo. To disable this check remove the " \
+              "remote pointing to the CocoaPods master repo."
+          end
+        end
+
+
+        # 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` }
+        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
+end

data/lib/cocoapods/command/search.rb

@@ -9,7 +9,9 @@ module Pod
         description of the pods.
       DESC
 
-      self.arguments = 'QUERY'
+      self.arguments = [
+          ['QUERY', :required]
+      ]
 
       def self.options
         [

data/lib/cocoapods/command/spec.rb

@@ -18,7 +18,9 @@ module Pod
           If a GitHub url is passed the spec is prepopulated.
         DESC
 
-        self.arguments = '[ NAME | https://github.com/USER/REPO ]'
+        self.arguments = [
+            ['NAME | https://github.com/USER/REPO', :optional]
+        ]
 
         def initialize(argv)
           @name_or_url, @url = argv.shift_argument, argv.shift_argument
@@ -56,7 +58,9 @@ module Pod
           the argument is omitted, it defaults to the current working dir.
         DESC
 
-        self.arguments = '[ NAME.podspec | DIRECTORY | http://PATH/NAME.podspec, ... ]'
+        self.arguments = [
+            ['NAME.podspec | DIRECTORY | http://PATH/NAME.podspec, ...', :optional]
+        ]
 
         def self.options
           [ ["--quick",       "Lint skips checks that would require to download and build the spec"],
@@ -148,7 +152,9 @@ module Pod
           Prints the path of 'NAME.podspec'
         DESC
 
-        self.arguments = '[ NAME ]'
+        self.arguments = [
+            ['NAME', :optional]
+        ]
 
         def self.options
           [["--show-all", "Print all versions of the given podspec"]].concat(super)
@@ -180,7 +186,9 @@ module Pod
           Prints 'NAME.podspec' to standard output.
         DESC
 
-        self.arguments = '[ NAME ]'
+        self.arguments = [
+            ['NAME', :optional]
+        ]
 
         def self.options
           [["--show-all", "Pick from all versions of the given podspec"]].concat(super)
@@ -220,7 +228,9 @@ module Pod
           Opens 'NAME.podspec' to be edited.
         DESC
 
-        self.arguments = '[ NAME ]'
+        self.arguments = [
+            ['NAME', :optional]
+        ]
 
         def self.options
           [["--show-all", "Pick which spec to edit from all available versions of the given podspec"]].concat(super)
@@ -342,7 +352,7 @@ module Pod
       # @return [Pathname] the absolute path of the given spec and source
       #
       def pathname_from_spec(spec, source)
-        config.repos_dir + "#{source}/#{spec.name}/#{spec.version}/#{spec.name}.podspec"
+        Pathname(spec.defined_in_file)
       end
 
       # @return [String] of spec paths one on each line

data/lib/cocoapods/executable.rb

@@ -71,7 +71,7 @@ module Pod
       output  = stdout.join("\n") + stderr.join("\n")
       unless status.success?
         if raise_on_failure
-          raise Informative, "#{name} #{command}\n\n#{output}"
+          raise Informative, "#{full_command}\n\n#{output}"
         else
           UI.message("[!] Failed: #{full_command}".red)
         end

data/lib/cocoapods/gem_version.rb

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

data/lib/cocoapods/installer.rb

@@ -90,6 +90,7 @@ module Pod
       download_dependencies
       generate_pods_project
       integrate_user_project if config.integrate_targets?
+      perform_post_install_actions
     end
 
     def resolve_dependencies
@@ -164,9 +165,10 @@ module Pod
     #
     def analyze
       if lockfile && lockfile.cocoapods_version > Version.new(VERSION)
-        STDERR.puts '[!] The version of CocoaPods used to generate the lockfile is '\
-          'higher than the version of the current executable. Incompatibility ' \
-          'issues may arise.'.yellow
+        STDERR.puts '[!] The version of CocoaPods used to generate ' \
+          "the lockfile (#{lockfile.cocoapods_version}) is "\
+          "higher than the version of the current executable (#{VERSION}). " \
+          'Incompatibility issues may arise.'.yellow
       end
 
       analyzer = Analyzer.new(sandbox, podfile, lockfile)
@@ -286,6 +288,32 @@ module Pod
       end
     end
 
+    # Performs any post-installation actions
+    #
+    # @return [void]
+    #
+    def perform_post_install_actions
+      warn_for_deprecations
+    end
+
+    # Prints a warning for any pods that are deprecated
+    #
+    # @return [void]
+    #
+    def warn_for_deprecations
+      deprecated_pods = root_specs.select do |spec|
+        spec.deprecated || spec.deprecated_in_favor_of
+      end
+      deprecated_pods.each do |spec|
+        if spec.deprecated_in_favor_of
+          UI.warn "#{spec.name} has been deprecated in " \
+            "favor of #{spec.deprecated_in_favor_of}"
+        else
+          UI.warn "#{spec.name} has been deprecated"
+        end
+      end
+    end
+
     # Creates the Pods project from scratch if it doesn't exists.
     #
     # @return [void]
@@ -467,42 +495,11 @@ module Pod
     #
     def run_pre_install_hooks
       UI.message "- Running pre install hooks" do
-        analysis_result.specifications.each do |spec|
-          executed = false
-          libraries_using_spec(spec).each do |lib|
-            lib_representation = library_rep(lib)
-            executed ||= run_spec_pre_install_hook(spec, lib_representation)
-          end
-          UI.message "- #{spec.name}" if executed
-        end
-
         executed = run_podfile_pre_install_hook
         UI.message "- Podfile" if executed
       end
     end
 
-    # Runs the pre install hook of the given specification with the given
-    # library representation.
-    #
-    # @param  [Specification] spec
-    #         The spec for which the pre install hook should be run.
-    #
-    # @param  [Hooks::LibraryRepresentation] lib_representation
-    #         The library representation to be passed as an argument to the
-    #         hook.
-    #
-    # @raise  Raises an informative if the hooks raises.
-    #
-    # @return [Bool] Whether the hook was run.
-    #
-    def run_spec_pre_install_hook(spec, lib_representation)
-      spec.pre_install!(pod_rep(spec.root.name), lib_representation)
-    rescue => e
-      raise Informative, "An error occurred while processing the pre-install " \
-        "hook of #{spec}." \
-        "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
-    end
-
     # Runs the pre install hook of the Podfile
     #
     # @raise  Raises an informative if the hooks raises.
@@ -526,42 +523,11 @@ module Pod
     #
     def run_post_install_hooks
       UI.message "- Running post install hooks" do
-        analysis_result.specifications.each do |spec|
-          executed = false
-          libraries_using_spec(spec).each do |lib|
-            lib_representation = library_rep(lib)
-            executed ||= run_spec_post_install_hook(spec, lib_representation)
-          end
-          UI.message "- #{spec.name}" if executed
-        end
         executed = run_podfile_post_install_hook
         UI.message "- Podfile" if executed
       end
     end
 
-
-    # Runs the post install hook of the given specification with the given
-    # library representation.
-    #
-    # @param  [Specification] spec
-    #         The spec for which the post install hook should be run.
-    #
-    # @param  [Hooks::LibraryRepresentation] lib_representation
-    #         The library representation to be passed as an argument to the
-    #         hook.
-    #
-    # @raise  Raises an informative if the hooks raises.
-    #
-    # @return [Bool] Whether the hook was run.
-    #
-    def run_spec_post_install_hook(spec, lib_representation)
-      spec.post_install!(lib_representation)
-    rescue => e
-      raise Informative, "An error occurred while processing the post-install " \
-        "hook of #{spec}." \
-        "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
-    end
-
     # Runs the post install hook of the Podfile
     #
     # @raise  Raises an informative if the hooks raises.