cocoapods-bb-bin 0.1.9.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 421565cc472d283f9e146259dc55a04d59f47ea257971c5ed08c0c91a20f8103
-  data.tar.gz: 6fd6c9755d9dc3277a9f055e38dac34edee2ed1f2a827d454558be14c8a78668
+  metadata.gz: 9c3db228010949a3ee9a1029358a1ed29026a1e2ac100ea2eae52afe9a0c0843
+  data.tar.gz: cf85159135d5e2f16a6cd025cc1bbcfce786becf639e239ed832145cc62d91aa
 SHA512:
-  metadata.gz: 48b8836abd60d88e82321a1843964ccda27ff364a09f8f5b56b4ecd2b56b6d0735b07fa561954411534fd2d93338db0b34009764eb382f0b1794ae7781a16d69
-  data.tar.gz: 41233c856e3922cb85ac445219b14021670b10516fc8b2292e1326648ca842857081e27bce96c36bc61c242408a51d89e5876315476687985d67a12f745baff1
+  metadata.gz: 39a6e327cd12a99f317da290936820af7e680ecc5f29032fc3669a1059e54d3516091bf1c526b5239eb933784029d4fe1412e874460a77f997c94c9f2d7d2154
+  data.tar.gz: 072b9c4c9f0d2dad89cd20b5b77d987ed42d2a977b1f60b4d95ce79ee43af9aeb636f9e550d25799a30a1444b696740cec769e09cbb39a2be611dc74fb6387ff

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

@@ -21,7 +21,8 @@ module Pod
               ['--no-zip', '不压缩静态 framework 为 zip'],
               ['--all-make', '对该组件的依赖库，全部制作为二进制组件'],
               ['--configuration', 'Build the specified configuration (e.g. Release ). Defaults to Debug'],
-              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"]
+              ['--env', "该组件上传的环境 %w[dev debug_iphoneos release_iphoneos]"],
+              ['--all-push', '上传二进制同时，允许同时推送源码索引'],
           ].concat(Pod::Command::Gen.options).concat(super).uniq
         end
 
@@ -40,6 +41,7 @@ module Pod
             @allow_prerelease = argv.flag?('allow-prerelease')
             @framework_output = argv.flag?('framework-output', false )
             @xcframework_output = argv.flag?('xcframework-output', false )
+            @pushsourcespec = argv.flag?('all-push', false )
             @clean = argv.flag?('clean', true)
             @zip = argv.flag?('zip', true)
             @all_make = argv.flag?('all-make', false )
@@ -64,7 +66,7 @@ module Pod
           fail_push_specs = []
           sources_sepc.uniq.each do |spec|
             begin
-              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources).upload
+              fail_push_specs << spec unless CBin::Upload::Helper.new(spec,@code_dependencies,@sources,@pushsourcespec).upload
             rescue  Object => exception
               UI.puts exception
               fail_push_specs << spec
@@ -84,7 +86,6 @@ module Pod
               auto_success += "#{spec.name} | #{spec.version}\n"
               UI.warn "===【 #{spec.name} | #{spec.version} 】二进制组件制作完成 ！！！ "
             end
-            puts "==============  auto_success"
             puts auto_success
             ENV['auto_success'] = auto_success
           end

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

@@ -31,7 +31,6 @@ module Pod
           end
 
           def initialize(argv)
-            super
             @repo = argv.shift_argument
             @podspec = argv.shift_argument
             @binary = argv.flag?('binary')
@@ -43,13 +42,8 @@ module Pod
             @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
@@ -110,13 +104,12 @@ module Pod
                   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
@@ -124,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.9.1'
+  VERSION = '0.2.1'
 end
 
 module Pod

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

@@ -43,15 +43,24 @@ module CBin
         end
 
         @filename = file
+        # Pod::UI::puts "===copy origin file: #{file}"
+        # Pod::UI::puts "===copy desc file: #{sourceSpecFilePath}"
+        # 拷贝二进制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
+        @sourcefilename ||= "#{CBin::Config::Builder.instance.binary_json_dir_name}/#{spec.name}.podspec.json"
+      end
 
       private
 

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

@@ -15,10 +15,11 @@ module CBin
     class Helper
       include CBin::SourcesHelper
 
-      def initialize(spec,code_dependencies,sources)
+      def initialize(spec,code_dependencies,sources, pushsourcespec = false)
         @spec = spec
         @code_dependencies = code_dependencies
         @sources = sources
+        @pushsourcespec = pushsourcespec # 推送源码
       end
 
       def upload
@@ -29,7 +30,13 @@ module CBin
           res_zip = curl_zip
           if res_zip
             filename = spec_creator
+            Pod::UI.message "上传二进制 podspec: #{filename}"
             push_binary_repo(filename)
+            # 上传源码 podspec
+            if @pushsourcespec
+              Pod::UI.message "上传源码 podspec: #{@spec_creator.sourceSpecFilePath}"
+              push_source_repo(@spec_creator.sourceSpecFilePath)
+            end
           end
           res_zip
         end
@@ -37,6 +44,7 @@ module CBin
 
       def spec_creator
         spec_creator = CBin::SpecificationSource::Creator.new(@spec)
+        @spec_creator = spec_creator
         spec_creator.create
         spec_creator.write_spec_file
         spec_creator.filename
@@ -76,22 +84,44 @@ EOF
             "#{binary_source.name}",  # repo
             "#{binary_podsepc_json}", # spec
             "--binary",
-            "--sources=#{sources_option(@code_dependencies, @sources)},https:\/\/cdn.cocoapods.org",
+            "--sources=#{binary_source},https:\/\/cdn.cocoapods.org",
             "--skip-import-validation",
             "--use-libraries",
             "--allow-warnings",
             "--verbose",
-            "--code-dependencies"
+            "--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/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/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.9.1
+  version: 0.2.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-04-02 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