cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/command/list.rb

@@ -6,8 +6,8 @@ module Pod
 
       def self.options
         [[
-          "--update", "Run `pod repo update` before listing",
-          "--stats",  "Show additional stats (like GitHub watchers and forks)"
+          '--update', 'Run `pod repo update` before listing',
+          '--stats',  'Show additional stats (like GitHub watchers and forks)'
         ]].concat(super)
       end
 
@@ -23,7 +23,7 @@ module Pod
       def run
         update_if_necessary!
 
-        sets = SourcesManager.all_sets
+        sets = SourcesManager.aggregate.all_sets
         sets.each { |set| UI.pod(set, :name_and_version) }
         UI.puts "\n#{sets.count} pods were found"
       end
@@ -31,7 +31,7 @@ module Pod
       def update_if_necessary!
         if @update && config.verbose?
           UI.section("\nUpdating Spec Repositories\n".yellow) do
-            Repo.new(ARGV.new(["update"])).run
+            Repo.new(ARGV.new(['update'])).run
           end
         end
       end
@@ -44,10 +44,10 @@ module Pod
         def run
           update_if_necessary!
 
-          days = [1,2,3,5,8]
+          days = [1, 2, 3, 5, 8]
           dates, groups = {}, {}
-          days.each {|d| dates[d] = Time.now - 60 * 60 * 24 * d}
-          sets = SourcesManager.all_sets
+          days.each { |d| dates[d] = Time.now - 60 * 60 * 24 * d }
+          sets = SourcesManager.aggregate.all_sets
           statistics_provider = Config.instance.spec_statistics_provider
           creation_dates = statistics_provider.creation_dates(sets)
 
@@ -64,8 +64,8 @@ module Pod
           days.reverse.each do |d|
             sets = groups[d]
             next unless sets
-            UI.section("\nPods added in the last #{"day".pluralize(d)}".yellow) do
-              sorted = sets.sort_by {|s| creation_dates[s.name]}
+            UI.section("\nPods added in the last #{'day'.pluralize(d)}".yellow) do
+              sorted = sets.sort_by { |s| creation_dates[s.name] }
               mode = @stats ? :stats : :name
               sorted.each { |set| UI.pod(set, mode, statistics_provider) }
             end

data/lib/cocoapods/command/outdated.rb

@@ -9,7 +9,7 @@ module Pod
       DESC
 
       def self.options
-        [["--no-repo-update", "Skip running `pod repo update` before install"]].concat(super)
+        [['--no-repo-update', 'Skip running `pod repo update` before install']].concat(super)
       end
 
       def initialize(argv)
@@ -23,11 +23,10 @@ module Pod
       # @todo fix.
       #
       def run
-
         if updates.empty?
-          UI.puts "No updates are available.".yellow
+          UI.puts 'No updates are available.'.yellow
         else
-          UI.section "The following updates are available:" do
+          UI.section 'The following updates are available:' do
             updates.each do |(name, from_version, to_version)|
               UI.puts "- #{name} #{from_version} -> #{to_version}"
             end
@@ -46,7 +45,6 @@ module Pod
             end
           end
         end
-
       end
 
       private
@@ -56,7 +54,7 @@ module Pod
           spec_sets.map do |set|
             spec = set.specification
             source_version = set.versions.first
-            pod_name = spec.name
+            pod_name = spec.root.name
             lockfile_version = lockfile.version(pod_name)
             if source_version > lockfile_version
               [pod_name, lockfile_version, source_version]
@@ -97,9 +95,6 @@ module Pod
           config.lockfile
         end
       end
-
     end
   end
 end
-
-

data/lib/cocoapods/command/project.rb

@@ -1,16 +1,47 @@
 module Pod
   class Command
+    # Provides support for commands to take a user-specified `project directory`
+    #
+    module ProjectDirectory
+      module Options
+        def options
+          [
+            ['--project-directory=/project/dir/', 'The path to the root of the project directory'],
+          ].concat(super)
+        end
+      end
+
+      def self.included(base)
+        base.extend(Options)
+      end
+
+      def initialize(argv)
+        if project_directory = argv.option('project-directory')
+          @project_directory = Pathname.new(project_directory).expand_path
+        end
+        config.installation_root = @project_directory
+        super
+      end
+
+      def validate!
+        super
+        if @project_directory && !@project_directory.directory?
+          raise Informative,
+                "`#{@project_directory}` is not a valid directory."
+        end
+      end
+    end
 
