cocoapods-tj 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c19499045bd3ffc6d5560615fe275c5536fc77edf473287d4b4083c762bd844
-  data.tar.gz: 1d537197c9fc98673efe6ac66ff8c18cced37e8fdf7accdbf4cc3aca58483a24
+  metadata.gz: 9b193a6c5aed30e2c45bbd8e398530bd1da8d7db9b681d69bbb2fdef1c3231be
+  data.tar.gz: 3123030cefc773344aa59231faa1750b2b7877124c17302ab2098d4622a87e69
 SHA512:
-  metadata.gz: d1b62da32595d65aa008cdd51ea697f995e7aaff6339aca35d27fc0aa8aa4ccff021d82f01306df463e0c7f29137f1e298b875bf3ecc165552669ea8524450a4
-  data.tar.gz: 2bea39604bc3dacd09306f22348e3910aab2bd1a584ab31371594c412b377f111bd6a59496879b1395b7ca0b4e4ebd3888748f07d5deb805627728390bb2de70
+  metadata.gz: 8113752741960702b582e48c83434385fdb93fd7f9daa814d1db726588f9acd1fb4473fc31f285645f3938bfc6f4bfd7da81192324481e498ced46d05a085391
+  data.tar.gz: f47235caa4e106f9305b88c26c445bcf059de3f4638a980d500dd98440a4d4095ff125a3e2111fb2dbbf3f60847944189d640d50415689f238fc95055d6257cd

data/lib/cocoapods-tj/command/bin/spec/create.rb

@@ -14,12 +14,14 @@ module Pod
             [
               ['--platforms=ios', '生成二进制 spec 支持的平台'],
               ['--template-podspec=A.binary-template.podspec', '生成拥有 subspec 的二进制 spec 需要的模版 podspec, 插件会更改 version 和 source'],
-              ['--no-overwrite', '不允许覆盖']
+              ['--no-overwrite', '不允许覆盖'],
+              ['--binary_source', '生成的二进制podspec的source地址']
             ].concat(super)
           end
 
           def initialize(argv)
             @platforms = argv.option('platforms', 'ios')
+            @binary_source = argv.option('binary_source', '')
             @allow_overwrite = argv.flag?('overwrite', true)
             @template_podspec = argv.option('template-podspec')
             @podspec = argv.shift_argument
@@ -34,7 +36,7 @@ module Pod
 
             if binary_spec && !@allow_overwrite
             else
-              spec_file = create_binary_spec_file(code_spec, template_spec)
+              spec_file = create_binary_spec_file(code_spec,@binary_source, template_spec)
             end
           end
 

data/lib/cocoapods-tj/command/bin.rb

@@ -8,7 +8,7 @@ require 'cocoapods-tj/command/bin/local'
 require 'cocoapods-tj/command/bin/update'
 require 'cocoapods-tj/command/bin/install'
 require 'cocoapods-tj/command/bin/imy'
-
+require 'cocoapods-tj/command/bin/spec/create'
 require 'cocoapods-tj/helpers'
 
 module Pod

data/lib/cocoapods-tj/gem_version.rb

@@ -1,6 +1,6 @@
 
 module CBin
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end
 
 module Pod

data/lib/cocoapods-tj/helpers/spec_creator.rb

@@ -7,11 +7,13 @@ module CBin
   class Specification
     class Creator
       attr_reader :code_spec
+      attr_reader :binary_source #二进制仓库地址
       attr_reader :template_spec
       attr_reader :spec
 
-      def initialize(code_spec, template_spec, platforms = 'ios')
+      def initialize(code_spec, binary_source, template_spec, platforms = 'ios')
         @code_spec = code_spec
+        @binary_source = binary_source
         @template_spec = template_spec
         @platforms = Array(platforms)
         validate!
@@ -50,7 +52,7 @@ module CBin
       end
 
       def filename
-        @filename ||= "#{spec.name}.binary.podspec.json"
+        @filename ||= "#{spec.name}.podspec.json"
       end
 
       private
