cocoapods 0.14.0 → 0.15.0

data/lib/cocoapods/downloader/subversion.rb

@@ -8,11 +8,15 @@ module Pod
       end
 
       def download
-        svn! %|export "#{reference_url}" "#{target_path}"|
+        UI.section(' > Exporting subversion repo', '', 3) do
+          svn! %|export "#{reference_url}" "#{target_path}"|
+        end
       end
 
       def download_head
-        svn! %|export "#{trunk_url}" "#{target_path}"|
+        UI.section(' > Exporting subversion repo', '', 3) do
+          svn! %|export "#{trunk_url}" "#{target_path}"|
+        end
       end
 
       def reference_url

data/lib/cocoapods/executable.rb

@@ -3,12 +3,14 @@ require 'open4'
 module Pod
   module Executable
     class Indenter < ::Array
+      include Config::Mixin
+
       attr_accessor :indent
       attr_accessor :io
 
-      def initialize(io = nil, indent = '   ')
+      def initialize(io = nil)
         @io = io
-        @indent = indent
+        @indent = ' ' * UI.indentation_level
       end
 
       def <<(value)
@@ -27,20 +29,19 @@ module Pod
         end
         full_command = "#{bin} #{command}"
         if Config.instance.verbose?
-          puts "   $ #{full_command}"
+          UI.message("$ #{full_command}")
           stdout, stderr = Indenter.new(STDOUT), Indenter.new(STDERR)
         else
           stdout, stderr = Indenter.new, Indenter.new
         end
         status = Open4.spawn(full_command, :stdout => stdout, :stderr => stderr, :status => true)
-        # TODO not sure that we should be silent in case of a failure.
 
         output = stdout.join("\n") + stderr.join("\n") # TODO will this suffice?
         unless status.success?
           if should_raise
             raise Informative, "#{name} #{command}\n\n#{output}"
           else
-            puts((Config.instance.verbose? ? '   ' : '') << "[!] Failed: #{full_command}".red) unless Config.instance.silent?
+            UI.message("[!] Failed: #{full_command}".red)
           end
         end
         output
@@ -54,7 +55,6 @@ module Pod
         send(base_method, command, true)
       end
 
-
       private name
     end
   end

data/lib/cocoapods/generator/acknowledgements/markdown.rb

@@ -28,6 +28,7 @@ module Pod
         licenses_string = "#{title_from_string(header_title, 1)}\n#{header_text}\n"
         @pods.each do |pod|
           if (license = string_for_pod(pod))
+            license = license.force_encoding("UTF-8") if license.respond_to?(:force_encoding) 
             licenses_string += license
           end
         end

data/lib/cocoapods/installer.rb

@@ -23,7 +23,7 @@ module Pod
         # Add all source files to the project grouped by pod
         pod.relative_source_files_by_spec.each do |spec, paths|
           parent_group = pod.local? ? @project.local_pods : @project.pods
-          group = @project.add_spec_group(pod.name, parent_group)
+          group = @project.add_spec_group(spec.name, parent_group)
           paths.each do |path|
             group.files.new('path' => path.to_s)
           end
@@ -49,23 +49,21 @@ module Pod
     def install_dependencies!
       pods.sort_by { |pod| pod.top_specification.name.downcase }.each do |pod|
         should_install = @resolver.should_install?(pod.top_specification.name) || !pod.exists?
-
-        unless config.silent?
-          marker = config.verbose ? "\n-> ".green : ''
-          puts marker << ( should_install ? "Installing #{pod}".green : "Using #{pod}" )
-        end
-
         if should_install
-          unless pod.downloaded?
-            pod.implode
-            download_pod(pod)
+          UI.section("Installing #{pod}".green, "-> ".green) do
+            unless pod.downloaded?
+              pod.implode
+              download_pod(pod)
+            end
+            # The docs need to be generated before cleaning because the
+            # documentation is created for all the subspecs.
+            generate_docs(pod)
+            # Here we clean pod's that just have been downloaded or have been
+            # pre-downloaded in AbstractExternalSource#specification_from_sandbox.
+            pod.clean! if config.clean?
           end
