cocoapods-mtxx-bin 0.0.4 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2655d65a99f939390567f80fbc9fd8e85c4d6994455caeccb3b82bf39a7987
-  data.tar.gz: aabeca38bc8eb8140dcddfeb760b096ffb66facf8ca0c601d457d3e95d823be1
+  metadata.gz: 00c25aad1e1bb13ef8c88e50faf60801931532128a902ab72d40415c6f74809f
+  data.tar.gz: 59e39e2c15ea57d12940f89dc13760155a663aeb22ed7077bb6bcc8e0d4c7e43
 SHA512:
-  metadata.gz: f3aee79c6b95e790279f73bb03f3ca1ab9e9fecd72e3508ecf9c188c1244368815d19de7b47904f13ba8c1fa37882b649f0f82a56e96c5666ca7329baf19483b
-  data.tar.gz: 8cfbb96d608773133d5e636e55a56812835001c50e745299833aef178da7c43a6f1022d615dc7ec3cb23960bf1774dd8d2effdefd1bdb9e1207a8385605079d9
+  metadata.gz: b6f9e5f92d9a260f67fe3f94ecd695314fcb523defdb9d407a5398be6984c2d1d672cc7a54e47c0d031ee158d91075c8da5a6cc27a9d53c1588fc1cc5a6f639d
+  data.tar.gz: 3c678a0494d56ac065707adb58470f33ac94590087b9b2957fd901e23dfd1bcd589214ef42ce5df285ed2511d11af1481202f211faffa4628ac5a39f5a42a072

data/lib/cocoapods-mtxx-bin/command/bin/buildAll.rb

@@ -2,6 +2,7 @@ require 'cocoapods-mtxx-bin/helpers/buildAll/builder'
 require 'cocoapods-mtxx-bin/helpers/buildAll/podspec_util'
 require 'cocoapods-mtxx-bin/helpers/buildAll/zip_file_helper'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
 require 'yaml'
 require 'digest'
 
@@ -18,7 +19,7 @@ module Pod
 
         self.summary = '根据壳工程打包所有依赖组件为静态库（static framework）'
         self.description = <<-DESC
-          #{self.summary}
+          #{summary}
         DESC
 
         def self.options
@@ -30,9 +31,9 @@ module Pod
         end
 
         def initialize(argv)
-          @clean = argv.flag?('clean', false )
-          @repo_update = argv.flag?('repo-update', false )
-          @full_build = argv.flag?('full-build', false )
+          @clean = argv.flag?('clean', false)
+          @repo_update = argv.flag?('repo-update', false)
+          @full_build = argv.flag?('full-build', false)
           @base_dir = "#{Pathname.pwd}/build_pods"
           super
         end
@@ -70,10 +71,10 @@ module Pod
 
         # 读取配置文件
         def read_config
-          UI.title "Read config from file `BinConfig.yaml`".green do
-            config_file = File.join(Dir.pwd, 'BinConfig.yaml')
+          UI.title 'Read config from file `BinConfig.yaml`'.green do
+            config_file = File.join(CBin.config.binary_dir, 'BinConfig.yaml')
             return unless File.exist?(config_file)
-            config = YAML.load(File.open(config_file))
+            config = YAML.safe_load(File.open(config_file))
             return if config.nil?
             build_config = config['build_config']
             return if build_config.nil?
@@ -86,38 +87,44 @@ module Pod
 
         # 更新repo仓库
         def repo_update
-          UI.title "Repo update".green do
-            return if podfile.nil?
-            sources_manager = Pod::Config.instance.sources_manager
-            podfile.sources.uniq.map { |src|
-              # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
-              next unless src.include?(MT_REPO)
-              UI.message "Update repo: #{src}"
-              source = sources_manager.source_with_name_or_url(src)
-              source.update(false )
-            }
-          end if @repo_update
+          if @repo_update
+            UI.title 'Repo update'.green do
+              return if podfile.nil?
+              sources_manager = Pod::Config.instance.sources_manager
+              podfile.sources.uniq.map do |src|
+                # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
+                next unless src.include?(MT_REPO)
+                UI.message "Update repo: #{src}"
+                source = sources_manager.source_with_name_or_url(src)
+                source.update(false)
+              end
+            end
+          end
         end
 
         # 执行pre build
         def pre_build
-          UI.title "Execute the command of pre build".green do
-            system(@pre_build)
-          end if @pre_build
+          if @pre_build
+            UI.title 'Execute the command of pre build'.green do
+              system(@pre_build)
+            end
+          end
         end
 
         # 执行post build
