fir-cli 1.7.4.1 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f723191be804ce033110a2bc4a06ce2b414faf41946ee6ce9381387dd17a5f2
-  data.tar.gz: ce3e48b02cd7aaebe5177d7779f2f246d2be3bc81b8722becd45280072eba325
+  metadata.gz: 673a534b58afadd5a2b7491884a074dd2db722b636929ac3a43c5de1778e981d
+  data.tar.gz: fcf5a3e79f1bfaf937d6ae13bfed6f40c3f405e59344c797c1fe7a43f8489ddd
 SHA512:
-  metadata.gz: a20bf8b51310992a44ab78bc636bd3d7e88291857aa2098e57b59b0e59ceab0d68d6e7fe7569bc19db7e2d0a55c9d5bbf9630ee8820f65bdec8526ec3e7b8cb1
-  data.tar.gz: ffab9cc8875d30a33015627411013709e14d87a98ae03a34cd6471715e6220ec253bd84394961a4d4c849eee1a50ba1dd1e331cad393e70ef902ce96e9932987
+  metadata.gz: 3d62c7e16583cf776c29bbbaec8dfae9104b01534cbf52882545bebf688fda89a51dd928cbd31ae7ccab6ac833fffd1650c13f9c2639f526396c1bdd4ec60a99
+  data.tar.gz: 31d38f670026014742b1a4c1cf87b5f1e33d13bb294266d327dc517a655a395a84629f226285432899c0755882e3304a2ab199b21994f227b348fa54f7d20b53

data/.travis.yml

@@ -1,7 +1,5 @@
 rvm:
 - 2.4
-- 2.5
-- 2.6
 env:
   matrix:
   - USE_OFFICIAL_GEM_SOURCE=true

data/README.md

@@ -14,6 +14,7 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 
 # 最近更新