-          # The docs need to be generated before cleaning because the
-          # documentation is created for all the subspecs.
-          generate_docs(pod)
-          # Here we clean pod's that just have been downloaded or have been
-          # pre-downloaded in AbstractExternalSource#specification_from_sandbox.
-          pod.clean! if config.clean?
+        else
+          UI.section("Using #{pod}", "-> ".green)
         end
       end
     end
@@ -89,10 +87,10 @@ module Pod
     def generate_docs(pod)
       doc_generator = Generator::Documentation.new(pod)
       if ( config.generate_docs? && !doc_generator.already_installed? )
-        puts "-> Installing documentation" if config.verbose?
+        UI.section " > Installing documentation"
         doc_generator.generate(config.doc_install?)
       else
-        puts "-> Using existing documentation" if config.verbose?
+        UI.section " > Using existing documentation"
       end
     end
 
@@ -100,47 +98,65 @@ module Pod
     #
     def remove_deleted_dependencies!
       resolver.removed_pods.each do |pod_name|
-        marker = config.verbose ? "\n-> ".red : ''
-        path = sandbox.root + pod_name
-        puts marker << "Removing #{pod_name}".red
-        path.rmtree if path.exist?
+        UI.section("Removing #{pod_name}", "-> ".red) do
+          path = sandbox.root + pod_name
+          path.rmtree if path.exist?
+        end
       end
     end
 
     def install!
       @sandbox.prepare_for_install
+      UI.section "Resolving dependencies of #{UI.path @podfile.defined_in_file}" do
+        specs_by_target
+      end
 
-      print_title "Resolving dependencies of: #{@podfile.defined_in_file}"
-      specs_by_target
+      UI.section "Removing deleted dependencies" do
+        remove_deleted_dependencies!
+      end unless resolver.removed_pods.empty?
 
-      print_title "Removing deleted dependencies" unless resolver.removed_pods.empty?
-      remove_deleted_dependencies!
+      UI.section "Downloading dependencies" do
+        install_dependencies!
+      end
 
-      print_title "Installing dependencies"
-      install_dependencies!
+      UI.section "Generating support files" do
+        UI.message "- Running pre install hooks" do
+          run_pre_install_hooks
+        end
 
-      print_title("Generating support files\n", false)
-      target_installers.each do |target_installer|
-        pods_for_target = pods_by_target[target_installer.target_definition]
-        target_installer.install!(pods_for_target, @sandbox)
-        acknowledgements_path = target_installer.target_definition.acknowledgements_path
-        Generator::Acknowledgements.new(target_installer.target_definition,
-                                        pods_for_target).save_as(acknowledgements_path)
-        generate_dummy_source(target_installer)
-      end
+        UI.message"- Generating project" do
+          project
+        end
+
+        UI.message"- Installing targets" do
+          generate_target_support_files
+        end
+
+        UI.message "- Running post install hooks" do
+          # Post install hooks run _before_ saving of project, so that they can alter it before saving.
+          run_post_install_hooks
+        end
 
-      puts "- Running post install hooks" if config.verbose?
-      # Post install hooks run _before_ saving of project, so that they can alter it before saving.
-      run_post_install_hooks
+        UI.message "- Writing Xcode project file to #{UI.path @sandbox.project_path}" do
+          project.save_as(@sandbox.project_path)
+        end
 
-      puts "- Writing Xcode project file to `#{@sandbox.project_path}'" if config.verbose?
-      project.save_as(@sandbox.project_path)
+        UI.message "- Writing lockfile in #{UI.path config.project_lockfile}" do
+          @lockfile = Lockfile.generate(@podfile, specs_by_target.values.flatten)
+          @lockfile.write_to_disk(config.project_lockfile)
+        end
+      end
 
-      puts "- Writing lockfile in `#{config.project_lockfile}'\n\n" if config.verbose?
-      @lockfile = Lockfile.generate(@podfile, specs_by_target.values.flatten)
-      @lockfile.write_to_disk(config.project_lockfile)
+        UserProjectIntegrator.new(@podfile).integrate! if config.integrate_targets?
+    end
 
