cocoapods-amimono 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a607ef5c8f40f9e3573b195af6e60a5e0467054
-  data.tar.gz: 8da7473fed96d2e25e069b70c6228a1c6fc3ac05
+  metadata.gz: 55367906ce81e287ef9418f45edf5b4d88d5ce00
+  data.tar.gz: 1e56ba267843312e80b12c4d8a7b6d6c9f76faa3
 SHA512:
-  metadata.gz: 93182f0c82f6a5cf9ab1f587f3ca5fceeaa90f58a3b76c78939bc95d685f5d0d0e92e89dc6c281ae37588a4a573e61f8767491ede509a7f3b269c43aad0bb65f
-  data.tar.gz: 13feccb0c3b83750b6a05c63f6fa2858f1f8de236b9ededca0e305523a16e187ba7a0480e2b64ab1c9fd79ab1b8a5c000b9dc66777665956ea174f6738d7c953
+  metadata.gz: 58247c18d5c9274e759bc45582b60ba9d41a4b2b7f36e282079cc63d951dcda9a3fca4f1b26d40b7365ce0b3fae631eefa9938ea4683a751d1323ca73763e1e7
+  data.tar.gz: 72d9dd1ec10d12a11c7ba68fca3c953f67cbba5c06271f895b57ba0f01af8b3434656ebdbd4a246f4b530f0d99175a72acf019d8cc68e70193210a27fe51dbd8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-amimono (0.0.2)
+    cocoapods-amimono (0.0.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -51,7 +51,7 @@ Add the following to your `post_install` hook:
 ```ruby
 post_install do |installer|
   require 'cocoapods-amimono/patcher'
-  Amimono::Patcher.patch_copy_resources_script(installer: installer)
+  Amimono::Patcher.patch!(installer: installer)
   ...
 ```
 

data/lib/cocoapods-amimono/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAmimono
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/cocoapods-amimono/integrator.rb

@@ -2,25 +2,20 @@ module Amimono
   class Integrator
 
     FILELIST_SCRIPT = <<-SCRIPT.strip_heredoc
-          #!/usr/bin/ruby
-          intermediates_directory = ENV['OBJROOT']
-          configuration = ENV['CONFIGURATION']
-          platform = ENV['EFFECTIVE_PLATFORM_NAME']
-          archs = ENV['ARCHS']
-          target_name = ENV['TARGET_NAME']
-
-          archs.split(" ").each do |architecture|
-            Dir.chdir("\#{intermediates_directory}/Pods.build") do
-              filelist = ""
-              %s.each do |dependency|
-                Dir.glob("\#{configuration}\#{platform}/\#{dependency}.build/Objects-normal/\#{architecture}/*.o") do |object_file|
-                  next if ["Pods-\#{target_name}-dummy", "Pods_\#{target_name}_vers"].any? { |dummy_object| object_file.include? dummy_object }
-                  filelist += File.absolute_path(object_file) + "\\n"
-                end
-              end
-              File.write("\#{configuration}\#{platform}-\#{architecture}.objects.filelist", filelist)
-            end
-          end
+          IFS=" " read -r -a SPLIT <<< "$ARCHS"
+          for ARCH in "${SPLIT[@]}"; do
+            cd "$OBJROOT/Pods.build"
+            filelist=""
+            for dependency in "${DEPENDENCIES[@]}"; do
+              path="${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/${dependency}.build/Objects-normal/${ARCH}/*.o"
+              for obj_file in $path; do
+                filelist+="${OBJROOT}/Pods.build/${obj_file}"
+                filelist+=$'\\n'
+              done
+            done
+            filelist=${filelist\%$'\\n'}
+            echo "$filelist" > "${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}-${ARCH}.objects.filelist"
+          done
         SCRIPT
 
     AMIMONO_FILELIST_BUILD_PHASE = '[Amimono] Create filelist per architecture'
@@ -43,36 +38,43 @@ module Amimono
       end
     end
 
-    def update_build_phases(aggregated_target:)
-      user_project = aggregated_target.user_project
-      application_target = user_project.targets.find { |target| target.product_type.end_with? 'application' }
-      # Remove the `Embed Pods Frameworks` build phase
-      remove_embed_pods_frameworks(application_target: application_target)
-      # Create or update [Amimono] build phase
-      create_or_update_amimono_phase(application_target: application_target, phase_name: AMIMONO_FILELIST_BUILD_PHASE, script: generate_filelist_script(aggregated_target: aggregated_target))
+    def update_build_phases(aggregated_targets:)
+      # All user projects should be the same I hope
+      user_project = aggregated_targets.first.user_project
+      aggregated_targets.each do |aggregated_target|
+        # This pick is probably wrong, but works for most of the simple cases
+        user_target = aggregated_target.user_targets.first
+        # Remove the `Embed Pods Frameworks` build phase
+        remove_embed_pods_frameworks(user_target: user_target)
+        # Create or update [Amimono] build phase
+        create_or_update_amimono_phase(user_target: user_target, phase_name: AMIMONO_FILELIST_BUILD_PHASE, script: generate_filelist_script(aggregated_target: aggregated_target))
+        puts "[Amimono] Build phases updated for target #{aggregated_target.cocoapods_target_label}"
+      end
       user_project.save
     end
 
     private
 
-    def remove_embed_pods_frameworks(application_target:)
-      embed_pods_frameworks_build_phase = application_target.build_phases.find { |build_phase| build_phase.display_name.include? 'Embed Pods Frameworks' }
+    def remove_embed_pods_frameworks(user_target:)
+      embed_pods_frameworks_build_phase = user_target.build_phases.find { |build_phase| build_phase.display_name.include? 'Embed Pods Frameworks' }
       return if embed_pods_frameworks_build_phase.nil?
       embed_pods_frameworks_build_phase.remove_from_project
     end
 
-    def create_or_update_amimono_phase(application_target:, phase_name:, script:)
-      amimono_filelist_build_phase = application_target.build_phases.find { |build_phase| build_phase.display_name.include? phase_name } || application_target.new_shell_script_build_phase(phase_name)
-      amimono_filelist_build_phase.shell_path = '/usr/bin/ruby'
+    def create_or_update_amimono_phase(user_target:, phase_name:, script:)
+      amimono_filelist_build_phase = user_target.build_phases.find { |build_phase| build_phase.display_name.include? phase_name } || user_target.new_shell_script_build_phase(phase_name)
+      amimono_filelist_build_phase.shell_path = '/bin/bash'
       amimono_filelist_build_phase.shell_script = script
-      application_target.build_phases.insert(1, amimono_filelist_build_phase)
-      application_target.build_phases.uniq!
+      user_target.build_phases.insert(1, amimono_filelist_build_phase)
+      user_target.build_phases.uniq!
     end
 
     def generate_filelist_script(aggregated_target:)
       dependencies = aggregated_target.specs.map(&:name).reject { |dependency| dependency.include? '/'}
       puts "[Amimono] #{dependencies.count} dependencies found"
-      FILELIST_SCRIPT % dependencies.to_s
+      bash_array = dependencies.map { |dependency| "'#{dependency}'" }.join ' '
+      declare_statement = "declare -a DEPENDENCIES=(%s);\n" % bash_array
+      declare_statement + FILELIST_SCRIPT
     end
   end
 end

data/lib/cocoapods-amimono/patcher.rb

@@ -2,18 +2,52 @@ module Amimono
   # This class will patch your project's copy resources script to match the one that would be
   # generated as if the `use_frameworks!` flag wouldn't be there
   class Patcher
-    def self.patch_copy_resources_script(installer:)!
-      aggregated_target = installer.aggregate_targets.first
-      project = installer.sandbox.project
-      path = aggregated_target.copy_resources_script_path
-      resources = resources_by_config(aggregated_target: aggregated_target, project: project)
-      generator = Pod::Generator::CopyResourcesScript.new(resources, aggregated_target.platform)
-      generator.save_as(path)
-      puts "[Amimono] Copy resources script patched"
+
+    def self.patch!(installer:)
+      patch_copy_resources_script(installer: installer)
+      patch_vendored_build_settings(installer: installer)
     end
 
     private
 
+    def self.patch_vendored_build_settings(installer:)
+      aggregated_targets = installer.aggregate_targets.reject { |target| target.label.include? 'Test' }
+      aggregated_targets.each do |aggregated_target|
+        path = installer.sandbox.target_support_files_dir aggregated_target.label
+        Dir.entries(path).select { |entry| entry.end_with? 'xcconfig' }.each do |entry|
+          full_path = path + entry
+          xcconfig = Xcodeproj::Config.new full_path
+          # Another option would be to inspect installer.analysis_result.result.target_inspections
+          # But this also works and it's simpler
+          configuration = entry.split('.')[-2]
+          pod_targets = aggregated_target.pod_targets_for_build_configuration configuration
+          generate_vendored_build_settings(pod_targets: pod_targets, xcconfig: xcconfig)
+          xcconfig.save_as full_path
+        end
+        puts "[Amimono] Vendored build settings patched for target #{aggregated_target.label}"
+      end
+    end
+
+    def self.patch_copy_resources_script(installer:)
+      project = installer.sandbox.project
+      aggregated_targets = installer.aggregate_targets.reject { |target| target.label.include? 'Test' }
+      aggregated_targets.each do |aggregated_target|
+        path = aggregated_target.copy_resources_script_path
+        resources = resources_by_config(aggregated_target: aggregated_target, project: project)
+        generator = Pod::Generator::CopyResourcesScript.new(resources, aggregated_target.platform)
+        generator.save_as(path)
+        puts "[Amimono] Copy resources script patched for target #{aggregated_target.label}"
+      end
+    end
+
+    # Copied over from https://github.com/CocoaPods/CocoaPods/blob/e5afc825eeafa60933a1299f52eb764c267cc9b2/lib/cocoapods/generator/xcconfig/aggregate_xcconfig.rb#L152-L158
+    # with some modifications to this particular use case
+    def self.generate_vendored_build_settings(pod_targets:, xcconfig:)
+      pod_targets.each do |pod_target|
+        Pod::Generator::XCConfig::XCConfigHelper.add_settings_for_file_accessors_of_target(pod_target, xcconfig)
+      end
+    end
+
     # Copied over from https://github.com/CocoaPods/CocoaPods/blob/master/lib/cocoapods/installer/xcode/pods_project_generator/aggregate_target_installer.rb#L115-L131
     # with some modifications to this particular use case
     def self.resources_by_config(aggregated_target:, project:)

data/lib/cocoapods_plugin.rb

@@ -2,20 +2,19 @@ require 'cocoapods-amimono/command'
 require 'cocoapods-amimono/integrator'
 
 Pod::HooksManager.register('cocoapods-amimono', :post_install) do |installer_context|
-  # Find the aggregated target
-  # This is probably wrong, all agregated targets are prefixed by 'Pods-'
-  # but this works for now because find will return the first one
-  # which is usually the app target
-  pods_target = installer_context.umbrella_targets.find do |target|
-    target.cocoapods_target_label.include? 'Pods'
+  # We exclude all targets that contain `Test`, which might not work for some test targets
+  # that doesn't include that word
+  pods_targets = installer_context.umbrella_targets.reject { |target| target.cocoapods_target_label.include? 'Test' }
+  target_info = Hash.new
+  pods_targets.each do |pods_target|
+    puts "[Amimono] Pods target found: #{pods_target.cocoapods_target_label}"
+    target_info[pods_target] = installer_context.sandbox.target_support_files_dir pods_target.cocoapods_target_label
   end
-  puts "[Amimono] Pods target found: #{pods_target.cocoapods_target_label}"
-
-  path = installer_context.sandbox.target_support_files_dir pods_target.cocoapods_target_label
 
   integrator = Amimono::Integrator.new
-  integrator.update_xcconfigs(aggregated_target_sandbox_path: path)
-  puts "[Amimono] xcconfigs updated with filelist"
-  integrator.update_build_phases(aggregated_target: pods_target)
-  puts "[Amimono] Build phases updated"
+  target_info.each do |pods_target, path|
+    integrator.update_xcconfigs(aggregated_target_sandbox_path: path)
+    puts "[Amimono] xcconfigs updated with filelist for target #{pods_target.cocoapods_target_label}"
+  end
+  integrator.update_build_phases(aggregated_targets: target_info.keys)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-amimono
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Renzo Crisostomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler