cocoapods-imy-bin 0.3.1.3 → 0.3.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81383fa8d08be932b1ed68004d45af11fd39a692379a8f4c56e8b4a3ff7f6c1c
-  data.tar.gz: 0e05d990c1c50e6367045115daca97cbe8dc8e463fcdd51099d7944396a53610
+  metadata.gz: 8437b35eb1e2e055b25903d650608ff5efded69cdcb33f31d511ed8c5c5779c7
+  data.tar.gz: ab134be81f4b228d7d6456f8afb15171170c99797aabfc4fbdb90eb645bb3db3
 SHA512:
-  metadata.gz: 8590a4e21b0a8423b48dae44334dea6862a78261e07e273bfc50d5334c0523ea73d538d317ed5bfd9b9e109b14d49e2b269db5d3da163e47bfe23336a0478216
-  data.tar.gz: e0e0f49bc52ace2f2afa4a7608537747c9aeb9868fbb789607b63601d1dba0816893a0bc4493aea2262c4cfd960ddec8379042f117e264db0b12ea8409d75a34
+  metadata.gz: e4a3e25504e6d3c2083c0ff460e2d4ab05016124655df9ee293abd08ecd2097ec0b6704cb299d71138458521237b560795efb64a7beb75288b4812567115f7fa
+  data.tar.gz: 634b5f9bfa23d62d1d201429dc117c115edeaa3d9d80cb21f69c838d8078db41eed61382809e0ebd8a1464a935bf3a7dca8084d892a24d1b59b4836c23882c43

data/README.md

@@ -1 +1,4 @@
 
+指定本地路径
+specifications gem 仓库文件夹，类似podspec仓库
+gem "cocoapods-imy-bin",'0.3.1.15',:path => '/Library/Ruby/Gems/2.6.0/specifications'

data/lib/cocoapods-imy-bin/command/bin/archive.rb

@@ -63,24 +63,23 @@ module Pod
         end
 
         def run
-          # 清除之前的缓存
-          CBin::Config::Builder.instance.clean
+          #清除之前的缓存
+          zip_dir = CBin::Config::Builder.instance.zip_dir
+          FileUtils.rm_rf(zip_dir) if File.exist?(zip_dir)
 
           @spec = Specification.from_file(spec_file)
           generate_project
 
           swift_pods_buildsetting
+          source_specs = Array.new
+          source_specs.concat(build_root_spec)
+          source_specs.concat(build_dependencies) if @all_make
 
-          build_root_spec
-
-          sources_sepc = Array.new
-          sources_sepc << @spec
-          sources_sepc.concat(build_dependencies) if @all_make
-
-          sources_sepc
+          source_specs
         end
 
         def build_root_spec
+          source_specs = []
           builder = CBin::Build::Helper.new(@spec,
                                             @platform,
                                             @framework_output,
@@ -90,12 +89,15 @@ module Pod
                                             @config)
           builder.build
           builder.clean_workspace if @clean && !@all_make
+          source_specs << @spec unless CBin::Config::Builder.instance.white_pod_list.include?(@spec.name)
+
+          source_specs
         end
 
         def build_dependencies
           @build_finshed = true
           #如果没要求，就清空依赖库数据
-          sources_sepc = []
+          source_specs = []
           @@missing_binary_specs.uniq.each do |spec|
             next if spec.name.include?('/')
             next if spec.name == @spec.name
@@ -115,11 +117,11 @@ module Pod
             next if spec.attributes_hash['vendored_frameworks'] && @spec.name != spec.name #过滤带有vendored_frameworks的
             next if spec.attributes_hash['ios.vendored_frameworks'] && @spec.name != spec.name #过滤带有vendored_frameworks的
             #获取没有制作二进制版本的spec集合
-            sources_sepc << spec
+            source_specs << spec
           end
 
           fail_build_specs = []