-        def post_build(results)
-          UI.title "Execute the command of post build".green do
-            system(@post_build)
-          end if @post_build
+        def post_build(_results)
+          if @post_build
+            UI.title 'Execute the command of post build'.green do
+              system(@post_build)
+            end
+          end
         end
 
         # 获取 podfile
         def podfile
           @podfile ||= begin
-                         podfile_path = File.join(Pathname.pwd,"Podfile")
-                         raise "Podfile不存在" unless File.exist?(podfile_path)
+                         podfile_path = File.join(Pathname.pwd, 'Podfile')
+                         raise 'Podfile不存在' unless File.exist?(podfile_path)
                          sources_manager = Pod::Config.instance.sources_manager
                          podfile = Podfile.from_file(Pathname.new(podfile_path))
                          podfile_hash = podfile.to_hash
@@ -131,8 +138,8 @@ module Pod
         # 获取 podfile.lock
         def lockfile
           @lockfile ||= begin
-                          lock_path = File.join(Pathname.pwd,"Podfile.lock")
-                          raise "Podfile.lock不存在，请执行pod install" unless File.exist?(lock_path)
+                          lock_path = File.join(Pathname.pwd, 'Podfile.lock')
+                          raise 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
                           Lockfile.from_file(Pathname.new(lock_path))
                         end
         end
@@ -140,30 +147,30 @@ module Pod
         # 获取 sandbox
         def sandbox
           @sandbox ||= begin
-                         sandbox_path = File.join(Pathname.pwd, "Pods")
-                         raise "Pods文件夹不存在，请执行pod install" unless File.exist?(sandbox_path)
+                         sandbox_path = File.join(Pathname.pwd, 'Pods')
+                         raise 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
                          Pod::Sandbox.new(sandbox_path)
                        end
         end
 
         # 根据podfile和podfile.lock分析依赖
         def analyse
-          UI.title "Analyze dependencies".green do
+          UI.title 'Analyze dependencies'.green do
             analyzer = Pod::Installer::Analyzer.new(
               sandbox,
               podfile,
               lockfile
             )
-            analyzer.analyze(true )
+            analyzer.analyze(true)
           end
         end
 
         # 删除编译产物
         def clean_build_pods
-          UI.title "Clean build pods".green do
-            build_path = Dir.pwd + "/build"
+          UI.title 'Clean build pods'.green do
+            build_path = Dir.pwd + '/build'
             FileUtils.rm_rf(build_path) if File.exist?(build_path)
-            build_pods_path = Dir.pwd + "/build_pods"
+            build_pods_path = Dir.pwd + '/build_pods'
             FileUtils.rm_rf(build_pods_path) if File.exist?(build_pods_path)
           end
         end
@@ -268,14 +275,14 @@ module Pod
 
         # 展示结果
         def show_results(results)
-          UI.title "打包结果：".green do
-            UI.info "——————————————————————————————————".green
-            UI.info "|#{"Type".center(20)}|#{"Count".center(11)}|".green
-            UI.info "——————————————————————————————————".green
+          UI.title '打包结果：'.green do
+            UI.info '——————————————————————————————————'.green
+            UI.info "|#{'Type'.center(20)}|#{'Count'.center(11)}|".green
+            UI.info '——————————————————————————————————'.green
             results.each do |key, value|
               UI.info "|#{key.center(20)}|#{value.size.to_s.center(11)}|".green
             end
-            UI.info "——————————————————————————————————".green
+            UI.info '——————————————————————————————————'.green
 
             # 打印出失败的 target
             unless results['Fail'].empty?
@@ -303,7 +310,6 @@ module Pod
           end
           result
         end
-
       end
     end
   end

data/lib/cocoapods-mtxx-bin/command/bin/init.rb

@@ -11,7 +11,7 @@ module Pod
 
         def self.options
           [
-            ['--bin-url=URL', '配置文件地址，直接从此地址下载配置文件'],
+            %w[--bin-url=URL 配置文件地址，直接从此地址下载配置文件],
             ['--update-sources', '更新源码私有源配置 bin_dev.yml 中的 code_repo_url_list 配置,支持多私有源,多个私有源用分号区分  example：git@techgit.meitu.com:iMeituPic/mtsourcespecs.git;git@techgit.meitu.com:iosmodules/specs.git;https://github.com/CocoaPods/Specs.git']
           ].concat(super)
         end

