[UserProjectIntegrator::TargetIngtegrator] Prepend sandbox check in a safe way (see Xcodeproj API)

lib/cocoapods/installer/user_project_integrator/target_integrator.rb

+require 'active_support'
+
 module Pod
   class Installer
     class UserProjectIntegrator
@@ -134,22 +136,26 @@ module Pod
         # locked in the Pods/Manifest.lock file are in sync with the Pods defined
         # in the Podfile.lock.
         #
+        # @note   The build phase is appended to the front because to fail
+        #         fast.
+        #
         # @return [void]
         #
         def add_check_manifest_lock_script_phase
           targets.each do |target|
-            phase = target.new_shell_script_build_phase('Check Pods Manifest.lock')
-            phase.shell_script = <<-EOS
-diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-if [[ $? != 0 ]] ; then
-    cat << EOM
-Podfile.lock and Manifest.lock are not in sync.
-You might need to run a \`pod install\`.
-EOM
-    exit 1
-fi
+            phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+            target.build_phases.unshift(phase)
+            phase.name = 'Check Pods Manifest.lock'
+            phase.shell_script = <<-EOS.strip_heredoc
+              diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
+              if [[ $? != 0 ]] ; then
+                  cat << EOM
+              Podfile.lock and Manifest.lock are not in sync.
+              You might need to run a \`pod install\`.
+              EOM
+                  exit 1
+              fi
             EOS
-            target.build_phases.rotate!(-1) # if we fail, let's fail early
           end
         end
 

spec/integration_spec.rb

@@ -302,8 +302,6 @@ module Pod
 
         #--------------------------------------#
 
-        # @note The shell script should be the last phase.
-        #
         it "sets up an existing project with pods" do
           config.integrate_targets = true
 
@@ -331,17 +329,6 @@ module Pod
             config.base_configuration_reference.path.should == 'Pods/Pods.xcconfig'
           end
           target.frameworks_build_phase.files.should.include libPods.build_files.first
-          target.build_phases.last.shell_script.should == %{"${SRCROOT}/Pods/Pods-resources.sh"\n}
-          target.build_phases.first.shell_script.should == <<-EOS
-diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-if [[ $? != 0 ]] ; then
-    cat << EOM
-Podfile.lock and Manifest.lock are not in sync.
-You might need to run a \`pod install\`.
-EOM
-    exit 1
-fi
-            EOS
         end
 
         #--------------------------------------#

spec/unit/installer/user_project_integrator/target_integrator_spec.rb

@@ -83,16 +83,16 @@ module Pod
       it 'adds a Check Manifest.lock build phase to each target' do
         target = @target_integrator.targets.first
         phase = target.shell_script_build_phases.find { |bp| bp.name == "Check Pods Manifest.lock" }
-        phase.shell_script.should == <<-EOS
-diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
-if [[ $? != 0 ]] ; then
-    cat << EOM
-Podfile.lock and Manifest.lock are not in sync.
-You might need to run a \`pod install\`.
-EOM
-    exit 1
-fi
-            EOS
+        phase.shell_script.should == <<-EOS.strip_heredoc
+          diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
+          if [[ $? != 0 ]] ; then
+              cat << EOM
+          Podfile.lock and Manifest.lock are not in sync.
+          You might need to run a \`pod install\`.
+          EOM
+              exit 1
+          fi
+        EOS
       end
 
       it 'adds the Check Manifest.lock build phase as the first build phase' do