cocoapods-amimono 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d83abd81181d3e4f326d6a8f0cc34d0bc71d6a
-  data.tar.gz: 5f60dbc389e7c92460a017b43511ac870bfca548
+  metadata.gz: 9e30439c931168e37c701a6b32a76fee58a6fdf5
+  data.tar.gz: 982a2fec2cf47816cc0ef881f490e8ad078b9796
 SHA512:
-  metadata.gz: 0793b02daca88b49b514cb9ffc05e45808478ff2fd5a687cf0fb337c9e8b6b71fa24389f1a2d425c45d5f2b598aeb35dac0ee77a0eb722da12f956fc769b9b42
-  data.tar.gz: 023966834456d97a796bdb11c223a16f093514279c0c7f824fcaff7d52d2341a82ff1212c80bc1464a6f5f30d2119dc9d02c48a88136394b71f232bb16aa448b
+  metadata.gz: 025476375dee99fd73ba30c09c46c5cc2f99d51d47964171bb1b3007e6eca0dc8272c35f92834815c376388d9f699db4476141080630425881b699a495647573
+  data.tar.gz: 200c539fc225795a5e84c5a2e6cdf36cb519bf4b3e7d6457dfde990c059c078b13f51cbc2d295094da6907ebe00fceea4f3d35ff7d72898490be1897d76f2cc6

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    cocoapods-amimono (0.0.4)
+    cocoapods-amimono (0.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     bacon (1.2.0)
     claide (1.0.0)
@@ -45,13 +46,13 @@ GEM
       netrc (= 0.7.8)
     cocoapods-try (1.1.0)
     colored (1.2)
-    concurrent-ruby (1.0.2)
     escape (0.0.4)
     fourflusher (0.3.2)
     fuzzy_match (2.0.4)
     i18n (0.7.0)
+    json (1.8.3)
     metaclass (0.0.4)
-    minitest (5.9.0)
+    minitest (5.9.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mocha-on-bacon (0.2.2)

data/cocoapods-amimono.gemspec

@@ -20,4 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
+
+  spec.rubygems_version = "1.6.2"
+  spec.required_rubygems_version = Gem::Requirement.new(">= 0") if spec.respond_to? :required_rubygems_version=
+  spec.required_ruby_version = '>= 2.0.0'
+  spec.specification_version = 3 if spec.respond_to? :specification_version
 end

data/lib/cocoapods-amimono/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAmimono
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/cocoapods-amimono/integrator.rb

@@ -1,6 +1,12 @@
 module Amimono
   class Integrator
 
+    attr_reader :installer_context
+
+    def initialize(installer_context)
+      @installer_context = installer_context
+    end
+
     FILELIST_SCRIPT = <<-SCRIPT.strip_heredoc
           IFS=" " read -r -a SPLIT <<< "$ARCHS"
           for ARCH in "${SPLIT[@]}"; do
@@ -23,7 +29,7 @@ module Amimono
 
     AMIMONO_FILELIST_BUILD_PHASE = '[Amimono] Create filelist per architecture'
 
-    def update_xcconfigs(aggregated_target_sandbox_path:)
+    def update_xcconfigs(aggregated_target_sandbox_path)
       path = aggregated_target_sandbox_path
       archs = ['armv7', 'armv7s', 'arm64', 'i386', 'x86_64']
       # Find all xcconfigs for the aggregated target
@@ -41,16 +47,16 @@ module Amimono
       end
     end
 
-    def update_build_phases(aggregated_targets:)
+    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)
+        remove_embed_pods_frameworks(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))
+        create_or_update_amimono_phase(user_target, AMIMONO_FILELIST_BUILD_PHASE, generate_filelist_script(aggregated_target))
         puts "[Amimono] Build phases updated for target #{aggregated_target.cocoapods_target_label}"
       end
       user_project.save
@@ -58,13 +64,13 @@ module Amimono
 
     private
 
-    def remove_embed_pods_frameworks(user_target:)
+    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(user_target:, phase_name:, script:)
+    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
@@ -72,12 +78,18 @@ module Amimono
       user_target.build_phases.uniq!
     end
 
-    def generate_filelist_script(aggregated_target:)
-      dependencies = aggregated_target.specs.map(&:name).reject { |dependency| dependency.include? '/'}
+    def generate_filelist_script(aggregated_target)
+      dependencies = []
+      installer_context.pods_project.targets.select { |target| target.name == aggregated_target.cocoapods_target_label }.first.dependencies.each do |dependency|
+        case dependency.target.product_type
+        when 'com.apple.product-type.framework'
+          dependencies << "'#{dependency.name}'"
+        when 'com.apple.product-type.bundle'
+          # ignore
+        end
+      end
       puts "[Amimono] #{dependencies.count} dependencies found"
-      bash_array = dependencies.map { |dependency| "'#{dependency}'" }.join ' '
-      declare_statement = "declare -a DEPENDENCIES=(%s);\n" % bash_array
-      declare_statement + FILELIST_SCRIPT
+      "declare -a DEPENDENCIES=(#{dependencies.join(' ')});\n" + FILELIST_SCRIPT
     end
   end
 end

data/lib/cocoapods-amimono/patcher.rb

@@ -1,16 +1,18 @@
+require 'cocoapods/installer'
+
 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!(installer:)
-      patch_copy_resources_script(installer: installer)
-      patch_vendored_build_settings(installer: installer)
+    def self.patch!(installer)
+      patch_copy_resources_script(installer)
+      patch_vendored_build_settings(installer)
     end
 
     private
 
-    def self.patch_vendored_build_settings(installer:)
+    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
@@ -21,19 +23,19 @@ module Amimono
           # 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)
+          generate_vendored_build_settings(pod_targets, 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:)
+    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)
+        resources = resources_by_config(aggregated_target, 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}"
@@ -42,7 +44,7 @@ module Amimono
 
     # 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:)
+    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
@@ -50,7 +52,7 @@ module Amimono
 
     # 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:)
+    def self.resources_by_config(aggregated_target, project)
       library_targets = aggregated_target.pod_targets.reject do |pod_target|
         # This reject doesn't matter much anymore. We have to process all targets because
         # every single one requires frameworks and this workaround doesn't work with Pods

data/lib/cocoapods_plugin.rb

@@ -11,10 +11,10 @@ Pod::HooksManager.register('cocoapods-amimono', :post_install) do |installer_con
     target_info[pods_target] = installer_context.sandbox.target_support_files_dir pods_target.cocoapods_target_label
   end
 
-  integrator = Amimono::Integrator.new
+  integrator = Amimono::Integrator.new(installer_context)
   target_info.each do |pods_target, path|
-    integrator.update_xcconfigs(aggregated_target_sandbox_path: path)
+    integrator.update_xcconfigs(path)
     puts "[Amimono] xcconfigs updated with filelist for target #{pods_target.cocoapods_target_label}"
   end
-  integrator.update_build_phases(aggregated_targets: target_info.keys)
+  integrator.update_build_phases(target_info.keys)
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-amimono
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Renzo Crisostomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Move all dynamic frameworks symbols into the main executable.
@@ -46,7 +46,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -73,19 +73,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Move all dynamic frameworks symbols into the main executable.
 test_files:
 - spec/command/amimono_spec.rb