-    # Provides support the common behaviour of the `install` and `update`
+    # Provides support for the common behaviour of the `install` and `update`
     # commands.
     #
     module Project
       module Options
         def options
           [
-            ["--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"],
+            ['--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)
         end
       end
@@ -46,7 +77,7 @@ module Pod
     class Install < Command
       include Project
 
-      self.summary = 'Install project dependencies'
+      self.summary = 'Install project dependencies to Podfile.lock versions'
 
       self.description = <<-DESC
         Downloads all dependencies defined in `Podfile` and creates an Xcode
@@ -76,17 +107,19 @@ module Pod
     class Update < Command
       include Project
 
-      self.summary = 'Update outdated project dependencies'
+      self.summary = 'Update outdated project dependencies and create new ' \
+        'Podfile.lock'
 
       self.description = <<-DESC
-        Updates the Pods identified by the specified POD_NAMES. If no POD_NAMES are
-        specified it updates all the Pods ignoring the contents of the Podfile.lock.
-        This command is reserved to the update of dependencies and pod install should
-        be used to install changes to the Podfile.
+        Updates the Pods identified by the specified `POD_NAMES`. If no
+        `POD_NAMES` are specified it updates all the Pods ignoring the contents
+        of the Podfile.lock.
+        This command is reserved to the update of dependencies and pod install
+        should be used to install changes to the Podfile.
       DESC
 
       self.arguments = [
-          ['POD_NAMES...', :optional]
+        CLAide::Argument.new('POD_NAMES', false, true),
       ]
 
       def initialize(argv)
@@ -101,22 +134,27 @@ module Pod
           verify_lockfile_exists!
 
           # Check if all given pods are installed
-          missing_pods = @pods.select { |pod| !config.lockfile.pod_names.include?(pod) }
+          missing_pods = @pods.select do |pod|
+            !config.lockfile.pod_names.include?(pod)
+          end
+
           if missing_pods.length > 0
-            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(', ')
+            if missing_pods.length > 1
+              message = "Pods `#{missing_pods.join('`, `')}` are not " \
+                'installed and cannot be updated'
+            else
+              message = "The `#{missing_pods.first}` Pod is not installed " \
+                'and cannot be updated'
+            end
+            raise Informative, message
           end
 
           run_install_with_update(:pods => @pods)
         else
-          UI.puts "Update all pods".yellow unless @pods
+          UI.puts 'Update all pods'.yellow unless @pods
           run_install_with_update(true)
         end
       end
     end
-
   end
 end
-

data/lib/cocoapods/command/push.rb

@@ -3,7 +3,6 @@ module Pod
     class Push < Command
       self.summary = 'Temporary alias for the `pod repo push` command'
 
-
       def initialize(argv)
         @push_command = Repo::Push.new(argv)
         super

data/lib/cocoapods/command/repo.rb

@@ -19,14 +19,14 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME',   :required],
-            ['URL',    :required],
-            ['BRANCH', :optional]
+          CLAide::Argument.new('NAME',   true),
+          CLAide::Argument.new('URL',    true),
+          CLAide::Argument.new('BRANCH', false),
         ]
 
         def self.options
           [
-            ["--shallow", "Create a shallow clone (fast clone, but no push capabilities)"],
+            ['--shallow', 'Create a shallow clone (fast clone, but no push capabilities)'],
           ].concat(super)
         end
 
@@ -39,7 +39,7 @@ module Pod
         def validate!
           super
           unless @name && @url
-            help! "Adding a repo needs a `NAME` and a `URL`."
+            help! 'Adding a repo needs a `NAME` and a `URL`.'
           end
         end
 
@@ -69,7 +69,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :optional]
+          CLAide::Argument.new('NAME', false),
         ]
 
         def initialize(argv)
@@ -94,11 +94,11 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME | DIRECTORY', :optional]
+          CLAide::Argument.new(%w(NAME DIRECTORY), false),
         ]
 
         def self.options
-          [["--only-errors", "Lint presents only the errors"]].concat(super)
+          [['--only-errors', 'Lint presents only the errors']].concat(super)
         end
 
         def initialize(argv)
@@ -114,16 +114,16 @@ module Pod
         #
         def run
           if @name
-            dirs = File.exists?(@name) ? [ Pathname.new(@name) ] : [ dir ]
+            dirs = File.exist?(@name) ? [Pathname.new(@name)] : [dir]
           else
-            dirs = config.repos_dir.children.select {|c| c.directory?}
+            dirs = config.repos_dir.children.select(&:directory?)
           end
           dirs.each do |dir|
             SourcesManager.check_version_information(dir)
             UI.puts "\nLinting spec repo `#{dir.realpath.basename}`\n".yellow
 
             validator = Source::HealthReporter.new(dir)
-            validator.pre_check do |name, version|
+            validator.pre_check do |_name, _version|
               UI.print '.'
             end
             report = validator.analyze
@@ -144,7 +144,7 @@ module Pod
 
             UI.puts "Analyzed #{report.analyzed_paths.count} podspecs files.\n\n"
             if report.pods_by_error.count.zero?
-              UI.puts "All the specs passed validation.".green << "\n\n"
+              UI.puts 'All the specs passed validation.'.green << "\n\n"
             else
               raise Informative, "#{report.pods_by_error.count} podspecs failed validation."
             end
@@ -162,7 +162,7 @@ module Pod
         DESC
 
         self.arguments = [
-            ['NAME', :required]
+          CLAide::Argument.new('NAME', true),
         ]
 
         def initialize(argv)
@@ -175,7 +175,7 @@ module Pod
           help! 'Deleting a repo needs a `NAME`.' unless @name
           help! "repo #{@name} does not exist" unless File.directory?(dir)
           help! "You do not have permission to delete the #{@name} repository." \