-          sources_sepc.uniq.each do |spec|
+          source_specs.uniq.each do |spec|
             begin
               builder = CBin::Build::Helper.new(spec,
                                                 @platform,
@@ -140,7 +142,7 @@ module Pod
               UI.warn "【#{spec.name} | #{spec.version}】组件二进制版本编译失败 ."
             end
           end
-          sources_sepc - fail_build_specs
+          source_specs - fail_build_specs
         end
 
         # 解析器传过来的
@@ -157,18 +159,14 @@ module Pod
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
                   "--gen-directory=#{CBin::Config::Builder.instance.gen_dir}",
                   '--clean',
-                  "--verbose",
                   *@additional_args
                 ]
 
-                if File.exist?(Pod::Config.instance.podfile_path)
+                podfile= File.join(Pathname.pwd, "Podfile")
+                if File.exist?(podfile)
                   argvs += ['--use-podfile']
                 end
-
-                unless CBin::Build::Utils.uses_frameworks?
-                  argvs += ['--use-libraries']
-                end
-
+                
                 argvs << spec_file if spec_file
 
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))

data/lib/cocoapods-imy-bin/command/bin/auto.rb

@@ -54,10 +54,13 @@ module Pod
         def run
           @specification = Specification.from_file(@podspec)
 
+          unless @podspec
+            raise Informative, "未找到 podspec文件"
+          end
           sources_sepc = run_archive
 
           fail_push_specs = []
-          sources_sepc.uniq.each do |spec|
+          source_specs.uniq.each do |spec|
             begin
               fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources).upload
             rescue  Object => exception
@@ -72,7 +75,7 @@ module Pod
             end
           end
 
-          success_specs = sources_sepc - fail_push_specs
+          success_specs = source_specs - fail_push_specs
           if success_specs.any?
             auto_success = ""
             success_specs.uniq.each do |spec|
@@ -123,11 +126,11 @@ module Pod
             argvs += ["--env=#{@env}"]
           end
           argvs += ["--configuration=#{@config}"]
-
+          
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
           archive.validate!
-          sources_sepc = archive.run
-          sources_sepc
+          source_specs = archive.run
+          source_specs
         end
 
 
@@ -183,10 +186,10 @@ module Pod
             puts child
             if File.file?(child)
               if child.extname == '.podspec'
-                name = File.basename(child)
-                unless name.include?("binary-template")
-                  return name
-                end
+                  name = File.basename(child)
+                  unless name.include?("binary-template")
+                    return name
+                  end
               end
             end
           end

data/lib/cocoapods-imy-bin/command/bin/clean.rb

@@ -0,0 +1,126 @@
+require 'cocoapods-imy-bin/config/config_hot_key_asker'
+require 'tmpdir'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Clean < Bin
+        self.summary = '清除缓存'
+        self.description = <<-DESC
+            清除缓存
+            1、清除私有源spec仓库缓存
+            2、清除二进制仓库编译产物
+        DESC
+
+        def self.options
+          [
+              ['--env=configuration_env', '清除哪个环境，在.cocoapods下的 bin_dev.yml的配置项，dev'],
+              ['--list=[module,module,...]', '清除某个仓库下的模块 TODO'],
+              ['--all', '清除所有 TODO'],
+          ].concat(Pod::Command::Gen.options).concat(super).uniq
+        end
+
+
+        def initialize(argv)
+          @env =  argv.option('env') || nil
+          @list = argv.flag?('list', [] )
+          @all_clean = argv.flag?('all', false )
+
+          @config = Pod::Config.instance
+
+          super
+        end
+
+
+        def run
+          #清除所有仓库缓存
+          if @all_clean
+
+          elsif @env  #是否存在spec仓库
+            #获取对应环境地址
+             CBin.config.set_configuration_env(@env)
+             @config = CBin.config
+            unless @config
+              raise "请检查 env = #{@env} 私有源仓库是否设置正常"
+            end
+
+            # #1、清除git
+            reset_binary_repo
+            # #2、更新本地仓库源
+            update_cocoapods_repo
+            #3、删除二进制私有源存储二进制文件
+            update_cocoapods_repo
+
+             delete_build_binary
+            #4、清除cocoapods pods cache
+            update_cocopods_pods_cache
+
+            # @config.clean_binary_url
+          else #不存在spec仓库、就抛异常
+            raise "未设置 spec 私有源仓库"
+          end
+
+        end
+
+        #一、清除git上的仓库
+        # 1、拿到仓库地址 CBin.config.binary_repo_url
+        # 2、clone仓库
+        # 3、删除仓库下所有可见目录，除了.git
+        # 4、提交删除记录
+        def reset_binary_repo
+          work_dir = Dir.tmpdir + '/cocoapods-imy-bin-' + Array.new(8) { rand(36).to_s(36) }.join
+          UI.puts "临时目录 work_dir = #{work_dir}"
+          Pathname.new(work_dir).mkdir
+
+          `git clone #{@config.binary_repo_url} #{work_dir}`
+
+          deleteDirectory(work_dir)
+          UI.puts "binary_repo_url = #{@config.binary_repo_url}"
+
+          #在当前目录下 做git操作，才能提交成功
+          Dir.chdir(work_dir) do
+            UI.puts "当前目录 = #{Dir.pwd}"
+            `git add .`
+            `git commit -m "cocopods-imy-bin auto del"`
+            `/usr/bin/git push`
+          end
+
+        end
+
+        #二、更新本地仓库源，
+        # pod repo update xxx
+        def update_cocoapods_repo
+          `pod repo update`
+          UI.puts "完成pod repo update"
+        end
+
+        #三、删除二进制私有源存储二进制文件，
+        def delete_build_binary
+          `curl #{@config.delete_binary_url}`
+          UI.puts "完成删除服务器二进制包"
+        end
+
+        #四、清除cocoapods pods cache
+        def update_cocopods_pods_cache
+          `pod cache clean --all --verbose`
+          UI.puts "完成清除本地pod cache"
+        end
+
+
+        #遍历文件夹
+        def deleteDirectory(dirPath)
+          if File.directory?(dirPath)
+            puts "是文件夹";
+            Dir.foreach(dirPath) do |subFile|
+              if subFile != '.' and subFile != '..' and subFile != ".git"
+                FileUtils.remove_entry(File.join(dirPath, subFile))
+              end
+            end
+          end
+        end
+
+
+      end
+    end
+  end
+end

data/lib/cocoapods-imy-bin/command/bin/local.rb

