cocoapods-jxedt 0.0.10 → 0.0.13

data/lib/cocoapods-jxedt/command/options/options.rb

@@ -10,9 +10,14 @@ module Pod
                 self.arguments = [
                 ]
                 def self.options
-                    []
+                    [
+                        ['--more-config', '获取cocoapods-jxedt插件的完整配置'],
+                        ['--config', '获取cocoapods-jxedt插件的基础配置']
+                    ]
                 end
                 def initialize(argv)
+                    @config = argv.flag?('config', false)
+                    @more_config = argv.flag?('more-config', false)
                     super
                 end
       
@@ -22,10 +27,88 @@ module Pod
       
                 def run
                     require 'cocoapods-jxedt/binary/config'
+
+                    return print_options_config if @more_config
+                    return print_base_options_config if @config
+
                     require 'json'
                     
+                    log_section "🌹 APPLICABLE_DSL_CONFIG"
                     dsl_config = Jxedt::Config::APPLICABLE_DSL_CONFIG
-                    puts JSON.pretty_generate(dsl_config)
+                    Pod::UI.puts JSON.pretty_generate(dsl_config)
+
+                    log_section "🌹 GIT_CACHE_CONFIG"
+                    git_config = Jxedt::Config::GIT_CACHE_CONFIG
+                    Pod::UI.puts JSON.pretty_generate(git_config)
+                end
+
+                def print_base_options_config
+                    config = <<CONFIG
+use_frameworks! :linkage => :static
+# use_modular_headers!
+
+plugin 'cocoapods-jxedt'
+options = {
+    'all_binary': true, # 所有组件开启binary
+    'keep_source_project': true, # 保留源码pod工程，所在目录`Pods-Source`
+    'excluded_pods': [], # 排除binary的组件名称
+    'framework_header_search_enabled': true, # 兼容头文件引用`#import "xxx.h"`
+    'configurations': ['Release'], # 支持的configurations ['Release', 'Debug']
+    'device_build_enabled': true, # 真机
+    'simulator_build_enabled': false # 模拟器
+}
+cocoapods_jxedt_config(options)
+CONFIG
+                    Pod::UI.puts config
+                end
+
+                def print_options_config
+                    dsl_config = Jxedt::Config::APPLICABLE_DSL_CONFIG
+                    git_config = Jxedt::Config::GIT_CACHE_CONFIG
+
+                    config = <<CONFIG
+use_frameworks! :linkage => :static # 插件是支持使用library的，插件会把编译后的.a生成framework。如果你的工程不支持module，可以删掉或者注释掉这一行。不影响使用
+# use_modular_headers!
+
+plugin 'cocoapods-jxedt'
+
+# 这里默认配置了大部分常用的配置参数，只需要简单修改就可以使用了
+options = {
+    'all_binary': true, # #{dsl_config[:all_binary]}
+    'binary_dir': '../_Prebuild', # #{dsl_config[:binary_dir]}
+    'binary_switch': true, # #{dsl_config[:binary_switch]}
+    'prebuild_job': true, # #{dsl_config[:prebuild_job]}
+    'keep_source_project': false, # #{dsl_config[:keep_source_project]}
+    'excluded_pods': [], # #{dsl_config[:excluded_pods]}
+    'framework_header_search_enabled': false, # #{dsl_config[:framework_header_search_enabled]}
+    'configurations': ['Release'], # #{dsl_config[:configurations]}
+    'xcframework': false, # #{dsl_config[:xcframework]}
+    'clean_build': true, # #{dsl_config[:clean_build]}
+    'device_build_enabled': true, # #{dsl_config[:device_build_enabled]}
+    'simulator_build_enabled': false, # #{dsl_config[:simulator_build_enabled]}
+    'disable_resource_compilable_pods': false, # #{dsl_config[:disable_resource_compilable_pods]}
+    'build_args': { # 下面是默认的配置，如果没有改动可删除节点
+        'default': ["ONLY_ACTIVE_ARCH=NO", "BUILD_LIBRARY_FOR_DISTRIBUTION=YES"],
+        'device': ["ARCHS='arm64'"],
+        'simulator': ["ARCHS='x86_64'"]
+    },
+    'git_cache': { # 如果不需要git缓存，直接删掉这个节点即可
+        'repo': '', # #{git_config[:repo]}
+        'branch': 'develop', # #{git_config[:branch]}
+        'auto_fetch': true, # #{git_config[:auto_fetch]}
+        'auto_push': false # #{git_config[:auto_push]}
+    }
+}
+cocoapods_jxedt_config(options)
+CONFIG
+
+                    Pod::UI.puts config
+                end
+
+                def log_section(message)
+                    Pod::UI.puts "-----------------------------------------"
+                    Pod::UI.puts message
+                    Pod::UI.puts "-----------------------------------------"
                 end
             end
         end

