cocoapods-bb-bin 0.1.8.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ed14a53820238e12852776bab7bbd9229b2dae2fc38a78b41c4998dbcc58261
-  data.tar.gz: 0bb09aed068cafaa633dd1bc0d84a545f5c2e0ccea091833b01ce04bc7e69780
+  metadata.gz: 4926e04b2eaade743939e92c8de3707bdaf3444b06b9515aa45278b63c444df8
+  data.tar.gz: 677d14354d6f11f34a30e956c515f9b9db5040076cdbf2902a71ed9ff3badd65
 SHA512:
-  metadata.gz: c3491aafbd2c3aca48bdf526a861b491b67e4dcd544cf2d39c9215b98e366fda139aed77f93000d4b821c5b778b91de5acb5a25a9d91ac6e531fffb635df89e5
-  data.tar.gz: a5cf6d9fcb8f22206d9951cd7bb15e611c7b1c38efe1ab8665ca1ad1af8431913776a0ee7c049ac5d81e7013c361cb29303811c5f1615fa89db75b1498d02f06
+  metadata.gz: bc1d214967a7056d24836d7162bc5140c771575f1a4f0c59f90b91a47d782ba506069fadb22c35cdf2f4b13a1d6aca9e63595c4c51b068836135a19b30795c0d
+  data.tar.gz: c625ef1d42a31eef96e0f9fc492ddd21066dd59ff35d88a2529f227466ca533cdaf276dbecfe136870abc916e7448fc9dcc381ca958635174b7d8a3785b909ea

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

@@ -38,7 +38,6 @@ module Pod
             @podspec = argv.shift_argument
             super
             @additional_args = argv.remainder!
-            @verbose = argv.flag?('verbose', false)
           end
 
           def run
@@ -109,11 +108,12 @@ module Pod
                   argvs += ['--verbose'] if @verbose
                 end
                 
-                # puts "pod lib lint argvs:#{argvs}"
+                puts "pod bin lib lint argvs:#{argvs}"
                 lint = Pod::Command::Lib::Lint.new(CLAide::ARGV.new(argvs))
                 lint.validate!
                 lint.run
               rescue Object => exception
+                UI.puts "fail....."
                 UI.puts exception
               end
             end

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

@@ -13,7 +13,8 @@ module Pod
           DESC
 
           self.arguments = [
-            CLAide::Argument.new('NAME.podspec', false)
+            CLAide::Argument.new('REPO', true),
+            CLAide::Argument.new('NAME.podspec', false),
           ]
 
           def self.options
@@ -30,6 +31,7 @@ module Pod
           end
 
           def initialize(argv)
+            @repo = argv.shift_argument
             @podspec = argv.shift_argument
             @binary = argv.flag?('binary')
             @loose_options = argv.flag?('loose-options')
@@ -42,11 +44,6 @@ module Pod
             @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
@@ -99,17 +96,20 @@ module Pod
                   end
                   @podspec = podspecs.first
                 end
+                new_repo = repo # 内部判断区源码还是二进制
+                if !@repo.nil?
+                  new_repo = @repo # 使用命令传入
+                end
                 argvs = [
-                  repo, # 内部判断区源码还是二进制
+                  new_repo, 
                   @podspec,
                   "--sources=#{sources_option(@code_dependencies, @sources)}",
-                  # '--verbose'
+                  # '--verbose',
                   '--allow-warnings',
                   '--use-static-frameworks',
                   '--skip-import-validation',
                   '--use-modular-headers',
                   '--swift-version=5.0',
-                  '--use_cocoapods_validator', #cocoapods验证
                   *@additional_args
                 ]
                 argvs += ['--verbose'] if @verbose
@@ -117,7 +117,7 @@ module Pod
                 argvs += ['--use-json'] if @use_json
                 argvs += ['--local-only'] if @local_only
 
-                # UI.puts "pod repo push argvs:#{argvs}"
+                UI.puts "pod bin repo push argvs:#{argvs}"
                 push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
                 push.validate!
                 push.run

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

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

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

@@ -43,15 +43,22 @@ module CBin
         end
 
         @filename = file
+        # 拷贝二进制spec到源码spec by hm 22/1/19
+        `cp -fa #{file} #{sourceSpecFilePath}` 
       end
 
       def clear_spec_file
         File.delete(filename) if File.exist?(filename)
       end
 
+      # 二进制spec路径
       def filename
         @filename ||= "#{CBin::Config::Builder.instance.binary_json_dir_name}/#{spec.name}.binary.podspec.json"
       end
+      # 源码spec路径（指向二进制库）
+      def sourceSpecFilePath
+        @filename ||= "#{CBin::Config::Builder.instance.binary_json_dir_name}/#{spec.name}.podspec.json"
+      end
 
       private
 

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

