cocoapods-mtxx-bin 0.0.13 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f14e9ea300e62342de7ad1999cba481413d19066015bba58eaffb5a75c95001c
-  data.tar.gz: 5adc6de925603cc92ef507d48e77033d6d828d3e9503adfa9ea13a942771608e
+  metadata.gz: 41f8002bb6e1aebd88af984e688177d9ac4821eb2c1d006da248c2f269712b70
+  data.tar.gz: aeaf21d40990fe819241aed0115990d258b624331767f30e0a8bb9d437896b3e
 SHA512:
-  metadata.gz: d302ef5efe2bdfba39904c903a68f779c7ae409276d4271a78f6663725af5d6f546322ca0a3693c595ca3cbea5adf0cb91067a7cf06b5eaa8fefca51b1bdb319
-  data.tar.gz: f239253f6770287351b31fb9da0486272948a07036e59b50ec09651a8ed13f5c9da6893d3cce2f3b2b6c9ab41bf8e70fe46f243f028940e4d2d385e7816b81c8
+  metadata.gz: 947e653552621d2fd5d2798f672ab145d30b79f9f007fa0aea0c97137d8cc9018e1f03708b0c4685e844f298d8a48615fe521b8bf05dd2a4b9a490426b0ee230
+  data.tar.gz: 1c971b939a41dfe772bf233d9118ef83bf46672cd5421ba59a3211f4012c103cb17b7141888444b031397ff4a35f65ed7f9c4ae1e68501509054571a7cdb4d0c

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

@@ -24,22 +24,31 @@ module Pod
 
         def self.options
           [
-            %w[--clean 删除编译临时目录],
+            %w[--clean 全部二进制包制作完成后删除编译临时目录],
+            %w[--clean-single 每制作完一个二进制包就删除该编译临时目录],
             %w[--repo-update 更新Podfile中指定的repo仓库],
-            %w[--full-build 是否全量打包]
+            %w[--full-build 是否全量打包],
+            %w[--skip-simulator 跳过模拟器编译],
+            %w[--configuration=configName 在构建每个目标时使用configName指定构建配置，如：'Debug'、'Release'等]
           ].concat(super).uniq
         end
 
         def initialize(argv)
           @clean = argv.flag?('clean', false)
+          @clean_single = argv.flag?('clean-single', false)
           @repo_update = argv.flag?('repo-update', false)
           @full_build = argv.flag?('full-build', false)
+          @skip_simulator = argv.flag?('skip-simulator', false)
+          @configuration = argv.option('configuration', 'Debug')
           @base_dir = "#{Pathname.pwd}/build_pods"
           @version_helper = BinHelper.new
           super
         end
 
         def run
+          CBin.config.config_file_exist?
+          # 打印提示
+          print_tip
           # 开始时间
           @start_time = Time.now.to_i
           # 读取配置文件
@@ -64,6 +73,14 @@ module Pod
 
         private
 
+        def print_tip
+          UI.info '——————————————————————————————————'.blue
+          UI.info "|#{' '.center(32)}|".blue
+          UI.info "|#{"Configuration:`#{@configuration}`".center(32)}|".blue
+          UI.info "|#{' '.center(32)}|".blue
+          UI.info '——————————————————————————————————'.blue
+        end
+
         # 打印耗时
         def show_cost_time
           return if @start_time.nil?
@@ -73,7 +90,7 @@ module Pod
         # 读取配置文件
         def read_config
           UI.title 'Read config from file `BinConfig.yaml`'.green do
-            config_file = File.join(CBin.config.binary_dir, 'BinConfig.yaml')
+            config_file = File.join(Pod::Config.instance.project_root, 'BinConfig.yaml')
             return unless File.exist?(config_file)
             config = YAML.safe_load(File.open(config_file))
             return if config.nil?
@@ -125,7 +142,7 @@ module Pod
         def podfile
           @podfile ||= begin
                          podfile_path = File.join(Pathname.pwd, 'Podfile')
-                         raise 'Podfile不存在' unless File.exist?(podfile_path)
+                         raise Informative, '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
@@ -140,7 +157,7 @@ module Pod
         def lockfile
           @lockfile ||= begin
                           lock_path = File.join(Pathname.pwd, 'Podfile.lock')
-                          raise 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
+                          raise Informative, 'Podfile.lock不存在，请执行pod install' unless File.exist?(lock_path)
                           Lockfile.from_file(Pathname.new(lock_path))
                         end
         end
@@ -149,7 +166,7 @@ module Pod
         def sandbox
           @sandbox ||= begin
                          sandbox_path = File.join(Pathname.pwd, 'Pods')
