cocoapods-amicable 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e660036bec0a4fa8dbff088a4040f46a08f7aee2b0f42ac70280f9599e4f8f9
-  data.tar.gz: 647c6738de1bdad2fe6eff05402673c7f20e81ecaf0e5833c46109ad3dbcc18d
+  metadata.gz: 7206583281f3373c1c53205ea9294ba0528b20b7f12c749ed1b5847e7540f657
+  data.tar.gz: 88025c9a7c09a7d07b70d10751486773436c8bdec654ea9b73069e0f9d4cddaa
 SHA512:
-  metadata.gz: 5ae8d92127d8e141627149aafea415399525bcb8d052deac8c375f7515f7cec3dc9f8fc19d112ea5e65b71e6d6e30ab572482ab85a4ac65da6a8e6bce38b3f97
-  data.tar.gz: 806ffe80b279f8476c217afde01bf2f824dcf3a6cec5fc70befeac5c2ad06b4add967f8827e7a63099579452ba740652c5d10890d4815b18db7f36c7ca3560d5
+  metadata.gz: 2f3ec86cea08e8eb518d178389a0420bdba5e927a2fa97afbc4655deb97f5c59f64c226533fc3196741866c6c6e8a5d2cece7788990c411ed9fe3ae0c326d18e
+  data.tar.gz: dc9a85f45341ce0d9f08634993179c27ef40b1e6aba0e22615fa68de89a03ff562108008d4556d62177a683af6a0573feb31f1798ffa313edf3da052e1594387

data/lib/cocoapods_amicable.rb

@@ -1,81 +1,17 @@
 # frozen_string_literal: true
 
 module CocoaPodsAmicable
-  class PodfileChecksumFixer
-    def initialize(post_install_context)
-      @post_install_context = post_install_context
-    end
-
-    def fix!
-      Pod::UI.titled_section 'Moving the Podfile checksum from the lockfile' do
-        @checksum = remove_checksum_from_lockfiles
-        write_sha1_file
-        update_check_manifest_script_phases
-      end
-    end
-
-    private
-
-    attr_reader :checksum
-
-    def sandbox
-      @post_install_context.sandbox
-    end
-
-    def lockfiles
-      [Pod::Config.instance.lockfile_path, sandbox.manifest_path].map do |lockfile_path|
-        Pod::Lockfile.from_file(lockfile_path)
-      end
-    end
-
-    def remove_checksum_from_lockfiles
-      checksums = lockfiles.map do |lockfile|
-        checksum = lockfile.internal_data.delete('PODFILE CHECKSUM')
-        lockfile.write_to_disk(lockfile.defined_in_file)
-        checksum
-      end.uniq
-      case checksums.size
-      when 1
-        checksums.first
-      else
-        raise 'Multiple (different) podfiles checksums found'
-      end
-    end
-
-    def sha1_file_path
-      sandbox.root + 'Podfile.sha1'
-    end
-
-    def podfile_basename
-      File.basename(Pod::Config.instance.podfile.defined_in_file)
-    end
-
-    def write_sha1_file
-      return unless name = podfile_basename
-      sha1_file_path.open('w') do |f|
-        f.write <<-EOS
-#{checksum}  #{name}
-                   EOS
-      end
-    end
+  module TargetIntegratorMixin
+    def add_check_manifest_lock_script_phase
+      podfile = target.target_definition.podfile
+      return super unless podfile.plugins.key?('cocoapods-amicable')
 
-    def update_check_manifest_script_phases
-      user_projects = []
-      @post_install_context.umbrella_targets.each do |umbrella_target|
-        user_projects << umbrella_target.user_project
-        umbrella_target.user_targets.each do |user_target|
-          build_phase = user_target.build_phases.find do |bp|
-            bp.name.end_with? Pod::Installer::UserProjectIntegrator::TargetIntegrator::CHECK_MANIFEST_PHASE_NAME
-          end
-          update_check_manifest_script_phase(build_phase)
-        end
-      end
-
-      user_projects.uniq.each(&:save)
-    end
+      phase_name = Pod::Installer::UserProjectIntegrator::TargetIntegrator::CHECK_MANIFEST_PHASE_NAME
+      native_targets.each do |native_target|
+        phase = Pod::Installer::UserProjectIntegrator::TargetIntegrator.create_or_update_build_phase(native_target, Pod::Installer::UserProjectIntegrator::TargetIntegrator::BUILD_PHASE_PREFIX + phase_name)
+        native_target.build_phases.unshift(phase).uniq! unless native_target.build_phases.first == phase
 
-    def update_check_manifest_script_phase(build_phase)
-      build_phase.shell_script = <<-SH
+        phase.shell_script = <<-SH
 set -e
 set -u
 set -o pipefail
@@ -94,16 +30,58 @@ fi
 
 # This output is used by Xcode 'outputs' to avoid re-running this script phase.
 echo "SUCCESS" > "${SCRIPT_OUTPUT_FILE_0}"
-      SH
+              SH
+
+        phase.input_paths = %w[
+          ${PODS_PODFILE_DIR_PATH}/Podfile.lock
+          ${PODS_ROOT}/Manifest.lock
+          ${PODS_ROOT}/Podfile.sha1
+        ]
+        if name = podfile.defined_in_file && podfile.defined_in_file.basename
+          phase.input_paths << "${PODS_PODFILE_DIR_PATH}/#{name}"
+        end
+        phase.output_paths = [target.check_manifest_lock_script_output_file_path]
+      end
+    end
+  end
+
+  module InstallerMixin
+    def write_lockfiles
+      super
+      return unless podfile.plugins.key?('cocoapods-amicable')
+      return unless checksum = podfile.checksum
+      return unless podfile_path = podfile.defined_in_file
+      checksum_path = sandbox.root + 'Podfile.sha1'
 
-      build_phase.input_paths = %w[
-        ${PODS_PODFILE_DIR_PATH}/Podfile.lock
-        ${PODS_ROOT}/Manifest.lock
-        ${PODS_ROOT}/Podfile.sha1
-      ]
-      if name = podfile_basename
-        build_phase.input_paths << "${PODS_PODFILE_DIR_PATH}/#{name}"
+      Pod::UI.message "- Writing Podfile checksum in #{Pod::UI.path checksum_path}" do
+        checksum_path.open('w') { |f| f << checksum << '  ' << podfile_path.basename.to_s << "\n" }
       end
     end
   end
+
+  module LockfileMixin
+    def generate(podfile, *)
+      lockfile = super
+      lockfile.internal_data.delete('PODFILE CHECKSUM') if podfile.plugins.key?('cocoapods-amicable')
+      lockfile
+    end
+  end
+end
+
+module Pod
+  class Installer
+    prepend ::CocoaPodsAmicable::InstallerMixin
+
+    class UserProjectIntegrator
+      class TargetIntegrator
+        prepend ::CocoaPodsAmicable::TargetIntegratorMixin
+      end
+    end
+  end
+
+  class Lockfile
+    class << self
+      prepend ::CocoaPodsAmicable::LockfileMixin
+    end
+  end
 end

data/lib/cocoapods_plugin.rb

@@ -1,7 +1,3 @@
 # frozen_string_literal: true
 
 require 'cocoapods_amicable'
-
-Pod::HooksManager.register 'cocoapods-amicable', :post_install do |post_install_context|
-  CocoaPodsAmicable::PodfileChecksumFixer.new(post_install_context).fix!
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-amicable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Giddins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A CocoaPods plugin that moves the Podfile checksum to a file in the Sandbox,