@@ -73,14 +73,16 @@ EOF
       # 上传二进制 podspec
       def push_binary_repo(binary_podsepc_json)
         argvs = [
-            "#{binary_podsepc_json}",
+            "#{binary_source.name}",  # repo
+            "#{binary_podsepc_json}", # spec
             "--binary",
             "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",
             "--verbose",
-            "--code-dependencies"
+            "--code-dependencies",
+            '--no-cocoapods-validator', #不采用cocoapods验证
         ]
         if @verbose
           argvs += ['--verbose']

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

@@ -15,18 +15,16 @@ module Pod
     class PodfileGenerator
       # @return [Podfile] a podfile suitable for installing the given spec
       #
-      # @param  [Specification] spec
+      # @param  [Array<Specification>] specs
       #
-      alias old_podfile_for_spec podfile_for_spec
-
-      def podfile_for_spec(spec)
+      def podfile_for_specs(specs)
         generator = self
-        dir = configuration.gen_dir_for_pod(spec.name)
-        project_name = configuration.project_name_for_spec(spec)
+        dir = configuration.gen_dir_for_specs(specs)
+        project_name = configuration.project_name_for_specs(specs)
 
         Pod::Podfile.new do
           project "#{project_name}.xcodeproj"
-          workspace "#{spec.name}.xcworkspace"
+          workspace "#{project_name}.xcworkspace"
 
           plugin 'cocoapods-generate'
 
@@ -35,8 +33,8 @@ 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?)
+
+          use_frameworks!(generator.use_frameworks_value)
 
           if (supported_swift_versions = generator.supported_swift_versions)
             supports_swift_versions(supported_swift_versions)
@@ -49,44 +47,51 @@ module Pod
 
           self.defined_in_file = dir.join('CocoaPods.podfile.yaml')
 
-          test_specs = spec.recursive_subspecs.select(&:test_specification?)
-          app_specs = if spec.respond_to?(:app_specification?)
-                        spec.recursive_subspecs.select(&:app_specification?)
-                      else
-                        []
-                      end
+          test_specs_by_spec = Hash[specs.map do |spec|
+            [spec, spec.recursive_subspecs.select(&:test_specification?)]
+          end]
+          app_specs_by_spec = Hash[specs.map do |spec|
+            app_specs = if spec.respond_to?(:app_specification?)
+                          spec.recursive_subspecs.select(&:app_specification?)
+                        else
+                          []
+                        end
+            [spec, app_specs]
+          end]
 
           # Stick all of the transitive dependencies in an abstract target.
           # This allows us to force CocoaPods to use the versions / sources / external sources
           # that we want.
-          # By using an abstract target,
-
+          
           # 会导致多个dependencies出现， 注释by slj
           # abstract_target 'Transitive Dependencies' do
-          #   pods_for_transitive_dependencies = [spec.name]
-          #                                          .concat(test_specs.map(&:name))
-          #                                          .concat(test_specs.flat_map { |ts| ts.dependencies.flat_map(&:name) })
-          #                                          .concat(app_specs.map(&:name))
-          #                                          .concat(app_specs.flat_map { |as| as.dependencies.flat_map(&:name) })
-          #
+          #   pods_for_transitive_dependencies = specs.flat_map do |spec|
+          #     [spec.name]
+          #       .concat(test_specs_by_spec.keys.map(&:name))
+          #       .concat(test_specs_by_spec.values.flatten.flat_map { |ts| ts.dependencies.flat_map(&:name) })
+          #       .concat(app_specs_by_spec.keys.map(&:name))
+          #       .concat(app_specs_by_spec.values.flatten.flat_map { |as| as.dependencies.flat_map(&:name) })
+          #   end
+          #   pods_for_transitive_dependencies.uniq!
+
+          #   spec_names = specs.map { |s| s.root.name }.to_set
           #   dependencies = generator
-          #                      .transitive_dependencies_by_pod
-          #                      .values_at(*pods_for_transitive_dependencies)
-          #                      .compact
-          #                      .flatten(1)
-          #                      .uniq
-          #                      .sort_by(&:name)
-          #                      .reject { |d| d.root_name == spec.root.name }
-          #
+          #                  .transitive_dependencies_by_pod
+          #                  .values_at(*pods_for_transitive_dependencies)
+          #                  .compact
+          #                  .flatten(1)
+          #                  .uniq
+          #                  .sort_by(&:name)
+          #                  .reject { |d| spec_names.include?(d.root_name) }
+
           #   dependencies.each do |dependency|
           #     pod_args = generator.pod_args_for_dependency(self, dependency)
           #     pod(*pod_args)
           #   end
           # end
 