-                         raise 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
+                         raise Informative, 'Pods文件夹不存在，请执行pod install' unless File.exist?(sandbox_path)
                          Pod::Sandbox.new(sandbox_path)
                        end
         end
@@ -166,6 +183,14 @@ module Pod
           end
         end
 
+        # 删除单个Pod的编译中间产物
+        def clean_single_build_pod(pod_target)
+          UI.title "Clean build pod: `#{pod_target}`".green do
+            build_pod_path = File.join(Dir.pwd, 'build_pods', "#{pod_target}")
+            FileUtils.rm_rf(build_pod_path) if File.exist?(build_pod_path)
+          end
+        end
+
         # 删除编译产物
         def clean_build_pods
           UI.title 'Clean build pods'.green do
@@ -189,14 +214,10 @@ module Pod
             pod_targets.map do |pod_target|
               begin
                 version = @version_helper.version(pod_target.pod_name, pod_target.root_spec.version.to_s, @analyze_result.specifications)
-                # 全量
-                if @full_build
-                  # 黑名单
-                  next if !@black_list.nil? && !@black_list.empty? && @black_list.include?(pod_target.pod_name)
-                else
-                  # 白名单
-                  next if !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
-                end
+                # 黑名单（不分全量和非全量）
+                next if skip_build?(pod_target)
+                # 白名单（有白名单，只看白名单，不分全量和非全量）
+                next if !@write_list.nil? && !@write_list.empty? && !@write_list.include?(pod_target.pod_name)
                 # 本地库
                 if @sandbox.local?(pod_target.pod_name)
                   local_pods << pod_target.pod_name
@@ -215,22 +236,20 @@ module Pod
                   show_skip_tip("#{pod_target.pod_name} 无需编译")
                   next
                 end
-                # 非全量编译、 不在白名单中且已经有相应的二进制版本
+                # 非全量编译、不在白名单中且已经有相应的二进制版本
                 if has_created_binary?(pod_target.pod_name, version)
                   created_pods << pod_target.pod_name
                   show_skip_tip("#{pod_target.pod_name}(#{version}) 已经有二进制版本了")
                   next
                 end
-                # 是否跳过编译（黑名单）
-                next if skip_build?(pod_target)
                 # 构建产物
-                builder = Builder.new(pod_target, @sandbox.checkout_sources)
+                builder = Builder.new(pod_target, @sandbox.checkout_sources, @skip_simulator, @configuration)
                 result = builder.build
                 fail_pods << pod_target.pod_name unless result
                 next unless result
                 builder.create_binary
                 # 压缩并上传zip
-                zip_helper = ZipFileHelper.new(pod_target, version, builder.product_dir, builder.build_as_framework)
+                zip_helper = ZipFileHelper.new(pod_target, version, builder.product_dir, builder.build_as_framework?, @configuration)
                 result = zip_helper.zip_lib
                 fail_pods << pod_target.pod_name unless result
                 next unless result
@@ -238,15 +257,18 @@ module Pod
                 fail_pods << pod_target.pod_name unless result
                 next unless result
                 # 生成二进制podspec并上传
-                podspec_creator = PodspecUtil.new(pod_target, version, builder.build_as_framework)
+                podspec_creator = PodspecUtil.new(pod_target, version, builder.build_as_framework?, @configuration)
                 bin_spec = podspec_creator.create_binary_podspec
                 bin_spec_file = podspec_creator.write_binary_podspec(bin_spec)
-                podspec_creator.push_binary_podspec(bin_spec_file)
-                success_pods << pod_target.pod_name
+                result = podspec_creator.push_binary_podspec(bin_spec_file)
+                fail_pods << pod_target.pod_name unless result
+                success_pods << pod_target.pod_name if result
               rescue Pod::StandardError => e
-                UI.info "#{pod_target} 编译失败，原因：#{e}".red
+                UI.info "`#{pod_target}`编译失败，原因：#{e}".red
                 fail_pods << pod_target.pod_name
                 next
