cocoapods 0.14.0 → 0.15.0

data/lib/cocoapods/command/search.rb

@@ -12,20 +12,22 @@ module Pod
       end
 
       def self.options
-        [["--full", "Search by name, summary, and description"]].concat(Presenter.options).concat(super)
+        [[
+          "--full",  "Search by name, summary, and description",
+          "--stats", "Show additional stats (like GitHub watchers and forks)"
+        ]].concat(super)
       end
 
       def initialize(argv)
         @full_text_search = argv.option('--full')
-        @presenter = Presenter.new(argv)
+        @stats = argv.option('--stats')
         @query = argv.shift_argument
         super unless argv.empty? && @query
       end
 
       def run
         sets = Source.search_by_name(@query.strip, @full_text_search)
-        sets.each {|s| puts @presenter.describe(s)}
-        puts
+        sets.each { |set| UI.pod(set, (@stats ? :stats : :normal)) }
       end
     end
   end

data/lib/cocoapods/command/setup.rb

@@ -89,21 +89,22 @@ module Pod
       end
 
       def run
-        print_title "Setting up CocoaPods master repo"
-        if dir.exist?
-          set_master_repo_url
-          set_master_repo_branch
-          update_master_repo
-        else
-          add_master_repo
-        end
-        # Mainly so the specs run with submodule repos
-        if (dir + '.git/hooks').exist?
-          hook = dir + '.git/hooks/pre-commit'
-          hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
-          `chmod +x '#{hook}'`
+        UI.section "Setting up CocoaPods master repo" do
+          if dir.exist?
+            set_master_repo_url
+            set_master_repo_branch
+            update_master_repo
+          else
+            add_master_repo
+          end
+          # Mainly so the specs run with submodule repos
+          if (dir + '.git/hooks').exist?
+            hook = dir + '.git/hooks/pre-commit'
+            hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
+            `chmod +x '#{hook}'`
+          end
         end
-        print_subtitle "Setup completed (#{push? ? "push" : "read-only"} access)"
+        UI.puts "Setup completed (#{push? ? "push" : "read-only"} access)".green
       end
     end
   end

data/lib/cocoapods/command/spec.rb

@@ -20,6 +20,7 @@ module Pod
 
       def self.options
         [ ["--quick",       "Lint skips checks that would require to download and build the spec"],
+          ["--local",       "Lint a podspec against the local files contained in its directory"],
           ["--only-errors", "Lint validates even if warnings are present"],
           ["--no-clean",    "Lint leaves the build directory intact for inspection"] ].concat(super)
       end
@@ -32,9 +33,10 @@ module Pod
           super if @name_or_url.nil?
           super unless argv.empty?
         elsif @action == 'lint'
-          @quick          = argv.option('--quick')
-          @only_errors    = argv.option('--only-errors')
-          @no_clean       = argv.option('--no-clean')
+          @quick       =  argv.option('--quick')
+          @local       =  argv.option('--local')
+          @only_errors =  argv.option('--only-errors')
+          @no_clean    =  argv.option('--no-clean')
           @podspecs_paths = argv
         else
           super
@@ -59,21 +61,22 @@ module Pod
           repo_id = repo_id_match[1]
           data = github_data_for_template(repo_id)
           data[:name] = @name_or_url if @url
-          puts semantic_versioning_notice(repo_id, data[:name]) if data[:version] == '0.0.1'
+          UI.puts semantic_versioning_notice(repo_id, data[:name]) if data[:version] == '0.0.1'
         else
           data = default_data_for_template(@name_or_url)
         end
         spec = spec_template(data)
         (Pathname.pwd + "#{data[:name]}.podspec").open('w') { |f| f << spec }
-        puts "\nSpecification created at #{data[:name]}.podspec".green
+        UI.puts "\nSpecification created at #{data[:name]}.podspec".green
       end
 
       def lint
-        puts
+        UI.puts
         invalid_count = 0
         podspecs_to_lint.each do |podspec|
-          linter          = Linter.new(podspec)
-          linter.quick    = @quick
+          linter       = Linter.new(podspec)
+          linter.quick = @quick
+          linter.local = @local
           linter.no_clean = @no_clean
 
           # Show immediatly which pod is being processed.