@@ -0,0 +1,169 @@
+
+require 'cocoapods-imy-bin/native/podfile'
+require 'cocoapods/command/gen'
+require 'cocoapods/generate'
+require 'cocoapods-imy-bin/helpers/local/local_framework_builder'
+require 'cocoapods-imy-bin/helpers/local/local_library_builder'
+require 'cocoapods-imy-bin/helpers/local/local_build_helper'
+require 'cocoapods-imy-bin/helpers/spec_source_creator'
+require 'cocoapods-imy-bin/config/config_builder'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Local < Bin
+        self.summary = '根据podfile中信息 将本地已存在的组件静态包 归档，需要归档的组件由外部传入'
+        self.description = <<-DESC
+          根据podfile中信息 将本地已存在的组件静态包 归档，需要归档的组件由外部传入
+          仅支持 iOS 平台
+          此静态 framework/.a 不包含依赖组件的 symbol
+
+          一个用ccache，一个是cocoapods-imy-bin插件支持下的，
+          拿xcodebuild生成的中间构建产物，如生成的 libIMYYQHome.a，利用cocoapods-imy-bin 制作成二进制静态库，保存起来。
+          下次pod update 工程时，在pod update时去捞已经生成的二进制组件打包。这样可以大大减少编译时间
+
+          制作流程:
+          每次pod update 时记录无二进制组件的库，build完后，自动制作缺失二进制组件库。
+          如果pod update 时无二进制组件的库，采用源码编译，源码编译同时有ccache缓存支持，也能加快速度
+        DESC
+
+        def self.options
+          [
+            ['--no-clean', '保留构建中间产物'],
+            ['--framework-output', '输出framework文件'],
+            ['--no-zip', '不压缩静态 framework 为 zip'],
+            ['--make-binary-specs', '需要制作spec集合'],
+            ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
+          ].concat(Pod::Command::Gen.options).concat(super).uniq
+        end
+
+        def initialize(argv)
+          @env = argv.option('env') || 'dev'
+          CBin.config.set_configuration_env(@env)
+          UI.warn "====== cocoapods-imy-bin #{CBin::VERSION} 版本 ======== \n "
+          UI.warn "======  #{@env} 环境 ======== "
+
+
+          @make_binary_specs = argv.option('make-binary-specs') || []
+          @framework_output = argv.flag?('framework-output', false)
+          @clean = argv.flag?('no-clean', true)
+          @zip = argv.flag?('zip', true)
+          @sources = argv.option('sources') || []
+          @platform = Platform.new(:ios)
+
+          @target_name = CBin::Config::Builder.instance.target_name
+          @local_build_dir_name = CBin::Config::Builder.instance.xcode_build_name
+          @local_build_dir = CBin::Config::Builder.instance.xcode_build_dir
+
+          @framework_path
+          super
+        end
+
+        def run
+          # 清除之前的缓存
+          # temp = File.join(@local_build_dir, @platform.to_s)
+          # FileUtils.rm_r(temp) if File.exist? temp
+          # if File.exist?(CBin::Config::Builder.instance.zip_dir)
+          #   FileUtils.rm_rf(Dir.glob("#{CBin::Config::Builder.instance.zip_dir}/*"))
+          # end
+
+          sources_spec = []
+          Dir.chdir(CBin::Config::Builder.instance.local_psec_dir) do
+            spec_files = Dir.glob(%w[*.json *.podspec])
+            spec_files.each do |file|
+              spec = Pod::Specification.from_file(file)
+              sources_spec << spec
+            end
+          end
+
+          build(sources_spec)
+        end
+
+        def build(make_binary_specs)
+          # 如果没要求，就清空依赖库数据
+          sources_sepc = []
+          make_binary_specs.uniq.each do |spec|
+            next if spec.name.include?('/')
+            next if spec.name == @target_name
+            #过滤白名单
+            next if CBin::Config::Builder.instance.white_pod_list.include?(spec.name)
+            #过滤 git
+            ignore_git_list = CBin::Config::Builder.instance.ignore_git_list
+            if spec.source[:git] && spec.source[:git] && ignore_git_list
+              spec_git = spec.source[:git]
+              spec_git_res = false
+              ignore_git_list.each do |ignore_git|
+                spec_git_res = spec_git.include?(ignore_git)
+                break if spec_git_res
+              end
+              next if spec_git_res
+            end
+            UI.warn "#{spec.name}.podspec 带有 vendored_frameworks 字段，请检查是否有效！！！" if spec.attributes_hash['vendored_frameworks']
+            next if spec.attributes_hash['vendored_frameworks'] && @target_name != spec.name #过滤带有vendored_frameworks的
+            next if (spec.attributes_hash['ios'] && spec.attributes_hash['ios']['vendored_frameworks'])  #过滤带有vendored_frameworks的
+            #获取没有制作二进制版本的spec集合
+
+            next unless library_exist(spec)
+
+            # 获取没有制作二进制版本的spec集合
+            sources_sepc << spec
+          end
+
+          fail_build_specs = []
+          sources_sepc.uniq.each do |spec|
+            begin
+              builder = CBin::LocalBuild::Helper.new(spec,
+                                                     @platform,
+                                                     @framework_output,
+                                                     @zip,
+                                                     @clean,
+                                                     @target_name,
+                                                     @local_build_dir_name,
+                                                     @local_build_dir)
+              if  builder.build
+                CBin::Upload::Helper.new(spec, @code_dependencies, @sources).upload
+              else
+                fail_build_specs << spec
+              end
+            rescue StandardError
+              fail_build_specs << spec
+            end
+          end
+
+          if fail_build_specs.any?
+            fail_build_specs.uniq.each do |spec|
+              UI.warn "【#{spec.name} | #{spec.version}】组件二进制版本编译失败 ."
+            end
+          end
+
+          success_specs = sources_sepc - fail_build_specs
+          if success_specs.any?
+            success_specs.uniq.each do |spec|
+              UI.warn " =======【 #{spec.name} | #{spec.version} 】二进制组件制作完成 ！！！"
+            end
+          end
+          # pod repo update
+          UI.section("\nUpdating Spec Repositories\n".yellow) do
+            Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new([])).run
+          end
+        end
+
+        private
+
+        def library_exist(spec)
+          File.exist?(File.join(@local_build_dir, "lib#{spec.name}.a")) || is_framework(spec)
+        end
+        # 使用了user_framework 会有#{@spec.name}.framework
+        # 未使用的 需要判断文件
+        def is_framework(spec)
+          res = File.exist?(File.join(@local_build_dir, "#{spec.name}.framework"))
+          unless res
+            res = File.exist?(File.join(CBin::Config::Builder.instance.xcode_BuildProductsPath_dir, "#{spec.name}","Swift Compatibility Header"))
+          end
+          res
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-imy-bin/command/bin/update.rb