+              ensure
+                clean_single_build_pod(pod_target) if @clean_single
               end
             end
             results = {

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

@@ -4,56 +4,53 @@ module Pod
   class Command
     class Bin < Command
       class Init < Bin
-        self.summary = '初始化插件'
+        self.summary = '配置插件'
         self.description = <<-DESC
-          创建yml配置文件，保存插件需要的配置信息，如源码podspec仓库、二进制下载地址等
+          创建yml配置文件，保存插件需要的配置信息，如二进制podspec仓库、二进制下载地址等
         DESC
 
         def self.options
           [
-            %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']
+            %w[--bin-url=URL 配置文件地址，直接从此地址下载配置文件]
           ].concat(super)
         end
 
         def initialize(argv)
           @bin_url = argv.option('bin-url')
-          @update_sources = argv.flag?('update-sources')
           super
         end
 
         def run
-          if @update_sources
-            update_code_repo_url_list
+          raise Informative, "当前目录下没有`Podfile`文件" unless File.exist?(File.join(Dir.pwd, "Podfile"))
+          raise Informative, "当前目录下已经存在配置文件" if File.exist?(CBin.config.config_file)
+          if @bin_url.nil?
+            config_with_asker
           else
-            if @bin_url.nil?
-              config_with_asker
-            else
-              config_with_url(@bin_url)
-            end
+            config_with_url(@bin_url)
           end
-
         end
 
         private
 
+        # 从远端下载配置文件
         def config_with_url(url)
           require 'open-uri'
 
-          UI.puts "开始下载配置文件...\n"
+          UI.puts "开始下载配置文件..."
           file = open(url)
           contents = YAML.safe_load(file.read)
 
-          UI.puts "开始同步配置文件...\n"
+          UI.puts "开始同步配置文件..."
           CBin.config.sync_config(contents.to_hash)
-          UI.puts "设置完成.\n".green
+          UI.puts "设置完成.".green
         rescue Errno::ENOENT => e
           raise Informative, "配置文件路径 #{url} 无效，请确认后重试."
         end
 
+        # 询问用户相关的配置
         def config_with_asker
           asker = CBin::Config::Asker.new
-          asker.wellcome_message
+          asker.welcome_message
 
           config = {}
           template_hash = CBin.config.template_hash
@@ -69,25 +66,6 @@ module Pod
           CBin.config.sync_config(config)
           asker.done_message
         end
-        def update_code_repo_url_list
-          asker = CBin::Config::Asker.new
-          config = {}
-          template_hash = CBin.config.template_hash
-          template_hash.each do |k, v|
-            if k == "code_repo_url_list"
-              default = begin
-                          CBin.config.send(k)
-                        rescue StandardError
-                          nil
-                        end
-              config[k] = asker.ask_with_answer(v[:description], default, v[:selection])
-            else
-              config[k] =  CBin.config.config_old[k]
-            end
-          end
-          CBin.config.sync_config_code_repo_url_list(config)
-          asker.done_message_update
-        end
       end
     end
   end

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

@@ -0,0 +1,82 @@
+
+module Pod
+  class Command
+    class Bin < Command
+      class Lock < Bin
+        class Dependency < Lock
+          include Pod
+
+          self.summary = '分析`POD_NAME`依赖的库'
+          self.description = <<-DESC
+#{self.summary}，如果加上`--reverse`，则分析依赖`POD_NAME`的库
+          DESC
+
+          self.arguments = [
+            CLAide::Argument.new('POD_NAME', true)
+          ]
+
+          def self.options
+            [
+              %w[--reverse 分析依赖`POD_NAME`的库]
+            ].concat(super).uniq
+          end
+
+          def initialize(argv)
+            super
+            @pod_name = argv.shift_argument
+            @reverse = argv.flag?('reverse', false)
+          end
+
+          def run
+            super
+            raise Informative, "请输入Pod库名称，如：AFNetworking" if @pod_name.nil?
+            if @reverse
+              reverse_dependencies
+            else
+              dependencies
+            end
+          end
+
+          def dependencies
+            deps = []
+            @analyze_result.specifications.map do |spec|
+              if spec.name == @pod_name
+                deps.concat(spec.all_dependencies)
+              end
+            end
+            deps.uniq!
+            UI.puts "\n"
+            if deps.empty?
+              UI.puts "`#{@pod_name}`无依赖的库".red
+            else
+              UI.puts "`#{@pod_name}`依赖的库如下：".yellow
+              deps.map { |dep| UI.puts "- #{dep}" }
+              UI.puts "total #{deps.size} deps".green
+            end
+          end
+
+          def reverse_dependencies
+            pods = []
+            @analyze_result.specifications.map do |spec|
+              spec.all_dependencies.map do |dep|
+                if dep.name == @pod_name
+                  pods << spec
+                  break
+                end
+              end
+            end
+            pods.uniq!
+            UI.puts "\n"
+            if pods.empty?
+              UI.puts "没有依赖`#{@pod_name}`的库".red
+            else
+              UI.puts "依赖`#{@pod_name}`的库如下：".yellow
+              pods.map { |dep| UI.puts "- #{dep}" }
+              UI.puts "total #{pods.size} pods".green
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,105 @@
+
+module Pod
+  class Command
+    class Bin < Command
+      class Lock < Bin
+        class SpecRepo < Lock
+          include Pod
+
+          self.summary = '分析`podspec`源'
+          self.description = <<-DESC
+#{self.summary}，如果加`POD_NAME`，则分析该`POD_NAME`所属的repo仓库；如果不加，则打印项目中用到的repo仓库及每个仓库下Pod个数
+          DESC
+
+          self.arguments = [
+            CLAide::Argument.new('POD_NAME', false)
+          ]
+
+          def initialize(argv)
+            super
+            @pod_name = argv.shift_argument
+          end
+
+          def run
+            super
+            if @pod_name.nil?
+              spec_repo_summary
+            else
+              pod_source
+            end
+          end
+
+          private
+
+          def spec_repos
+            raise Informative, "依赖分析失败" if @analyze_result.nil?
+            result = Hash.new
+            @analyze_result.specs_by_source.map do |source, specs|
+              next unless source
+              next if specs.empty?
+              key = source.url || source.name
+
+              # save `trunk` as 'trunk' so that the URL itself can be changed without lockfile churn
+              key = Pod::TrunkSource::TRUNK_REPO_NAME if source.name == Pod::TrunkSource::TRUNK_REPO_NAME
+
+              value = specs.map { |s| s.root.name }.uniq
+              # 合并重复的source源，而不是替换
+              if result[key].nil?
+                result[key] = YAMLHelper.sorted_array(value)
+              else
+                result[key] = YAMLHelper.sorted_array(result[key].concat(value))
+              end
+            end
+            result.compact
+          end
+
+          def external_sources
+            deps = config.podfile.dependencies.select(&:external?)
+            deps = deps.sort { |d, other| d.name <=> other.name }
+            sources = {}
+            deps.each { |d| sources[d.root_name] = d.external_source }
+            sources
+          end
+
+          # 打印所有source及其pods个数
+          def spec_repo_summary
+            pod_count = 0
+            UI.puts "\n"
+            spec_repos.map do |source, specs|
+              pod_count += specs.size
+              UI.puts "#{source}".yellow
+              UI.puts "- #{specs.size} pods"
+            end
+            pod_count += external_sources.keys.size
+            UI.puts "External".yellow
+            UI.puts "- #{external_sources.keys.size} pods"
+
+            UI.puts "\n"
+            UI.puts "total #{spec_repos.size + 1} sources, #{pod_count} pods".green
+          end
+
+          # 打印pod所属的source
+          def pod_source
+            sources = []
+            external = false
+            spec_repos.map do |source, specs|
+              if specs.include?(@pod_name)
+                sources << source
+              end
+            end
+            external_sources.map do |pod, ext_source|
+              if pod == @pod_name
+                external = true
+                sources << ext_source
+              end
+            end
+            UI.puts "\n"
+            raise Informative, "未找到`#{@pod_name}`所属的source，请检查`#{@pod_name}`是否拼写错误" if sources.empty?
+            UI.puts "#{@pod_name}#{external ? ' (External Source)' : ''}".yellow
+            sources.map { |source| UI.puts "- #{source}" }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+
+module Pod
+  class Command
+    class Bin < Command
+      class Lock < Bin
+        class Version < Lock
+          include Pod
+
+          self.summary = '分析项目中使用的`Pod`库版本'
+
+          self.arguments = [
+            CLAide::Argument.new('POD_NAME', true)
+          ]
+
+          def initialize(argv)
+            super
+            @pod_name = argv.shift_argument
+          end
+
+          def run
+            super
+            raise Informative, "请输入Pod库名称，如：AFNetworking" if @pod_name.nil?
+            versions = []
+            @analyze_result.specifications.map do |spec|
+              if spec.name == @pod_name
+                versions << spec.version
+              end
+            end
+            versions = versions.uniq
+            UI.puts "\n"
+            raise Informative, "未查找到`#{@pod_name}`的版本号，请检查`#{@pod_name}`是否拼写错误" if versions.empty?
+            UI.puts "`#{@pod_name}`版本如下：".yellow
+            versions.map { |v| UI.puts "- #{v}" }
+
+            UI.puts "[!] `#{@pod_name}`有`#{versions.size}`个版本，可能会导致意想不到的事情，请确保每个Pod库只有一个依赖版本".yellow if versions.size > 1
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'cocoapods-mtxx-bin/command/bin/lock/spec_repo'
+require 'cocoapods-mtxx-bin/command/bin/lock/version'
+require 'cocoapods-mtxx-bin/command/bin/lock/dependency'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Lock < Bin
+        include Pod
+        include Config::Mixin
+
+        self.abstract_command = true
+        self.summary = '分析 Pod 依赖关系'
+
+        def initialize(argv)
+          super
+        end
+
+        def run
+          # 校验Podfile是否存在
+          verify_podfile_exists!
+          # 依赖分析
+          @analyze_result = analyze
+        end
+
+        # 依赖分析
+        def analyze
+          UI.title 'Analyze dependencies'.green do
+            analyzer = Pod::Installer::Analyzer.new(config.sandbox, config.podfile, config.lockfile)
+            analyzer.analyze(true )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -46,25 +46,32 @@ module Pod
           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]