-      UserProjectIntegrator.new(@podfile).integrate! if config.integrate_targets?
+    def run_pre_install_hooks
+      pods_by_target.each do |target_definition, pods|
+        pods.each do |pod|
+          pod.top_specification.pre_install(pod, target_definition)
+        end
+      end
+      @podfile.pre_install!(self)
     end
 
     def run_post_install_hooks
@@ -151,10 +167,20 @@ module Pod
           spec.post_install(target_installer)
         end
       end
-
       @podfile.post_install!(self)
     end
 
+    def generate_target_support_files
+      target_installers.each do |target_installer|
+        pods_for_target = pods_by_target[target_installer.target_definition]
+        target_installer.install!(pods_for_target, @sandbox)
+        acknowledgements_path = target_installer.target_definition.acknowledgements_path
+        Generator::Acknowledgements.new(target_installer.target_definition,
+                                        pods_for_target).save_as(acknowledgements_path)
+        generate_dummy_source(target_installer)
+      end
+    end
+
     def generate_dummy_source(target_installer)
       class_name_identifier = target_installer.target_definition.label
       dummy_source = Generator::DummySource.new(class_name_identifier)
@@ -198,15 +224,5 @@ module Pod
       end
       result
     end
-
-    private
-
-    def print_title(title, only_verbose = true)
-      if config.verbose?
-        puts "\n" + title.yellow
-      elsif !config.silent? && !only_verbose
-        puts title
-      end
-    end
   end
 end

data/lib/cocoapods/installer/target_installer.rb

@@ -97,20 +97,24 @@ module Pod
       end
 
       def create_files(pods, sandbox)
-        if @podfile.generate_bridge_support?
-          bridge_support_metadata_path = sandbox.root + @target_definition.bridge_support_name
-          puts "- Generating BridgeSupport metadata file at `#{bridge_support_metadata_path}'" if config.verbose?
+        bridge_support_metadata_path = sandbox.root + @target_definition.bridge_support_name
+        UI.message "- Generating BridgeSupport metadata file at #{UI.path bridge_support_metadata_path}" do
           bridge_support_generator_for(pods, sandbox).save_as(bridge_support_metadata_path)
           copy_resources_script_for(pods).resources << @target_definition.bridge_support_name
+        end if @podfile.generate_bridge_support?
+
+        UI.message "- Generating xcconfig file at #{UI.path(sandbox.root + @target_definition.xcconfig_name)}" do
+          xcconfig.save_as(sandbox.root + @target_definition.xcconfig_name)
+          @target_definition.xcconfig = xcconfig
+        end
+
+        UI.message "- Generating prefix header at #{UI.path(sandbox.root + @target_definition.prefix_header_name)}" do
+          save_prefix_header_as(sandbox.root + @target_definition.prefix_header_name, pods)
+        end
+
+        UI.message "- Generating copy resources script at #{UI.path(sandbox.root + @target_definition.copy_resources_script_name)}" do
+          copy_resources_script_for(pods).save_as(sandbox.root + @target_definition.copy_resources_script_name)
         end
-        puts "- Generating xcconfig file at `#{sandbox.root + @target_definition.xcconfig_name}'" if config.verbose?
-        xcconfig.save_as(sandbox.root + @target_definition.xcconfig_name)
-        @target_definition.xcconfig = xcconfig
-
-        puts "- Generating prefix header at `#{sandbox.root + @target_definition.prefix_header_name}'" if config.verbose?
-        save_prefix_header_as(sandbox.root + @target_definition.prefix_header_name, pods)
-        puts "- Generating copy resources script at `#{sandbox.root + @target_definition.copy_resources_script_name}'" if config.verbose?
-        copy_resources_script_for(pods).save_as(sandbox.root + @target_definition.copy_resources_script_name)
       end
 
       private

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -51,7 +51,7 @@ module Pod
           workspace << project_path unless workspace.include?(project_path)
         end
         unless workspace_path.exist? || config.silent?
-          puts "[!] From now on use `#{workspace_path.basename}'."
+          UI.notice "From now on use `#{workspace_path.basename}'."
         end
         workspace.save_as(workspace_path)
       end
