cocoapods-bb-bin 0.1.8 → 0.1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6bfe1244ff7ee292516ac3f497b988ccfcc7db6cbed08617ec46dc2af558886
-  data.tar.gz: 036b33803b77ebd6281ebe98639100fc8bb92c20f7448faec758a42ea2706e82
+  metadata.gz: 3ed14a53820238e12852776bab7bbd9229b2dae2fc38a78b41c4998dbcc58261
+  data.tar.gz: 0bb09aed068cafaa633dd1bc0d84a545f5c2e0ccea091833b01ce04bc7e69780
 SHA512:
-  metadata.gz: 4b3e12f0e1f5fac44c4fe96315838254ad4cb69b083c224d46a13782fad2537d78c73c88a0dffd6dda7f59e69c9183160a9d67fe9815f1e4fbc6f7187769b1e6
-  data.tar.gz: 5d7e079146176eb2c0a9b68e4d2f68cf47286acb5d5a8dd8c81f4bb1a655c29a8981fb1bf6b322ebc47f067fa097aef4bce517b79cc8e276e66464ded1993b73
+  metadata.gz: c3491aafbd2c3aca48bdf526a861b491b67e4dcd544cf2d39c9215b98e366fda139aed77f93000d4b821c5b778b91de5acb5a25a9d91ac6e531fffb635df89e5
+  data.tar.gz: a5cf6d9fcb8f22206d9951cd7bb15e611c7b1c38efe1ab8665ca1ad1af8431913776a0ee7c049ac5d81e7013c361cb29303811c5f1615fa89db75b1498d02f06

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

@@ -32,7 +32,7 @@ module Pod
             @env = argv.option('env') || 'dev'
             CBin.config.set_configuration_env(@env)
   
-            podfile_path = link_podfile # 创建软链接
+            # podfile_path = link_podfile # 创建软链接 去除link操作 by hm 21/11/24
             @podspec = argv.shift_argument || find_podspec
             @specification = Specification.from_file(@podspec)
   

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

@@ -109,6 +109,7 @@ module Pod
                   '--skip-import-validation',
                   '--use-modular-headers',
                   '--swift-version=5.0',
+                  '--use_cocoapods_validator', #cocoapods验证
                   *@additional_args
                 ]
                 argvs += ['--verbose'] if @verbose

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

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

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

@@ -27,14 +27,15 @@ module Pod
           @skip_tests = argv.flag?('skip-tests', false)
           @allow_overwrite = argv.flag?('overwrite', true)
           super
+          @use_cocoapods_validator = argv.flag?('use_cocoapods_validator', false)# 配置参数cocoapods进行验证，内部进行hook,二进制hook，源码cocoapods进行验证
         end
 
         # Performs a full lint against the podspecs.
         #
         def validate_podspec_files
-          UI.puts "\nValidating #{'spec'.pluralize(count)}".yellow
+          UI.puts "\nbin Validating #{'spec'.pluralize(count)}".yellow
           podspec_files.each do |podspec|
-            validator = Validator.new(podspec, @source_urls)
+            validator = Validator.new(podspec, @source_urls, [], @use_cocoapods_validator)
             validator.allow_warnings = @allow_warnings
             validator.use_frameworks = @use_frameworks
             validator.use_static_frameworks = @use_static_frameworks

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

@@ -0,0 +1,151 @@
+
+
+module Pod
+  class Validator
+    # @return [Boolean] 使用cocoapods进行验证，二进制库推送默认不采用cocoapods(1.11.2)验证
+    #
+    # attr_accessor :use_cocoapods_validator
+    def initialize(spec_or_path, source_urls, platforms = [], use_cocoapods_validator = false)
+      @use_cocoapods_validator = use_cocoapods_validator
+      @use_frameworks = true
+      @linter = Specification::Linter.new(spec_or_path)
+      @source_urls = if @linter.spec && @linter.spec.dependencies.empty? && @linter.spec.recursive_subspecs.all? { |s| s.dependencies.empty? }
+                       []
+                     else
+                       source_urls.map { |url| config.sources_manager.source_with_name_or_url(url) }.map(&:url)
+                     end
+
+      @platforms = platforms.map do |platform|
+        result =  case platform.to_s.downcase
+                  # Platform doesn't recognize 'macos' as being the same as 'osx' when initializing
+                  when 'macos' then Platform.macos
+                  else Platform.new(platform, nil)
+                  end
+        unless valid_platform?(result)
+          raise Informative, "Unrecognized platform `#{platform}`. Valid platforms: #{VALID_PLATFORMS.join(', ')}"
+        end
+        result
+      end
+      @use_frameworks = true
+    end
+
+    # Perform analysis for a given spec (or subspec)
+    #
+    def perform_extensive_analysis(spec)
+      if @use_cocoapods_validator
+        return cocoapods_perform_extensive_analysis(spec) 
+      end
+      return true
+    end
+
+    #覆盖
+    def check_file_patterns
+      if @use_cocoapods_validator
+        cocoapods_check_file_patterns
+        return
+      end
+      # 二进制验证部分
+      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)
+      if @use_cocoapods_validator
+        cocoapods_validate_source_url(spec)
+        return
+      end
+    end
+
+    # cocoapods(1.11.2) validator源码
+    private
+
+    # It checks that every file pattern specified in a spec yields
+    # at least one file. It requires the pods to be already present
+    # in the current working directory under Pods/spec.name.
+    #
+    # @return [void]
+    #
+    def cocoapods_check_file_patterns
+      FILE_PATTERNS.each do |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
+
+    # Performs validations related to the `source` -> `http` attribute (if exists)
+    #
+    def cocoapods_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 cocoapods_perform_extensive_analysis(spec)
+      if spec.non_library_specification?
+        error('spec', "Validating a non library spec (`#{spec.name}`) is not supported.")
+        return false
+      end
+      validate_homepage(spec)
+      validate_screenshots(spec)
+      validate_social_media_url(spec)
+      validate_documentation_url(spec)
+      validate_source_url(spec)
+
+      platforms = platforms_to_lint(spec)
+
+      valid = platforms.send(fail_fast ? :all? : :each) do |platform|
+        UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
+        @consumer = spec.consumer(platform)
+        setup_validation_environment
+        begin
+          create_app_project
+          download_pod
+          check_file_patterns
+          install_pod
+          validate_swift_version
+          add_app_project_import
+          validate_vendored_dynamic_frameworks
+          build_pod
+          test_pod unless skip_tests
+        ensure
+          tear_down_validation_environment
+        end
+        validated?
+      end
+      return false if fail_fast && !valid
+      perform_extensive_subspec_analysis(spec) unless @no_subspecs
+    rescue => e
+      message = e.to_s
+      message << "\n" << e.backtrace.join("\n") << "\n" if config.verbose?
+      error('unknown', "Encountered an unknown error (#{message}) during validation.")
+      false
+    end
+
+  end
+end

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

@@ -12,7 +12,7 @@ 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' #移除使用cocoapods默认自带
+  require 'cocoapods-bb-bin/native/validator' #使用cocoapods-1.11.2
   require 'cocoapods-bb-bin/native/acknowledgements'
   require 'cocoapods-bb-bin/native/sandbox_analyzer'
   require 'cocoapods-bb-bin/native/podspec_finder'

metadata

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