+            all_source_list << {specification.root.name => specification.root.source}
+            if @error_source && invalid_git_address?(specification)
+              error_source_list << {specification.root.name => specification.root.source}
             end
           end
           if @error_source
-            UI.info '问题组件，source 为http CI打包不支持http认证，应修改为ssh'.red
-            UI.info error_source_list.to_s.red
+            if error_source_list.uniq.empty?
+              UI.info "没有有问题的组件".green
+            else
+              UI.info '问题组件，source 为http CI打包不支持http认证，应修改为ssh'.red
+              error_source_list.uniq.map do |source|
+                UI.info "- #{source}".red
+              end
+            end
           else
-            UI.info '输出所有pod组件source'.green
-            UI.info error_source_list.to_s.green
+            UI.info '输出所有pod组件source'.yellow
+            all_source_list.uniq.map do |source|
+              UI.info "- #{source}"
+            end
           end
         end
 
         # git clone 地址 是否非法
-        def verified_git_address(specification)
-          return false if specification.source[:git].nil?
-          git = specification.source[:git]
+        def invalid_git_address?(specification)
+          return false if specification.root.source[:git].nil?
+          git = specification.root.source[:git]
           git.include?('http://techgit.meitu.com') || git.include?('https://techgit.meitu.com')
         end
 

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

