Merge branch 'master' into dedicated-targets

* master:
  [Rakefile] Perform setup on for integration only if needed 2
  [Rakefile] Don't set the git user as not needed anymore
  [Rakefile] Perform setup on for integration only if needed.
  [Doc] Make clear that an error occurred in a pre/post hook.

Rakefile

@@ -208,14 +208,13 @@ namespace :spec do
   #
   desc "Run all specs and build all examples"
   task :ci => :unpack_fixture_tarballs do
-    sh 'git config --global user.email "cocoapods@example.com"' if `git config user.email`.empty?
-    sh 'git config --global user.name "CocoaPods"' if `git config user.name`.empty?
-
     title 'Running the specs'
     sh "bundle exec bacon #{specs('**')}"
 
+    unless Pathname.new(ENV['HOME']+'/.cocoapods/master').exist?
       title 'Ensuring specs repo is up to date'
       sh    "./bin/pod setup"
+    end
 
     title 'Running Integration 2 tests'
     sh "bundle exec bacon spec/integration_2.rb"

lib/cocoapods/installer.rb

@@ -416,8 +416,8 @@ module Pod
     def run_spec_pre_install_hook(spec, lib_representation)
       spec.pre_install!(pod_rep(spec.root.name), lib_representation)
     rescue => e
-      raise Informative, "The pre install hook of #{spec} is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the pre-install " \
+        "hook of #{spec}." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -430,8 +430,8 @@ module Pod
     def run_podfile_pre_install_hook
       podfile.pre_install!(installer_rep)
     rescue => e
-      raise Informative, "The pre install hook of the Podfile is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the pre-install " \
+        "hook of the Podfile." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -475,8 +475,8 @@ module Pod
     def run_spec_post_install_hook(spec, lib_representation)
       spec.post_install!(lib_representation)
     rescue => e
-      raise Informative, "The post install hook of #{spec} is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the post-install " \
+        "hook of #{spec}." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end
 
@@ -489,8 +489,8 @@ module Pod
     def run_podfile_post_install_hook
       podfile.post_install!(installer_rep)
     rescue => e
-      raise Informative, "The post install hook of the Podfile is not " \
-        "compatible with this version of CocoaPods." \
+      raise Informative, "An error occurred while processing the post-install " \
+        "hook of the Podfile." \
         "\n\n#{e.message}\n\n#{e.backtrace * "\n"}"
     end