data/lib/cocoapods-jxedt/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsJxedt
-  VERSION = "0.0.10"
+  VERSION = "0.0.13"
 end

data/lib/cocoapods-jxedt/git_helper/cache_fetcher.rb

@@ -0,0 +1,34 @@
+module Jxedt
+    module CacheFetcher
+        def self.fetch
+            require_relative 'git_command'
+            repo = Jxedt.config.git_remote_repo
+            cache_path = Jxedt.config.git_cache_path
+            branch = Jxedt.config.cache_branch
+
+            commander = Jxedt::GitCommand.new(cache_path)
+            commander.git_fetch(repo, branch)
+        end
+
+        def self.sync(binary_hash, to_dir)
+            # fetch
+            fetch
+            
+            require_relative 'zip'
+
+            cache_dir = Pathname.new(Jxedt.config.git_cache_path) + "GeneratedFrameworks"
+            to_dir = Pathname.new(to_dir)
+            binary_hash.each do |name, checksum|
+                zip_file = cache_dir + name + "#{checksum}.zip"
+                next unless zip_file.exist?
+
+                file_path = to_dir + name + "#{checksum}.checksum"
+                next if file_path.exist? # 存在同校验和的文件，跳过
+                file_path.parent.rmtree if file_path.parent.exist?
+
+                Jxedt::ZipUtils.unzip(zip_file, :to_dir => to_dir)
+                Pod::UI.puts "✅  已从缓存下载组件#{name}, 校验和:#{checksum}".yellow
+            end            
+        end
+    end
+end

data/lib/cocoapods-jxedt/git_helper/cache_pucher.rb

@@ -0,0 +1,42 @@
+module Jxedt
+    module CachePucher
+        def self.push(output_dir, targets=nil, force_push=false)
+            require_relative 'git_command'
+            require_relative 'zip'
+
+            repo = Jxedt.config.git_remote_repo
+            cache_path = Jxedt.config.git_cache_path
+            branch = Jxedt.config.cache_branch
+            commander = Jxedt::GitCommand.new(cache_path)
+            # fetch
+            commander.git_fetch(repo, branch)
+
+            output_dir = Pathname.new(output_dir)
+            approve, refuse = [], []
+            output_dir.children.each do |child|
+                next unless child.directory?
+                pod_name = child.basename.to_s
+                next if targets && targets.is_a?(Array) && !(targets.include?(pod_name))
+
+                pod_checksum = child.children.select { |ch| ch.extname == '.checksum' }.first
+                pod_checksum = pod_checksum.basename.sub_ext('').to_s unless pod_checksum.nil?
+                next if pod_checksum.nil?
+
+                to_dir = Pathname.new(cache_path) + "GeneratedFrameworks" + pod_name
+                to_dir.mkpath unless to_dir.exist?
+                zip_file = to_dir + "#{pod_checksum}.zip"
+                skip = zip_file.exist? && !force_push
+                next refuse << pod_name if skip
+
+                approve << pod_name
+                Jxedt::ZipUtils.zip(child.to_s, :zip_name => pod_checksum, :to_dir => to_dir)
+            end
+
+            # push
+            commander.git_commit_and_push(branch) if approve.size > 0
+            
+            Pod::UI.puts "🎉  组件已缓存成功: #{approve}".yellow if approve.size > 0
+            Pod::UI.puts "👻  组件缓存失败,存在相同的校验和: #{refuse}".red if refuse.size > 0
+        end
+    end
+end

data/lib/cocoapods-jxedt/git_helper/git_command.rb