@@ -93,19 +96,19 @@ module Pod
           end
 
           # This overwrites the previously printed text
-          puts " -> ".send(color) << linter.spec_name unless config.silent?
+          UI.puts " -> ".send(color) << linter.spec_name unless config.silent?
           print_messages('ERROR', linter.errors)
           print_messages('WARN',  linter.warnings)
           print_messages('NOTE',  linter.notes)
 
-          puts unless config.silent?
+          UI.puts unless config.silent?
         end
 
-        puts "Analyzed #{podspecs_to_lint.count} podspecs files.\n\n" unless config.silent?
+        UI.puts "Analyzed #{podspecs_to_lint.count} podspecs files.\n\n" unless config.silent?
         count = podspecs_to_lint.count
         if invalid_count == 0
           lint_passed_message = count == 1 ? "#{podspecs_to_lint.first.basename} passed validation." : "All the specs passed validation."
-          puts lint_passed_message.green << "\n\n" unless config.silent?
+          UI.puts lint_passed_message.green << "\n\n" unless config.silent?
         else
           raise Informative, count == 1 ? "The spec did not pass validation." : "#{invalid_count} out of #{count} specs failed validation."
         end
@@ -116,7 +119,7 @@ module Pod
 
       def print_messages(type, messages)
         return if config.silent?
-        messages.each {|msg| puts "    - #{type.ljust(5)} | #{msg}"}
+        messages.each {|msg| UI.puts "    - #{type.ljust(5)} | #{msg}"}
       end
 
       def podspecs_to_lint
@@ -171,7 +174,7 @@ module Pod
         data = {}
 
         data[:name]          = repo['name']
