cocoapods-modularization 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ce2a7c7df77a07a8425e0a83ea6000715fae66d1d9b299b763da0d92eda63bd
-  data.tar.gz: 93502239994e546320afdabdfb44abbd68e6fe4a91a6476f5bcafd66ba0d5058
+  metadata.gz: 42d014222c41482f1b2df08d7311a46239f4568f2e909543b846b60727b334b6
+  data.tar.gz: 18c9f07033eab5f6fa81c44f850b97dc66cb5fa87489a8d9cb444e354e856f07
 SHA512:
-  metadata.gz: '08ebed102dd8fa4df5fb3818aac2a0cfbe0928c3e5ea2c7f093caf13976faae26de124a3562d019f63e9d2d98992525bd77e545fe8827fae14d488293f3b59f2'
-  data.tar.gz: 5c7d1ada31906d351b2e40f2ecc7ebb1c461d7c79bdda254f8415edef3357af9c2c755c3764337fb5340b3c1aa82682d900ef3998e1391a092749ec5b3bae587
+  metadata.gz: 1a2e5f5b3c43a60595a8e5343768a5d4ba08e72b619a66345d80cf3d0bd94f5e5147885454c254bf2a6b7467da81b673f1c71f312fa39180e3f8e83600fda851
+  data.tar.gz: 025aacca5b1f552e251ca79adc5549779b2aeaa4e8e5c7c5f9a740929da6b0a6b1671a03d2775cb7f199509d9cfc374e765a010c5f7462935ec5c3deca6ddf88

data/lib/cocoapods-modularization/command/install.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-modularization/meta'
 require 'fileutils'
+require 'yaml'
 
 module Pod
   class Command
@@ -38,7 +39,8 @@ module Pod
           ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only ' \
             'applies to projects that have enabled incremental installation'],
           ['--enable-branch', 'Enable branch dependency'],
-          ['--original', 'Run pod install ignore cocoapods-modularization']
+          ['--original', 'Run pod install ignore cocoapods-modularization'],
+          ['--sync', 'Run pod install and sync all local dependencies according with branch_cache.yml']
         ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
       end
 
@@ -48,6 +50,7 @@ module Pod
         @clean_install = argv.flag?('clean-install', false)
         @enable_branch = argv.flag?('enable-branch', false)
         @original = argv.flag?('original', false)
+        @sync = argv.flag?('sync', false)
       end
 
       def run
@@ -56,6 +59,10 @@ module Pod
           FileUtils.rm_rf('Podfile.lock')
         end
 
+        if @sync
+          sync_local_dependencies
+        end
+
         unless @original
           begin
             Meta::MetaReference.encode_podfile(@enable_branch)
@@ -86,7 +93,7 @@ module Pod
       def add_modularization_into_xcode_reference
         project = Xcodeproj::Project.open('Pods/Pods.xcodeproj')
 
-        [Meta::MetaConstants.podfile_local_path, Meta::MetaConstants.meta_path, Meta::MetaConstants.data_path].each do |file|
+        [Meta::MetaConstants.podfile_local_path, Meta::MetaConstants.meta_path, Meta::MetaConstants.data_path, Meta::MetaConstants.branch_cache_path].each do |file|
           next unless File.exists?(file)
           project.new_file("#{Dir.pwd}/#{file}", :project).tap do |podfile_ref|
             podfile_ref.xc_language_specification_identifier = 'xcode.lang.yaml'
@@ -104,6 +111,39 @@ module Pod
         end
       end
 
+      def sync_local_dependencies
+        return unless File.exist?(Meta::MetaConstants.branch_cache_path)
+        branch_cache_hash = YAML.load_file(Meta::MetaConstants.branch_cache_path)
+        return unless branch_cache_hash.kind_of?(Hash)
+
+        podfile_hash = YAML.load_file(Meta::MetaConstants.podfile_local_path)
+        return unless podfile_hash.kind_of?(Hash)
+
+        branch_cache_hash.each do |key, value|
+          local_data_hash = podfile_hash[key]
+          next unless local_data_hash.kind_of?(Hash)
+          git = value[Meta::MetaConstants.git_key]
+          next unless git.kind_of?(String)
+          branch = value[Meta::MetaConstants.branch_key]
+          next unless branch.kind_of?(String)
+          local_path = local_data_hash[Meta::MetaConstants.local_path_key]
+          next unless local_path.kind_of?(String)
+
+          puts "Start checkout #{key}, git: #{git}, branch: #{branch}, local_path: #{local_path}"
+          `git -C #{local_path} checkout #{branch}`
+        end
+
+        podfile_hash.each do |key, value|
+          local_path = value[Meta::MetaConstants.local_path_key]
+          next unless local_path.kind_of?(String)          
+
+          if branch_cache_hash.has_key?(key)
+            Meta::MetaAccessor.set_local_path(key, local_path)
+          else
+            Meta::MetaAccessor.remove_local_path(key)
+          end
+        end
+      end
     end
   end
 end

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/cocoapods-modularization/private/private_cache.rb

@@ -12,12 +12,12 @@ module Pod
         end
 
         def git
-          git = `git -C #{@path} remote get-url origin`.lines.to_a.first
+          git = `git -C #{@path} remote get-url origin`
           git.strip if git
         end
 
         def branch
-          branch = `git -C #{@path} rev-parse --abbrev-ref HEAD`.lines.to_a.first
+          branch = `git -C #{@path} rev-parse --abbrev-ref HEAD`
           branch.strip if branch
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-modularization
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - lazy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler