cocoapods-bb-bin 0.2.1 → 0.2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c3db228010949a3ee9a1029358a1ed29026a1e2ac100ea2eae52afe9a0c0843
-  data.tar.gz: cf85159135d5e2f16a6cd025cc1bbcfce786becf639e239ed832145cc62d91aa
+  metadata.gz: 4f787451d6932076c5b8349d83b1c6dd8fa1a6721ae55f7d9fa6bb8364d82d90
+  data.tar.gz: '00817f2a55057afef1d6d2c6e7b1e8ba5899dc258cd7d606ab8ceb52129a0b67'
 SHA512:
-  metadata.gz: 39a6e327cd12a99f317da290936820af7e680ecc5f29032fc3669a1059e54d3516091bf1c526b5239eb933784029d4fe1412e874460a77f997c94c9f2d7d2154
-  data.tar.gz: 072b9c4c9f0d2dad89cd20b5b77d987ed42d2a977b1f60b4d95ce79ee43af9aeb636f9e550d25799a30a1444b696740cec769e09cbb39a2be611dc74fb6387ff
+  metadata.gz: fe72bb8f5fc7cf45e5b47af44117378407bf68ca4cf91f97ad2b40e7a62c6baac93f904385f4b50e3e0bef7e62d079afc89383cf9d815fc657b6323951d9e945
+  data.tar.gz: 861b6079b705cc0a37edf8e1bc3e1c114f5d07d76451ed8ad0d95e44684f3c36dbdc700612da90ede301f67b4dd6236d66c3a34bd0c1466bc52aaf08a9cf4acc

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

@@ -61,6 +61,11 @@ module Pod
 
           @additional_args = argv.remainder!
           @build_finshed = false
+          @spec_sources = @sources
+          if @xcframework_output == true
+            # 生存xcframework优先使用源码仓库\二进制仓库
+            @spec_sources = "#{sources_optionV2(@code_dependencies, nil)},https:\/\/cdn.cocoapods.org"
+          end
         end
 
         def run
@@ -86,7 +91,7 @@ module Pod
                                             @platform,
                                             @framework_output,
                                             @xcframework_output,
-                                            @sources,
+                                            @spec_sources,
                                             @zip,
                                             @spec,
                                             CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),

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

@@ -0,0 +1,153 @@
+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 Tag < Bin
+        self.summary = '推送标签.'
+
+        self.arguments = [
+            CLAide::Argument.new('NAME.podspec', false)
+        ]
+        def self.options
+          [
+            ['--sources', '私有源地址，多个用分号区分'],
+            ['--no-clean', '保留构建中间产物'],
+            ['--skip-build-project', '跳过编译工程文件操作(直接推送假标签，操作慎重!!!)'],
+            ['--debug', 'debug环境只是验证工程编译是否ok，不进行标签推送操作'],
+          ].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') || []
+            @clean = argv.flag?('no-clean', false)
+            @skip_build_project = argv.flag?('skip-build-project', false)
+            @is_debug = argv.flag?('debug', false)
+            @platform = Platform.new(:ios)
+          end
+          super
+        end
+
+        def validate!
+            help! "未找到 podspec文件" unless @podspec
+            super
+          end
+
+        def run
+          # 清除之前的缓存
+          CBin::Config::Builder.instance.clean
+          @spec = Specification.from_file(@podspec)
+
+          if @skip_build_project
+            # 跳过工程编译
+            is_build_ok = true
+            Pod::UI.warn "请注意⚠️正在推送假标签！！！#{@podspec}==>#{@spec.name}(#{@spec.version})"
+          elsif
+            # step.1 工程编译
+            is_build_ok = check_build_workspace
+          end
+          if is_build_ok && !@is_debug
+            # step.2 工程编译ok，进行标签推送
+            push_helper = CBin::Push::Helper.new()
+            push_helper.push_source_repo(@podspec)
+          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 check_build_workspace
+          generate_project
+          swift_pods_buildsetting
+          return build_root_spec
+        end
+
+        private
+        def build_root_spec
+          builder = CBin::Build::Helper.new(@spec,
+                                            @platform,
+                                            false,
+                                            false,
+                                            @sources,
+                                            true,
+                                            @spec,
+                                            CBin::Config::Builder.instance.white_pod_list.include?(@spec.name),
+                                            'Release')
+          builder.build
+          builder.clean_workspace if @clean
+          return builder.is_build_finish
+        end
+        def swift_pods_buildsetting
+          # swift_project_link_header
+          worksppace_path = File.expand_path("#{CBin::Config::Builder.instance.gen_dir}/#{@spec.name}")
+          path = File.join(worksppace_path, "Pods.xcodeproj")
+          path = File.join(worksppace_path, "Pods/Pods.xcodeproj") unless File.exist?(path)
+          raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
+          project = Xcodeproj::Project.open(path)
+          project.build_configurations.each do |x|
+            x.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = true #设置生成swift inter
+          end
+          project.save
+        end
+
+        def generate_project
+          Podfile.execute_with_bin_plugin do
+            Podfile.execute_with_use_binaries(!@code_dependencies) do
+                argvs = [
+                  "--sources=#{sources_option(@code_dependencies, @sources)}",
+                  "--gen-directory=#{CBin::Config::Builder.instance.gen_dir}",
+                  '--clean',
+                  "--verbose",
+                  *@additional_args
+                ]
+                podfile_path = Pod::Config.instance.podfile_path
+                if podfile_path && File.exist?(podfile_path)
+                  argvs += ['--use-podfile']
+                end
+
+                if CBin::Build::Utils.uses_frameworks? # 组件库重新生成pod工程引入静态库需要使用该选项，否则报cocoapods中verify_no_static_framework_transitive_dependencies验证无法通过 by hm 21/10/18
+                  argvs += ['--use-libraries']
+                end
+
+                argvs << @podspec if @podspec
+                # UI.puts "argvs:#{argvs}"
+                gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
+                gen.validate!
+                gen.run
+            end
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ require 'cocoapods-bb-bin/command/bin/code'
 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/helpers'
 

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

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

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