+- (2.0.0) publish 使用更快的存储商, 加速上传速度, 若感觉没以前可使用 switch_to_qiniu 恢复
 - 支持了在fastlane 直接调用, 具体请参见 [https://github.com/FIRHQ/fastlane-plugin-fir_cli](https://github.com/FIRHQ/fastlane-plugin-fir_cli)
 - publish 支持 新参数 force_pin_history, 可以 将上传的版本, 固定在下载页面上(当大于最大固定版本数后, 会挤掉最老的固定版本) [2019年11月18日]
 - publish 支持 新参数 specify_icon_file_path, 可以直接指定 app 的 icon 图标文件 [2019年11月18日]
@@ -78,7 +79,7 @@ docker run firhq/fir-cli:latest -e API_TOKEN=XXXX -v ./1.apk:1.apk publish 1.apk
 
 ## 提交反馈
 
-- 联系微信 `atpking` 
+- 联系微信 `atpking`, 请注明 "fir-cli 交流"
 
 - 使用 Github 的 [Issue](https://github.com/FIRHQ/fir-cli/issues) 
 
@@ -86,3 +87,9 @@ docker run firhq/fir-cli:latest -e API_TOKEN=XXXX -v ./1.apk:1.apk publish 1.apk
 
 - 感谢 sparkrico 提供修正的 https://github.com/sparkrico/ruby_apk 解决了 android 解析的问题
 
+
+## 鼓励维护
+
+感谢支持
+
+![luckin](luckin_coffee.png)

data/fir-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (2.0.0) publish 使用更快的存储商, 加速上传速度, 若感觉没以前可使用 switch_to_qiniu 恢复
   - (1.7.4) 配合 fastlane-plugin-fir_cli 做了一些小优化
   - (1.7.3) 新增了 上传指定图标, 不上传图标 以及 将版本固定显示在下载页上
   - (1.7.2) 修正了无论是否加参数都固定出现二维码图片的bug
@@ -44,7 +45,7 @@ Gem::Specification.new do |spec|
   # spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'minitest', '~> 5.7'
   spec.add_development_dependency 'pry',      '~> 0.10'
-
+  
   spec.add_dependency 'thor',           '~> 0.19'
   spec.add_dependency 'rest-client',    '~> 2.0'
   spec.add_dependency 'ruby_android_apk',   '~> 0.7.7.1'

data/lib/fir/cli.rb

@@ -107,12 +107,14 @@ module FIR
     method_option :short,       type: :string,  aliases: '-s', desc: 'Set custom short link'
     method_option :changelog,   type: :string,  aliases: '-c', desc: 'Set changelog'
     method_option :qrcode,      type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
-    method_option :need_release_id, type: :boolean, aliases: '-R', desc: 'Add release id with fir url (WARNING: FIR ONLY SAVED 30 releases recently per app'
+    method_option :need_release_id, type: :boolean, aliases: '-R', default: false, desc: 'Add release id with fir url (WARNING: FIR ONLY SAVED 30 releases recently per app'
 
-    method_option :force_pin_history, type: :boolean, aliases: '-H', default: false,  desc: 'pin this release to the download page by force'
-    method_option :skip_update_icon, type: :boolean, aliases: '-S', default: false,  desc: 'skip update app icon'
+    method_option :force_pin_history, type: :boolean, aliases: '-H', default: false, desc: 'pin this release to the download page by force'
+    method_option :skip_update_icon, type: :boolean, aliases: '-S', default: false, desc: 'skip update app icon'
     method_option :specify_icon_file, type: :string, desc: 'specify icon file'
 
+    method_option :switch_to_qiniu, type: :boolean, default: false, aliases: '-N', desc: 'if app upload slowly, u can switch this option'
+
     method_option :mappingfile, type: :string,  aliases: '-m', desc: 'App mapping file'
     method_option :dingtalk_access_token, type: :string, aliases: '-D', desc: 'Send msg to dingtalk, only need access_token, not whole url'
 

data/lib/fir/util/ali_uploader.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require_relative './app_uploader'
+# require 'byebug'
+
+module FIR
+  class AliUploader < AppUploader
+    def upload_icon
+      if skip_update_icon?
+        logger.info 'skip update icon...'
+        return
+      end
+      try_to_action('upload icon') do
+        # 拿到 icon 的授权
+        icon_url = uploading_info[:cert][:icon][:upload_url]
+        icon_info = uploading_icon_info
+
+        logger.debug "icon_url = #{icon_url}, icon_info = #{icon_info}"
+
+        put_file(icon_url, uploading_icon_info, uploading_info[:cert][:icon][:custom_headers])
+     
+        callback_to_api(callback_url, callback_icon_information)
+      end
+    rescue StandardError => e
+      # ignore icon error
+      logger.info "ignore icon upload error #{e.message}"
+    end
+
+    def upload_binary
+      try_to_action 'upload binary ...' do
+        binary_url = uploading_info[:cert][:binary][:upload_url]
+        binary_info = uploading_binary_info
+
+        logger.debug "binary_url = #{binary_url}, binary_info = #{binary_info}"
+        headers = uploading_info[:cert][:binary][:custom_headers]
+        headers_copy = {
+          'CONTENT-DISPOSITION' => headers[:"CONTENT-DISPOSITION"],
+          'Content-Type' => headers[:"content-type"],
+          'date' => headers[:date],
+          'x-oss-date' => headers[:"x-oss-date"],
+          'authorization' => headers[:authorization]
+        }
+
+        logger.debug headers_copy
+        put_file(binary_url, binary_info, headers_copy)
+
+        callback_to_api(callback_url, callback_binary_information)
+      end
+    rescue StandardError => e
+      logger.error "binary upload to ali fail, #{e.message}"
+      exit 1
+    end
+
+    protected
+
+    def put_file(url, file, headers)
+      RestClient::Request.execute(
+        method: 'PUT',
+        url: url,
+        payload: file,
+        headers: headers,
+        timeout: 300
+      )
+    end
+
+    def callback_url
+      "#{fir_api[:base_url]}/auth/ali/callback"
+    end
+
+    def uploading_icon_info
+      File.new(icon_file_path, 'rb')
+    end
+
+    def uploading_binary_info
+      File.new(file_path, 'rb')
+    end
+  end
+end

data/lib/fir/util/app_uploader.rb

@@ -0,0 +1,111 @@
+module FIR
+  class AppUploader
+    include ApiTools::DefaultRestModule
+    include Config
+
+    attr_accessor :app_info, :user_info, :uploading_info, :options
+    def initialize(app_info, user_info, uploading_info, options)
+      @app_info = app_info
+      @user_info = user_info
+      @uploading_info = uploading_info
+      @options = options
+    end
+
+    def upload
+      upload_icon
+      binary_callback_info = upload_binary
+      # 将 binary 的callback信息返回
+      binary_callback_info
+    end
+
+    protected
+
+    def callback_to_api(callback_url, callback_binary_information)
+      return if callback_binary_information.blank?
+
+      post callback_url, callback_binary_information
+    end
+
+    def icon_file_path
+      if options[:specify_icon_file].blank?
+        app_info[:icons].max_by { |f| File.size(f) }
+      else
+        File.absolute_path(options[:specify_icon_file])
+      end
+    end
+
+    # 是否跳过 icon 上传
+    def skip_update_icon?
+      options[:skip_icon_upload].to_s == 'true'
+    end
+
+    def read_changelog
+      changelog = options[:changelog].to_s.to_utf8
+      return if changelog.blank?
+
+      File.exist?(changelog) ? File.read(changelog) : changelog
+    end
+
+    def icon_cert
+      uploading_info[:cert][:icon]
+    end
+
+    def binary_cert
+      uploading_info[:cert][:binary]
+    end
+
+    def file_path
+      app_info[:file_path]
+    end
+
+    def try_to_action(action, &block)
+      logger.debug "begin to #{action}"
+      answer = block.call
+      logger.debug "#{action} finished"
+      answer
+    rescue StandardError => e
+      logger.error "#{action} error ! #{e.message}"
+      raise e
+    end
+
+    def app_id
+      uploading_info[:id]
+    end
+
+    def callback_icon_information
+      return {} if icon_file_path.nil?
+      {
+        key: icon_cert[:key],
+        token: icon_cert[:token],
+        origin: 'fir-cli',
+        parent_id: app_id,
+        fsize: File.size(icon_file_path),
+        fname: 'blob'
+      }
+    end
+
+    def callback_binary_information
+      {
+        build: app_info[:build],
+        fname: File.basename(file_path),
+        key: binary_cert[:key],
+        name: app_info[:display_name] || app_info[:name],
+        origin: 'fir-cli',
+        parent_id: app_id,
+        release_tag: 'develop',
+        fsize: File.size(file_path),
+        release_type: app_info[:release_type],
+        distribution_name: app_info[:distribution_name],
+        token: binary_cert[:token],
+        version: app_info[:version],
+        changelog: read_changelog,
+        user_id: user_info[:id]
+      }.reject { |x| x.nil? || x == '' }
+    end
+
+    def logger
+      FIR.logger
+    end
+    
+  end
+end

data/lib/fir/util/info.rb

@@ -26,12 +26,14 @@ module FIR
       app  = ipa.app
       info = app.full_info(options)
       ipa.cleanup
+      info[:file_path] = ipa_path
       info
     end
 
     def apk_info(apk_path, options = {})
       apk  = FIR::Parser::Apk.new(apk_path)
       info = apk.full_info(options)
+      info[:file_path] = apk_path
       info
     end
   end

data/lib/fir/util/publish.rb

@@ -1,146 +1,75 @@
 # frozen_string_literal: true
+
 # require 'byebug'
+require_relative './qiniu_uploader'
+
+require_relative './ali_uploader'
+
 module FIR
   module Publish
     def publish(*args, options)
       initialize_publish_options(args, options)
-      @options = options
       check_supported_file_and_token
-
       logger_info_publishing_message
 
-      @app_info = send("#{@file_type}_info", @file_path, full_info: true)
-      @user_info = fetch_user_info(@token)
-      @uploading_info = fetch_uploading_info
-      @app_id = @uploading_info[:id]
+      logger.info 'begin to upload ...'
+      received_app_info = upload_app
 
-      logger.info "begin to upload ..."
-      upload_app
-      logger.info "end upload "
+      short = received_app_info[:short]
+      release_id = received_app_info[:release_id]
+
+      logger.info 'end upload'
 
       logger_info_dividing_line
-      logger_info_app_short_and_qrcode
 
-      dingtalk_notifier
+      download_url = build_download_url(short, release_id)
+      logger.info "Published succeed: #{download_url}"
+
+      qrcode_path = build_qrcode download_url
+      dingtalk_notifier(download_url, qrcode_path)
       upload_mapping_file_with_publish
+
       logger_info_blank_line
-      clean_files
+
       {
         app_id: @app_id,
-        release_id: @release_id,
-        short: @fir_app_info[:short]
+        release_id: release_id,
+        short: short
       }
     end
 
-    def logger_info_publishing_message
-      user_info = fetch_user_info(@token)
+    protected
 
-      email = user_info.fetch(:email, '')
-      name  = user_info.fetch(:name, '')
+    def logger_info_publishing_message
+      email = @user_info.fetch(:email, '')
+      name  = @user_info.fetch(:name, '')
 
       logger.info "Publishing app via #{name}<#{email}>......."
       logger_info_dividing_line
     end
 
     def upload_app
+      
+      app_uploaded_callback_data = if @options[:switch_to_qiniu] 
+        QiniuUploader.new(@app_info, @user_info, @uploading_info, @options).upload
+      else 
+        AliUploader.new(@app_info, @user_info, @uploading_info, @options).upload
+      end
 
-      @icon_cert   = @uploading_info[:cert][:icon]
-      @binary_cert = @uploading_info[:cert][:binary]
-      logger.debug "in upload app begin to upload icon"
-      upload_app_icon unless @skip_update_icon
-      logger.debug "in upload icon finished"
-     
-      logger.debug "in upload app begin to upload binary"
-      @app_uploaded_callback_data = upload_app_binary
-      logger.debug "in upload binary"
-      @release_id = @app_uploaded_callback_data[:release_id]
-
-      force_pin_release if @force_pin_history
+      release_id = app_uploaded_callback_data[:release_id]
 
       logger.info "App id is #{@app_id}"
-      logger.info "Release id is #{@app_uploaded_callback_data[:release_id]}"
+      logger.info "Release id is #{release_id}"
+
+      # 处理上传完毕后, 需要的后续操作
+      force_pin_release(release_id) if @force_pin_history
       upload_device_info
       update_app_info
-      fetch_app_info
-    end
 
-    %w[binary icon].each do |word|
-      define_method("upload_app_#{word}") do
-        upload_file(word)
-        storage = ENV['SOTRAGE_NAME'] || 'qiniu'
-        information = send("#{word}_information")
-        post("#{fir_api[:base_url]}/auth/#{storage}/callback", information) unless information.blank?
-      end
-    end
+      app_info_dict = fetch_app_info
+      app_info_dict[:release_id] = release_id
 
-    def upload_file(postfix)
-      logger.info "Uploading app #{postfix}......"
-      url = @uploading_info[:cert][postfix.to_sym][:upload_url]
-      info = send("uploading_#{postfix}_info")
-      logger.debug "url = #{url}, info = #{info}"
-      uploaded_info = post(url, info.merge(manual_callback: true),
-                           params_to_json: false,
-                           header: nil)
-    rescue StandardError => e
-      logger.error "Uploading app #{postfix} failed"
-      exit 1 if postfix != 'icon'
-    end
-
-    def uploading_icon_info
-      large_icon_path = @app_info[:icons].max_by { |f| File.size(f) }
-      @uncrushed_icon_path = @specify_icon_file_path || convert_icon(large_icon_path)
-      {
-        key: @icon_cert[:key],
-        token: @icon_cert[:token],
-        file: File.new(@uncrushed_icon_path, 'rb'),
-        'x:is_converted' => '1'
-      }
-    end
-
-    def icon_information
-      return {} if @uncrushed_icon_path.nil?  
-      {
-        key: @icon_cert[:key],
-        token: @icon_cert[:token],
-        origin: 'fir-cli',
-        parent_id: @app_id,
-        fsize: File.size(@uncrushed_icon_path),
-        fname: 'blob'
-      }
-    end
-
-    def binary_information
-      {
-        build: @app_info[:build],
-        fname: File.basename(@file_path),
-        key: @binary_cert[:key],
-        name: @app_info[:display_name] || @app_info[:name],
-        origin: 'fir-cli',
-        parent_id: @app_id,
-        release_tag: 'develop',
-        fsize: File.size(@file_path),
-        release_type: @app_info[:release_type],
-        distribution_name: @app_info[:distribution_name],
-        token: @binary_cert[:token],
-        version: @app_info[:version],
-        changelog: @changelog,
-        user_id: @user_info[:id]
-      }.reject { |x| x.nil? || x == '' }
-    end
-
-    def uploading_binary_info
-      {
-        key: @binary_cert[:key],
-        token: @binary_cert[:token],
-        file: File.new(@file_path, 'rb'),
-        # Custom variables
-        'x:name' => @app_info[:display_name] || @app_info[:name],
-        'x:build' => @app_info[:build],
-        'x:version' => @app_info[:version],
-        'x:changelog' => @changelog,
-        'x:release_type' => @app_info[:release_type],
-        'x:distribution_name' => @app_info[:distribution_name]
-      }
+      app_info_dict
     end
 
     def upload_device_info
@@ -151,7 +80,7 @@ module FIR
       post fir_api[:udids_url], key: @binary_cert[:key],
                                 udids: @app_info[:devices].join(','),
                                 api_token: @token
-      end
+    end
 
     def update_app_info
       update_info = { short: @short, passwd: @passwd, is_opened: @is_opened }.compact
@@ -163,27 +92,33 @@ module FIR
       patch fir_api[:app_url] + "/#{@app_id}", update_info.merge(api_token: @token)
     end
 
+    # 获得 上传文件的授权信息
     def fetch_uploading_info
       logger.info "Fetching #{@app_info[:identifier]}@fir.im uploading info......"
       logger.info "Uploading app: #{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
 
-      post fir_api[:app_url], type: @app_info[:type],
-                              bundle_id: @app_info[:identifier],
-                              skip_icon_upload: @options[:skip_update_icon],
-                              manual_callback: true,
-                              api_token: @token
-    end
-
-    def fetch_release_id
-      get "#{fir_api[:base_url]}/apps/#{@app_id}/releases/find_release_by_key", api_token: @token, key: @binary_cert[:key]
+      post fir_api[:app_url],
+           {  type: @app_info[:type],
+              bundle_id: @app_info[:identifier],
+              fname: @file_path.split('/').last,
+              force_upload: options[:switch_to_qiniu] ? 'qiniu' : 'ali',
+              skip_icon_upload: @options[:skip_update_icon],
+              manual_callback: true,
+              protocol: 'https',
+              api_token: @token },
+           header: {
+             user_agent: 'new-cli'
+           }
     end
 
     def fetch_app_info
       logger.info 'Fetch app info from fir.im'
 
-      @fir_app_info = get(fir_api[:app_url] + "/#{@app_id}", api_token: @token)
-      write_app_info(id: @fir_app_info[:id], short: @fir_app_info[:short], name: @fir_app_info[:name])
-      @fir_app_info
+      fir_app_info = get(fir_api[:app_url] + "/#{@app_id}", api_token: @token)
+      write_app_info(id: fir_app_info[:id],
+                     short: fir_app_info[:short],
+                     name: fir_app_info[:name])
+      fir_app_info
     end
 
     def upload_mapping_file_with_publish
@@ -197,62 +132,67 @@ module FIR
                                      token: @token
     end
 
-    def logger_info_app_short_and_qrcode
-      @download_url = "#{fir_api[:domain]}/#{@fir_app_info[:short]}"
-      @download_url += "?release_id=#{@app_uploaded_callback_data[:release_id]}" if !!options[:need_release_id]
-
-      logger.info "Published succeed: #{@download_url}"
-
-      @qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
-      FIR.generate_rqrcode(@download_url, @qrcode_path)
-
-      logger.info "Local qrcode file: #{@qrcode_path}" if @export_qrcode
+    def build_qrcode(download_url)
+      qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
+      FIR.generate_rqrcode(download_url, qrcode_path)
+      # 为何在这里必须生成 QrCode ? 因为要在 dingtalk 调用
+      logger.info "Local qrcode file: #{qrcode_path}" if @export_qrcode
+      qrcode_path
     end
 
-    private
+    def build_download_url(short, release_id)
+      url = "#{fir_api[:domain]}/#{short}"
+      url += "?release_id=#{release_id}" if options[:need_release_id]
+      url
+    end
 
     def options
       @options
     end
 
-    def force_pin_release
-      post "#{fir_api[:base_url]}/apps/#{@app_id}/releases/#{@release_id}/force_set_history",
+    def force_pin_release(release_id)
+      post "#{fir_api[:base_url]}/apps/#{@app_id}/releases/#{release_id}/force_set_history",
            api_token: @token
     end
 
-    def clean_files
-      File.delete(@qrcode_path) unless @export_qrcode
-    end
+    def dingtalk_notifier(download_url, qrcode_path)
+      return if options[:dingtalk_access_token].blank?
 
-    def dingtalk_notifier
-      if options[:dingtalk_access_token]
-        title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
-        payload = {
-          "msgtype": 'markdown',
-          "markdown": {
-            "title": "#{title} uploaded",
-            "text": "#{title} uploaded at #{Time.now}\nurl: #{@download_url}\n ![app二维码](data:image/png;base64,#{Base64.strict_encode64(File.read(open(@qrcode_path)))})"
-          }
+      title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
+      payload = {
+        "msgtype": 'markdown',
+        "markdown": {
+          "title": "#{title} uploaded",
+          "text": "#{title} uploaded at #{Time.now}\nurl: #{download_url}\n ![app二维码](data:image/png;base64,#{Base64.strict_encode64(File.read(open(qrcode_path)))})"
         }
-        url = "https://oapi.dingtalk.com/robot/send?access_token=#{options[:dingtalk_access_token]}"
-        DefaultRest.post(url, payload)
-      end
+      }
+      url = "https://oapi.dingtalk.com/robot/send?access_token=#{options[:dingtalk_access_token]}"
+
+      # 用完了二维码, 就删了
+      File.delete(qrcode_path) unless @export_qrcode
+
+      DefaultRest.post(url, payload)
     rescue StandardError => e
       logger.warn "Dingtalk send error #{e.message}"
     end
 
     def initialize_publish_options(args, options)
-      @file_path     = File.absolute_path(args.first.to_s)
-      @file_type     = File.extname(@file_path).delete('.')
-      @token         = options[:token] || current_token
-      @changelog     = read_changelog(options[:changelog]).to_s.to_utf8
-      @short         = options[:short].to_s
-      @passwd        = options[:password].to_s
-      @is_opened     = @passwd.blank? ? options[:open] : false
+      @options = options
+      @file_path = File.absolute_path(args.first.to_s)
+      @file_type = File.extname(@file_path).delete('.')
+      @token = options[:token] || current_token
+      @changelog = read_changelog(options[:changelog]).to_s.to_utf8
+      @short = options[:short].to_s
+      @passwd = options[:password].to_s
+      @is_opened = @passwd.blank? ? options[:open] : false
       @export_qrcode = !!options[:qrcode]
+      @app_info = send("#{@file_type}_info", @file_path, full_info: true)
+      @user_info = fetch_user_info(@token)
+      @uploading_info = fetch_uploading_info # 获得上传信息
+      @app_id = @uploading_info[:id]
 
-      @force_pin_history = options[:force_pin_history]
       @skip_update_icon = options[:skip_update_icon]
+      @force_pin_history = options[:force_pin_history]
       @specify_icon_file_path = File.absolute_path(options[:specify_icon_file]) unless options[:specify_icon_file].blank?
     end
 
@@ -268,20 +208,5 @@ module FIR
       check_token_cannot_be_blank(@token)
       fetch_user_info(@token)
     end
-
-    def convert_icon(origin_path)
-      # 兼容性不太好, 蔽掉转化图标
-      return origin_path
-
-      logger.info "Converting app's icon......"
-
-      if @app_info[:type] == 'ios'
-        output_path = Tempfile.new(['uncrushed_icon', '.png']).path
-        FIR::Parser::Pngcrush.uncrush_icon(origin_path, output_path)
-        origin_path = output_path if File.size(output_path) != 0
-      end
-
-      origin_path
-    end
   end
 end

data/lib/fir/util/publisher.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module FIR
+  module Util
+    class Publisher
+      include FIR::Util
+
+      attr_accessor :args, :options
+
+      def initialize(args, options)
+        @file_path     = File.absolute_path(args.first.to_s)
+        @file_type     = File.extname(@file_path).delete('.')
+        @token         = options[:token] || current_token
+        @changelog     = read_changelog(options[:changelog]).to_s.to_utf8
+        @short         = options[:short].to_s
+        @passwd        = options[:password].to_s
+        @is_opened     = @passwd.blank? ? options[:open] : false
+        @export_qrcode = !!options[:qrcode]
+      end
+
+      private
+
+      def file_path
+        @file_path = File.absolute_path(args.first.to_s)
+      end
+
+      def read_changelog(changelog)
+        return if changelog.blank?
+
+        File.exist?(changelog) ? File.read(changelog) : changelog
+      end
+    end
+  end
+end

data/lib/fir/util/qiniu_uploader.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require_relative './app_uploader'
+# require 'byebug'
+
+module FIR
+  class QiniuUploader < AppUploader
+    def upload_icon
+      if skip_update_icon?
+        logger.info 'skip update icon...'
+        return
+      end
+      try_to_action('upload icon') do
+        # 拿到 icon 的授权
+        icon_url = uploading_info[:cert][:icon][:upload_url]
+        icon_info = uploading_icon_info
+
+        logger.debug "icon_url = #{icon_url}, icon_info = #{icon_info}"
+
+        _uploaded_info = post(icon_url, icon_info.merge(manual_callback: true),
+                              params_to_json: false,
+                              header: nil)
+
+        callback_to_api(callback_url, callback_icon_information)
+      end
+    rescue StandardError => e
+      # ignore icon error
+      logger.info "ignore icon upload error #{e.message}"
+    end
+
+    def upload_binary
+      try_to_action 'upload binary ...' do
+        binary_url = uploading_info[:cert][:binary][:upload_url]
+        binary_info = uploading_binary_info
+
+        _uploaded_info = post(binary_url, binary_info.merge(manual_callback: true),
+                              params_to_json: false,
+                              header: nil)
+
+        callback_to_api(callback_url, callback_binary_information)
+      end
+    rescue StandardError => e
+      logger.error "binary upload to qiniu fail, #{e.message}"
+      exit 1
+    end
+
+    protected
+
+    def callback_url
+      "#{fir_api[:base_url]}/auth/qiniu/callback"
+    end
+
+    # 七牛需要的 icon params
+    def uploading_icon_info
+      icon_cert = uploading_info[:cert][:icon]
+      {
+        key: icon_cert[:key],
+        token: icon_cert[:token],
+        file: File.new(icon_file_path, 'rb')
+      }
+    end
+
+    # 七牛需要的 binary params
+    def uploading_binary_info
+      binary_cert = uploading_info[:cert][:binary]
+      {
+        key: binary_cert[:key],
+        token: binary_cert[:token],
+        file: File.new(file_path, 'rb')
+      }
+    end
+  end
+end

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.7.4.1'
+  VERSION = '2.0.0.beta'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.4.1
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2019-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,6 +198,8 @@ files:
 - lib/fir/patches/os_patch.rb
 - lib/fir/patches/try.rb
 - lib/fir/util.rb
+- lib/fir/util/ali_uploader.rb
+- lib/fir/util/app_uploader.rb
 - lib/fir/util/build_apk.rb
 - lib/fir/util/build_common.rb
 - lib/fir/util/build_ipa.rb
@@ -213,9 +215,12 @@ files:
 - lib/fir/util/parser/ipa.rb
 - lib/fir/util/parser/pngcrush.rb
 - lib/fir/util/publish.rb
+- lib/fir/util/publisher.rb
+- lib/fir/util/qiniu_uploader.rb
 - lib/fir/version.rb
 - lib/fir/xcode_wrapper.sh
 - lib/fir_cli.rb
+- luckin_coffee.png
 - test/build_ipa_test.rb
 - test/cases/test_apk.apk
 - test/cases/test_apk_txt
@@ -234,12 +239,13 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  - (1.7.4) 配合 fastlane-plugin-fir_cli 做了一些小优化\n  - (1.7.3) 新增了 上传指定图标,
-  不上传图标 以及 将版本固定显示在下载页上\n  - (1.7.2) 修正了无论是否加参数都固定出现二维码图片的bug\n  - (1.7.1) 增加了 钉钉推送
-  , 增加了返回指定版本下载地址\n  - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run
-  的兼容\n  - (1.6.13) 上传图标逻辑修改\n  - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题\n  - (1.6.11)
-  变化了 ruby gem 仓库地址\n  - [fir-cli](https://github.com/firhq/fir-cli) 已经开源\n  - 欢迎
-  fork, issue 和 pull request\n  "
+  \ ## 更新记录\n  - (2.0.0) publish 使用更快的存储商, 加速上传速度, 若感觉没以前可使用 switch_to_qiniu 恢复\n
+  \ - (1.7.4) 配合 fastlane-plugin-fir_cli 做了一些小优化\n  - (1.7.3) 新增了 上传指定图标, 不上传图标 以及
+  将版本固定显示在下载页上\n  - (1.7.2) 修正了无论是否加参数都固定出现二维码图片的bug\n  - (1.7.1) 增加了 钉钉推送 , 增加了返回指定版本下载地址\n
+  \ - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容\n  - (1.6.13)
+  上传图标逻辑修改\n  - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题\n  - (1.6.11) 变化了 ruby gem 仓库地址\n
+  \ - [fir-cli](https://github.com/firhq/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
+  request\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -250,9 +256,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: