fir-cli 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20bfcb3b79089a7e71d3e11863ffcb2d884ba3f28036bd977a869b50a073b243
-  data.tar.gz: c7f95ac0b0da3915c1f402bd51ea14ae845ffdd018612efa984b16cf40853594
+  metadata.gz: f1f3a7635a80250efec2d4872867ac839b285fd92407b445e012a391a34aaaba
+  data.tar.gz: e87c109e31952cc513fce2090ad380e9bdfc3856894529bf7c79e08158904542
 SHA512:
-  metadata.gz: dce50d46d8fffd9221cee1b291c8f9c4ffe96005d8beb7d3e09564d636ecb0b6260b64e27de805c8d57876cf6ef5e4f1984f9e60424c08e60f48c6529e5ea625
-  data.tar.gz: 8c1c426413283f1925ef7811793449f2af0b87a661056d6700fc5548dd2d084c6e9bc5282bae4025dee0e580af9aec2d6a75d99ff8a81bc9480d674aabb66aae
+  metadata.gz: c01a2a16617b05c2394b001fc992dad32ea0c65b533cc7e8eac75e70f443be1f540ade44c97a0c6218384fed6bf335cff3b07e1baa118c3261fe76f734fa9207
+  data.tar.gz: d365066ff94a38ebcce9750f4d1af4754c0ff4e5501daa31ffc85edbc46cda6bad1c859f2e931e56cd7ababffc0266b25a17774515700ded348351c1f3d21203

data/.travis.yml

@@ -1,12 +1,7 @@
 rvm:
-- 2.3
 - 2.4
 - 2.5
 - 2.6
-- ruby-head
-matrix:
-  allow_failures:
-  - rvm: ruby-head
 env:
   matrix:
   - USE_OFFICIAL_GEM_SOURCE=true

data/README.md

@@ -14,8 +14,11 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 
 # 最近更新
+- publish 支持 新参数 force_pin_history, 可以 将上传的版本, 固定在下载页面上(当大于最大固定版本数后, 会挤掉最老的固定版本) 
+- publish 支持 新参数 specify_icon_file_path, 可以直接指定 app 的 icon 图标文件 
+- publish 支持 新参数 skip_update_icon, 可以略过更新app图标
 - 官方支持 钉钉推送, 使用方法为 在publish 中增加 --dingtalk_access_token=xxxxxxxxxxxxxxxxxxx (或者 -D=xxxxxxx)  [2019年05月06日]
-- 官方支持 上传完毕后, 返回精确的版本的下载地址, 使用方案为 在 publish 后增加 --need_release_id (特定版本支持近期30个以内的任意版本) [2019年05月06日]
+- 官方支持 上传完毕后, 返回精确的版本的下载地址, 使用方案为 在 publish 后增加 --need_release_id (特定版本支持近期30个以内的任意版本. 如有更多历史版本需要回溯, 可向线上客服或者 微信 atpking 进行申请特殊处理某app, 我们会根据使用情况酌情增加) [2019年05月06日]
 - 已过期 build_ipa 功能, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 `fir publish` 上传生成的ipa [2019年03月21日]
 - 由于部分地区上传时遇到的证书问题, 新版本默认忽略证书校验. 如需打开, 请在命令前加入`UPLOAD_VERIFY_SSL=1`
 - 现已添加 docker 版本, 具体请见 `Docker 运行 fir-cli ` 说明