-        data[:summary]       = repo['description'].gsub(/["]/, '\"')
+        data[:summary]       = (repo['description'] || '').gsub(/["]/, '\"')
         data[:homepage]      = (repo['homepage'] && !repo['homepage'].empty? ) ? repo['homepage'] : repo['html_url']
         data[:author_name]   = user['name']  || user['login']
         data[:author_email]  = user['email'] || 'email@address.com'

data/lib/cocoapods/command/update.rb

@@ -9,10 +9,18 @@ module Pod
       Updates all dependencies.}
       end
 
+      def self.options
+        [["--no-update", "Skip running `pod repo update` before install"]].concat(super)
+      end
+
+      def initialize(argv)
+        config.skip_repo_update = argv.option('--no-update')
+        super unless argv.empty?
+      end
+
       def run
         verify_podfile_exists!
         verify_lockfile_exists!
-        update_spec_repos_if_necessary!
         run_install_with_update(true)
       end
     end

data/lib/cocoapods/config.rb

@@ -14,7 +14,7 @@ module Pod
     attr_accessor :clean, :verbose, :silent
     attr_accessor :generate_docs, :doc_install
     attr_accessor :integrate_targets
-    attr_accessor :git_cache_size
+    attr_accessor :new_version_message, :skip_repo_update
 
     alias_method :clean?,             :clean
     alias_method :verbose?,           :verbose
@@ -22,11 +22,13 @@ module Pod
     alias_method :generate_docs?,     :generate_docs
     alias_method :doc_install?,       :doc_install
     alias_method :integrate_targets?, :integrate_targets
+    alias_method :skip_repo_update?,  :skip_repo_update
+    alias_method :new_version_message?, :new_version_message
 
     def initialize
       @repos_dir = Pathname.new(File.expand_path("~/.cocoapods"))
-      @verbose = @silent = false
-      @clean = @generate_docs = @doc_install = @integrate_targets = true
+      @verbose = @silent = @skip_repo_update = false
+      @clean = @generate_docs = @doc_install = @integrate_targets = @new_version_message = true
     end
 
     def project_root
@@ -38,7 +40,13 @@ module Pod
     end
 
     def project_podfile
-      @project_podfile ||= project_root + 'Podfile'
+      unless @project_podfile
+        @project_podfile = project_root + 'CocoaPods.podfile'
+        unless @project_podfile.exist?
+          @project_podfile = project_root + 'Podfile'
+        end
+      end
+      @project_podfile
     end
 
     def project_lockfile

data/lib/cocoapods/dependency.rb

@@ -177,10 +177,10 @@ module Pod
           output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
           output_path.dirname.mkpath
           if podspec.is_a?(String)
-            raise Informative, "No podspec found for `#{name}' in `#{description}'" unless podspec.include?('Spec.new')
+            raise Informative, "No podspec found for `#{name}' in #{description}" unless podspec.include?('Spec.new')
             output_path.open('w') { |f| f.puts(podspec) }
           else
-            raise Informative, "No podspec found for `#{name}' in `#{description}'" unless podspec.exist?
+            raise Informative, "No podspec found for `#{name}' in #{description}" unless podspec.exist?
             FileUtils.copy(podspec, output_path)
           end
         end
@@ -193,14 +193,15 @@ module Pod
 
       class GitSource < AbstractExternalSource
         def copy_external_source_into_sandbox(sandbox, platform)
-          puts "-> Pre-downloading: '#{name}'" unless config.silent?
-          target = sandbox.root + name
-          target.rmtree if target.exist?
-          downloader = Downloader.for_target(sandbox.root + name, @params)
-          downloader.download
-          store_podspec(sandbox, target + "#{name}.podspec")
-          if local_pod = sandbox.installed_pod_named(name, platform)
-            local_pod.downloaded = true
+          UI.info("->".green + " Pre-downloading: '#{name}'") do
+            target = sandbox.root + name
+            target.rmtree if target.exist?
+            downloader = Downloader.for_target(sandbox.root + name, @params)
+            downloader.download
+            store_podspec(sandbox, target + "#{name}.podspec")
+            if local_pod = sandbox.installed_pod_named(name, platform)
+              local_pod.downloaded = true
+            end
           end
         end
 
@@ -216,10 +217,11 @@ module Pod
       # can be http, file, etc
       class PodspecSource < AbstractExternalSource
         def copy_external_source_into_sandbox(sandbox, _)
-          puts "-> Fetching podspec for `#{name}' from: #{@params[:podspec]}" unless config.silent?
-          path = @params[:podspec]
-          path = Pathname.new(path).expand_path if path.start_with?("~")
-          open(path) { |io| store_podspec(sandbox, io.read) }
+          UI.info("->".green + " Fetching podspec for `#{name}' from: #{@params[:podspec]}") do
+            path = @params[:podspec]
+            path = Pathname.new(path).expand_path if path.start_with?("~")
+            open(path) { |io| store_podspec(sandbox, io.read) }
+          end
         end
 
         def description
@@ -229,7 +231,8 @@ module Pod
 
       class LocalSource < AbstractExternalSource
         def pod_spec_path
-          path = Pathname.new(@params[:local]).expand_path + "#{name}.podspec"
+          path = Pathname.new(@params[:local]).expand_path
+          path += "#{name}.podspec"# unless path.to_s.include?("#{name}.podspec")
           raise Informative, "No podspec found for `#{name}' in `#{@params[:local]}'" unless path.exist?
           path
         end

data/lib/cocoapods/downloader/git.rb

@@ -7,33 +7,34 @@ module Pod
   class Downloader
     class Git < Downloader
       include Config::Mixin
+
       executable :git
 
       MAX_CACHE_SIZE = 500
 
       def download
         create_cache unless cache_exist?
-        puts '-> Cloning git repo' if config.verbose?
-
-        if options[:tag]
-          download_tag
-        elsif options[:branch]
-          download_branch
-        elsif options[:commit]
-          download_commit
-        else
-          download_head
+        UI.section(' > Cloning git repo', '', 1) do
+          if options[:tag]
+            download_tag
+          elsif options[:branch]
+            download_branch
+          elsif options[:commit]
+            download_commit
+          else
+            download_head
+          end
+          Dir.chdir(target_path) { git! "submodule update --init"  } if options[:submodules]
         end
-
-        Dir.chdir(target_path) { git! "submodule update --init"  } if options[:submodules]
         prune_cache
       end
 
       def create_cache
-        puts "-> Creating cache git repo (#{cache_path})" if config.verbose?
-        cache_path.rmtree if cache_path.exist?
-        cache_path.mkpath
-        clone(url, cache_path)
+        UI.section(" > Creating cache git repo (#{cache_path})",'',1) do
+          cache_path.rmtree if cache_path.exist?
+          cache_path.mkpath
+          git! %Q|clone  --mirror "#{url}" "#{cache_path}"|
+        end
       end
 
       def prune_cache
@@ -42,7 +43,7 @@ module Pod
           repos = Pathname.new(caches_dir).children.select { |c| c.directory? }.sort_by(&:ctime)
           while caches_size >= MAX_CACHE_SIZE && !repos.empty?
             dir = repos.shift
-            puts '->'.yellow << " Removing git cache for `#{origin_url(dir)}'" if config.verbose?
+            UI.message "#{'->'.yellow} Removing git cache for `#{origin_url(dir)}'"
             dir.rmtree
           end
         end
@@ -74,12 +75,17 @@ module Pod
       end
 
       def update_cache
-        puts "-> Updating cache git repo (#{cache_path})" if config.verbose?
-        Dir.chdir(cache_path) do
-          git! "reset --hard HEAD"
-          git! "clean -d -x -f"
-          git! "pull origin master"
-          git! "fetch --tags"
+        UI.section(" > Updating cache git repo (#{cache_path})",'',1) do
+          Dir.chdir(cache_path) do
+            if git("config core.bare").chomp == "true"
+              git! "remote update"
+            else
+              git! "reset --hard HEAD"
+              git! "clean -d -x -f"
+              git! "pull origin master"
+              git! "fetch --tags"
+            end
+          end
         end
       end
 
@@ -95,10 +101,15 @@ module Pod
         raise Informative, "[!] Cache unable to find git reference `#{ref}' for `#{url}'.".red unless ref_exists?(ref)
       end
 
+      def branch_exists?(branch)
+        Dir.chdir(cache_path) { git "branch --all | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
+        $? == 0
+      end
+
       def ensure_remote_branch_exists(branch)
-        Dir.chdir(cache_path) { git "branch -r | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
-        return if $? == 0
-        raise Informative, "[!] Cache unable to find git reference `#{branch}' for `#{url}' (#{$?}).".red
+        return if branch_exists?(branch)
+        update_cache
+        raise Informative, "[!] Cache unable to find git reference `#{branch}' for `#{url}' (#{$?}).".red unless branch_exists?(branch)
       end
 
       def download_head
@@ -138,12 +149,14 @@ module Pod
           git! "remote add upstream '#{@url}'" # we need to add the original url, not the cache url
           git! "fetch -q upstream" # refresh the branches
           git! "checkout --track -b activated-pod-commit upstream/#{options[:branch]}" # create a new tracking branch
-          puts "Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}" if config.verbose?
+          UI.message("Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}")
         end
       end
 
       def clone(from, to)
-        git! %Q|clone "#{from}" "#{to}"|
+        UI.section(" > Cloning to Pods folder",'',1) do
+          git! %Q|clone "#{from}" "#{to}"|
+        end
       end
     end
 

data/lib/cocoapods/downloader/http.rb

@@ -16,9 +16,10 @@ module Pod
       def download
         @filename        = filename_with_type type
         @download_path   = target_path + @filename
-
-        download_file @download_path
-        extract_with_type @download_path, type
+        UI.section(' > Downloading from HTTP', '', 3) do
+          download_file @download_path
+          extract_with_type @download_path, type
+        end
       end
 
       def type
@@ -33,6 +34,8 @@ module Pod
           :tgz
         elsif url =~ /.tar$/
           :tar
+        elsif url =~ /.(tbz|tar\.bz2)$/
+          :tbz
         else
           nil
         end
@@ -46,6 +49,8 @@ module Pod
           "file.tgz"
         when :tar
           "file.tar"
+        when :tbz
+          "file.tbz"
         else
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end
@@ -63,6 +68,8 @@ module Pod
           tar! "xfz '#{full_filename}' -C '#{target_path}'"
         when :tar
           tar! "xf '#{full_filename}' -C '#{target_path}'"
+        when :tbz
+          tar! "xfj '#{full_filename}' -C '#{target_path}'"
         else
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end

data/lib/cocoapods/downloader/mercurial.rb

@@ -4,10 +4,12 @@ module Pod
       executable :hg
 
       def download
-        if options[:revision]
-          download_revision
-        else
-          download_head
+        UI.section(' > Cloning mercurial repo', '', 3) do
+          if options[:revision]
+            download_revision
+          else
+            download_head
+          end
         end
       end