cocoapods-bb-bin 0.1.4 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b89f001104ecdb85f0dd860945910ad39e9f571f6a6cf6bfb80d7dbcb3651b5
-  data.tar.gz: 7b8527d71339c4c3eb0e44037e96e402578c524abe32e4a6e5656a251acbf87c
+  metadata.gz: d6bfe1244ff7ee292516ac3f497b988ccfcc7db6cbed08617ec46dc2af558886
+  data.tar.gz: 036b33803b77ebd6281ebe98639100fc8bb92c20f7448faec758a42ea2706e82
 SHA512:
-  metadata.gz: 0efa752e40ced20e12331a10c9257b6af2699b3c113120f4fc03a1de0a232d0b4773ede729133bf420ad98f09c185a7a917356a969cf4206c9667eca01f609d6
-  data.tar.gz: f2c304f7f7cd5d8e547ddba78c00e2057d2c12de701c2699e700b94c1465bb65a97edb53d4d0b7e9d0bab1c348334d2ab9e0e88095290bb53ab7f0d31c1449c4
+  metadata.gz: 4b3e12f0e1f5fac44c4fe96315838254ad4cb69b083c224d46a13782fad2537d78c73c88a0dffd6dda7f59e69c9183160a9d67fe9815f1e4fbc6f7187769b1e6
+  data.tar.gz: 5d7e079146176eb2c0a9b68e4d2f68cf47286acb5d5a8dd8c81f4bb1a655c29a8981fb1bf6b322ebc47f067fa097aef4bce517b79cc8e276e66464ded1993b73

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

@@ -165,8 +165,8 @@ module Pod
                   "--verbose",
                   *@additional_args
                 ]
-
-                if File.exist?(Pod::Config.instance.podfile_path)
+                podfile_path = Pod::Config.instance.podfile_path
+                if podfile_path && File.exist?(podfile_path)
                   argvs += ['--use-podfile']
                 end
 
@@ -175,7 +175,7 @@ module Pod
                 end
 
                 argvs << spec_file if spec_file
-                UI.puts "argvs:#{argvs}"
+                # UI.puts "argvs:#{argvs}"
                 gen = Pod::Command::Gen.new(CLAide::ARGV.new(argvs))
                 gen.validate!
                 gen.run

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

@@ -29,12 +29,10 @@ module Pod
           @help = argv.flag?('help', false )
           if @help
           else
-            puts "开始执行自动推送操作，"
-            podfile_path = link_podfile # 创建软链接
-  
             @env = argv.option('env') || 'dev'
             CBin.config.set_configuration_env(@env)
   
+            podfile_path = link_podfile # 创建软链接
             @podspec = argv.shift_argument || find_podspec
             @specification = Specification.from_file(@podspec)
   
@@ -133,7 +131,7 @@ module Pod
             argvs += ["--env=#{@env}"]
           end
           argvs += ["--configuration=#{@config}"]
-          puts "===auto argvs: #{argvs}"
+          # puts "===auto argvs: #{argvs}"
           archive = Pod::Command::Bin::Archive.new(CLAide::ARGV.new(argvs))
           archive.validate!
           sources_sepc = archive.run
@@ -190,7 +188,7 @@ module Pod
         def find_podspec
           name = nil
           Pathname.pwd.children.each do |child|
-            puts child
+            # puts child
             if File.file?(child)
               if child.extname == '.podspec'
                 name = File.basename(child)
@@ -200,6 +198,7 @@ module Pod
               end
             end
           end
+          raise Informative,  "podspec File no exist, please check" unless name
           return name
         end
 
@@ -221,6 +220,8 @@ module Pod
                     if filename == 'Podfile'
                       podfile_path = File.join(filepath,"#{filename}")
                       create_link(podfile_path, current_path)
+                      # pods_path = File.join(filepath,"Pods")
+                      # create_link(pods_path, current_path)
                       return podfile_path
                     end
                   end
@@ -232,14 +233,14 @@ module Pod
           podfile_path = File.join(current_path,"Example/Podfile")
           if File.file?(podfile_path)
             create_link(podfile_path, current_path)
+            # pods_path = File.join(current_path,"Example/Pods")
+            # create_link(pods_path, current_path)
           end
         end
 
         def create_link(source_file, dest_file)
