cocoapods-mtxx-bin 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18fc57de2d08c49e956f598907f2ff443b8fa45d678f3efe4d283f7b1e5d06a
-  data.tar.gz: 236bb2f1d892cc19704ca68c821e9953fd000f98e55bf54c6eb12de47af02fd6
+  metadata.gz: df7e5b2628a85abdfb8c632ce10affd45eceef978f17030cc8fa587a55937052
+  data.tar.gz: 8ce6a4a89a75c32075f406d9ec8c929eac12b9b3b63e114f61b37ab56112a576
 SHA512:
-  metadata.gz: f0e563796e362c9c8980a9d7ac161dfc38667bd4feddbab330de53b58a69c89868098abf69a8d5fb164c02bd7afcd888f1a8df456a57ca95d8323deec2e56599
-  data.tar.gz: bd6017ec3927a02aae59bd02a78fa488e14bd4a481b1e4b20dced50b74ef7d71f96b1fcd4d97794dabc52a4f1347208e7b81ac59d30cc5e0b91f7e7e33fa89c7
+  metadata.gz: 6bb9deccb62a75ca54db13fb02f2b1c43b0a0cd5f945fd18bcfd34858b1a16c35df4d4214f5942dd1480fe9bfae9035687989db60c53e1d000ebc51654749491
+  data.tar.gz: dff8ecc36300ffd1e885d1f968f43276a9c055b24fb8dc791b4d568ac985928e468ae2e46d198d1589bfabf17fc0f390557ee083b3377de10e5a34b08d263de2

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/command/bin/upload.rb