@@ -69,20 +69,30 @@ module Pod
           "#<#{self.class} for target `#{@target_definition.label}'>"
         end
 
+        # Integrates the user project targets. Only the targets that do **not**
+        # already have the Pods library in their frameworks build phase are
+        # processed.
+        #
+        # @return [void]
+        #
         def integrate!
           return if targets.empty?
 
-          unless Config.instance.silent?
-            puts "-> Integrating `#{@target_definition.lib_name}' into #{'target'.pluralize(targets.size)} " \
-                 "`#{targets.map(&:name).to_sentence}' of Xcode project `#{user_project_path.basename}'.".green
+          UI.section("Integrating `#{@target_definition.lib_name}' into #{'target'.pluralize(targets.size)} " \
+                      "`#{targets.map(&:name).to_sentence}' of Xcode project #{UI.path user_project_path}.") do
+            add_xcconfig_base_configuration
+            add_pods_library
+            add_copy_resources_script_phase
+            user_project.save_as(@target_definition.user_project.path)
           end
-
-          add_xcconfig_base_configuration
-          add_pods_library
-          add_copy_resources_script_phase
-          user_project.save_as(@target_definition.user_project.path)
         end
 
+        # @return [Pathname] the path of the user project.
+        #
+        # @raises If the path doesn't exits.
+        #
+        # @raises If the project is implicit and there are multiple projects.
+        #
         def user_project_path
           if path = @target_definition.user_project.path
             unless path.exist?
@@ -96,6 +106,8 @@ module Pod
           end
         end
 
+        # @return [Xcodeproj::Project] Returns the project of the user.
+        #
         def user_project
           @user_project ||= Xcodeproj::Project.new(user_project_path)
         end
@@ -152,13 +164,10 @@ module Pod
               config.base_configuration = xcconfig
             end
 
-            unless config.silent?
-              config_build_names_by_overriden_key.each do |key, config_build_names|
-                name = "#{target.attributes["name"]} [#{config_build_names.join(' - ')}]"
-                puts "\n[!] The target `#{name}' overrides the `#{key}' build setting defined in `#{@target_definition.xcconfig_relative_path}'.".yellow
-                puts "    - Use the `$(inherited)' flag, or"
-                puts "    - Remove the build settings from the target."
-              end
+            config_build_names_by_overriden_key.each do |key, config_build_names|
+              name    = "#{target.attributes["name"]} [#{config_build_names.join(' - ')}]"
+              actions = [ "Use the `$(inherited)' flag, or", "Remove the build settings from the target." ]
+              UI.warn("The target `#{name}' overrides the `#{key}' build setting defined in `#{@target_definition.xcconfig_relative_path}'.", actions)
             end
           end
         end

data/lib/cocoapods/local_pod.rb

@@ -187,6 +187,27 @@ module Pod
 
     # @!group Files
 
+    # @return [Pathname] Returns the relative path from the sandbox.
+    #
+    # @note If the two abosule paths don't share the same root directory an
+    # extra `../` is added to the result of {Pathname#relative_path_from}
+    #
+    #     path = Pathname.new('/Users/dir')
+    #     @sandbox
+    #     #=> Pathname('/tmp/CocoaPods/Lint/Pods')
+    #
+    #     p.relative_path_from(@sandbox
+    #     #=> '../../../../Users/dir'
+    #
+    #     relativize_from_sandbox(path)
+    #     #=> '../../../../../Users/dir'
+    #
+    def relativize_from_sandbox(path)
+      result = path.relative_path_from(@sandbox.root)
+      result = Pathname.new('../') + result unless @sandbox.root.to_s.split('/')[1] == path.to_s.split('/')[1]
+      result
+    end
+
     # @return [Array<Pathname>] The paths of the source files.
     #
     def source_files
@@ -196,13 +217,13 @@ module Pod
     # @return [Array<Pathname>] The *relative* paths of the source files.
     #
     def relative_source_files
-      source_files.map{ |p| p.relative_path_from(@sandbox.root) }
+      source_files.map{ |p| relativize_from_sandbox(p) }
     end
 
     def relative_source_files_by_spec
       result = {}
       source_files_by_spec.each do |spec, paths|
