cocoapods-alexandria 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 335df8c8a5fec628ba5f248d9e6e0aebdc646580a1eb8084321eafb90c0f9826
-  data.tar.gz: 16eb476b2088a28ccdd79bb09ba86bc45a2a093d0d553b535560e0113015b2a3
+  metadata.gz: 9400a2ed133bb3f4f14db6c3d24a6df569875130386e59734e02558b05913143
+  data.tar.gz: 57dc2f0f5d526cffb5c8c0958a684d55be0413d64fada2df4426aa6b4c5615eb
 SHA512:
-  metadata.gz: 6a089c34cef83c8e4436d1af165fcbe179fc6eabc251ba27ee4ad585c389cf2fa91aeebf91fb1d9aa5ada7973bccd36509da05c4776edae3ea1bc4d9cc8a6561
-  data.tar.gz: a64669145f5e8f66c74856ab687e012445dadbef0d5073e7c78864c04d12ff400df23b30ebe0e825aa40831438f86c4f7ecc655fea3b08a7939a66cdeba6f1fd
+  metadata.gz: 3ca10b51f5ff9059f9fc3007191555e4b7af0b51c13f7d77295a8d6676c8c551b597db4f0d7da2498adb95cc6016dc53b75faa70e88823f03a015b0b5dbd942a
+  data.tar.gz: 2285e47798e9eb4207099d09e9eb5053fccc2021a43e7d9adf0c5801ca508808615a86a0a24f20ad27702093039ac89d2dc714718a592e8de3b224e5a674eaf8

data/lib/cocoapods-alexandria/env_local/pre_install.rb

@@ -8,17 +8,40 @@ module PodAlexandria
     end
 
     def run
-      Pod::UI.puts "Cocoapods Alexandria running in local mode."
+      Pod::UI.puts 'Cocoapods Alexandria running in local mode.'
 
-      Pod::UI.title "Generating project using XcodeGen"
+      if should_predownload_dep
+        Pod::UI.title 'Pre-downloading dependency for XcodeGen'
+        predownload_dep
+      end
+
+      Pod::UI.title 'Generating project using XcodeGen'
       XcodeGen::cleanupRome
       XcodeGen::clearDependencies(options.xcodegen_dependencies_file)
       XcodeGen::generate
 
-      Pod::UI.title "Preparing environment..."
+      Pod::UI.title 'Preparing environment...'
       podfile.prepare_for_xcodegen
 
-      Pod::UI.title "Continuing with normal CocoaPods"
+      Pod::UI.title 'Continuing with normal CocoaPods'
+    end
+
+    private
+
+    def should_predownload_dep
+      File.readlines('project.yml').grep(/Pods\/AppwiseCore\/XcodeGen/).any? &&
+        !File.directory?('Pods/AppwiseCore/XcodeGen')
+    end
+
+    def predownload_dep
+      system(
+        'rm -rf Pods/AppwiseCore && '\
+        'mkdir -p Pods && '\
+        'rm -f /tmp/ac.zip && '\
+        'curl -L "https://github.com/appwise-labs/AppwiseCore/archive/master.zip" > /tmp/ac.zip && '\
+        'unzip -q -d Pods /tmp/ac.zip && '\
+        'mv Pods/AppwiseCore-master Pods/AppwiseCore'
+      )
     end
   end
 end

data/lib/cocoapods-alexandria/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAlexandria
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/cocoapods-alexandria/helper/user_options.rb

@@ -3,17 +3,23 @@ module PodAlexandria
     attr_reader :environment_configs
     attr_reader :force_bitcode
     attr_reader :xcodegen_dependencies_file
+    attr_reader :do_not_embed_dependencies_in_targets
 
     def initialize(installer_context, user_options)
       @environment_configs = user_options.fetch('environment_configs', default_configurations(installer_context))
       @force_bitcode = user_options.fetch('force_bitcode', true)
       @xcodegen_dependencies_file = user_options.fetch('xcodegen_dependencies_file', 'projectDependencies.yml')
+      @do_not_embed_dependencies_in_targets = user_options.fetch('do_not_embed_dependencies_in_targets', [])
     end
 
     def environment_configs_for(target)
       environment_configs[normalize_target(target)]
     end
 
+    def allow_embed_dependencies_for(target)
+      !do_not_embed_dependencies_in_targets.include?(normalize_target(target))
+    end
+
     private
 
     def default_configurations(installer_context)

data/lib/cocoapods-alexandria/xcodegen/dependencies_generator.rb

