cocoapods-mtxx-bin 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7e5b2628a85abdfb8c632ce10affd45eceef978f17030cc8fa587a55937052
-  data.tar.gz: 8ce6a4a89a75c32075f406d9ec8c929eac12b9b3b63e114f61b37ab56112a576
+  metadata.gz: 00c25aad1e1bb13ef8c88e50faf60801931532128a902ab72d40415c6f74809f
+  data.tar.gz: 59e39e2c15ea57d12940f89dc13760155a663aeb22ed7077bb6bcc8e0d4c7e43
 SHA512:
-  metadata.gz: 6bb9deccb62a75ca54db13fb02f2b1c43b0a0cd5f945fd18bcfd34858b1a16c35df4d4214f5942dd1480fe9bfae9035687989db60c53e1d000ebc51654749491
-  data.tar.gz: dff8ecc36300ffd1e885d1f968f43276a9c055b24fb8dc791b4d568ac985928e468ae2e46d198d1589bfabf17fc0f390557ee083b3377de10e5a34b08d263de2
+  metadata.gz: b6f9e5f92d9a260f67fe3f94ecd695314fcb523defdb9d407a5398be6984c2d1d672cc7a54e47c0d031ee158d91075c8da5a6cc27a9d53c1588fc1cc5a6f639d
+  data.tar.gz: 3c678a0494d56ac065707adb58470f33ac94590087b9b2957fd901e23dfd1bcd589214ef42ce5df285ed2511d11af1481202f211faffa4628ac5a39f5a42a072

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

@@ -19,7 +19,7 @@ module Pod
 
         self.summary = '根据壳工程打包所有依赖组件为静态库（static framework）'
         self.description = <<-DESC
-          #{self.summary}
+          #{summary}
         DESC
 
         def self.options
@@ -31,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
@@ -71,10 +71,10 @@ module Pod
 
         # 读取配置文件
         def read_config
-          UI.title "Read config from file `BinConfig.yaml`".green do
+          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?
@@ -87,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
@@ -132,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
@@ -141,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
@@ -269,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?
@@ -304,7 +310,6 @@ module Pod
           end
           result
         end
-
       end
     end
   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.rb

@@ -9,6 +9,7 @@ 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'
@@ -42,7 +43,7 @@ module Pod
       self.summary = '组件二进制化插件'
       self.description = <<-DESC.strip_heredoc
         组件二进制化插件
-        
+
         利用源码私有源与二进制私有源实现对组件依赖类型的切换
       DESC
 

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.7"
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -108,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