cocoapods-mtxx-bin 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18fc57de2d08c49e956f598907f2ff443b8fa45d678f3efe4d283f7b1e5d06a
-  data.tar.gz: 236bb2f1d892cc19704ca68c821e9953fd000f98e55bf54c6eb12de47af02fd6
+  metadata.gz: 689e939141bc2513daab20d64c674a0b30494d9d1112119bd7314c295cd3111c
+  data.tar.gz: 9985c74c4ee328babe08b8071053bd60726ed5e8a591a070c6c513e4e5beb444
 SHA512:
-  metadata.gz: f0e563796e362c9c8980a9d7ac161dfc38667bd4feddbab330de53b58a69c89868098abf69a8d5fb164c02bd7afcd888f1a8df456a57ca95d8323deec2e56599
-  data.tar.gz: bd6017ec3927a02aae59bd02a78fa488e14bd4a481b1e4b20dced50b74ef7d71f96b1fcd4d97794dabc52a4f1347208e7b81ac59d30cc5e0b91f7e7e33fa89c7
+  metadata.gz: 2303bcbeb7703f42dcd5fefe29e74f3bc5a289e3a0568dbfa47386a54675d80f4ac78675dd317b277b73a14a48d50a5580b598afb02da6442017f7f4de266b9a
+  data.tar.gz: cbc7e1a3fefdfc9a2c02c3230b5c773c9045d99f67a3282bd6190a8439fe6d853a77fa8db04cd73c7a9680967e4f06d77dc8fc97a892defdd38880dda78cbdcd

data/lib/cocoapods-mtxx-bin/command/bin/buildAll.rb

@@ -2,6 +2,7 @@ require 'cocoapods-mtxx-bin/helpers/buildAll/builder'
 require 'cocoapods-mtxx-bin/helpers/buildAll/podspec_util'
 require 'cocoapods-mtxx-bin/helpers/buildAll/zip_file_helper'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
 require 'yaml'
 require 'digest'
 
@@ -71,7 +72,7 @@ module Pod
         # 读取配置文件
         def read_config
           UI.title "Read config from file `BinConfig.yaml`".green do
-            config_file = File.join(Dir.pwd, 'BinConfig.yaml')
+            config_file = File.join(CBin.config.binary_dir, 'BinConfig.yaml')
             return unless File.exist?(config_file)
             config = YAML.load(File.open(config_file))
             return if config.nil?

data/lib/cocoapods-mtxx-bin/command/bin/init.rb

@@ -11,7 +11,7 @@ module Pod
 
         def self.options
           [
-            ['--bin-url=URL', '配置文件地址，直接从此地址下载配置文件'],
+            %w[--bin-url=URL 配置文件地址，直接从此地址下载配置文件],
             ['--update-sources', '更新源码私有源配置 bin_dev.yml 中的 code_repo_url_list 配置,支持多私有源,多个私有源用分号区分  example：git@techgit.meitu.com:iMeituPic/mtsourcespecs.git;git@techgit.meitu.com:iosmodules/specs.git;https://github.com/CocoaPods/Specs.git']
           ].concat(super)
         end

data/lib/cocoapods-mtxx-bin/config/config.rb

@@ -13,12 +13,12 @@ module CBin
     def template_hash
       {
           'configuration_env' => { description: '编译环境', default: 'dev', selection: %w[dev debug_iphoneos release_iphoneos] },
-          'code_repo_url_list' => { description: '源码私有源 Git 地址 ,支持多私有源,多个私有源用分号区分', default: 'git@techgit.meitu.com:iMeituPic/mtsourcespecs.git' },
+          'code_repo_url_list' => { description: '源码私有源 Git 地址，多个私有源用分号区分', default: 'git@techgit.meitu.com:iMeituPic/mtsourcespecs.git' },
           'binary_repo_url' => { description: '二进制私有源 Git 地址', default: 'git@techgit.meitu.com:iMeituPic/mtbinaryspecs.git' },
-          'binary_upload_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本', default: 'http://pre.intapi.xiuxiu.meitu.com/internal/file/upload.json' },
+          'binary_upload_url' => { description: '二进制文件上传地址', default: 'http://pre.intapi.xiuxiu.meitu.com/internal/file/upload.json' },
           # 'binary_type' => { description: '二进制打包类型', default: 'framework', selection: %w[framework library] },
-          'binary_download_url' => { description: '二进制下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s', default: 'https://manhattan-test.obs.cn-north-4.myhuaweicloud.com:443/ios/binary' },
-          'download_file_type' => { description: '下载二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
+          'binary_download_url' => { description: '二进制文件下载地址，内部会依次传入组件名称与版本，替换字符串中的 %s', default: 'https://manhattan-test.obs.cn-north-4.myhuaweicloud.com:443/ios/binary' },
+          'download_file_type' => { description: '二进制文件类型', default: 'zip', selection: %w[zip tgz tar tbz txz dmg] }
       }
     end
 
@@ -36,12 +36,22 @@ module CBin
         raise "===== #{configuration_env} %w[dev debug_iphoneos release_iphoneos]===="
       end
 
-      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      # File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      File.expand_path("#{binary_dir}/#{file}")
     end
 
     def config_file_with_configuration_env_list(configuration_env)
       file = config_dev_file
-      File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      # File.expand_path("#{Pod::Config.instance.home_dir}/#{file}")
+      File.expand_path("#{binary_dir}/#{file}")
+    end
+
+    def binary_dir
+      @binary_dir ||= begin
+                        binary_dir = "#{Pod::Config.instance.project_root}/binary"
+                        FileUtils.mkdir(binary_dir) unless File.exist?(binary_dir)
+                        binary_dir
+                      end
     end
 
     def configuration_env