data/lib/cocoapods-mtxx-bin/command/bin/outputSource.rb

@@ -0,0 +1,141 @@
+require 'cocoapods-mtxx-bin/helpers/buildAll/builder'
+require 'cocoapods-mtxx-bin/helpers/buildAll/podspec_util'
+require 'cocoapods-mtxx-bin/helpers/buildAll/zip_file_helper'
+require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
+require 'yaml'
+require 'digest'
+
+module Pod
+  class Command
+    class Bin < Command
+      class OutputSource < Bin
+        self.summary = '输出各个组件的source源，默认输出全部组件的source'
+        self.description = <<-DESC
+          #{summary}
+        DESC
+
+        def self.options
+          [
+            %w[--error-source 过滤异常的source，比如http的，CI打包只支持SSH认证]
+          ].concat(super).uniq
+        end
+
+        def initialize(argv)
+          @error_source = argv.flag?('error-source', false)
+          super
+        end
+
+        def run
+          # 开始时间
+          @start_time = Time.now.to_i
+          # 更新repo仓库
+          repo_update
+          # 分析依赖
+          @analyze_result = analyse
+          # 打印source
+          show_cost_source
+          # 计算耗时
+          show_cost_time
+        end
+
+        private
+
+        # 打印source
+        def show_cost_source
+          all_source_list = []
+          error_source_list = []
+          @analyze_result.specifications.each do |specification|
+            next if specification.subspec?
+            all_source_list << specification.source
+            if @error_source && verified_git_address(specification)
+              error_source_list << specification.name + '  ' + specification.source[:git] + + '  ' + specification.source[:tag]
+            end
+          end
+          if @error_source
+            UI.info '问题组件，source 为http CI打包不支持http认证，应修改为ssh'.red
+            UI.info error_source_list.to_s.red
+          else
+            UI.info '输出所有pod组件source'.green
+            UI.info error_source_list.to_s.green
+          end
+        end
+
+        # git clone 地址 是否非法
+        def verified_git_address(specification)
+          return false if specification.source[:git].nil?
+          git = specification.source[:git]
+          git.include?('http://techgit.meitu.com') || git.include?('https://techgit.meitu.com')
+        end
+
+        # 打印耗时
+        def show_cost_time
+          return if @start_time.nil?
+          UI.info "总耗时：#{Time.now.to_i - @start_time}s".green
+        end
+
+        # 更新repo仓库
+        def repo_update
+          if @repo_update
+            UI.title 'Repo update'.green do
+              return if podfile.nil?
+              sources_manager = Pod::Config.instance.sources_manager
+              podfile.sources.uniq.map do |src|
+                # next if src.include?(CDN) || src.include?(MASTER_HTTP) || src.include?(MASTER_SSH)
+                next unless src.include?(MT_REPO)
+                UI.message "Update repo: #{src}"
+                source = sources_manager.source_with_name_or_url(src)
+                source.update(false)
+              end
+            end
+          end
+        end
+
+        # 获取 podfile
+        def podfile
+          @podfile ||= begin
+                         podfile_path = File.join(Pathname.pwd, 'Podfile')
+                         raise 'Podfile不存在' unless File.exist?(podfile_path)
+                         sources_manager = Pod::Config.instance.sources_manager
+                         podfile = Podfile.from_file(Pathname.new(podfile_path))
+                         podfile_hash = podfile.to_hash
+                         podfile_hash['sources'] = (podfile_hash['sources'] || []).concat(sources_manager.code_source_list.map(&:url))
+                         podfile_hash['sources'] << sources_manager.binary_source.url
+                         podfile_hash['sources'].uniq!
+                         Podfile.from_hash(podfile_hash)
+                       end
+        end
+
+        # 获取 podfile.lock
+        def lockfile
+          @lockfile ||= begin
+                          lock_path = File.join(Pathname.pwd, 'Podfile.lock')
+                          raise 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
+                          Lockfile.from_file(Pathname.new(lock_path))
+                        end
+        end
+
+        # 获取 sandbox
+        def sandbox
+          @sandbox ||= begin
+                         sandbox_path = File.join(Pathname.pwd, 'Pods')
+                         raise 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
+                         Pod::Sandbox.new(sandbox_path)
+                       end
+        end
+
+        # 根据podfile和podfile.lock分析依赖
+        def analyse
+          UI.title 'Analyze dependencies'.green do
+            analyzer = Pod::Installer::Analyzer.new(
+              sandbox,
+              podfile,
+              lockfile
+            )
+            analyzer.analyze(true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-mtxx-bin/command/bin/upload.rb

@@ -0,0 +1,173 @@
+require 'json'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Upload < Bin
+        include Pod
+
+        self.summary = "上传二进制文件及podspec"
+        self.description = <<-DESC
+#{self.summary}
+
+`NAME`: 库名【必填】\n
+`VERSION`: 版本号【必填】\n
+`FILE`: 需要压缩的二进制文件或目录【必填】\n
+`REPO`: 上传podspec的仓库，可以通过`pod repo list`查看【必填】\n
+
+e.g.:\n
+pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('NAME', true ),
+          CLAide::Argument.new('VERSION', true),
+          CLAide::Argument.new('FILE', true),
+          CLAide::Argument.new('REPO', true)
+        ]
+
+        def self.options
+          [
+            %w[--spec=SPEC 指定podspec文件路径，如果不指定，将在当前目录下查找]
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @version = argv.shift_argument
+          @file = argv.shift_argument
+          @repo = argv.shift_argument
+          @spec = argv.option('spec', nil)
+          super
+        end
+
+        def run
+          # 参数检查
+          argvsCheck
+          # 压缩文件
+          zip_file
+          # 上传文件
+          upload_zip_file
+          # 修改podspec
+          modify_spec
+          # 上传podspec
+          upload_spec
+        end
+
+        private
+
+        # 参数检查
+        def argvsCheck
+          raise Informative, "name不能为空" if @name.nil?
+          raise Informative, "version不能为空" if @version.nil?
+          raise Informative, "repo不能为空" if @repo.nil?
+          raise Informative, "未找到需要压缩的二进制文件" if @file.nil?
+          raise Informative, "未找到podspec文件" unless File.exist?(podspec)
+        end
+
+        # 压缩文件
+        def zip_file
+          UI.title "压缩二进制文件`#{zip_file_name}`".yellow do
+            output_zip_file = File.join(Dir.pwd, zip_file_name)
+            FileUtils.rm_f(output_zip_file) if File.exist?(output_zip_file)
+            command = "zip --symlinks -r #{zip_file_name} #{@file}"
+            UI.info "#{command}"
+            `#{command}`
+            raise Informative, "压缩二进制文件失败" unless File.exist?(output_zip_file)
+          end
+        end
+
+        # 压缩后的zip包名
+        def zip_file_name
+          @zip_file_name ||= begin
+                               "#{@name}_#{@version}.zip"
+                             end
+        end
+
+        # 上传文件
+        def upload_zip_file
+          UI.title "上传二进制文件`#{zip_file_name}`".yellow do
+            zip_file = File.join(Dir.pwd, zip_file_name)
+            raise Informative, "`#{@zip_file_name}`不存在" unless File.exist?(zip_file)
+            upload_url = CBin.config.binary_upload_url_str
+            command = "curl -F \"name=#{@name}\" -F \"version=#{@version}\" -F \"file=@#{zip_file}\" #{upload_url}"
+            UI.info "#{command}"
+            json = `#{command}`
+            UI.info json
+            begin
+              error_code = JSON.parse(json)["error_code"]
+              raise Informative, "`#{zip_file_name}`上传失败" unless error_code == 0
+              UI.info "`#{zip_file_name}`上传成功".green
+            rescue JSON::ParserError => e
+              raise Informative, "`#{zip_file_name}`上传失败\n#{e.to_s}"
+            end
+          end
+        end
+
+        # 修改podspec
+        def modify_spec
+          UI.title "修改podspec：`#{podspec}`".yellow do
+            spec = Specification.from_file(podspec)
+            spec_hash = spec.to_hash
+            spec_hash['version'] = @version
+            spec_hash['source'] = source
+            spec = Specification.from_hash(spec_hash)
+            write_podspec_json(spec)
+          end
+        end
+
+        # 写入podspec
+        def write_podspec_json(spec)
+          FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+          File.open(podspec_json_file, "w+") do |f|
+            f.write(spec.to_pretty_json)
+          end
+        end
+
+        def source
+          url = "#{CBin.config.binary_download_url_str}/#{@name}/#{@version}/#{zip_file_name}"
+          { http: url, type: 'zip' }
+        end
+
+        # 上传podspec
+        def upload_spec
+          UI.title "推送podspec：`#{podspec_json_file_name}`".yellow do
+            raise Informative, "`#{podspec_json_file_name}`不存在" unless File.exist?(podspec_json_file)
+            argvs = %W[#{@repo} #{podspec_json_file} --skip-import-validation --use-libraries --allow-warnings --verbose]
+
+            begin
+              push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+              push.validate!
+              push.run
+            rescue Pod::StandardError => e
+              raise Informative, "推送podspec：`#{podspec_json_file_name}失败\n#{e.to_s}"
+            end
+            # 上传完成后，清理工作目录
+            FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+            FileUtils.rm_r('binary') if File.exist?('binary')
+            FileUtils.rm_f(zip_file_name) if File.exist?(zip_file_name)
+          end
+        end
+
+        def binary_dir
+          File.join(Dir.pwd, 'binary')
+        end
+
+        def podspec_json_file_name
+          "#{@name}.podspec.json"
+        end
+
+        def podspec_json_file
+          File.join(Dir.pwd, podspec_json_file_name)
+        end
+
+        def podspec
+          @spec ||= begin
+                      "#{@name}.podspec"
+                    end
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-mtxx-bin/command/bin.rb

@@ -9,6 +9,8 @@ require 'cocoapods-mtxx-bin/command/bin/install'
 require 'cocoapods-mtxx-bin/command/bin/repo'
 require 'cocoapods-mtxx-bin/command/bin/spec'
 require 'cocoapods-mtxx-bin/command/bin/buildAll'
+require 'cocoapods-mtxx-bin/command/bin/outputSource'
+require 'cocoapods-mtxx-bin/command/bin/upload'
 require 'cocoapods-mtxx-bin/helpers'
 # require 'cocoapods-mtxx-bin/native'
 
@@ -41,7 +43,7 @@ module Pod
       self.summary = '组件二进制化插件'
       self.description = <<-DESC.strip_heredoc
         组件二进制化插件
-        
+
         利用源码私有源与二进制私有源实现对组件依赖类型的切换
       DESC
 

data/lib/cocoapods-mtxx-bin/config/config.rb

@@ -13,12 +13,12 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-          'code_repo_url_list' => { description: '源码私有源 Git 地址 ,支持多私有源,多个私有源用分号区分', default: 'git@techgit.meitu.com:iMeituPic/mtsourcespecs.git' },
+          'code_repo_url_list' => { description: '源码私有源 Git 地址，多个私有源用分号区分', default: 'git@techgit.meitu.com:iMeituPic/mtsourcespecs.git' },
           'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@techgit.meitu.com:iMeituPic/mtbinaryspecs.git' },
-          'binary_upload_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本', default: 'http://pre.intapi.xiuxiu.meitu.com/internal/file/upload.json' },
+          'binary_upload_url' => { description: '二进制文件上传地址', default: 'http://pre.intapi.xiuxiu.meitu.com/internal/file/upload.json' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
-          'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s', default: 'https://manhattan-test.obs.cn-north-4.myhuaweicloud.com:443/ios/binary' },
-          'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
+          'binary_download_url' => { description: '二进制文件下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s', default: 'https://manhattan-test.obs.cn-north-4.myhuaweicloud.com:443/ios/binary' },
+          'download_file_type' => { description: '二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
       }
     end
 
@@ -36,12 +36,22 @@ module CBin
         raise "===== #{configuration_env} %w[dev debug_iphoneos release_iphoneos]===="
       end
 
-      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      # File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      File.expand_path("#{binary_dir}/#{file}")
     end
 
     def config_file_with_configuration_env_list(configuration_env)
       file = config_dev_file
-      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      # File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      File.expand_path("#{binary_dir}/#{file}")
+    end
+
+    def binary_dir
+      @binary_dir ||= begin
+                        binary_dir = "#{Pod::Config.instance.project_root}/binary"
+                        FileUtils.mkdir(binary_dir) unless File.exist?(binary_dir)
+                        binary_dir
+                      end
     end
 
     def configuration_env

data/lib/cocoapods-mtxx-bin/config/config_asker.rb

@@ -40,10 +40,10 @@ module CBin
       def wellcome_message
         print <<~EOF
 
-          开始设置二进制化初始信息.
+          设置插件配置信息.
           所有的信息都会保存在 #{CBin.config.config_file} 文件中.
-          %w[bin_dev.yml bin_debug_iphoneos.yml bin_release_iphoneos.yml] 
-          你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
+          你可以在对应目录下手动添加编辑该文件. 
+          文件包含的配置信息样式如下：
 
           #{CBin.config.default_config.to_yaml}
         EOF

