fir-cli 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6523d1d4b8ddda66152739a53aa64aa8a0a83f83fa632e8046b0e00d1fc127e
-  data.tar.gz: a9b8bd3eca63dfeef6648c8b81dd6a3f9ef6c708a90d3a09b34e15fcd9e608ce
+  metadata.gz: a24ad298a981ef005c28065354236351301c0de4c47beb7109fa1b03d0f04aa9
+  data.tar.gz: 8dd1f7047b2ba6c7cd89be9044b1498f732458bec23214e6df2c8838a11db2fc
 SHA512:
-  metadata.gz: 27c08bcc4b241027ada0f539da89edfed8f61662e8449e23772d756845ad93156341725b49acf97c9647c757ba716be32e756b67290d4a5b64b55fbac385523d
-  data.tar.gz: 7fc8675d828d9c9a8a6f3db0310ccf93c355b509c6a301d36e335b84c863f2ad369a9f7629ad530f31c7eae136fdef1f52084dd8656e834f3e0cf0d346efab71
+  metadata.gz: 943daed46cbd32bd3df0b26ae9e756efea7ac0fa2577d78e49cb5e21618484bc4e1e49e9c0ced2a2479f8a27d43743305faf1f8650e72e3c8fad5d62c1e7b617
+  data.tar.gz: c33fec27c39712aba5ef7ae4576438721ade9cd546cec91628de60728325889721fe144387e4f1743c282291a603f69913beee289500d105cc2bb3a652a566c4

data/README.md

@@ -14,7 +14,11 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 
 # 最近更新
-- (2.0.0.beta2 beta 版本, `gem install fir-cli -v 2.0.0.beta2` 进行安装) publish 使用更快的存储商, 加速上传速度, 若感觉没以前可使用 switch_to_qiniu 恢复
+- (2.0.1) publish 支持 新参数 `specify_app_display_name`, 指定 app 显示名称
+- (2.0.1) publish 支持 新参数 `need_ansi_qrcode`, 在控制台直接打印二维码, jenkins 用户可能需要使用 `AnsiColor Plugin` 插件配合
+- (2.0.1) publish 支持 新参数 `dingtalk_custom_message`, 可以在钉钉通知里增加自定义消息, 此命令需配合 `dingtalk_access_token` 使用
+- (2.0.1) publish 支持 新参数 `skip_fir_cli_feedback`, 可禁止 fir-cli 发送统计信息
+- 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日]

data/fir-cli.gemspec

@@ -27,6 +27,10 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (2.0.1) publish 支持 新参数 `specify_app_display_name`, 指定 app 显示名称
+  - (2.0.1) publish 支持 新参数 `need_ansi_qrcode`, 在控制台直接打印二维码, jenkins 用户可能需要使用 `AnsiColor Plugin` 插件配合
+  - (2.0.1) publish 支持 新参数 `dingtalk_custom_message`, 可以在钉钉通知里增加自定义消息, 此命令需配合 `dingtalk_access_token` 使用
+  - (2.0.1) publish 支持 新参数 `skip_fir_cli_feedback`, 可禁止 fir-cli 发送统计信息
   - (2.0.0) publish 使用更快的存储商, 加速上传速度, 若感觉没以前可使用 switch_to_qiniu 恢复
   - (1.7.4) 配合 fastlane-plugin-fir_cli 做了一些小优化
   - (1.7.3) 新增了 上传指定图标, 不上传图标 以及 将版本固定显示在下载页上
@@ -42,10 +46,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  # spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'minitest', '~> 5.7'
   spec.add_development_dependency 'pry',      '~> 0.10'
   
+  spec.add_dependency 'admqr_knife',    '~> 0.1.2'
   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.rb

@@ -4,6 +4,7 @@ require 'thor'
 require 'logger'
 require 'yaml'
 require 'rest-client'
+require 'admqr_knife'
 require 'json'
 require 'securerandom'
 require 'fileutils'
@@ -23,6 +24,7 @@ require 'fir/util'
 require 'fir/version'
 require 'fir/cli'
 
+AdmqrKnife.init('fir-cli')
 module FIR
   include Util
 end

data/lib/fir/cli.rb

@@ -107,16 +107,22 @@ 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_ansi_qrcode, type: :boolean, default: false, desc: 'Generate qrcode'
     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 :specify_icon_file, type: :string, desc: 'specify icon file'
 
+    method_option :skip_fir_cli_feedback, type: :boolean, default: false, desc: 'skip fir-cli usage info feedback'
+
+    method_option :specify_app_display_name, type: :string, desc: 'specify app display name'
+
     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'
+    method_option :dingtalk_custom_message, type: :string, desc: 'add custom message to dingtalk'
 
     method_option :open,        type: :boolean, desc: 'true/false if open for everyone'
     method_option :password,    type: :string,  desc: 'Set password for app'

