cocoapods-modularization 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ef233aa5cb35dabcfdb1c5d73bfd39873a2426b53c8f43067b998a2696808ec
-  data.tar.gz: 63e4b092e68e900beded3b7539ad0cdc0f1d81dfad1b1fbe5661a4699b2ec4f0
+  metadata.gz: 56537d38322e4052df931fb49411ae622d97a11739ef53edc414bfc08e6f55c1
+  data.tar.gz: 52e5d74e0403f1b67438ff4cd6974f1d266a2204d751ab28b414aa8e3cf0a9dd
 SHA512:
-  metadata.gz: 17ff2f5a7b32612c1c2b9811a6ab6a17433b5412dbd231f2067a5d6f80d24b5c1fc28b612b38fb14e7fa3b24948ea92c5c397cc7fc8d423df13f199fd7b2c96a
-  data.tar.gz: 762caf19c7f6e5bb6a0fd148caa99f0d5ce0794cd16e43b9df8f0e6c9618938306917e81b7f560d32f53e73264712c74b601cd1e4a7808a8380c5378c24dcbcf
+  metadata.gz: da8df3c05c0b37d9fcae59445b52a24f53d2bd43f4aff04b096ff3b4260048e1fca9d444362436b35933c611d70cdf12e69d25b9ab412f87b920e8dd77a3ccf8
+  data.tar.gz: 5acc32106f62cce5c781012ebd3e28a49da5ea4776e826e39177c5b07cc69c8a3704ec4a9e131787070b19abbeab98127e66cda22977f06cefcdda7dd0de58c6

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)
@@ -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/command/mod/template.rb

@@ -5,22 +5,13 @@ module Pod
     class Mod < Command
       class Template < Mod
 
-        self.summary = 'Fetch build.rb from remote' 
+        self.summary = 'Fetch build.sh from remote' 
 
         self.description = <<-DESC
-          Fetch build.rb from remote
+          Fetch build.sh from remote
         DESC
 
-        def self.options 
-          [
-            ['--binary-only', '把framework推送到source和binary，一般用于三方库本地化'],
-            ['--framework-only', '把Binary/*framework推送到source和binary，一般用于私有库']
-          ].concat(super)
-        end
-
         def initialize(argv)
-          @binary = argv.flag?('binary-only')
-          @framework = argv.flag?('framework-only')
           super
         end
 
@@ -29,7 +20,7 @@ module Pod
         end
 
         def run
-          build_path = "#{Dir.pwd}/build.rb"
+          build_path = "#{Dir.pwd}/build.sh"
           if File.exist?(build_path)
             FileUtils.rm_rf(build_path)
           end
@@ -41,13 +32,7 @@ module Pod
             return
           end
 
-          if @binary
-            FileUtils.mv("#{Dir.pwd}/.build/Binary/binary_only.rb", "#{Dir.pwd}/build.rb")
-          elsif @framework
-            FileUtils.mv("#{Dir.pwd}/.build/Binary/framework_only.rb", "#{Dir.pwd}/build.rb")
-          else
-            FileUtils.mv("#{Dir.pwd}/.build/build.rb", "#{Dir.pwd}/build.rb")
-          end
+          FileUtils.mv("#{Dir.pwd}/.build/build.sh", "#{Dir.pwd}/build.sh")
           FileUtils.rm_rf("#{Dir.pwd}/.build")
         end
       end

data/lib/cocoapods-modularization/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsModularization
-  VERSION = "0.3.2"
-end
+  VERSION = "0.5.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.2
+  version: 0.5.0
 platform: ruby
 authors:
 - lazy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler