cocoapods-bb-bin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4926e04b2eaade743939e92c8de3707bdaf3444b06b9515aa45278b63c444df8
-  data.tar.gz: 677d14354d6f11f34a30e956c515f9b9db5040076cdbf2902a71ed9ff3badd65
+  metadata.gz: 9c3db228010949a3ee9a1029358a1ed29026a1e2ac100ea2eae52afe9a0c0843
+  data.tar.gz: cf85159135d5e2f16a6cd025cc1bbcfce786becf639e239ed832145cc62d91aa
 SHA512:
-  metadata.gz: bc1d214967a7056d24836d7162bc5140c771575f1a4f0c59f90b91a47d782ba506069fadb22c35cdf2f4b13a1d6aca9e63595c4c51b068836135a19b30795c0d
-  data.tar.gz: c625ef1d42a31eef96e0f9fc492ddd21066dd59ff35d88a2529f227466ca533cdaf276dbecfe136870abc916e7448fc9dcc381ca958635174b7d8a3785b909ea
+  metadata.gz: 39a6e327cd12a99f317da290936820af7e680ecc5f29032fc3669a1059e54d3516091bf1c526b5239eb933784029d4fe1412e874460a77f997c94c9f2d7d2154
+  data.tar.gz: 072b9c4c9f0d2dad89cd20b5b77d987ed42d2a977b1f60b4d95ce79ee43af9aeb636f9e550d25799a30a1444b696740cec769e09cbb39a2be611dc74fb6387ff

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

@@ -21,7 +21,8 @@ module Pod
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
-              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
+              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"],
+              ['--all-push', '上传二进制同时，允许同时推送源码索引'],
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -40,6 +41,7 @@ module Pod
             @allow_prerelease = argv.flag?('allow-prerelease')
             @framework_output = argv.flag?('framework-output', false )
             @xcframework_output = argv.flag?('xcframework-output', false )
+            @pushsourcespec = argv.flag?('all-push', false )
             @clean = argv.flag?('clean', true)
             @zip = argv.flag?('zip', true)
             @all_make = argv.flag?('all-make', false )
@@ -64,7 +66,7 @@ module Pod
           fail_push_specs = []
           sources_sepc.uniq.each do |spec|
             begin
-              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources).upload
+              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources,@pushsourcespec).upload
             rescue  Object => exception
               UI.puts exception
               fail_push_specs << spec
@@ -84,7 +86,6 @@ module Pod
               auto_success += "#{spec.name} | #{spec.version}\n"
               UI.warn "===【 #{spec.name} | #{spec.version} 】二进制组件制作完成 ！！！ "
             end
-            puts "==============  auto_success"
             puts auto_success
             ENV['auto_success'] = auto_success
           end

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end
 
 module Pod

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

@@ -43,6 +43,8 @@ module CBin
         end
 
         @filename = file
+        # Pod::UI::puts "===copy origin file: #{file}"
+        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}"
         # 拷贝二进制spec到源码spec by hm 22/1/19
         `cp -fa #{file} #{sourceSpecFilePath}` 
       end
@@ -57,7 +59,7 @@ module CBin
       end
       # 源码spec路径（指向二进制库）
       def sourceSpecFilePath
-        @filename ||= "#{CBin::Config::Builder.instance.binary_json_dir_name}/#{spec.name}.podspec.json"
+        @sourcefilename ||= "#{CBin::Config::Builder.instance.binary_json_dir_name}/#{spec.name}.podspec.json"
       end
 
       private

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

@@ -15,10 +15,11 @@ module CBin
     class Helper
       include CBin::SourcesHelper
 
-      def initialize(spec,code_dependencies,sources)
+      def initialize(spec,code_dependencies,sources, pushsourcespec = false)
         @spec = spec
         @code_dependencies = code_dependencies
         @sources = sources
+        @pushsourcespec = pushsourcespec # 推送源码
       end
 
       def upload
@@ -29,7 +30,13 @@ module CBin
           res_zip = curl_zip
           if res_zip
             filename = spec_creator
+            Pod::UI.message "上传二进制 podspec: #{filename}"
             push_binary_repo(filename)
+            # 上传源码 podspec
+            if @pushsourcespec
+              Pod::UI.message "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"
+              push_source_repo(@spec_creator.sourceSpecFilePath)
+            end
           end
           res_zip
         end
@@ -37,6 +44,7 @@ module CBin
 
       def spec_creator
         spec_creator = CBin::SpecificationSource::Creator.new(@spec)
+        @spec_creator = spec_creator
         spec_creator.create
         spec_creator.write_spec_file
         spec_creator.filename
@@ -76,7 +84,7 @@ EOF
             "#{binary_source.name}",  # repo
             "#{binary_podsepc_json}", # spec
             "--binary",
-            "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
+            "--sources=#{binary_source},https:\/\/cdn.cocoapods.org",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",
@@ -87,12 +95,33 @@ EOF
         if @verbose
           argvs += ['--verbose']
         end
-
+        Pod::UI.message "上传二进制 argvs: #{argvs}"
         push = Pod::Command::Bin::Repo::Push.new(CLAide::ARGV.new(argvs))
         push.validate!
         push.run
       end
 
+      # 上传源码podspec
+      def push_source_repo(source_podsepc_json)
+        argvs = [
+          "#{code_source.name}",  # repo
+          "#{source_podsepc_json}", # spec
+          "--sources=#{code_source},https:\/\/cdn.cocoapods.org",
+          "--skip-import-validation",
+          "--use-libraries",
+          "--allow-warnings",
+          "--verbose",
+          "--code-dependencies",
+          '--no-cocoapods-validator', #不采用cocoapods验证
+        ]
+        if @verbose
+          argvs += ['--verbose']
+        end
+        Pod::UI.message "上传源码 argvs: #{argvs}"
+        push = Pod::Command::Bin::Repo::Push.new(CLAide::ARGV.new(argvs))
+        push.validate!
+        push.run
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-19 00:00:00.000000000 Z
+date: 2022-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel