cocoapods-bb-bin 0.2.6.1 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1cdc1d9981ad04ed6d174e1234cf97946cf9053590c9626f2c39a552e89625c
-  data.tar.gz: 5b201e5cc0bd349ce52fda0d423020f211172c05857a60341c764a7c89832f20
+  metadata.gz: a6d7ed2b021027dcd6f7ce5b5924e6527eae30107123250bff8bba761a5e5ec1
+  data.tar.gz: 9f7db13d3bdaecdf92aa5d41d3aaca05b543745ebcd9a6da729c45b9cfe93033
 SHA512:
-  metadata.gz: 6fe18b6d92c6a1a4ab1bcfc46ace767a09a750e704f8008857dedae9c89f8fc8e903a4f3047f5cdb255680a374c194e14413f5af15990a4397ae630c244fc7f0
-  data.tar.gz: b38737fc90cb2003468b66579a0f6c26d1f86c2f9602bd1109f55eba16fbcf02f471c28ebd9d4867f5ea38e1f9e77161a641279267106b34b1eee94f144aa55a
+  metadata.gz: 74f02d04acc23dc999f9bad0af3d4bd7c4073a18a7f997be946c025ae742340389d2b27959ac84ac210e59c39975fae353face18d0b9fd6cbc68f55258a7b189
+  data.tar.gz: 379aedee58963ceb87da4de8ac3d83627e00574b8f0a415e9ba3835276a7ec33dbed2489cfe868aa3a99246ee57c5a5348f932e78b3e727424436eecd1e14a4f

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

@@ -7,7 +7,7 @@ module Pod
   class Command
     class Bin < Command
       class Auto < Bin
-        self.summary = '打开 workspace 工程.'
+        self.summary = '制作二进制组件库、podspec索引推送.'
 
         self.arguments = [
             CLAide::Argument.new('NAME.podspec', false)

data/lib/cocoapods-bb-bin/command/bin/code.rb

@@ -4,7 +4,7 @@ module Pod
   class Command
     class Bin < Command
       class Code < Bin
-        self.summary = '通过将二进制对应源码放置在临时目录中，让二进制出现断点时可以跳到对应的源码，方便调试。'
+        self.summary = '通过将二进制对应源码放置在临时目录中，让二进制出现断点时可以跳到对应的源码。切换源码调试 pod bin code <组件名称> -—source=<组件本地路径>'
 
         self.description = <<-DESC
           通过将二进制对应源码放置在临时目录中，让二进制出现断点时可以跳到对应的源码，方便调试。

data/lib/cocoapods-bb-bin/command/bin/localPush.rb

@@ -0,0 +1,131 @@
+require 'cocoapods-bb-bin/native/podfile'
+require 'cocoapods/command/gen'
+require 'cocoapods/generate'
+require 'xcodeproj'
+require 'cocoapods-bb-bin/helpers/push_spec_helper'
+require 'cocoapods-bb-bin/helpers/build_helper'
+require 'cocoapods-bb-bin/helpers/spec_source_creator'
+
+module Pod
+  class Command
+    class Bin < Command
+      class LocalPush < Bin
+        self.summary = '本地推送，支持二进制文件上传.'
+
+        self.arguments = [
+            CLAide::Argument.new('NAME.podspec', false)
+        ]
+        def self.options
+          [
+            ['--sources', '私有源地址，多个用分号区分'],
+            ['--path', '(必传)需要上传文件路径'],
+            ['--vendored_framework_name', '(可选)组件库依赖framework名称，默认组件名称'],
+            ['--dylib', '(可选)是否动态库,默认静态库'],
+          ].concat(Pod::Command::Gen.options).concat(super).uniq
+        end
+
+        def initialize(argv)
+          @help = argv.flag?('help', false )
+          if @help
+          else
+            @env = argv.option('env') || 'dev'
+            CBin.config.set_configuration_env(@env)
+  
+            @podspec = argv.shift_argument || find_podspec
+            @sources = argv.option('sources') || []
+            @localPath = argv.option('path') || nil
+            @vendored_framework_name = argv.option('vendored_framework_name') || nil
+            @is_dylib = argv.flag?('dylib', false )
+          end
+          super
+        end
+
+        def validate!
+            help! "未找到 podspec文件" unless @podspec
+            super
+          end
+
+        def run
+            # 配置二进制库环境，需要区分静态库还是动态库
+            isGenDylib = @is_dylib
+            sources_manager = Pod::Config.instance.sources_manager
+            sources_manager.initLibEnv(isGenDylib)
+            # 清除之前的缓存
+            CBin::Config::Builder.instance.clean
+            @spec = Specification.from_file(@podspec)
+            # 上传文件
+            localPath = update_uploadpath unless !@localPath
+            if File.file?(localPath)
+                # 生成podspec
+                sources_sepc = Array.new
+                sources_sepc << @spec
+
+                fail_push_specs = []
+                sources_sepc.uniq.each do |spec|
+                    begin
+                        fail_push_specs << spec unless CBin::Upload::Helper.new(spec,true,@sources,true).upload_binary_file(localPath, @is_dylib, @vendored_framework_name)
+                    rescue  Object => exception
+                        UI.puts exception
+                        fail_push_specs << spec
+                    end
+                end
+    
+                if fail_push_specs.any?
+                    fail_push_specs.uniq.each do |spec|
+                        UI.warn "【#{spec.name} | #{spec.version}】组件spec push失败 ."
+                    end
+                end
+    
+                success_specs = sources_sepc - fail_push_specs
+                if success_specs.any?
+                    auto_success = ""
+                    success_specs.uniq.each do |spec|
+                        auto_success += "#{spec.name} | #{spec.version}\n"
+                        UI.warn "===【 #{spec.name} | #{spec.version} 】二进制组件制作完成 ！！！ "
+                    end
+                    puts auto_success
+                    ENV['auto_success'] = auto_success
+                end
+                #pod repo update
+                UI.section("\nUpdating Spec Repositories\n".yellow) do
+                    Pod::Command::Bin::Repo::Update.new(CLAide::ARGV.new([])).run
+                end
+            end
+        end
+
+        #Dir.glob 可替代
+        def find_podspec
+            name = nil
+            Pathname.pwd.children.each do |child|
+              # puts child
+              if File.file?(child)
+                if child.extname == '.podspec'
+                  name = File.basename(child)
+                  unless name.include?("binary-template")
+                    return name
+                  end
+                end
+              end
+            end
+            raise Informative,  "podspec File no exist, please check" unless name
+            return name
+        end
+        
+        def update_uploadpath
+            worksppace_path = Dir.pwd
+            path = @localPath
+            if File.absolute_path?(path) # 判断文件绝对路径
+                return path
+            else
+                path = File.join(worksppace_path, @localPath)
+                if File.absolute_path?(path)
+                    return path
+                end
+            end
+            return nil
+        end
+
+      end
+    end
+  end
+end

data/lib/cocoapods-bb-bin/command/bin/tag.rb

@@ -10,7 +10,7 @@ module Pod
   class Command
     class Bin < Command
       class Tag < Bin
-        self.summary = '推送标签.'
+        self.summary = '同时支持推送源码/二进制标签.'
 
         self.arguments = [
             CLAide::Argument.new('NAME.podspec', false)

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

@@ -8,6 +8,7 @@ require 'cocoapods-bb-bin/command/bin/update'
 require 'cocoapods-bb-bin/command/bin/install'
 require 'cocoapods-bb-bin/command/bin/imy'
 require 'cocoapods-bb-bin/command/bin/tag'
+require 'cocoapods-bb-bin/command/bin/localPush'
 
 require 'cocoapods-bb-bin/helpers'
 
@@ -36,7 +37,7 @@ module Pod
 
       self.abstract_command = true
 
-      self.default_subcommand = 'open'
+      self.default_subcommand = 'auto'
       self.summary = '组件二进制化插件.'
       self.description = <<-DESC
         组件二进制化插件。利用源码私有源与二进制私有源实现对组件依赖类型的切换。

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.6.1'
+  VERSION = '0.2.7'
 end
 
 module Pod

data/lib/cocoapods-bb-bin/helpers/spec_source_creator.rb

@@ -19,13 +19,16 @@ module CBin
         raise Pod::Informative, '源码 podspec 不能为空 .' unless code_spec
       end
 
-      def create
+      def create(frameworkName=nil)
         # spec = nil
         if CBin::Build::Utils.is_framework(@code_spec)
-          Pod::UI::puts "make framework spec"
-          spec = create_framework_from_code_spec
+          Pod::UI::puts "make framework spec. vendored_framework_name:#{frameworkName}"
+          if !frameworkName # 如果外部没有传入fk名称默认组件名称
+            frameworkName = code_spec.root.name
+          end
+          spec = create_framework_from_code_spec(frameworkName)
         else
-          Pod::UI::puts "make source code spec"
+          Pod::UI::puts "make source code spec. vendored_framework_name:#{frameworkName}"
           spec = create_from_code_spec
         end
 
@@ -137,13 +140,13 @@ module CBin
         @spec
       end
 
-      def create_framework_from_code_spec
+      def create_framework_from_code_spec(frameworkName)
         @spec = code_spec.dup
         # vendored_frameworks | resources | source | source_files | public_header_files
         # license | resource_bundles | vendored_libraries
 
         # Project Linkin
-        @spec.vendored_frameworks = "#{code_spec.root.name}.{framework,xcframework}" # 支持framework、xcframework
+        @spec.vendored_frameworks = "#{frameworkName}.{framework,xcframework}" # 支持framework、xcframework
         
         # Resources
         extnames = []

data/lib/cocoapods-bb-bin/helpers/upload_helper.rb

@@ -23,37 +23,42 @@ module CBin
       end
 
       def upload(isGenDylib=false)
+        return upload_binary_file(own_source_binary_file, isGenDylib, @spec.name)
+      end
+
+      def upload_binary_file(zip_file, isGenDylib=false, vendored_framework_name=nil)
         Dir.chdir(CBin::Config::Builder.instance.root_dir) do
           # 创建binary-template.podsepc
           # 上传二进制文件
           # 上传二进制 podspec
-          res_zip = curl_zip
-          if res_zip
-            filename = spec_creator
-            Pod::UI.message "上传二进制 podspec: #{filename} 是否动态库: #{isGenDylib}"
+          isupload = binary_upload(zip_file)
+          if isupload
+            filename = spec_creator(vendored_framework_name)
+            Pod::UI.puts "上传二进制 podspec: #{filename} 是否动态库: #{isGenDylib} vendored_framework_name:#{vendored_framework_name}"
             push_helper = CBin::Push::Helper.new()
             push_helper.push_binary_repo(filename,isGenDylib)
             # 上传源码 podspec
             if @pushsourcespec
-              Pod::UI.message "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"
+              Pod::UI.puts "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"
               push_helper.push_source_repo(@spec_creator.sourceSpecFilePath)
             end
           end
-          res_zip
+          isupload
         end
       end
 
-      def spec_creator
+      private
+      def spec_creator(vendored_framework_name=nil)
         spec_creator = CBin::SpecificationSource::Creator.new(@spec)
         @spec_creator = spec_creator
-        spec_creator.create
+        spec_creator.create(vendored_framework_name)
         spec_creator.write_spec_file
         spec_creator.filename
       end
 
-      #推送二进制
-      # curl http://ci.xxx:9192/frameworks -F "name=IMYFoundation" -F "version=7.7.4.2" -F "annotate=IMYFoundation_7.7.4.2_log" -F "file=@bin_zip/bin_IMYFoundation_7.7.4.2.zip"
-      def curl_zip
+      private
+      #推送源码组件库二进制文件
+      def own_source_binary_file
         # lib
         zip_file = "#{CBin::Config::Builder.instance.library_file(@spec)}.zip"
         res = File.exist?(zip_file)
@@ -67,14 +72,23 @@ module CBin
           zip_file = CBin::Config::Builder.instance.xcframework_zip_file(@spec) + ".zip"
           res = File.exist?(zip_file)
         end
+        if res
+          return zip_file
+        end
+        return nil
+      end
+
+      # 上传二进制文件
+      private
+      def binary_upload(zip_file)
+        res = File.file?(zip_file)
         if res
           print <<EOF
-          上传二进制文件
+          上传二进制文件: #{@spec.name} (#{@spec.version})
          curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"
 EOF
           `curl #{CBin.config.binary_upload_url} -F "name=#{@spec.name}" -F "version=#{@spec.version}" -F "annotate=#{@spec.name}_#{@spec.version}_log" -F "file=@#{zip_file}"` if res
         end
-
         res
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.6.1
+  version: 0.2.7
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-13 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.1
+        version: 0.2.6.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6.1
+        version: 0.2.6.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -134,6 +134,7 @@ files:
 - lib/cocoapods-bb-bin/command/bin/initHotKey.rb
 - lib/cocoapods-bb-bin/command/bin/install.rb
 - lib/cocoapods-bb-bin/command/bin/lib/lint.rb
+- lib/cocoapods-bb-bin/command/bin/localPush.rb
 - lib/cocoapods-bb-bin/command/bin/repo/push.rb
 - lib/cocoapods-bb-bin/command/bin/repo/update.rb
 - lib/cocoapods-bb-bin/command/bin/spec/create.rb
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.16
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between