@@ -70,9 +70,17 @@ module Pod
                 local_post_install_callback = @post_install_callback
               end
             end
+            local_podfile_internal_hash = nil
+            local_podfile.instance_eval do
+              begin
+                local_podfile_internal_hash = internal_hash
+              end
+            end
+
 
             podfile.instance_eval do
               begin
+                internal_hash.merge!(local_podfile_internal_hash)
 
                 # podfile HASH_KEYS才有plugins字段，否则会被限制
                 if local_podfile.plugins.any?
@@ -111,9 +119,12 @@ module Pod
                         end
 
                         target_dependencies.each do |target_dependency|
-                          next unless target_dependency.is_a?(Hash) &&
-                                      target_dependency.keys.first &&
-                                      target_dependency.keys.first == local_dependency.keys.first
+                          dp_hash_equal = target_dependency.is_a?(Hash) &&
+                            target_dependency.keys.first &&
+                            target_dependency.keys.first == local_dependency.keys.first
+                          dp_str_equal = target_dependency.is_a?(String) &&
+                            target_dependency == local_dependency.keys.first
+                          next unless dp_hash_equal || dp_str_equal
 
                           target_dependencies.delete target_dependency
                           break

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

@@ -4,9 +4,11 @@ require 'cocoapods-imy-bin/command/bin/init'
 require 'cocoapods-imy-bin/command/bin/archive'
 require 'cocoapods-imy-bin/command/bin/auto'
 require 'cocoapods-imy-bin/command/bin/code'
+require 'cocoapods-imy-bin/command/bin/local'
 require 'cocoapods-imy-bin/command/bin/update'
 require 'cocoapods-imy-bin/command/bin/install'
 require 'cocoapods-imy-bin/command/bin/imy'
+require 'cocoapods-imy-bin/command/bin/clean'
 
 require 'cocoapods-imy-bin/helpers'
 

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

@@ -55,6 +55,14 @@ module CBin
       binary_download_url[0,binary_download_url.length - cut_string.length]
     end
 
+    #清除接口 http://ci.meiyou.im:10240/frameworks_del
+    def delete_binary_url
+      cut_string = "/%s/%s/zip"
+      url = binary_download_url[0,binary_download_url.length - cut_string.length]
+      url += "_del"
+      url
+    end
+
     def set_configuration_env(env)
       @configuration_env = env
     end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.3.1.3'
+  VERSION = '0.3.1.21'
 end
 
 module Pod

data/lib/cocoapods-imy-bin/helpers/build_utils.rb

@@ -14,6 +14,43 @@ module CBin
         return Utils.is_swift_module(spec)
       end
 