data/lib/fir/util/app_uploader.rb

@@ -89,7 +89,7 @@ module FIR
         build: app_info[:build],
         fname: File.basename(file_path),
         key: binary_cert[:key],
-        name: app_info[:display_name] || app_info[:name],
+        name: options[:specify_app_display_name] || app_info[:display_name] || app_info[:name],
         origin: 'fir-cli',
         parent_id: app_id,
         release_tag: 'develop',

data/lib/fir/util/login.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+# require 'byebug'
 
 module FIR
   module Login
@@ -7,10 +8,18 @@ module FIR
 
       user_info = fetch_user_info(token)
 
-      logger.info "Login succeed, previous user's email: #{config[:email]}" unless config.blank?
+      unless config.blank?
+        logger.info "Login succeed, previous user's email: #{config[:email]}"
+      end
       write_config(email: user_info.fetch(:email, ''), token: token)
       reload_config
       logger.info "Login succeed, current  user's email: #{config[:email]}"
+      
+      AdmqrKnife.visit(
+        unique_code: 'fir_cli_login',
+        tag: 'fir_cli',
+        referer: "https://#{FIR::VERSION}.fir-cli/#{config[:email]}"
+      )
       logger_info_blank_line
     end
   end

data/lib/fir/util/publish.rb

@@ -2,7 +2,6 @@
 
 # require 'byebug'
 require_relative './qiniu_uploader'
-
 require_relative './ali_uploader'
 
 module FIR
@@ -29,6 +28,8 @@ module FIR
       dingtalk_notifier(download_url, qrcode_path)
       upload_mapping_file_with_publish
 
+      upload_fir_cli_usage_info(received_app_info)
+
       logger_info_blank_line
 
       {
@@ -59,12 +60,17 @@ module FIR
     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
+      time1 = Time.now.to_i
+      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
+
+      during_seconds = Time.now.to_i - time1
+      speed = File.size(@app_info[:file_path]) / during_seconds / 1024
+
+      logger.info "File uploaded. During: #{during_seconds} seconds, Upload Speed: #{speed} KB/s "
 
       release_id = app_uploaded_callback_data[:release_id]
 
@@ -82,6 +88,16 @@ module FIR
       app_info_dict
     end
 
+    def upload_fir_cli_usage_info(received_app_info)
+      return if @options[:skip_fir_cli_feedback]
+      short = received_app_info[:short]
+      AdmqrKnife.visit(
+        unique_code: 'fir_cli_publish',
+        tag: 'fir_cli',
+        referer: "https://#{FIR::VERSION}.fir-cli/#{short}"
+      )
+    end
+
     def upload_device_info
       return if @app_info[:devices].blank?
 
@@ -121,8 +137,6 @@ module FIR
            }
     end
 
-
-
     def upload_mapping_file_with_publish
       return if !options[:mappingfile] || !options[:proj]
 
@@ -137,6 +151,15 @@ module FIR
     def build_qrcode(download_url)
       qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
       FIR.generate_rqrcode(download_url, qrcode_path)
+
+      
+      # NOTE: showing with default options specified explicitly
+      puts RQRCode::QRCode.new(download_url).as_ansi(
+        light: "\033[47m", dark: "\033[40m",
+        fill_character: '  ',
+        quiet_zone_size: 1
+      ) if @options[:need_ansi_qrcode]
+
       # 为何在这里必须生成 QrCode ? 因为要在 dingtalk 调用
       logger.info "Local qrcode file: #{qrcode_path}" if @export_qrcode
       qrcode_path
@@ -165,7 +188,7 @@ module FIR
         "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)))})"
+          "text": "#{title} uploaded at #{Time.now}\nurl: #{download_url}\n#{options[:dingtalk_custom_message]}\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]}"
@@ -195,7 +218,9 @@ module FIR
 
       @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?
+      unless options[:specify_icon_file].blank?
+        @specify_icon_file_path = File.absolute_path(options[:specify_icon_file])
+      end
     end
 
     def read_changelog(changelog)

data/lib/fir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: admqr_knife
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -239,9 +267,13 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\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
+  \ ## 更新记录\n  - (2.0.1) publish 支持 新参数 `specify_app_display_name`, 指定 app 显示名称\n
+  \ - (2.0.1) publish 支持 新参数 `need_ansi_qrcode`, 在控制台直接打印二维码, jenkins 用户可能需要使用 `AnsiColor
+  Plugin` 插件配合\n  - (2.0.1) publish 支持 新参数 `dingtalk_custom_message`, 可以在钉钉通知里增加自定义消息,
+  此命令需配合 `dingtalk_access_token` 使用\n  - (2.0.1) publish 支持 新参数 `skip_fir_cli_feedback`,
+  可禁止 fir-cli 发送统计信息\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