-                "Perhaps try prefixing this command with sudo." unless File.writable?(dir)
+                'Perhaps try prefixing this command with sudo.' unless File.writable?(dir)
         end
 
         def run
@@ -194,4 +194,3 @@ module Pod
     end
   end
 end
-

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

@@ -8,20 +8,20 @@ module Pod
         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.
+        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]
+          CLAide::Argument.new('REPO', true),
+          CLAide::Argument.new('NAME.podspec', false),
         ]
 
         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)
+          [['--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)
@@ -34,7 +34,7 @@ module Pod
 
         def validate!
           super
-          help! "A spec-repo name is required." unless @repo
+          help! 'A spec-repo name is required.' unless @repo
         end
 
         def run
@@ -69,15 +69,14 @@ module Pod
           end
 
           if is_master_repo
-            raise Informative, "To push to the CocoaPods master repo use " \
+            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."
+              '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
@@ -87,7 +86,7 @@ module Pod
             validator.only_errors = @allow_warnings
             begin
               validator.validate
-            rescue Exception
+            rescue
               raise Informative, "The `#{podspec}` specification does not validate."
             end
             raise Informative, "The `#{podspec}` specification does not validate." unless validator.validated?
@@ -143,7 +142,7 @@ module Pod
             FileUtils.cp(spec_file, output_path)
             Dir.chdir(repo_dir) do
               # only commit if modified
-              if git!("status --porcelain 2>&1").include?(spec.name)
+              if git!('status --porcelain 2>&1').include?(spec.name)
                 UI.puts " - #{message}"
                 git!("add #{spec.name}")
                 git!("commit --no-verify -m '#{message}'")
@@ -172,15 +171,22 @@ module Pod
         # @return [Pathname] The directory of the repository.
         #
         def repo_dir
+          specs_dir = Pathname.new(File.join(config.repos_dir, @repo, 'Specs'))
           dir = config.repos_dir + @repo
-          raise Informative, "`#{@repo}` repo not found" unless dir.exist?
+          if specs_dir.exist?
+            dir = specs_dir
+          elsif dir.exist?
+            dir
+          else
+            raise Informative, "`#{@repo}` repo not found either in #{specs_dir} or #{dir}"
+          end
           dir
         end
 
         # @return [Array<Pathname>] The path of the specifications to push.
         #
         def podspec_files
-          files = Pathname.glob(@podspec || "*.podspec")
+          files = Pathname.glob(@podspec || '*.podspec')
           raise Informative, "Couldn't find any .podspec file in current directory" if files.empty?
           files
         end
@@ -192,7 +198,6 @@ module Pod
         end
 
         #---------------------------------------------------------------------#
-
       end
     end
   end

data/lib/cocoapods/command/search.rb

@@ -10,16 +10,16 @@ module Pod
       DESC
 
       self.arguments = [
-          ['QUERY', :required]
+        CLAide::Argument.new('QUERY', true),
       ]
 
       def self.options
         [
-          ["--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"],
-          ["--osx",   "Restricts the search to Pods supported on OS X"],
-          ["--web",   "Searches on cocoapods.org"]
+          ['--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'],
+          ['--osx',   'Restricts the search to Pods supported on OS X'],
+          ['--web',   'Searches on cocoapods.org'],
         ].concat(super.reject { |option, _| option == '--silent' })
       end
 
@@ -36,13 +36,13 @@ module Pod
 
       def validate!
         super
-        help! "A search query is required." unless @query
+        help! 'A search query is required.' unless @query
 
         unless @web
           begin
             /#{@query.join(' ').strip}/
           rescue RegexpError
-            help! "A valid regular expression is required."
+            help! 'A valid regular expression is required.'
           end
         end
       end
@@ -62,9 +62,9 @@ module Pod
         query_parameter = [
           ('on:osx' if @supported_on_osx),
           ('on:ios' if @supported_on_ios),
-          @query
+          @query,
         ].compact.flatten.join(' ')
-        url = "http://cocoapods.org/?q=#{CGI.escape(query_parameter).gsub("+", "%20")}"
+        url = "http://cocoapods.org/?q=#{CGI.escape(query_parameter).gsub('+', '%20')}"
         UI.puts("Opening #{url}")
         open!(url)
       end
@@ -72,10 +72,10 @@ module Pod
       def local_search
         sets = SourcesManager.search_by_name(@query.join(' ').strip, @full_text_search)
         if @supported_on_ios
-          sets.reject!{ |set| !set.specification.available_platforms.map(&:name).include?(:ios) }
+          sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:ios) }
         end
         if @supported_on_osx
-          sets.reject!{ |set| !set.specification.available_platforms.map(&:name).include?(:osx) }
+          sets.reject! { |set| !set.specification.available_platforms.map(&:name).include?(:osx) }
         end
 
         statistics_provider = Config.instance.spec_statistics_provider
@@ -91,7 +91,6 @@ module Pod
           end
         end
       end
-
     end
   end
 end