@@ -6,7 +6,12 @@ module PodAlexandria
     # and also checking if they are linked dynamically or not.
     def self.generate_dependencies(installer_context, options)
       targets = installer_context.umbrella_targets.map { |target|
-        generate_for_target(installer_context, target, options.environment_configs_for(target.cocoapods_target_label))
+        generate_for_target(
+          installer_context,
+          target,
+          options.environment_configs_for(target.cocoapods_target_label),
+          options.allow_embed_dependencies_for(target.cocoapods_target_label)
+        )
       }.to_h
 
       File.open(options.xcodegen_dependencies_file, 'w') { |file|
@@ -16,7 +21,7 @@ module PodAlexandria
 
     private
 
-    def self.generate_for_target(installer_context, target, configurations)
+    def self.generate_for_target(installer_context, target, configurations, allow_embed)
       target_name = target.cocoapods_target_label.sub(/^Pods-/, '')
       xcconfig = config_file_for_target(installer_context, target)
 
@@ -24,13 +29,7 @@ module PodAlexandria
         target_name,
         {
           'configFiles' => configurations,
-          'dependencies' => get_dependencies_from_xcconfig(xcconfig).map { |dependency|
-            if dependency.exists?
-              { 'framework' => dependency.path, 'embed' => dependency.is_dynamic? }
-            else
-              { 'sdk' => dependency.sdk }
-            end
-          }
+          'dependencies' => get_dependencies_from_xcconfig(xcconfig).map { |d| d.xcodegen_info(allow_embed) }
         }
       ]
     end
@@ -42,10 +41,11 @@ module PodAlexandria
 
     def self.get_dependencies_from_xcconfig(file)
       File.readlines(file).select { |line| line.start_with?('OTHER_LDFLAGS') }.first
-        .split('=')[1].tr('"', '') # get value (and remove quotes)
-        .gsub('-framework', '').gsub('-ObjC', '') # remove unneeded flags
-        .split.drop(1) # remove inherited
-        .map { |d| Dependency.new(d) }
+        &.split('=')&.at(1)&.tr('"', '') # get value (and remove quotes)
+        &.gsub('-framework ', '-f')&.gsub('-weak_framework ', '-wf') # replace framework with fake linker flag
+        &.gsub('-ObjC', '') # remove unneeded flags
+        &.split&.drop(1) # remove inherited
+        &.map { |d| Dependency.new(d) } || []
     end
   end
 end

data/lib/cocoapods-alexandria/xcodegen/dependency.rb

@@ -1,11 +1,30 @@
 module PodAlexandria
   class Dependency
-    attr_reader :value
+    attr_reader :flag
+    attr_reader :module_name
 
     def initialize(value)
-      @value = value
+      @flag = value.start_with?('-wf') ? 'wf' : value[1]
+      @module_name = value.delete_prefix('-l').delete_prefix('-f').delete_prefix('-wf')
     end
 
+    def xcodegen_info(allow_embed)
+      if exists?
+        {
+          'framework' => path,
+          'embed' => is_dynamic? && allow_embed,
+          'weak' => is_weak?
+        }
+      else
+        {
+          'sdk' => sdk,
+          'weak' => is_weak?
+        }
+      end
+    end
+
+    private
+
     def path
       binary = Dir["Rome/*.{framework,xcframework}/**/#{binary_name}"].first
       binary&.split(File::SEPARATOR)&.first(2)&.join(File::SEPARATOR)
@@ -15,7 +34,7 @@ module PodAlexandria
       if is_library?
         "lib#{module_name}.tbd"
       else
-        "#{value}.framework"
+        "#{module_name}.framework"
       end
     end
 
@@ -26,17 +45,19 @@ module PodAlexandria
     def is_dynamic?
       if path.end_with? 'xcframework'
         any_arch = Dir["#{path}/*/*.framework"].first
-        binary = "#{any_arch}/#{value}"
+        binary = "#{any_arch}/#{module_name}"
       else
-        binary = "#{path}/#{value}"
+        binary = "#{path}/#{module_name}"
       end
       !%x(file #{binary} | grep dynamic).to_s.strip.empty?
     end
 
-    private
-
     def is_library?
-      value.start_with? '-l'
+      flag == 'l'
+    end
+
+    def is_weak?
+      flag == 'wf'
     end
 
     def binary_name
@@ -46,9 +67,5 @@ module PodAlexandria
         module_name
       end
     end
-
-    def module_name
-      value.delete_prefix('-l')
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-alexandria
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Jennes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-25 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods