cocoapods 0.14.0 → 0.15.0

data/CHANGELOG.md

@@ -1,6 +1,45 @@
 ## Master
 
-[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...master)
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.15.0...master)
+
+## 0.15.0
+
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.14.0...0.15.0) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.3.3...0.3.4)
+
+###### Enhancements
+- Pod `install` will update the specs repo only if needed.
+  [#533](https://github.com/CocoaPods/CocoaPods/issues/533)
+- CocoaPods now searches for the highest version of a Pod on all the repos.
+  [#85](https://github.com/CocoaPods/CocoaPods/issues/85)
+- Added a pre install hook to the Podfile and to root specifications.
+  [#486](https://github.com/CocoaPods/CocoaPods/issues/486)
+- Support for `header_mappings_dir` attribute in subspecs.
+- Added support for linting a Podspec using the files from its folder `pod spec
+  lint --local`
+- Refactored UI.
+- Added support for Podfiles named `CocoaPods.podfile` which allows to
+  associate an editor application in Mac OS X.
+  [#528](https://github.com/CocoaPods/CocoaPods/issues/528)
+- Added config option to disable the new version available message.
+  [#448](https://github.com/CocoaPods/CocoaPods/issues/448)
+- Added support for extracting `.tar.bz2` files
+  [#522](https://github.com/CocoaPods/CocoaPods/issues/522)
+- Improved feedback for errors of repo subcommands.
+  [#505](https://github.com/CocoaPods/CocoaPods/issues/505)
+
+
+###### Bug fixes
+- Subspecs namespacing has been restored.
+  [#541](https://github.com/CocoaPods/CocoaPods/issues/541)
+- Improvements to the git cache that should be more robust.
+  [#517](https://github.com/CocoaPods/CocoaPods/issues/517)
+  - In certain conditions pod setup would execute twice.
+- The git cache now is updated if a branch is not found
+  [#514](https://github.com/CocoaPods/CocoaPods/issues/514)
+- Forcing UTF-8 encoding on licenses generation in Ruby 1.9.
+  [#530](https://github.com/CocoaPods/CocoaPods/issues/530)
+- Added support for `.hpp` headers.
+  [#244](https://github.com/CocoaPods/CocoaPods/issues/244)
 
 ## 0.14.0
 
@@ -45,32 +84,26 @@
     [#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.
+- Add meaningful error messages
+  - ia 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)

data/bin/pod

@@ -7,6 +7,10 @@ if $0 == __FILE__
   $:.unshift File.expand_path('../../lib', __FILE__)
 end
 
+if (ENV['CP_STDOUT_SYNC'] == 'TRUE')
+  STDOUT.sync = true
+end
+
 require 'cocoapods'
 
 Pod::Command.run(*ARGV)

data/lib/cocoapods.rb

@@ -7,13 +7,12 @@ require 'rubygems'
 #
 # E.g. https://github.com/CocoaPods/CocoaPods/issues/398
 unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(Gem::VERSION))
-  require 'colored'
   STDERR.puts "Your RubyGems version (#{Gem::VERSION}) is too old, please update with: `gem update --system`".red
   exit 1
 end
 
 module Pod
-  VERSION = '0.14.0'
+  VERSION = '0.15.0'
 
   class PlainInformative < StandardError
   end
@@ -41,6 +40,7 @@ module Pod
   autoload :Source,                 'cocoapods/source'
   autoload :Spec,                   'cocoapods/specification'
   autoload :Specification,          'cocoapods/specification'
+  autoload :UI,                     'cocoapods/user_interface'
   autoload :Version,                'cocoapods/version'
 
   autoload :Pathname,               'pathname'

data/lib/cocoapods/command.rb

@@ -7,7 +7,6 @@ module Pod
     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'
@@ -70,10 +69,11 @@ module Pod
 
     def self.run(*argv)
       sub_command = parse(*argv)
-      unless ENV['SKIP_SETUP']
+      unless sub_command.is_a?(Setup) || ENV['SKIP_SETUP']
         Setup.new(ARGV.new).run_if_needed
       end
       sub_command.run
+      UI.puts
 
     rescue Interrupt
       puts "[!] Cancelled".red
@@ -142,29 +142,6 @@ module Pod
         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
-      elsif !config.silent? && !only_verbose
-        puts title
-      end
-    end
-
-    def print_subtitle(title, only_verbose = false)
-      if config.verbose?
-        puts "\n" + title.green
-      elsif !config.silent? && !only_verbose
-        puts title
-      end
-    end
   end
 end
 

data/lib/cocoapods/command/install.rb

@@ -35,7 +35,7 @@ module Pod
         config.clean             = !argv.option('--no-clean')
         config.generate_docs     = !argv.option('--no-doc')
         config.integrate_targets = !argv.option('--no-integrate')
-        @update_repo             = !argv.option('--no-update')
+        config.skip_repo_update  = argv.option('--no-update')
         super unless argv.empty?
       end
 
@@ -48,7 +48,6 @@ module Pod
 
       def run
         verify_podfile_exists!
-        update_spec_repos_if_necessary!
         run_install_with_update(false)
       end
     end

data/lib/cocoapods/command/linter.rb

@@ -6,6 +6,14 @@ module Pod
       # TODO: Add check to ensure that attributes inherited by subspecs are not duplicated ?
 
       attr_accessor :quick, :no_clean, :repo_path
+
+      # @return [Bool] Wether the lint should be performed against the root of
+      #   the podspec instead to its original source. Uses the `:local` option
+      #   of the Podfile.
+      #
+      attr_accessor :local
+      alias :local? :local
+
       attr_reader   :spec, :file
       attr_reader   :errors, :warnings, :notes
 
@@ -91,7 +99,7 @@ module Pod
         if `which xcodebuild`.strip.empty?
           puts "Skipping compilation with `xcodebuild' because it can't be found.\n".yellow if config.verbose?
         else
-          puts "Building with xcodebuild.\n".yellow if config.verbose?
+          puts "\nBuilding with xcodebuild.\n".yellow if config.verbose?
           # treat xcodebuild warnings as notes because the spec maintainer might not be the author of the library
           xcodebuild_output.each { |msg| ( msg.include?('error: ') ? @platform_errors[@platform] : @platform_notes[@platform] ) << msg }
         end
@@ -103,6 +111,7 @@ module Pod
       def install_pod
         podfile = podfile_from_spec
         config.verbose
+        config.skip_repo_update = true
         sandbox = Sandbox.new(config.project_pods_root)
         resolver = Resolver.new(podfile, nil, sandbox)
         installer = Installer.new(resolver)
@@ -113,11 +122,16 @@ module Pod
 
       def podfile_from_spec
         name     = spec.name
-        podspec  = file.realpath.to_s
+        podspec  = file.realpath
         platform = @platform
+        local    = local?
         podfile  = Pod::Podfile.new do
           platform(platform.to_sym, platform.deployment_target)
-          pod name, :podspec => podspec
+          if (local)
+            pod name, :local => podspec.dirname.to_s
+          else
+            pod name, :podspec => podspec.to_s
+          end
         end
         podfile
       end
@@ -166,10 +180,11 @@ module Pod
         messages << "Unrecognized platfrom" unless platform_valid?
         messages << "Missing name"          unless spec.name
         messages << "Missing version"       unless spec.version
-        messages << "Missing summary"       unless spec.summary
+        messages << "Missing summary"       if !spec.summary || spec.summary.empty?
         messages << "Missing homepage"      unless spec.homepage
         messages << "Missing author(s)"     unless spec.authors
         messages << "Missing or invalid source: #{spec.source}" unless source_valid?
+        messages << "The summary should be short use `description` (max 140 characters)." if spec.summary && spec.summary.length > 140
 
         # attributes with multiplatform values
         return messages unless platform_valid?
@@ -227,11 +242,16 @@ module Pod
         messages << "The description is not meaningful"                     if spec.description && spec.description =~ /An optional longer description of/
         messages << "The summary should end with a dot"                     if spec.summary !~ /.*\./
         messages << "The description should end with a dot"                 if spec.description !~ /.*\./ && spec.description != spec.summary
+        messages << "The summary should end with a dot"                     if spec.summary !~ /.*\./
         messages << "Comments must be deleted"                              if text.scan(/^\s*#/).length > 24
         messages << "Warnings must not be disabled (`-Wno' compiler flags)" if spec.compiler_flags.split(' ').any? {|flag| flag.start_with?('-Wno') }
 
         if (git_source = source[:git])
           messages << "Git sources should specify either a tag or a commit" unless source[:commit] || source[:tag]
+          if spec.version.to_s != '0.0.1'
+          messages << "The version of the spec should be part of the git tag (not always applicable)" if source[:tag] && !source[:tag].include?(spec.version.to_s)
+          messages << "Git sources without tag should be marked as 0.0.1 (not always applicable)" if !source[:tag]
+          end
           if git_source.include?('github.com')
             messages << "Github repositories should end in `.git'"          unless git_source.end_with?('.git')
             messages << "Github repositories should use `https' link"       unless git_source.start_with?('https://github.com') || git_source.start_with?('git://gist.github.com')

data/lib/cocoapods/command/list.rb

@@ -14,23 +14,26 @@ module Pod
       end
 
       def self.options
-        [["--update", "Run `pod repo update` before listing"]].concat(Presenter.options).concat(super)
+        [[
+          "--update", "Run `pod repo update` before listing",
+          "--stats",  "Show additional stats (like GitHub watchers and forks)"
+        ]].concat(super)
       end
 
       extend Executable
       executable :git
 
       def initialize(argv)
-        @update    = argv.option('--update')
-        @new       = argv.option('new')
-        @presenter = Presenter.new(argv)
+        @update = argv.option('--update')
+        @stats  = argv.option('--stats')
+        @new    = argv.option('new')
         super unless argv.empty?
       end
 
       def list_all
         sets = Source.all_sets
-        sets.each {|s| puts @presenter.describe(s)}
-        puts "\n#{sets.count} pods were found"
+        sets.each { |set| UI.pod(set, :name) }
+        UI.puts "\n#{sets.count} pods were found"
       end
 
       def list_new
@@ -53,16 +56,18 @@ module Pod
         days.reverse.each do |d|
           sets = groups[d]
           next unless sets
-          puts "\nPods added in the last #{d == 1 ? 'day' : "#{d} days"}".yellow
-          sets.sort_by {|s| creation_dates[s.name]}.each {|s| puts @presenter.describe(s)}
+          UI.section("\nPods added in the last #{"day".pluralize(d)}".yellow) do
+            sorted = sets.sort_by {|s| creation_dates[s.name]}
+            sorted.each { |set| UI.pod(set, (@stats ? :stats : :name)) }
+          end
         end
       end
 
       def run
-        puts "\nUpdating Spec Repositories\n".yellow if @update && config.verbose?
-        Repo.new(ARGV.new(["update"])).run           if @update
+        UI.section("\nUpdating Spec Repositories\n".yellow) do
+          Repo.new(ARGV.new(["update"])).run
+        end if @update && config.verbose?
         @new ? list_new : list_all
-        puts
       end
     end
   end

data/lib/cocoapods/command/outdated.rb

@@ -11,13 +11,11 @@ module Pod
       end
 
       def self.options
-        [
-          ["--no-update", "Skip running `pod repo update` before install"],
-        ].concat(super)
+        [["--no-update", "Skip running `pod repo update` before install"]].concat(super)
       end
 
       def initialize(argv)
-        @update_repo = !argv.option('--no-update')
+        config.skip_repo_update = argv.option('--no-update')
         super unless argv.empty?
       end
 

data/lib/cocoapods/command/push.rb

@@ -36,20 +36,20 @@ module Pod
         update_repo
         add_specs_to_repo
         push_repo unless @local_only
-        puts
       end
 
       private
 
       def update_repo
-        puts "Updating the `#{@repo}' repo\n".yellow unless config.silent
+        UI.puts "Updating the `#{@repo}' repo\n".yellow unless config.silent
         # show the output of git even if not verbose
-        Dir.chdir(repo_dir) { puts `git pull 2>&1` }
+        # TODO: use the `git!' and find a way to show the output in realtime.
+        Dir.chdir(repo_dir) { UI.puts `git pull 2>&1` }
       end
 
       def push_repo
-        puts "\nPushing the `#{@repo}' repo\n".yellow unless config.silent
-        Dir.chdir(repo_dir) { puts `git push 2>&1` }
+        UI.puts "\nPushing the `#{@repo}' repo\n".yellow unless config.silent
+        Dir.chdir(repo_dir) { UI.puts `git push 2>&1` }
       end
 
       def repo_dir
@@ -71,7 +71,7 @@ module Pod
       end
 
       def validate_podspec_files
-        puts "\nValidating specs".yellow unless config.silent
+        UI.puts "\nValidating specs".yellow unless config.silent
         lint_argv = ["lint"]
         lint_argv << "--only-errors" if @allow_warnings
         lint_argv << "--silent" if config.silent
@@ -82,7 +82,7 @@ module Pod
       end
 
       def add_specs_to_repo
-        puts "\nAdding the specs to the #{@repo} repo\n".yellow unless config.silent
+        UI.puts "\nAdding the specs to the #{@repo} repo\n".yellow unless config.silent
         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)
@@ -93,14 +93,14 @@ module Pod
           else
             message = "[Add] #{spec}"
           end
-          puts " - #{message}" unless config.silent
+          UI.puts " - #{message}" unless config.silent
 
           FileUtils.mkdir_p(output_path)
           FileUtils.cp(Pathname.new(spec.name+'.podspec'), output_path)
           Dir.chdir(repo_dir) do
-            git("add #{spec.name}")
+            git!("add #{spec.name}")
             # Bypass the pre-commit hook because we already performed validation
-            git("commit --no-verify -m '#{message}'")
+            git!("commit --no-verify -m '#{message}'")
           end
         end
       end

data/lib/cocoapods/command/repo.rb

@@ -16,7 +16,7 @@ module Pod
       Updates the local clone of the spec-repo `NAME'. If `NAME' is omitted
       this will update all spec-repos in `~/.cocoapods'.
 
-    $ pod repo update [NAME | DIRECTORY]
+    $ pod repo lint [NAME | DIRECTORY]
 
       Lints the spec-repo `NAME'. If a directory is provided it is assumed
       to be the root of a repo. Finally, if NAME is not provided this will
@@ -56,23 +56,25 @@ module Pod
       end
 
       def add
-        print_subtitle "Cloning spec repo `#{@name}' from `#{@url}'#{" (branch `#{@branch}')" if @branch}"
-        config.repos_dir.mkpath
-        Dir.chdir(config.repos_dir) { git("clone '#{@url}' #{@name}") }
-        Dir.chdir(dir) { git("checkout #{@branch}") } if @branch
-        check_versions(dir)
+        UI.section("Cloning spec repo `#{@name}' from `#{@url}'#{" (branch `#{@branch}')" if @branch}") do
+          config.repos_dir.mkpath
+          Dir.chdir(config.repos_dir) { git!("clone '#{@url}' #{@name}") }
+          Dir.chdir(dir) { git!("checkout #{@branch}") } if @branch
+          check_versions(dir)
+        end
       end
 
       def update
         dirs = @name ? [dir] : config.repos_dir.children.select {|c| c.directory?}
         dirs.each do |dir|
-          print_subtitle "Updating spec repo `#{dir.basename}'"
-          Dir.chdir(dir) do
-            `git rev-parse  >/dev/null 2>&1`
-            if $?.exitstatus.zero?
-              git("pull")
-            else
-              puts("   Not a git repository") if config.verbose?
+          UI.section "Updating spec repo `#{dir.basename}'" do
+            Dir.chdir(dir) do
+              `git rev-parse  >/dev/null 2>&1`
+              if $?.exitstatus.zero?
+                git!("pull")
+              else
+                UI.message "Not a git repository"
+              end
             end
           end
           check_versions(dir)
@@ -87,7 +89,7 @@ module Pod
         end
         dirs.each do |dir|
           check_versions(dir)
-          puts "\nLinting spec repo `#{dir.realpath.basename}'\n".yellow
+          UI.puts "\nLinting spec repo `#{dir.realpath.basename}'\n".yellow
           podspecs = dir.glob('**/*.podspec')
           invalid_count = 0
 
@@ -109,19 +111,19 @@ module Pod
             end
 
             if should_display
-              puts " -> ".send(color) << linter.spec_name
+              UI.puts " -> ".send(color) << linter.spec_name
               print_messages('ERROR', linter.errors)
               unless @only_errors
                 print_messages('WARN',  linter.warnings)
                 print_messages('NOTE',  linter.notes)
               end
-              puts unless config.silent?
+              UI.puts unless config.silent?
             end
           end
-          puts "Analyzed #{podspecs.count} podspecs files.\n\n" unless config.silent?
+          UI.puts "Analyzed #{podspecs.count} podspecs files.\n\n" unless config.silent?
 
           if invalid_count == 0
-            puts "All the specs passed validation.".green << "\n\n" unless config.silent?
+            UI.puts "All the specs passed validation.".green << "\n\n" unless config.silent?
           else
             raise Informative, "#{invalid_count} podspecs failed validation."
           end
@@ -130,7 +132,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 check_versions(dir)
@@ -142,7 +144,7 @@ module Pod
           "\n[!] The `#{dir.basename.to_s}' repo requires CocoaPods #{version_msg}\n".red +
           "Update Cocoapods, or checkout the appropriate tag in the repo.\n\n"
         end
-        puts "\nCocoapods #{versions['last']} is available.\n".green if has_update(versions)
+        UI.puts "\nCocoapods #{versions['last']} is available.\n".green if has_update(versions) && config.new_version_message?
       end
 
       def self.compatible?(name)