-          if File.file?(source_file)
-            system("ln -s #{source_file} #{dest_file}")
-            UI.puts "创建软链接 source:#{source_file} link:#{dest_file}"
-          end
+          system("ln -s #{source_file} #{dest_file}")
+          UI.puts "create link source:#{source_file} dest:#{dest_file}"
         end
       end
     end

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

@@ -1,18 +1,21 @@
 require 'cocoapods-bb-bin/config/config'
 require 'cocoapods-bb-bin/native/podfile'
+require 'cocoapods/command/lib/lint'
+require 'cocoapods'
 
 module Pod
   class Command
     class Bin < Command
       class Lib < Bin
         class Lint < Lib
-          self.summary = 'lint 组件.'
+          self.summary = 'Validates a Pod'
+
           self.description = <<-DESC
-            lint 二进制组件 / 源码组件
+            Validates the Pod using the files in the working directory.
           DESC
 
           self.arguments = [
-            CLAide::Argument.new('NAME.podspec', false)
+            CLAide::Argument.new('NAME.podspec', false),
           ]
 
           # lib lint 不会下载 source，所以不能进行二进制 lint
@@ -21,46 +24,100 @@ module Pod
             [
               ['--code-dependencies', '使用源码依赖进行 lint'],
               ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
-              ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
+              ['--allow-prerelease', '允许使用 prerelease 的版本 lint'],
+              ['--bb-env', 'bb Company environment(Internal use),support oc、swift project']
             ].concat(Pod::Command::Lib::Lint.options).concat(super).uniq
           end
 
           def initialize(argv)
             @loose_options = argv.flag?('loose-options')
-            @code_dependencies = argv.flag?('code-dependencies')
+            @code_dependencies = argv.flag?('code-dependencies', true)
             @sources = argv.option('sources') || []
             @allow_prerelease = argv.flag?('allow-prerelease')
+            @bb_env = argv.flag?('bb-env', false)
             @podspec = argv.shift_argument
             super
-
             @additional_args = argv.remainder!
+            @verbose = argv.flag?('verbose', false)
           end
 
           def run
-            Podfile.execute_with_bin_plugin do
-              Podfile.execute_with_allow_prerelease(@allow_prerelease) do
+            # @bb_env = false
+            if @bb_env
+              Podfile.execute_with_bin_plugin do
                 Podfile.execute_with_use_binaries(!@code_dependencies) do
-                  argvs = [
-                    @podspec || code_spec_files.first,
-                    "--sources=#{sources_option(@code_dependencies, @sources)}",
-                    *@additional_args
-                  ]
+                  build_bb_lint
+                end
+              end
+            else
+              Podfile.execute_with_bin_plugin do
+                Podfile.execute_with_allow_prerelease(@allow_prerelease) do
+                  Podfile.execute_with_use_binaries(!@code_dependencies) do
+                    argvs = [
+                      @podspec || code_spec_files.first,
+                      "--sources=#{sources_option(@code_dependencies, @sources)}",
+                      *@additional_args
+                    ]
 
-                  if @loose_options
-                    argvs << '--allow-warnings'
-                    if code_spec&.all_dependencies&.any?
-                      argvs << '--use-libraries'
+                    if @loose_options
+                      argvs << '--allow-warnings'
+                      if code_spec&.all_dependencies&.any?
+                        argvs << '--use-libraries'
+                      end
                     end
-                  end
 
-                  lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
-                  lint.validate!
-                  lint.run
+                    lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
+                    lint.validate!
+                    lint.run
+                  end
                 end
               end
             end
           end
 