-          # Add platform-specific concrete targets that inherit the
-          # `pod` declaration for the local pod.
-          spec_platform_names = spec.available_platforms.map(&:string_name).flatten.each.reject do |platform_name|
+          # Add platform-specific concrete targets that inherit the `pod` declaration for the local pod.
+          spec_platform_names = specs.flat_map { |s| s.available_platforms.map(&:string_name) }.uniq.each.reject do |platform_name|
             !generator.configuration.platforms.nil? && !generator.configuration.platforms.include?(platform_name.downcase)
           end
 
@@ -98,8 +103,16 @@ module Pod
 
           # this block has to come _before_ inhibit_all_warnings! / use_modular_headers!,
           # and the local `pod` declaration
-          # 会导致多个dependencies出现， 注释by slj
-
+          # current_target_definition.instance_exec do
+          #   transitive_dependencies = children.find { |c| c.name == 'Transitive Dependencies' }
+
+          #   %w[use_modular_headers inhibit_warnings].each do |key|
+          #     Pod::UI::puts "====key:#{key} value:#{value}"
+          #     value = transitive_dependencies.send(:internal_hash).delete(key)
+          #     next if value.blank?
+          #     set_hash_value(key, value)
+          #   end
+          # end
 
           inhibit_all_warnings! if generator.inhibit_all_warnings?
           # use_modular_headers! if generator.use_modular_headers?
@@ -112,15 +125,18 @@ module Pod
             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
-          { 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
+          specs.each do |spec|
+            # 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 spec.name, **pod_options
+            path = spec.defined_in_file.relative_path_from(dir).to_s
+            pod_options[:path] = path
+            { testspecs: test_specs_by_spec[spec], appspecs: app_specs_by_spec[spec] }.each do |key, subspecs|
+              pod_options[key] = subspecs.map { |s| s.name.sub(%r{^#{Regexp.escape spec.root.name}/}, '') }.sort unless subspecs.blank?
+            end
+            pod spec.name, **pod_options
+          end
 
           if Pod::Config.instance.podfile
             target_definitions['Pods'].instance_exec do
@@ -187,14 +203,16 @@ module Pod
 
           # Implement local-sources option to set up dependencies to podspecs in the local filesystem.
           next if generator.configuration.local_sources.empty?
-          generator.transitive_local_dependencies(spec, generator.configuration.local_sources).each do |dependency, podspec_file|
-            pod_options = generator.dependency_compilation_kwargs(dependency.name)
-            pod_options[:path] = if podspec_file[0] == '/' # absolute path
-                                   podspec_file
-                                 else
-                                   '../../' + podspec_file
-                                 end
-            pod dependency.name, **pod_options
+          specs.each do |spec|
+            generator.transitive_local_dependencies(spec, generator.configuration.local_sources).sort_by(&:first).each do |dependency, podspec_file|
+              pod_options = generator.dependency_compilation_kwargs(dependency.name)
+              pod_options[:path] = if podspec_file[0] == '/' # absolute path
+                                     podspec_file
+                                   else
+                                     '../../' + podspec_file
+                                   end
+              pod dependency.name, **pod_options
+            end
           end
         end
       end

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

@@ -27,7 +27,7 @@ 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进行验证
+          @use_cocoapods_validator = argv.flag?('cocoapods-validator', true)# 配置参数cocoapods进行验证，内部进行hook,二进制hook，源码cocoapods进行验证
         end
 
         # Performs a full lint against the podspecs.

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

@@ -126,8 +126,8 @@ module Pod
             source = use_binary ? sources_manager.binary_source : sources_manager.code_source
 
             spec_version = rspec.spec.version
-            UI.message 'cocoapods-bb-bin 插件'
-            UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
+            # UI.message 'cocoapods-bb-bin 插件'
+            # UI.message "- 开始处理 #{rspec.spec.name} #{spec_version} 组件."
 
             begin
               # 从新 source 中获取 spec,在bin archive中会异常，因为找不到

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

@@ -5,8 +5,9 @@ module Pod
     # @return [Boolean] 使用cocoapods进行验证，二进制库推送默认不采用cocoapods(1.11.2)验证
     #
     # attr_accessor :use_cocoapods_validator
-    def initialize(spec_or_path, source_urls, platforms = [], use_cocoapods_validator = false)
+    def initialize(spec_or_path, source_urls, platforms = [], use_cocoapods_validator = true)
       @use_cocoapods_validator = use_cocoapods_validator
+      UI.puts "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? }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-bin
 version: !ruby/object:Gem::Version
-  version: 0.1.8.1
+  version: 0.2.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -48,16 +48,22 @@ dependencies:
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: cocoapods-bb-xcframework
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.30
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: cocoapods-bb-bin is a plugin which helps develpers switching pods between