data/lib/cocoapods-mtxx-bin/gem_version.rb

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.4"
+  VERSION = "0.0.8"
 end
 
 module Pod

data/lib/cocoapods-mtxx-bin/helpers/buildAll/bin_helper.rb

@@ -10,6 +10,8 @@ module CBin
         specs = specifications.map(&:name).select { |spec|
           spec.include?(pod_name) && !spec.include?('/Binary')
         }.sort!
+        xcode_version = `xcodebuild -version`.split(' ').join('')
+        specs << xcode_version
         specs_str = specs.join('')
         "#{original_version}.bin#{Digest::MD5.hexdigest(specs_str)[0,6]}"
       end

data/lib/cocoapods-mtxx-bin/helpers/buildAll/builder.rb

@@ -94,12 +94,16 @@ module CBin
         "#{@base_dir}/#{@pod_target}/Temp"
       end
 
+      def configuration
+        "Debug"
+      end
+
       def iphoneos
-        "Release-iphoneos"
+        "#{configuration}-iphoneos"
       end
 
       def iphonesimulator
-        "Release-iphonesimulator"
+        "#{configuration}-iphonesimulator"
       end
 
       # 需要排除的资源文件后缀
@@ -130,7 +134,7 @@ CONFIGURATION_TEMP_DIR=#{temp_dir} \
 BUILD_ROOT=#{product_dir} \
 BUILD_DIR=#{product_dir} \
 clean build \