+          private
+
+          def build_bb_lint
+            UI.section("\npod bin lib lint\n".yellow) do
+              begin
+                if @podspec && !@podspec.empty?
+                  argvs = [
+                    @podspec, # 业务方传入podspec,对于业务方没有传入podspec，内部由podspecs_to_lint进行遍历
+                    # '--verbose',
+                    '--allow-warnings',
+                    '--use-static-frameworks',
+                    '--no-clean',
+                    '--skip-import-validation',
+                    '--use-modular-headers',
+                    "--sources=#{sources_option(@code_dependencies, @sources)}",
+                    '--swift-version=5.0',
+                    *@additional_args
+                  ]
+                  argvs += ['--verbose'] if @verbose
+                else
+                  argvs = [
+                    # '--verbose',
+                    '--allow-warnings',
+                    '--use-static-frameworks',
+                    '--no-clean',
+                    '--skip-import-validation',
+                    '--use-modular-headers',
+                    "--sources=#{sources_option(@code_dependencies, @sources)}",
+                    '--swift-version=5.0',
+                    *@additional_args
+                  ]
+                  argvs += ['--verbose'] if @verbose
+                end
+                
+                # puts "pod lib lint argvs:#{argvs}"
+                lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
+                lint.validate!
+                lint.run
+              rescue Object => exception
+                UI.puts exception
+              end
+            end
+          end
 
         end
       end

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