@@ -39,7 +39,7 @@ pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
           @file = argv.shift_argument
           @repo = argv.shift_argument
           @spec = argv.option('spec', nil)
-          @xcode_version = BinHelper.xcode_version
+          @xcode_version = CBin::BuildAll::BinHelper.xcode_version
           super
         end
 
@@ -128,7 +128,7 @@ pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
 
         def source
           url = "#{CBin.config.binary_download_url_str}/#{@xcode_version}/#{@name}/#{@version}/#{zip_file_name}"
-          { http: url, type: 'zip' }
+          { http: url, type: CBin.config.download_file_type }
         end
 
         # 上传podspec

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

@@ -1,18 +1,17 @@
-# require 'cocoapods-mtxx-bin/command/bin/initHotKey'
 require 'cocoapods-mtxx-bin/command/bin/init'
-require 'cocoapods-mtxx-bin/command/bin/archive'
-require 'cocoapods-mtxx-bin/command/bin/auto'
+# require 'cocoapods-mtxx-bin/command/bin/archive'
+# require 'cocoapods-mtxx-bin/command/bin/auto'
 # require 'cocoapods-mtxx-bin/command/bin/code'
-require 'cocoapods-mtxx-bin/command/bin/update'
-require 'cocoapods-mtxx-bin/command/bin/install'
-# require 'cocoapods-mtxx-bin/command/bin/imy'
+# require 'cocoapods-mtxx-bin/command/bin/update'
+# 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/command/bin/lock'
 require 'cocoapods-mtxx-bin/helpers'
-# require 'cocoapods-mtxx-bin/native'
+require 'cocoapods-mtxx-bin/helpers/framework_builder'
 
 module Pod
   class Command
@@ -41,11 +40,11 @@ module Pod
 
       # self.default_subcommand = 'open'
       self.summary = '组件二进制化插件'
-      self.description = <<-DESC.strip_heredoc
-        组件二进制化插件
-
-        利用源码私有源与二进制私有源实现对组件依赖类型的切换
-      DESC
+      # self.description = <<-DESC.strip_heredoc
+      #   组件二进制化插件
+      #
+      #   利用源码私有源与二进制私有源实现对组件依赖类型的切换
+      # DESC
 
       def initialize(argv)
         # ！！！ 下面这个require必须放在这里，不能放到文件顶部，切记 ！！！