+      def Utils.spec_header_dir(spec)
+
+        header_dir = "./Headers/Public/#{spec.name}"
+        header_dir = "./Pods/Headers/Public/#{spec.name}" unless File.exist?(header_dir)
+
+        unless File.exist?(header_dir)
+          # 一些库名称中使用了中划线如AAA-BBB，public header中库名称会默认处理成下划线AAA_BBB
+          module_name = spec.name.gsub("-", "_")
+          header_dir = "./Pods/Headers/Public/#{module_name}"
+        end
+
+        # 暂时只支持:ios
+        consumer = Pod::Specification::Consumer.new(spec, :ios)
+        unless consumer.header_dir.nil?
+          header_dir = File.join(header_dir, consumer.header_dir)
+        end
+
+        header_dir
+      end
+
+      def Utils.spec_module_dir(spec)
+        if spec.module_name.nil?
+          module_dir = "./Headers/Public/#{spec.name}"
+          module_dir = "./Pods/Headers/Public/#{spec.name}" unless File.exist?(module_dir)
+          unless File.exist?(module_dir)
+            # 一些库名称中使用了中划线如AAA-BBB，public header中库名称会默认处理成下划线AAA_BBB
+            module_name = spec.name.gsub("-", "_")
+            module_dir = "./Pods/Headers/Public/#{module_name}"
+          end
+        else
+          module_dir = "./Headers/Public/#{spec.module_name}"
+          module_dir = "./Pods/Headers/Public/#{spec.module_name}" unless File.exist?(module_dir)
+        end
+
+        module_dir
+      end
+
       def Utils.is_swift_module(spec)
 
         is_framework = false
@@ -21,15 +58,9 @@ module CBin
         #auto 走这里
         if File.exist?(dir)
           Dir.chdir(dir) do
-            public_headers = Array.new
-            spec_header_dir = "./Headers/Public/#{spec.name}"
-
-            unless File.exist?(spec_header_dir)
-              spec_header_dir = "./Pods/Headers/Public/#{spec.name}"
-            end
-            return false unless File.exist?(spec_header_dir)
-
-            is_framework = File.exist?(File.join(spec_header_dir, "#{spec.name}-umbrella.h"))
+            spec_module_dir = Utils.spec_module_dir(spec)
+            return false unless File.exist?(spec_module_dir)
+            is_framework = File.exist?(File.join(spec_module_dir, "#{spec.name}-umbrella.h"))
           end
         end
 

data/lib/cocoapods-imy-bin/helpers/framework_builder.rb

@@ -240,7 +240,7 @@ module CBin
         end
         raise "copy_headers #{spec_header_dir} no exist " unless File.exist?(spec_header_dir)
         Dir.chdir(spec_header_dir) do
-          headers = Dir.glob('*.h')
+          headers = Dir.glob('**/*.h')
           headers.each do |h|
             public_headers << Pathname.new(File.join(Dir.pwd,h))
           end

data/lib/cocoapods-imy-bin/helpers/local/loca_llibrary.rb

@@ -0,0 +1,57 @@
+
+
+# copy from https://github.com/CocoaPods/cocoapods-packager
+require 'cocoapods-imy-bin/config/config_builder'
+
+module CBin
+  class LocalLibrary
+    attr_reader :headers_path
+    attr_reader :resources_path
+    attr_reader :root_path
+    attr_reader :versions_path
+    attr_reader :name_path
+
+    def initialize(name, platform, version)
+      @name = name
+      @platform = platform
+      @version = version
+    end
+
+    def make
+      make_root
+      make_library
+      make_headers
+      make_resources
+    end
+
+    def delete_resources
+      Pathname.new(@resources_path).rmtree
+      (Pathname.new(@fwk_path) + Pathname.new('Resources')).delete
+    end
+
+    private
+
+    def make_library
+      @name_path = CBin::Config::Builder.instance.library_name_version(@name, @version)
+      @fwk_path = @root_path + Pathname.new(@name_path)
+      @fwk_path.mkdir unless @fwk_path.exist?
+
+      @versions_path = @fwk_path
+    end
+
+    def make_headers
+      @headers_path = @versions_path + Pathname.new('Headers')
+      # @headers_path.mkpath unless @headers_path.exist?
+    end
+
+    def make_resources
+      @resources_path = @versions_path + Pathname.new('Resources')
+      # @resources_path.mkpath unless @resources_path.exist?
+    end
+
+    def make_root
+      @root_path = Pathname.new(@platform)
+      @root_path.mkpath unless @root_path.exist?
+    end
+  end
+end