@@ -0,0 +1,169 @@
+require 'cocoapods-bb-bin/config/config'
+require 'cocoapods-bb-bin/native/podfile'
+require 'cocoapods-bb-bin/native/push'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Repo < Bin
+        class Push < Repo
+          self.summary = '发布组件.'
+          self.description = <<-DESC
+            发布二进制组件 / 源码组件
+          DESC
+
+          self.arguments = [
+            CLAide::Argument.new('NAME.podspec', false)
+          ]
+
+          def self.options
+            [
+              ['--binary', '发布组件的二进制版本'],
+              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
+              ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
+              ['--code-dependencies', '使用源码依赖进行 lint'],
+              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
+              ['--allow-prerelease', '允许使用 prerelease 的版本 lint'],
+              ['--use-static-frameworks', 'Lint uses static frameworks during installation,support modulemap'],
+              ['--bb-env', 'bb Company environment(Internal use),support oc、swift project']
+            ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
+          end
+
+          def initialize(argv)
+            @podspec = argv.shift_argument
+            @binary = argv.flag?('binary')
+            @loose_options = argv.flag?('loose-options')
+            @code_dependencies = argv.flag?('code-dependencies', true)
+            @sources = argv.option('sources') || []
+            @reserve_created_spec = argv.flag?('reserve-created-spec')
+            @template_podspec = argv.option('template-podspec')
+            @allow_prerelease = argv.flag?('allow-prerelease')
+            @use_static_frameworks = argv.flag?('use-static-frameworks', true)
+            @bb_env = argv.flag?('bb-env', false)
+            super
+            @additional_args = argv.remainder!
+            @message = argv.option('commit-message')
+            @commit_message = argv.flag?('commit-message', false)
+            @use_json = argv.flag?('use-json')
+            @verbose = argv.flag?('verbose', false)
+            @local_only = argv.flag?('local-only')
+          end
+
+          def run
+            # @bb_env = false
+            if @bb_env
+              Podfile.execute_with_bin_plugin do
+                Podfile.execute_with_use_binaries(!@code_dependencies) do
+                  build_bb_push
+                end
+              end
+            else
+              Podfile.execute_with_bin_plugin do
+                Podfile.execute_with_allow_prerelease(@allow_prerelease) do
+                  Podfile.execute_with_use_binaries(!@code_dependencies) do
+                    argvs = [
+                      repo,
+                      "--sources=#{sources_option(@code_dependencies, @sources)}",
+                      *@additional_args
+                    ]
+  
+                    argvs << spec_file if spec_file
+  
+                    if @loose_options
+                      argvs += ['--allow-warnings', '--use-json']
+                      if code_spec&.all_dependencies&.any?
+                        argvs << '--use-libraries'
+                      end
+                    end
+  
+                    push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+                    push.validate!
+                    push.run
+                  end
+                end
+              end
+            end
+          ensure
+            clear_binary_spec_file_if_needed unless @reserve_created_spec
+          end
+
+          private
+          def build_bb_push
+            UI.section("\npod bin repo push\n".yellow) do
+              begin
+                unless @podspec && !@podspec.empty? # 遍历当前目录下podspec文件
+                  podspecs = Pathname.glob(Pathname.pwd + '*.podspec{.json,}')
+                  if podspecs.count.zero?
+                    raise Informative, 'Unable to find a podspec in the working ' \
+                      'directory'
+                  end
+                  @podspec = podspecs.first
+                end
+                argvs = [
+                  repo, # 内部判断区源码还是二进制
+                  @podspec,
+                  "--sources=#{sources_option(@code_dependencies, @sources)}",
+                  # '--verbose'
+                  '--allow-warnings',
+                  '--use-static-frameworks',
+                  '--skip-import-validation',
+                  '--use-modular-headers',
+                  '--swift-version=5.0',
+                  *@additional_args
+                ]
+                argvs += ['--verbose'] if @verbose
+                argvs += ['--commit-message'] if @message
+                argvs += ['--use-json'] if @use_json
+                argvs += ['--local-only'] if @local_only
+
+                # UI.puts "pod repo push argvs:#{argvs}"
+                push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+                push.validate!
+                push.run
+              rescue Object => exception
+                UI.puts exception
+              end
+            end
+          end
+
+          def template_spec_file
+            @template_spec_file ||= begin
+              if @template_podspec
+                find_spec_file(@template_podspec)
+              else
+                binary_template_spec_file
+              end
+            end
+          end
+
+          def spec_file
+            @spec_file ||= begin
+              if @podspec
+                find_spec_file(@podspec)
+              else
+                if code_spec_files.empty?
+                  raise Informative, '当前目录下没有找到可用源码 podspec.'
+                end
+
+                spec_file = if @binary
+                              code_spec = Pod::Specification.from_file(code_spec_files.first)
+                              if template_spec_file
+                                template_spec = Pod::Specification.from_file(template_spec_file)
+                              end
+                              create_binary_spec_file(code_spec, template_spec)
+                            else
+                              code_spec_files.first
+                            end
+                spec_file
+              end
+            end
+          end
+
+          def repo
+            @binary ? binary_source.name : code_source.name
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,12 +24,12 @@ module CBin
       file = config_dev_file
       if configuration_env == "release_iphoneos"
         file = config_release_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "debug_iphoneos"
         file = config_debug_iphoneos_file
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       elsif configuration_env == "dev"
-        puts "\n======  #{configuration_env} 环境 ========"
+        # puts "\n======  #{configuration_env} 环境 ========"
       else
         raise "\n=====  #{configuration_env} 参数有误，请检查%w[dev debug_iphoneos release_iphoneos]===="
       end
@@ -94,7 +94,7 @@ module CBin
 
     def config
       @config ||= begin
-                    @config = OpenStruct.new load_config
+        @config = OpenStruct.new load_config
         validate!
         @config
       end
@@ -131,6 +131,4 @@ module CBin
   def self.config
     @config ||= Config.new
   end
-
-
 end

data/lib/cocoapods-bb-bin/config/config_builder.rb

@@ -27,7 +27,7 @@ module CBin
         if File.exist?(path)
           config = JSON.parse(File.read(path))
           @white_pod_list = config['archive-white-pod-list']
-          UI.warn "====== archive-white-pod-list = #{@white_pod_list}" if @white_pod_list
+          UI.warn "====== white_pod_list = #{@white_pod_list}" if @white_pod_list
           @ignore_git_list = config['ignore-git-list']
           UI.warn "====== ignore_git_list = #{@ignore_git_list}" if @ignore_git_list
           @ignore_http_list = config['ignore-http-list']
@@ -143,6 +143,10 @@ module CBin
 
       #编译target名，如 seeyou
       def target_name
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return ""
+        end
         @target_name ||= begin
                            target_name_str =  Pod::Config.instance.podfile.root_target_definitions.first.children.first.to_s
                            target_name_str[5,target_name_str.length]

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

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '0.1.4'
+  VERSION = '0.1.8'
 end
 
 module Pod

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

@@ -56,6 +56,7 @@ module CBin
             build_static_framework
             unless @skip_archive
               unless  CBin::Build::Utils.is_framework(@spec)
+                UI.puts "build static library"
                 build_static_library
                 zip_static_library
               else

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

@@ -48,6 +48,10 @@ module CBin
 
       def Utils.uses_frameworks?
         uses_frameworks = false
+        podfile_path = Pod::Config.instance.podfile_path
+        unless podfile_path
+          return true
+        end
         Pod::Config.instance.podfile.target_definitions.each do |key,value|
           if key != "Pods"
             uses_frameworks = value.uses_frameworks?

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

@@ -10,9 +10,10 @@ module CBin
     attr_reader :swift_module_path
     attr_reader :fwk_path
 
-    def initialize(name, platform)
+    def initialize(name, platform, embedded=false)
       @name = name
       @platform = platform
+      @embedded = embedded
     end
 
     def make
@@ -79,6 +80,11 @@ module CBin
 
     def make_root
       @root_path = Pathname.new(@platform)
+
+      if @embedded
+        @root_path += Pathname.new(@name + '.embeddedframework')
+      end
+      
       @root_path.mkpath unless @root_path.exist?
     end
   end

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

@@ -42,10 +42,11 @@ module CBin
 
         UI.puts "framework lipo build"
 
-        if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        # if CBin::Build::Utils.is_swift_module(@spec) || !CBin::Build::Utils.uses_frameworks?
+        if CBin::Build::Utils.is_framework(@spec) # 默认生成framework为静态库.a
           UI.section("Building static Library #{@spec}") do
             # defines = compile
-            UI.puts "swift framework lipo build"
+            UI.puts "static framework lipo build"
             # build_sim_libraries(defines)
             output = framework.versions_path + Pathname.new(@spec.name)
 
@@ -185,7 +186,8 @@ module CBin
           archs = ios_architectures
           # archs = %w[arm64 armv7 armv7s]
           archs.map do |arch|
-            xcodebuild(defines, "ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'","build-#{arch}",@build_model)
+            # xcodebuild(defines, "-sdk iphoneos ARCHS=\'#{arch}\' ","build-#{arch}",@build_model)
           end
         # else
           # xcodebuild(defines,options)
@@ -208,12 +210,12 @@ module CBin
          end
       end
 
-      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug')
-
+      def xcodebuild(defines = '', args = '', build_dir = 'build', build_model = 'Debug', configuration = 'Release')
+        
         unless File.exist?("Pods.xcodeproj") #cocoapods-generate v2.0.0
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{build_model} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{File.join(File.expand_path("..", build_dir), File.basename(build_dir))} clean build -configuration #{configuration} -target #{target_name} -project ./Pods/Pods.xcodeproj 2>&1"
         else
-          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{build_model} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
+          command = "xcodebuild #{defines} #{args} CONFIGURATION_BUILD_DIR=#{build_dir} clean build -configuration #{configuration} -target #{target_name} -project ./Pods.xcodeproj 2>&1"
         end
 
         UI.message "command = #{command}"
@@ -264,14 +266,33 @@ module CBin
             module_map = File.read(module_map_file)
           end
         elsif public_headers.map(&:basename).map(&:to_s).include?("#{@spec.name}-umbrella.h")
-          module_map = <<-MAP
-          framework module #{@spec.name} {
-            umbrella header "#{@spec.name}-umbrella.h"
-
-            export *
-            module * { export * }
-          }
-          MAP
+          archs = ios_architectures + ios_architectures_sim
+          swift_Compatibility_Header = "build-#{archs.first}/Swift\ Compatibility\ Header/#{@spec.name}-Swift.h"
+          # 策略：针对混编组件，modulemap写入-Swift.h by hm 21.11.15
+          if File.exist?(swift_Compatibility_Header) # swift或swift与oc混编工程
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+
+module #{@spec.name}.Swift {
+    header "#{@spec.name}-Swift.h"
+    requires objc
+}
+MAP
+          else
+            module_map = <<-MAP
+framework module #{@spec.name} {
+  umbrella header "#{@spec.name}-umbrella.h"
+
+  export *
+  module * { export * }
+}
+MAP
+          end
         end
 
         unless module_map.nil?