--configuration Release \
+-configuration #{configuration} \
 -target #{@pod_target} \
 -project #{project}
         BUILD

data/lib/cocoapods-mtxx-bin/native/resolver.rb

@@ -8,6 +8,7 @@ require 'cocoapods-mtxx-bin/native/installation_options'
 require 'cocoapods-mtxx-bin/gem_version'
 require 'cocoapods-mtxx-bin/command/bin/archive'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
 
 module Pod
   class Resolver
@@ -90,8 +91,8 @@ module Pod
 
     # 读取黑名单
     def read_black_list
-      project_root = Pod::Config.instance.project_root
-      config_file = File.join(project_root, 'BinConfig.yaml')
+      binary_dir = CBin.config.binary_dir
+      config_file = File.join(binary_dir, 'BinConfig.yaml')
       return nil unless File.exist?(config_file)
       config = YAML.load(File.open(config_file))
       return nil if config.nil?
@@ -199,13 +200,6 @@ module Pod
 
               UI.message "specification = #{specification}"
               # 组件是 subspec
-              # subspec 需要特殊处理
-              # 如果是源码，则获取相应 subspec 的 specification
-              # 如果是二进制，则获取整个 specification
-              # if !use_binary && rspec.spec.subspec?
-              #   specification = specification.subspec_by_name(rspec.name, false, true)
-              # end
-
               if rspec.spec.subspec?
                 specification = specification.subspec_by_name(rspec.name, false, true)
               end

data/lib/cocoapods-mtxx-bin/source_provider_hook.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-mtxx-bin/native/sources_manager'
 require 'cocoapods-mtxx-bin/command/bin/repo/update'
+require 'cocoapods-mtxx-bin/config/config'
 require 'cocoapods/user_interface'
 require 'yaml'
 
@@ -44,7 +45,7 @@ Pod::HooksManager.register('cocoapods-mtxx-bin', :source_provider) do |context,
   podfile = Pod::Config.instance.podfile
   if podfile
     # 读取配置文件
-    project_root = Pod::Config.instance.project_root
+    project_root = CBin.config.binary_dir
     config_file = File.join(project_root, 'BinConfig.yaml')
     if File.exist?(config_file)
       config = YAML.load(File.open(config_file))

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.8
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.2
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +108,7 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/initHotKey.rb
 - lib/cocoapods-mtxx-bin/command/bin/install.rb
 - lib/cocoapods-mtxx-bin/command/bin/lib/lint.rb
+- lib/cocoapods-mtxx-bin/command/bin/outputSource.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo/push.rb
 - lib/cocoapods-mtxx-bin/command/bin/repo/update.rb
@@ -109,6 +116,7 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/spec/create.rb
 - lib/cocoapods-mtxx-bin/command/bin/spec/lint.rb
 - lib/cocoapods-mtxx-bin/command/bin/update.rb
+- lib/cocoapods-mtxx-bin/command/bin/upload.rb
 - lib/cocoapods-mtxx-bin/config/config.rb
 - lib/cocoapods-mtxx-bin/config/config_asker.rb
 - lib/cocoapods-mtxx-bin/config/config_builder.rb