cocoapods-bb-bin 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0b3904ae69693b6a4e16d57411ad5593eb0a1631a59481fc438dd608173c91
-  data.tar.gz: a6e88bbb26fe868817172d8bcfc695180833a2c56a456187e32f8b4fadb23b40
+  metadata.gz: d6bfe1244ff7ee292516ac3f497b988ccfcc7db6cbed08617ec46dc2af558886
+  data.tar.gz: 036b33803b77ebd6281ebe98639100fc8bb92c20f7448faec758a42ea2706e82
 SHA512:
-  metadata.gz: 9850aca45f033aba865d7f5aaca8b266c9ab158b27073a08fc11f035227f6b1b83e50903c1672c8141f2f2ec53beaa8b47c61c759852f78ceca8a29e06d56e59
-  data.tar.gz: 27d5e05acad74ff8173460a507ddcba00c7d61f8eb00fac82e3ab8db10233a631485bee04f2186c72550c2dc2644c1a6ff44b263a899bf029a4515b5bc8005f0
+  metadata.gz: 4b3e12f0e1f5fac44c4fe96315838254ad4cb69b083c224d46a13782fad2537d78c73c88a0dffd6dda7f59e69c9183160a9d67fe9815f1e4fbc6f7187769b1e6
+  data.tar.gz: 5d7e079146176eb2c0a9b68e4d2f68cf47286acb5d5a8dd8c81f4bb1a655c29a8981fb1bf6b322ebc47f067fa097aef4bce517b79cc8e276e66464ded1993b73

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/gem_version.rb

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

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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -128,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
@@ -166,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

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