@@ -0,0 +1,48 @@
+module Jxedt
+    class GitCommand
+      def initialize(cache_path)
+        @cache_path = File.expand_path(cache_path)
+        prepare_cache_dir
+      end
+  
+      def prepare_cache_dir
+        FileUtils.mkdir_p(@cache_path) if @cache_path
+      end
+  
+      def git(cmd, ignore_output: false, can_fail: false, git_dir: true)
+        comps = ["git"]
+        comps << "-C" << @cache_path if git_dir
+        comps << cmd
+        comps << "&> /dev/null" if ignore_output
+        comps << "|| true" if can_fail
+        cmd = comps.join(" ")
+        raise "Fail to run command '#{cmd}'" unless system(cmd)
+      end
+  
+      def git_clone(cmd, options = {})
+        git("clone #{cmd}", :git_dir => false)
+      end
+
+      def git_fetch(repo, branch)
+        Pod::UI.puts "Fetching cache from #{repo} (branch: #{branch})".green
+        dest_dir = @cache_path
+        if Dir.exist?(dest_dir + "/.git")
+          git("fetch origin #{branch}")
+          git("checkout -f FETCH_HEAD", ignore_output: true)
+          git("branch -D #{branch}", ignore_output: true, can_fail: true)
+          git("checkout -b #{branch}")
+        else
+          FileUtils.rm_rf(dest_dir)
+          git_clone("--depth=1 --branch=#{branch} #{repo} #{dest_dir}")
+        end
+      end
+
+      def git_commit_and_push(branch)
+        commit_message = "Update prebuilt cache"
+        git("add .")
+        git("commit -m '#{commit_message}'")
+        git("push origin #{branch}")
+      end
+    end
+  end
+  

data/lib/cocoapods-jxedt/git_helper/zip.rb

@@ -0,0 +1,22 @@
+module Jxedt
+    module ZipUtils
+      def self.zip(path, zip_name: nil, to_dir: nil)
+        basename = File.basename(path)
+        zip_name = basename if zip_name.nil?
+        out_path = to_dir.nil? ? "#{zip_name}.zip" : "#{to_dir}/#{zip_name}.zip"
+        cmd = []
+        cmd << "cd" << File.dirname(path)
+        cmd << "&& zip -r --symlinks" << out_path << basename
+        cmd << "&& cd -"
+        `#{cmd.join(" ")}`
+      end
+  
+      def self.unzip(path, to_dir: nil)
+        cmd = []
+        cmd << "unzip -nq" << path
+        cmd << "-d" << to_dir unless to_dir.nil?
+        `#{cmd.join(" ")}`
+      end
+    end
+  end
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-jxedt
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.13
 platform: ruby
 authors:
 - guojiashuang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -75,23 +75,34 @@ files:
 - lib/cocoapods-jxedt/binary/config.rb
 - lib/cocoapods-jxedt/binary/helper/names.rb
 - lib/cocoapods-jxedt/binary/helper/podfile_options.rb
+- lib/cocoapods-jxedt/binary/helper/podfile_post_install_hook.rb
 - lib/cocoapods-jxedt/binary/helper/prebuild_sandbox.rb
 - lib/cocoapods-jxedt/binary/helper/target_definition.rb
 - lib/cocoapods-jxedt/binary/hooks/CocoapodsJxedtHook.rb
 - lib/cocoapods-jxedt/binary/hooks/post_install.rb
 - lib/cocoapods-jxedt/binary/hooks/pre_install.rb
 - lib/cocoapods-jxedt/binary/main.rb
+- lib/cocoapods-jxedt/binary/pod-room/framework.rb
 - lib/cocoapods-jxedt/binary/pod-room/xcodebuild_command.rb
 - lib/cocoapods-jxedt/binary/pod-room/xcodebuild_raw.rb
 - lib/cocoapods-jxedt/binary/podfile_dsl.rb
 - lib/cocoapods-jxedt/binary/prebuild.rb
 - lib/cocoapods-jxedt/binary/targets/pod_target.rb
 - lib/cocoapods-jxedt/command.rb
+- lib/cocoapods-jxedt/command/binary/binary.rb
+- lib/cocoapods-jxedt/command/binary/command/build.rb
+- lib/cocoapods-jxedt/command/binary/command/clean.rb
+- lib/cocoapods-jxedt/command/binary/command/fetch.rb
+- lib/cocoapods-jxedt/command/binary/command/push.rb
+- lib/cocoapods-jxedt/command/binary/command/statistics.rb
 - lib/cocoapods-jxedt/command/header/header.rb
 - lib/cocoapods-jxedt/command/jxedt.rb
 - lib/cocoapods-jxedt/command/options/options.rb