@@ -332,6 +353,8 @@ module CBin
         if bundles.count > 0
           UI.message "Copying bundle files #{bundles}"
           bundle_files = bundles.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[build dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
           `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         end
 
@@ -343,7 +366,7 @@ module CBin
           end
           raise "copy_resources #{spec_source_dir} no exist " unless File.exist?(spec_source_dir)
 
-          spec_source_dir = File.join(Dir.pwd,"#{@spec.name}")
+          # spec_source_dir = File.join(Dir.pwd,"#{@spec.name}") # 去除重复赋值，有些资源放在pods/组件目录下
           real_source_dir = spec_source_dir
         end
 
@@ -362,8 +385,10 @@ module CBin
           resources.each do |source|
             escape_resource << Shellwords.join(source)
           end
-          UI.message "Copying resources #{escape_resource}"
-          `cp -rp #{escape_resource.join(' ')} #{framework.resources_path}`
+          bundle_files = escape_resource.join(' ')
+          raise Informative,  "source resource bundle no exist #{bundle_files}" unless File.exist?(bundle_files)
+          UI.message "[search dir]Copying resources current_path:#{Dir.pwd} bundle_files:#{bundle_files} res_path:#{framework.resources_path}"
+          `cp -rp #{bundle_files} #{framework.resources_path} 2>&1`
         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/spec/push'
+require 'cocoapods-bb-bin/command/bin/repo/push'
 
 module CBin
   class Upload

data/lib/cocoapods-bb-bin/native/podfile_generator.rb

@@ -22,9 +22,10 @@ module Pod
       def podfile_for_spec(spec)
         generator = self
         dir = configuration.gen_dir_for_pod(spec.name)
+        project_name = configuration.project_name_for_spec(spec)
 
         Pod::Podfile.new do
-          project "#{spec.name}.xcodeproj"
+          project "#{project_name}.xcodeproj"
           workspace "#{spec.name}.xcworkspace"
 
           plugin 'cocoapods-generate'
@@ -34,7 +35,7 @@ module Pod
           generator.podfile_plugins.each do |name, options|
             plugin(*[name, options].compact)
           end
-
+          # Pod::UI::puts "====use_frameworks:#{generator.configuration.use_frameworks?}"
           use_frameworks!(generator.configuration.use_frameworks?)
 
           if (supported_swift_versions = generator.supported_swift_versions)
@@ -101,16 +102,20 @@ module Pod
 
 
           inhibit_all_warnings! if generator.inhibit_all_warnings?
-          use_modular_headers! if generator.use_modular_headers?
+          # use_modular_headers! if generator.use_modular_headers?
+          # podfile 配置 use_frameworks! :linkage => :static 支持modulemap by hm 21/10/19
+          # Pod::UI::puts "====use_frameworks_value:#{generator.use_frameworks_value}"
+          unless generator.use_frameworks_value
+            use_modular_headers! # 默认组件没有配置或者没有podfile，支持modulemap by hm 21/10/20
+          end
+          if generator.use_modular_headers? || generator.use_frameworks_value.to_s == '{:linkage=>:static}'
+            use_modular_headers!
+          end
 
           # This is the pod declaration for the local pod,
           # it will be inherited by the concrete target definitions below
-
           pod_options = generator.dependency_compilation_kwargs(spec.name)
           pod_options[:path] = spec.defined_in_file.relative_path_from(dir).to_s
-          # generator.configuration.podfile.dependencies[0].external_source
-
-
           { testspecs: test_specs, appspecs: app_specs }.each do |key, specs|
             pod_options[key] = specs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless specs.empty?
           end
@@ -196,4 +201,3 @@ module Pod
     end
   end
 end
-

data/lib/cocoapods-bb-bin/native/push.rb

@@ -0,0 +1,59 @@
+require 'tempfile'
+require 'fileutils'
+require 'active_support/core_ext/string/inflections'
+
+module Pod
+  class Command
+    class Repo < Command
+      class Push < Repo
+
+        def initialize(argv)
+          @allow_warnings = argv.flag?('allow-warnings')
+          @local_only = argv.flag?('local-only')
+          @repo = argv.shift_argument
+          @source = source_for_repo
+          @source_urls = argv.option('sources', config.sources_manager.all.map(&:url).append(Pod::TrunkSource::TRUNK_REPO_URL).uniq.join(',')).split(',')
+          @update_sources = argv.flag?('update-sources')
+          @podspec = argv.shift_argument
+          @use_frameworks = !argv.flag?('use-libraries')
+          @use_modular_headers = argv.flag?('use-modular-headers', false)
+          @use_static_frameworks = argv.flag?('use-static-frameworks')
+          @private = argv.flag?('private', true)
+          @message = argv.option('commit-message')
+          @commit_message = argv.flag?('commit-message', false)
+          @use_json = argv.flag?('use-json')
+          @swift_version = argv.option('swift-version', nil)
+          @skip_import_validation = argv.flag?('skip-import-validation', false)
+          @skip_tests = argv.flag?('skip-tests', false)
+          @allow_overwrite = argv.flag?('overwrite', true)
+          super
+        end
+
+        # Performs a full lint against the podspecs.
+        #
+        def validate_podspec_files
+          UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow
+          podspec_files.each do |podspec|
+            validator = Validator.new(podspec, @source_urls)
+            validator.allow_warnings = @allow_warnings
+            validator.use_frameworks = @use_frameworks
+            validator.use_static_frameworks = @use_static_frameworks
+            validator.use_modular_headers = @use_modular_headers
+            validator.ignore_public_only_results = @private
+            validator.swift_version = @swift_version
+            validator.skip_import_validation = @skip_import_validation
+            validator.skip_tests = @skip_tests
+            begin
+              validator.validate
+            rescue => e
+              raise Informative, "The `#{podspec}` specification does not validate." \
+                                 "\n\n#{e.message}"
+            end
+            raise Informative, "The `#{podspec}` specification does not validate." unless validator.validated?
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -12,12 +12,13 @@ if Pod.match_version?('~> 1.4')
   require 'cocoapods-bb-bin/native/linter'
   require 'cocoapods-bb-bin/native/resolver'
   require 'cocoapods-bb-bin/native/source'
-  require 'cocoapods-bb-bin/native/validator'
+  # require 'cocoapods-bb-bin/native/validator' #移除使用cocoapods默认自带
   require 'cocoapods-bb-bin/native/acknowledgements'
   require 'cocoapods-bb-bin/native/sandbox_analyzer'
   require 'cocoapods-bb-bin/native/podspec_finder'
   require 'cocoapods-bb-bin/native/file_accessor'
   require 'cocoapods-bb-bin/native/pod_target_installer'
   require 'cocoapods-bb-bin/native/target_validator'
+  require 'cocoapods-bb-bin/native/push' # 支持modulemap & swift与oc工程混编
 
 end

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

@@ -6,7 +6,7 @@ Pod::HooksManager.register('cocoapods-bb-bin', :pre_install) do |_context, _|
   require 'cocoapods-bb-bin/native'
 
   #pod bin update || install  不走这里
-  if $ARGV[1] = 'update' || $ARGV[1] != 'install'
+  if $ARGV[1] == 'update' || $ARGV[1] != 'install'
 
   else
     # pod bin repo update 更新二进制私有源

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.8
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -62,6 +62,9 @@ dependencies:
   name: cocoapods-bb-xcframework
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -69,6 +72,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -122,9 +128,9 @@ 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/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/spec/push.rb
 - lib/cocoapods-bb-bin/command/bin/update.rb
 - lib/cocoapods-bb-bin/config/config.rb
 - lib/cocoapods-bb-bin/config/config_asker.rb
@@ -160,13 +166,13 @@ files:
 - lib/cocoapods-bb-bin/native/podfile_env.rb
 - lib/cocoapods-bb-bin/native/podfile_generator.rb
 - lib/cocoapods-bb-bin/native/podspec_finder.rb
+- lib/cocoapods-bb-bin/native/push.rb
 - lib/cocoapods-bb-bin/native/resolver.rb
 - lib/cocoapods-bb-bin/native/sandbox_analyzer.rb
 - lib/cocoapods-bb-bin/native/source.rb
 - lib/cocoapods-bb-bin/native/sources_manager.rb
 - lib/cocoapods-bb-bin/native/specification.rb
 - lib/cocoapods-bb-bin/native/target_validator.rb
-- lib/cocoapods-bb-bin/native/validator.rb
 - lib/cocoapods-bb-bin/source_provider_hook.rb
 - lib/cocoapods_plugin.rb
 - spec/command/bin_spec.rb
@@ -190,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between

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

@@ -1,114 +0,0 @@
-require 'cocoapods-bb-bin/config/config'
-require 'cocoapods-bb-bin/native/podfile'
-
-module Pod
-  class Command
-    class Bin < Command
-      class Repo < Bin
-        class Push < Repo
-          self.summary = '发布组件.'
-          self.description = <<-DESC
-            发布二进制组件 / 源码组件
-          DESC
-
-          self.arguments = [
-            CLAide::Argument.new('NAME.podspec', false)
-          ]
-
-          def self.options
-            [
-              ['--binary', '发布组件的二进制版本'],
-              ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
-              ['--reserve-created-spec', '保留生成的二进制 spec 文件'],
-              ['--code-dependencies', '使用源码依赖进行 lint'],
-              ['--loose-options', '添加宽松的 options, 包括 --use-libraries (可能会造成 entry point (start) undefined)'],
-              ['--allow-prerelease', '允许使用 prerelease 的版本 lint']
-            ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
-          end
-
-          def initialize(argv)
-            @podspec = argv.shift_argument
-            @binary = argv.flag?('binary')
-            @loose_options = argv.flag?('loose-options')
-            @code_dependencies = argv.flag?('code-dependencies')
-            @sources = argv.option('sources') || []
-            @reserve_created_spec = argv.flag?('reserve-created-spec')
-            @template_podspec = argv.option('template-podspec')
-            @allow_prerelease = argv.flag?('allow-prerelease')
-            super
-
-            @additional_args = argv.remainder!
-          end
-
-          def run
-            Podfile.execute_with_bin_plugin do
-              Podfile.execute_with_allow_prerelease(@allow_prerelease) do
-                Podfile.execute_with_use_binaries(!@code_dependencies) do
-                  argvs = [
-                    repo,
-                    "--sources=#{sources_option(@code_dependencies, @sources)}",
-                    *@additional_args
-                  ]
-
-                  argvs << spec_file if spec_file
-
-                  if @loose_options
-                    argvs += ['--allow-warnings', '--use-json']
-                    if code_spec&.all_dependencies&.any?
-                      argvs << '--use-libraries'
-                    end
-                  end
-
-                  push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
-                  push.validate!
-                  push.run
-                end
-              end
-            end
-          ensure
-            clear_binary_spec_file_if_needed unless @reserve_created_spec
-          end
-
-          private
-
-          def template_spec_file
-            @template_spec_file ||= begin
-              if @template_podspec
-                find_spec_file(@template_podspec)
-              else
-                binary_template_spec_file
-              end
-            end
-          end
-
-          def spec_file
-            @spec_file ||= begin
-              if @podspec
-                find_spec_file(@podspec)
-              else
-                if code_spec_files.empty?
-                  raise Informative, '当前目录下没有找到可用源码 podspec.'
-                end
-
-                spec_file = if @binary
-                              code_spec = Pod::Specification.from_file(code_spec_files.first)
-                              if template_spec_file
-                                template_spec = Pod::Specification.from_file(template_spec_file)
-                              end
-                              create_binary_spec_file(code_spec, template_spec)
-                            else
-                              code_spec_files.first
-                            end
-                spec_file
-              end
-            end
-          end
-
-          def repo
-            @binary ? binary_source.name : code_source.name
-          end
-        end
-      end
-    end
-  end
-end

data/lib/cocoapods-bb-bin/native/validator.rb

@@ -1,40 +0,0 @@
-
-
-module Pod
-  class Validator
-    # def validate_source_url(spec)
-    #   return if spec.source.nil? || spec.source[:http].nil?
-    #   url = URI(spec.source[:http])
-    #   return if url.scheme == 'https' || url.scheme == 'file'
-    #   warning('http', "The URL (`#{url}`) doesn't use the encrypted HTTPs protocol. " \
-    #           'It is crucial for Pods to be transferred over a secure protocol to protect your users from man-in-the-middle attacks. '\
-    #           'This will be an error in future releases. Please update the URL to use https.')
-    # end
-    #
-    # Perform analysis for a given spec (or subspec)
-    #
-    def perform_extensive_analysis(spec)
-      return true
-    end
-
-    #覆盖
-    def check_file_patterns
-      FILE_PATTERNS.each do |attr_name|
-        next if %i(source_files resources).include? attr_name
-          if respond_to?("_validate_#{attr_name}", true)
-            send("_validate_#{attr_name}")
-          else
-            validate_nonempty_patterns(attr_name, :error)
-          end
-      end
-
-      _validate_header_mappings_dir
-      if consumer.spec.root?
-        _validate_license
-        _validate_module_map
-      end
-    end
-
-    def validate_source_url(spec); end
-  end
-end