@@ -61,3 +64,7 @@ fir help
 
 - 使用 Github 的 [Issue](https://github.com/FIRHQ/fir-cli/issues) 
 
+## 特别感谢 
+
+- 感谢 sparkrico 提供修正的 https://github.com/sparkrico/ruby_apk 解决了 android 解析的问题
+

data/fir-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (1.7.3) 新增了 上传指定图标, 不上传图标 以及 将版本固定显示在下载页上
   - (1.7.2) 修正了无论是否加参数都固定出现二维码图片的bug
   - (1.7.1) 增加了 钉钉推送 , 增加了返回指定版本下载地址
   - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
@@ -44,7 +45,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor',           '~> 0.19'
   spec.add_dependency 'rest-client',    '~> 2.0'
-  spec.add_dependency 'ruby_android',   '~> 0.7.7'
+  spec.add_dependency 'ruby_android_apk',   '~> 0.7.7.1'
   spec.add_dependency 'rqrcode',        '~> 0.7'
   spec.add_dependency 'CFPropertyList'
   spec.add_dependency 'api_tools', '~> 0.1.0'

data/lib/fir/cli.rb

@@ -109,6 +109,10 @@ module FIR
     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 :force_pin_history, type: :boolean, default: false,  desc: 'pin this release to the download page by force'
+    method_option :skip_update_icon, type: :boolean, default: false,  desc: 'skip update app icon'
+    method_option :specify_icon_file, type: :string, desc: 'specify icon file'
+
     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'
 
@@ -163,7 +167,7 @@ module FIR
         logfile = '/dev/null' if options[:quiet]
 
         FIR.logger       = Logger.new(logfile)
-        FIR.logger.level = options[:verbose] ? Logger::INFO : Logger::ERROR
+        FIR.logger.level = options[:verbose] ? Logger::DEBUG : Logger::ERROR
         super
       end
     end

data/lib/fir/util/publish.rb

@@ -3,22 +3,25 @@ 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)
+      @user_info = fetch_user_info(@token)
       @uploading_info = fetch_uploading_info
-      @app_id         = @uploading_info[:id]
+      @app_id = @uploading_info[:id]
 
+      logger.info "begin to upload ..."
       upload_app
+      logger.info "end upload "
 
       logger_info_dividing_line
-      logger_info_app_short_and_qrcode(options)
+      logger_info_app_short_and_qrcode
 
-      dingtalk_notifier(options)
-      upload_mapping_file_with_publish(options)
+      dingtalk_notifier
+      upload_mapping_file_with_publish
       logger_info_blank_line
       clean_files
     end
@@ -34,11 +37,20 @@ module FIR
     end
 
     def upload_app
+
       @icon_cert   = @uploading_info[:cert][:icon]
       @binary_cert = @uploading_info[:cert][:binary]
-
-      upload_app_icon unless @app_info[:icons].blank?
+      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
+
       logger.info "App id is #{@app_id}"
       logger.info "Release id is #{@app_uploaded_callback_data[:release_id]}"
       upload_device_info
@@ -62,14 +74,14 @@ module FIR
       uploaded_info = post(url, info.merge(manual_callback: true),
                            params_to_json: false,
                            header: nil)
-    rescue StandardError
+    rescue StandardError => e
       logger.error "Uploading app #{postfix} failed"
       exit 1
     end
 
     def uploading_icon_info
       large_icon_path = @app_info[:icons].max_by { |f| File.size(f) }
-      @uncrushed_icon_path = convert_icon(large_icon_path)
+      @uncrushed_icon_path = @specify_icon_file_path || convert_icon(large_icon_path)
       {
         key: @icon_cert[:key],
         token: @icon_cert[:token],
@@ -149,6 +161,7 @@ module FIR
 
       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
@@ -165,7 +178,7 @@ module FIR
       @fir_app_info
     end
 
-    def upload_mapping_file_with_publish(options)
+    def upload_mapping_file_with_publish
       return if !options[:mappingfile] || !options[:proj]
 
       logger_info_blank_line
@@ -176,7 +189,7 @@ module FIR
                                      token: @token
     end
 
-    def logger_info_app_short_and_qrcode(options)
+    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]
 
@@ -190,11 +203,20 @@ module FIR
 
     private
 
+    def options
+      @options
+    end
+
+    def force_pin_release
+      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(options)
+    def dingtalk_notifier
       if options[:dingtalk_access_token]
         title = "#{@app_info[:name]}-#{@app_info[:version]}(Build #{@app_info[:build]})"
         payload = {
@@ -220,6 +242,10 @@ module FIR
       @passwd        = options[:password].to_s
       @is_opened     = @passwd.blank? ? options[:open] : false
       @export_qrcode = !!options[:qrcode]
+
+      @force_pin_history = options[:force_pin_history]
+      @skip_update_icon = options[:skip_update_icon]
+      @specify_icon_file_path = File.absolute_path(options[:specify_icon_file]) unless options[:specify_icon_file].blank?
     end
 
     def read_changelog(changelog)

data/lib/fir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,19 +96,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: ruby_android
+  name: ruby_android_apk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.7.7.1
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -234,11 +234,11 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\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  - (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
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: fir.im command tool