-- lib/cocoapods-jxedt/command/statistics/statistics.rb
 - lib/cocoapods-jxedt/gem_version.rb
+- lib/cocoapods-jxedt/git_helper/cache_fetcher.rb
+- lib/cocoapods-jxedt/git_helper/cache_pucher.rb
+- lib/cocoapods-jxedt/git_helper/git_command.rb
+- lib/cocoapods-jxedt/git_helper/zip.rb
 - lib/cocoapods-jxedt/tool.rb
 - lib/cocoapods_plugin.rb
 homepage: http://igit.58corp.com/com.wuba.jxedt.ios/cocoapods-jxedt

data/lib/cocoapods-jxedt/command/statistics/statistics.rb

@@ -1,98 +0,0 @@
-module Pod
-    class Command
-        class JxedtCommand < Command
-            class Statistics < JxedtCommand
-                self.summary = '统计二进制使用情况'
-                self.description = <<-DESC
-                统计二进制使用详情
-                DESC
-                self.command = 'statistics'
-                self.arguments = [
-                ]
-                def self.options
-                    [
-                        ['--failed', '统计校验失败的二进制'],
-                    ]
-                end
-                def initialize(argv)
-                    @check_failed = argv.flag?('failed')
-                    super
-                end
-      
-                def validate!
-                    super
-                end
-      
-                def run
-                    podfile = Pod::Config.instance.podfile
-                    lockfile = Pod::Config.instance.lockfile
-                    help! '请检查命令执行路径，需要在Podfile文件所在目录执行' if podfile.nil? || lockfile.nil?
-
-                    require 'cocoapods-jxedt/binary/config'
-                    require 'cocoapods-jxedt/binary/helper/podfile_options'
-
-                    pods_root = Pathname.new(File.dirname(podfile.defined_in_file)) + "Pods"
-                    binary_dir = pods_root + Jxedt.config.binary_dir
-
-                    used_binary = []
-                    Dir.glob("#{pods_root}/*/_Prebuild") do |file_path|
-                        next unless File.directory?(file_path)
-                        dir_name = File.dirname(file_path)
-                        name = File.basename(dir_name).to_s
-                        target_path = binary_dir + name
-                        next unless target_path.exist? # 路径不存在，跳过
-
-                        new_hash = {}
-                        # name
-                        new_hash[:name] = name
-
-                        # multiple_configuration
-                        configuration_enable = target_path.children().select { |path| "#{path.basename}" == 'Debug' || "#{path.basename}" == 'Release' }.count == 2
-                        new_hash[:multiple_configuration] = configuration_enable
-                        
-                        # checksum validation
-                        checksum_file = target_path.children().select { |path| path.extname == '.checksum' }.first
-                        new_hash[:checksum] = checksum_file.basename.to_s.gsub('.checksum', '') unless checksum_file.nil?
-
-                        used_binary << new_hash
-                    end
-                    
-                    # print
-                    index, failed = 0, []
-                    used_binary.sort_by {|hash| hash[:name] }.each do |hash|
-                        name = hash[:name]
-
-                        checksum = lockfile.spec_checksums_hash_key(name)
-                        validation_passed = checksum && checksum == hash[:checksum]
-                        failed << name unless validation_passed
-
-                        # 校验和是否用的 git commitid
-                        checkout_options = lockfile.internal_data["CHECKOUT OPTIONS"] || {}
-                        is_git_commitid = checkout_options[name] && checkout_options[name][:commit]
-                        
-                        if validation_passed
-                            next if @check_failed
-                            index += 1
-                            log = <<~LOG
-                            #{index}). #{name}:
-                                    multiple configuration: #{hash[:multiple_configuration]}
-                                    checksum#{"（git commitid）" if is_git_commitid}: #{hash[:checksum]}
-                            LOG
-                            Pod::UI.puts log
-                        else
-                            index += 1
-                            log = <<~LOG
-                            #{index}). #{name}:
-                                    multiple configuration: #{hash[:multiple_configuration]}
-                                    checksum: #{hash[:checksum]}
-                                    checksum in lockfile#{"（git commitid）" if is_git_commitid}: #{checksum}
-                            LOG
-                            Pod::UI.puts log.red
-                        end
-                    end
-                    Pod::UI.puts "checksum校验失败的组件: #{failed}".red if failed.size > 0
-                end
-            end
-        end
-    end
-end