@@ -68,6 +68,21 @@ module CBin
 
       end
 
+      def is_build_finish
+        if is_build_xcframework
+          path = xcframework_name_zip
+        else
+          path = framework_name_zip
+        end
+        output_path =  File.join(zip_dir, path)
+        unless File.exist?(xcframework_name)
+          UI.puts "工程文件编译成功"
+          return true
+        end
+        UI.puts "工程文件编译失败"
+        return false
+      end
+
       # 是否编译xcframework库
       def is_build_xcframework
         if @xcframework_output == true

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

@@ -0,0 +1,64 @@
+require 'cocoapods-bb-bin/native/podfile'
+require 'cocoapods/command/gen'
+require 'cocoapods/generate'
+require 'cocoapods-bb-bin/helpers/framework_builder'
+require 'cocoapods-bb-bin/helpers/library_builder'
+require 'cocoapods-bb-bin/helpers/sources_helper'
+require 'cocoapods-bb-bin/command/bin/repo/push'
+
+module CBin
+  class Push
+    class Helper
+      include CBin::SourcesHelper
+
+      def initialize()
+      end
+
+      # 上传二进制 podspec
+      def push_binary_repo(binary_podsepc_json)
+        argvs = [
+            "#{binary_source.name}",  # repo
+            "#{binary_podsepc_json}", # spec
+            "--binary",
+            "--sources=#{binary_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
+
+      # 上传源码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

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

@@ -29,8 +29,24 @@ module CBin
       sources
     end
 
+    def valid_sourcesV2(code_dependencies = false)
+      sources = [binary_source]
+      unless code_dependencies
+        sources << code_source
+        sources.reverse!
+      end
+      sources
+    end
+
+    # 二进制优先
     def sources_option(code_dependencies, additional_sources)
       (valid_sources(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
     end
+
+    # 源码优先
+    def sources_optionV2(code_dependencies, additional_sources)
+      (valid_sourcesV2(code_dependencies).map(&:url) + Array(additional_sources)).join(',')
+    end
+
   end
 end

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

@@ -8,7 +8,7 @@ require 'cocoapods/generate'
 require 'cocoapods-bb-bin/helpers/framework_builder'
 require 'cocoapods-bb-bin/helpers/library_builder'
 require 'cocoapods-bb-bin/helpers/sources_helper'
-require 'cocoapods-bb-bin/command/bin/repo/push'
+require 'cocoapods-bb-bin/helpers/push_spec_helper'
 
 module CBin
   class Upload
@@ -31,11 +31,12 @@ module CBin
           if res_zip
             filename = spec_creator
             Pod::UI.message "上传二进制 podspec: #{filename}"
-            push_binary_repo(filename)
+            push_helper = CBin::Push::Helper.new()
+            push_helper.push_binary_repo(filename)
             # 上传源码 podspec
             if @pushsourcespec
               Pod::UI.message "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"
-              push_source_repo(@spec_creator.sourceSpecFilePath)
+              push_helper.push_source_repo(@spec_creator.sourceSpecFilePath)
             end
           end
           res_zip
@@ -77,51 +78,6 @@ EOF
         res
       end
 
-
-      # 上传二进制 podspec
-      def push_binary_repo(binary_podsepc_json)
-        argvs = [
-            "#{binary_source.name}",  # repo
-            "#{binary_podsepc_json}", # spec
-            "--binary",
-            "--sources=#{binary_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
-
-      # 上传源码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.1
+  version: 0.2.2.2
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-02 00:00:00.000000000 Z
+date: 2022-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -137,6 +137,7 @@ files:
 - 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
+- lib/cocoapods-bb-bin/command/bin/tag.rb
 - lib/cocoapods-bb-bin/command/bin/update.rb
 - lib/cocoapods-bb-bin/config/config.rb
 - lib/cocoapods-bb-bin/config/config_asker.rb
@@ -152,6 +153,7 @@ files:
 - lib/cocoapods-bb-bin/helpers/framework_builder.rb
 - lib/cocoapods-bb-bin/helpers/library.rb
 - lib/cocoapods-bb-bin/helpers/library_builder.rb
+- lib/cocoapods-bb-bin/helpers/push_spec_helper.rb
 - lib/cocoapods-bb-bin/helpers/sources_helper.rb
 - lib/cocoapods-bb-bin/helpers/spec_creator.rb
 - lib/cocoapods-bb-bin/helpers/spec_files_helper.rb
@@ -203,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.18
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between