@@ -0,0 +1,173 @@
+require 'json'
+
+module Pod
+  class Command
+    class Bin < Command
+      class Upload < Bin
+        include Pod
+
+        self.summary = "上传二进制文件及podspec"
+        self.description = <<-DESC
+#{self.summary}
+
+`NAME`: 库名【必填】\n
+`VERSION`: 版本号【必填】\n
+`FILE`: 需要压缩的二进制文件或目录【必填】\n
+`REPO`: 上传podspec的仓库，可以通过`pod repo list`查看【必填】\n
+
+e.g.:\n
+pod bin upload Pod1 1.0.0 Pod1.framework mtxxspecs --spec=Pod1.podspec
+        DESC
+
+        self.arguments = [
+          CLAide::Argument.new('NAME', true ),
+          CLAide::Argument.new('VERSION', true),
+          CLAide::Argument.new('FILE', true),
+          CLAide::Argument.new('REPO', true)
+        ]
+
+        def self.options
+          [
+            %w[--spec=SPEC 指定podspec文件路径，如果不指定，将在当前目录下查找]
+          ].concat(super)
+        end
+
+        def initialize(argv)
+          @name = argv.shift_argument
+          @version = argv.shift_argument
+          @file = argv.shift_argument
+          @repo = argv.shift_argument
+          @spec = argv.option('spec', nil)
+          super
+        end
+
+        def run
+          # 参数检查
+          argvsCheck
+          # 压缩文件
+          zip_file
+          # 上传文件
+          upload_zip_file
+          # 修改podspec
+          modify_spec
+          # 上传podspec
+          upload_spec
+        end
+
+        private
+
+        # 参数检查
+        def argvsCheck
+          raise Informative, "name不能为空" if @name.nil?
+          raise Informative, "version不能为空" if @version.nil?
+          raise Informative, "repo不能为空" if @repo.nil?
+          raise Informative, "未找到需要压缩的二进制文件" if @file.nil?
+          raise Informative, "未找到podspec文件" unless File.exist?(podspec)
+        end
+
+        # 压缩文件
+        def zip_file
+          UI.title "压缩二进制文件`#{zip_file_name}`".yellow do
+            output_zip_file = File.join(Dir.pwd, zip_file_name)
+            FileUtils.rm_f(output_zip_file) if File.exist?(output_zip_file)
+            command = "zip --symlinks -r #{zip_file_name} #{@file}"
+            UI.info "#{command}"
+            `#{command}`
+            raise Informative, "压缩二进制文件失败" unless File.exist?(output_zip_file)
+          end
+        end
+
+        # 压缩后的zip包名
+        def zip_file_name
+          @zip_file_name ||= begin
+                               "#{@name}_#{@version}.zip"
+                             end
+        end
+
+        # 上传文件
+        def upload_zip_file
+          UI.title "上传二进制文件`#{zip_file_name}`".yellow do
+            zip_file = File.join(Dir.pwd, zip_file_name)
+            raise Informative, "`#{@zip_file_name}`不存在" unless File.exist?(zip_file)
+            upload_url = CBin.config.binary_upload_url_str
+            command = "curl -F \"name=#{@name}\" -F \"version=#{@version}\" -F \"file=@#{zip_file}\" #{upload_url}"
+            UI.info "#{command}"
+            json = `#{command}`
+            UI.info json
+            begin
+              error_code = JSON.parse(json)["error_code"]
+              raise Informative, "`#{zip_file_name}`上传失败" unless error_code == 0
+              UI.info "`#{zip_file_name}`上传成功".green
+            rescue JSON::ParserError => e
+              raise Informative, "`#{zip_file_name}`上传失败\n#{e.to_s}"
+            end
+          end
+        end
+
+        # 修改podspec
+        def modify_spec
+          UI.title "修改podspec：`#{podspec}`".yellow do
+            spec = Specification.from_file(podspec)
+            spec_hash = spec.to_hash
+            spec_hash['version'] = @version
+            spec_hash['source'] = source
+            spec = Specification.from_hash(spec_hash)
+            write_podspec_json(spec)
+          end
+        end
+
+        # 写入podspec
+        def write_podspec_json(spec)
+          FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+          File.open(podspec_json_file, "w+") do |f|
+            f.write(spec.to_pretty_json)
+          end
+        end
+
+        def source
+          url = "#{CBin.config.binary_download_url_str}/#{@name}/#{@version}/#{zip_file_name}"
+          { http: url, type: 'zip' }
+        end
+
+        # 上传podspec
+        def upload_spec
+          UI.title "推送podspec：`#{podspec_json_file_name}`".yellow do
+            raise Informative, "`#{podspec_json_file_name}`不存在" unless File.exist?(podspec_json_file)
+            argvs = %W[#{@repo} #{podspec_json_file} --skip-import-validation --use-libraries --allow-warnings --verbose]
+
+            begin
+              push = Pod::Command::Repo::Push.new(CLAide::ARGV.new(argvs))
+              push.validate!
+              push.run
+            rescue Pod::StandardError => e
+              raise Informative, "推送podspec：`#{podspec_json_file_name}失败\n#{e.to_s}"
+            end
+            # 上传完成后，清理工作目录
+            FileUtils.rm_f(podspec_json_file) if File.exist?(podspec_json_file)
+            FileUtils.rm_r('binary') if File.exist?('binary')
+            FileUtils.rm_f(zip_file_name) if File.exist?(zip_file_name)
+          end
+        end
+
+        def binary_dir
+          File.join(Dir.pwd, 'binary')
+        end
+
+        def podspec_json_file_name
+          "#{@name}.podspec.json"
+        end
+
+        def podspec_json_file
+          File.join(Dir.pwd, podspec_json_file_name)
+        end
+
+        def podspec
+          @spec ||= begin
+                      "#{@name}.podspec"
+                    end
+        end
+
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ require 'cocoapods-mtxx-bin/command/bin/install'
 require 'cocoapods-mtxx-bin/command/bin/repo'
 require 'cocoapods-mtxx-bin/command/bin/spec'
 require 'cocoapods-mtxx-bin/command/bin/buildAll'
+require 'cocoapods-mtxx-bin/command/bin/upload'
 require 'cocoapods-mtxx-bin/helpers'
 # require 'cocoapods-mtxx-bin/native'
 

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.7"
 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,41 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-mtxx-bin
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Jensen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-05-30 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.10.2
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.2
+    - - "<="
       - !ruby/object:Gem::Version
         version: 1.11.2
 - !ruby/object:Gem::Dependency
@@ -109,6 +115,7 @@ files:
 - lib/cocoapods-mtxx-bin/command/bin/spec/create.rb
 - lib/cocoapods-mtxx-bin/command/bin/spec/lint.rb
 - lib/cocoapods-mtxx-bin/command/bin/update.rb
+- lib/cocoapods-mtxx-bin/command/bin/upload.rb
 - lib/cocoapods-mtxx-bin/config/config.rb
 - lib/cocoapods-mtxx-bin/config/config_asker.rb
 - lib/cocoapods-mtxx-bin/config/config_builder.rb