data/lib/cocoapods-mtxx-bin/config/config_asker.rb

@@ -40,10 +40,10 @@ module CBin
       def wellcome_message
         print <<~EOF
 
-          开始设置二进制化初始信息.
+          设置插件配置信息.
           所有的信息都会保存在 #{CBin.config.config_file} 文件中.
-          %w[bin_dev.yml bin_debug_iphoneos.yml bin_release_iphoneos.yml] 
-          你可以在对应目录下手动添加编辑该文件. 文件包含的配置信息样式如下：
+          你可以在对应目录下手动添加编辑该文件. 
+          文件包含的配置信息样式如下：
 
           #{CBin.config.default_config.to_yaml}
         EOF

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

@@ -1,5 +1,5 @@
 module CBin
-  VERSION = "0.0.3"
+  VERSION = "0.0.6"
 end
 
 module Pod

data/lib/cocoapods-mtxx-bin/helpers/buildAll/builder.rb

@@ -233,7 +233,7 @@ ibtool \
           header_dir = headers_dir
           if @pod_target.uses_swift?
             umbrella_header = "#{product_dir}/#{iphoneos}/#{@pod_target}/#{@pod_target}-umbrella.h"
-            swift_header = "#{product_dir}/#{iphoneos}/#{@pod_target}/Swift\\ Compatibility\\ Header/#{@pod_target.product_module_name}-Swift.h"
+            swift_header = "#{product_dir}/#{iphoneos}/#{@pod_target}/Swift Compatibility Header/#{@pod_target.product_module_name}-Swift.h"
             headers.concat([umbrella_header, swift_header])
           end
         else

data/lib/cocoapods-mtxx-bin/native/installer.rb

@@ -94,25 +94,25 @@ module Pod
       end
     end
 
-    alias old_write_lockfiles write_lockfiles
-    def write_lockfiles
-      old_write_lockfiles
-      if File.exist?('Podfile_local')
-
-        project = Xcodeproj::Project.open(config.sandbox.project_path)
-        #获取主group
-        group = project.main_group
-        group.set_source_tree('SOURCE_ROOT')
-        #向group中添加 文件引用
-        file_ref = group.new_reference(config.sandbox.root + '../Podfile_local')
-        #podfile_local排序
-        podfile_local_group = group.children.last
-        group.children.pop
-        group.children.unshift(podfile_local_group)
-        #保存
-        project.save
-      end
-    end
+    # alias old_write_lockfiles write_lockfiles
+    # def write_lockfiles
+    #   old_write_lockfiles
+    #   if File.exist?('Podfile_local')
+    #
+    #     project = Xcodeproj::Project.open(config.sandbox.project_path)
+    #     #获取主group
+    #     group = project.main_group
+    #     group.set_source_tree('SOURCE_ROOT')
+    #     #向group中添加 文件引用
+    #     file_ref = group.new_reference(config.sandbox.root + '../Podfile_local')
+    #     #podfile_local排序
+    #     podfile_local_group = group.children.last
+    #     group.children.pop
+    #     group.children.unshift(podfile_local_group)
+    #     #保存
+    #     project.save
+    #   end
+    # end
   end
 
   module Downloader

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

@@ -8,6 +8,7 @@ require 'cocoapods-mtxx-bin/native/installation_options'
 require 'cocoapods-mtxx-bin/gem_version'
 require 'cocoapods-mtxx-bin/command/bin/archive'
 require 'cocoapods-mtxx-bin/helpers/buildAll/bin_helper'
+require 'cocoapods-mtxx-bin/config/config'
 
 module Pod
   class Resolver
@@ -90,8 +91,8 @@ module Pod
 
     # 读取黑名单
     def read_black_list
-      project_root = Pod::Config.instance.project_root
-      config_file = File.join(project_root, 'BinConfig.yaml')
+      binary_dir = CBin.config.binary_dir
+      config_file = File.join(binary_dir, 'BinConfig.yaml')
       return nil unless File.exist?(config_file)
       config = YAML.load(File.open(config_file))
       return nil if config.nil?
@@ -199,13 +200,6 @@ module Pod
 
               UI.message "specification = #{specification}"
               # 组件是 subspec
-              # subspec 需要特殊处理
-              # 如果是源码，则获取相应 subspec 的 specification
-              # 如果是二进制，则获取整个 specification
-              # if !use_binary && rspec.spec.subspec?
-              #   specification = specification.subspec_by_name(rspec.name, false, true)
-              # end
-
               if rspec.spec.subspec?
                 specification = specification.subspec_by_name(rspec.name, false, true)
               end

data/lib/cocoapods-mtxx-bin/source_provider_hook.rb

@@ -1,5 +1,6 @@
 require 'cocoapods-mtxx-bin/native/sources_manager'
 require 'cocoapods-mtxx-bin/command/bin/repo/update'
+require 'cocoapods-mtxx-bin/config/config'
 require 'cocoapods/user_interface'
 require 'yaml'
 
@@ -44,7 +45,7 @@ Pod::HooksManager.register('cocoapods-mtxx-bin', :source_provider) do |context,
   podfile = Pod::Config.instance.podfile
   if podfile
     # 读取配置文件
-    project_root = Pod::Config.instance.project_root
+    project_root = CBin.config.binary_dir
     config_file = File.join(project_root, 'BinConfig.yaml')
     if File.exist?(config_file)
       config = YAML.load(File.open(config_file))

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.22.0
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-generate
   requirement: !ruby/object:Gem::Requirement