-        result[spec] = paths.map{ |p| p.relative_path_from(@sandbox.root) }
+        result[spec] = paths.map{ |p| relativize_from_sandbox(p) }
       end
       result
     end
@@ -217,7 +238,7 @@ module Pod
     #   {Specification}.
     #
     def source_files_by_spec
-      options = {:glob => '*.{h,m,mm,c,cpp}'}
+      options = {:glob => '*.{h,hpp,m,mm,c,cpp}'}
       paths_by_spec(:source_files, options)
     end
 
@@ -230,7 +251,7 @@ module Pod
     # @return [Array<Pathname>] The *relative* paths of the source files.
     #
     def relative_header_files
-      header_files.map{ |p| p.relative_path_from(@sandbox.root) }
+      header_files.map{ |p| relativize_from_sandbox(p) }
     end
 
     # @return [Hash{Specification => Array<Pathname>}] The paths of the header
@@ -239,7 +260,7 @@ module Pod
     def header_files_by_spec
       result = {}
       source_files_by_spec.each do |spec, paths|
-        headers = paths.select { |f| f.extname == '.h' }
+        headers = paths.select { |f| f.extname == '.h' || f.extname == '.hpp' }
         result[spec] = headers unless headers.empty?
       end
       result
@@ -253,7 +274,7 @@ module Pod
     #   header files (i.e. the build ones) are intended to be public.
     #
     def public_header_files_by_spec
-      public_headers = paths_by_spec(:public_header_files, :glob => '*.h')
+      public_headers = paths_by_spec(:public_header_files, :glob => '*.{h,hpp}')
       build_headers  = header_files_by_spec
 
       result = {}
@@ -276,7 +297,7 @@ module Pod
     # @return [Array<Pathname>] The *relative* paths of the resources.
     #
     def relative_resource_files
-      resource_files.map{ |p| p.relative_path_from(@sandbox.root) }
+      resource_files.map{ |p| relativize_from_sandbox(p) }
     end
 
     # @return [Pathname] The absolute path of the prefix header file
@@ -356,7 +377,7 @@ module Pod
         if (public_h = public_headers[spec]) && !public_h.empty?
           result += public_h
         elsif (source_f = source_files[spec]) && !source_f.empty?
-          build_h = source_f.select { |f| f.extname == '.h' }
+          build_h = source_f.select { |f| f.extname == '.h' || f.extname == '.hpp' }
           result += build_h unless build_h.empty?
         end
       end
@@ -390,7 +411,7 @@ module Pod
       source_files_by_spec.each do | spec, files |
         compiler_flags = spec.compiler_flags.strip
         files.each do |file|
-          file = file.relative_path_from(@sandbox.root)
+          file = relativize_from_sandbox(file)
           desc = Xcodeproj::Project::PBXNativeTarget::SourceFileDescription.new(file, compiler_flags, nil)
           result << desc
         end
@@ -410,7 +431,7 @@ module Pod
     # (the files the need to compiled) of the pod.
     #
     def implementation_files
-      relative_source_files.select { |f| f.extname != '.h' }
+      relative_source_files.reject { |f| f.extname == '.h' ||  f.extname == '.hpp' }
     end
 
     # @return [Pathname] The path of the pod relative from the sandbox.
@@ -432,9 +453,10 @@ module Pod
       mappings = {}
       files_by_spec.each do |spec, paths|
         paths = paths - headers_excluded_from_search_paths
+        dir = spec.header_dir ? (headers_sandbox + spec.header_dir) : headers_sandbox
         paths.each do |from|
           from_relative = from.relative_path_from(root)
-          to = headers_sandbox + (spec.header_dir) + spec.copy_header_mapping(from_relative)
+          to = dir + spec.copy_header_mapping(from_relative)
           (mappings[to.dirname] ||= []) << from
         end
       end
@@ -452,7 +474,7 @@ module Pod
     # included in the linker search paths.
     #
     def headers_excluded_from_search_paths
-      options = { :glob => '*.h' }
+      options = { :glob => '*.{h,hpp}' }
       paths = paths_by_spec(:exclude_header_search_paths, options)
       paths.values.compact.uniq
     end