@@ -67,7 +69,7 @@ module CBin
           extnames += code_spec_consumer.resources.map { |r| File.basename(r) }
         end
         if extnames.any?
-          @spec.resources = framework_contents('Resources').flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
+          @spec.resources = framework_contents_root().flat_map { |r| extnames.map { |e| "#{r}/#{e}" } }
         end
 
         # Source Location
@@ -85,7 +87,7 @@ module CBin
         spec_hash.delete('preserve_paths')
 
         spec_hash.delete('vendored_libraries')
-        spec_hash['vendored_libraries'] = binary_vendored_libraries
+        # spec_hash['vendored_libraries'] = binary_vendored_libraries
 
 
         platforms = spec_hash['platforms']
@@ -104,7 +106,7 @@ module CBin
 
         @spec.source_files = binary_source_files
         @spec.public_header_files = binary_public_header_files
-        @spec.vendored_libraries = binary_vendored_libraries
+        # @spec.vendored_libraries = binary_vendored_libraries
 
         @spec.resources = binary_resources if @spec.attributes_hash.keys.include?("resources")
 
@@ -114,7 +116,7 @@ module CBin
       end
 
       def binary_source
-        { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
+        { git: @binary_source, tag:code_spec.version  }
       end
 
       def code_spec_consumer(_platform = :ios)
@@ -125,6 +127,10 @@ module CBin
         ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"].map { |path| "#{path}/#{name}" }
       end
 
+      def framework_contents_root()
+        ["#{code_spec.root.name}.framework", "#{code_spec.root.name}.framework/Versions/A"]
+      end
+
       def binary_source_files
         { http: format(CBin.config.binary_download_url, code_spec.root.name, code_spec.version), type: CBin.config.download_file_type }
       end

data/lib/cocoapods-tj/helpers/spec_files_helper.rb

@@ -14,7 +14,7 @@ module CBin
     end
 
     def binary_template_spec_files
-      @binary_spec_template_files ||= Pathname.glob('*.binary-template.podspec{,.json}')
+      @binary_spec_template_files ||= Pathname.glob('*.template.podspec{,.json}')
     end
 
     def binary_template_spec_file
@@ -50,7 +50,7 @@ module CBin
       path
     end
 
-    def create_binary_spec_file(code_spec, template_spec)
+    def create_binary_spec_file(code_spec,binary_source,template_spec)
 
 
       unless code_spec
@@ -60,7 +60,7 @@ module CBin
         raise Pod::Informative, '拥有 subspec 的组件，在生成二进制 podspec 时，必须要提供模版 podspec.'
      end
 
-      @spec_creator = CBin::Specification::Creator.new(code_spec, template_spec)
+      @spec_creator = CBin::Specification::Creator.new(code_spec, binary_source , template_spec)
       @spec_creator.create
       @spec_creator.write_spec_file
       @spec_creator.filename

data/lib/cocoapods-tj/native/pod_source_installer.rb

@@ -5,14 +5,14 @@ require 'cocoapods-tj/native/installation_options'
 module Pod
   class Installer
     class PodSourceInstaller
-      attr_accessor :installation_options
+      # attr_accessor :installation_options
 
-      alias old_verify_source_is_secure verify_source_is_secure
-      def verify_source_is_secure(root_spec)
-        if installation_options.warn_for_unsecure_source?
-          old_verify_source_is_secure(root_spec)
-        end
-      end
+      # alias old_verify_source_is_secure verify_source_is_secure
+      # def verify_source_is_secure(root_spec)
+      #   if installation_options.warn_for_unsecure_source?
+      #     old_verify_source_is_secure(root_spec)
+      #   end
+      # end
     end
   end
 end

data/lib/cocoapods-tj/native/podfile_generator.rb

@@ -11,7 +11,7 @@ require 'cocoapods'
 module Pod
   module Generate
     class PodfileGenerator
-      alias old_podfile_for_spec podfile_for_spec
+      # alias old_podfile_for_spec podfile_for_spec
 
       def podfile_for_spec(spec)
         generator = self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-tj
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - song
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-27 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel