fir-cli 2.0.18 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e15f62a0f7b559dac0e47d7aa637df6de1f267b950dc8d5c429f0539c0fd1f94
-  data.tar.gz: 8e42b4e2f0441651edd0871b8189b96fecfebbe068b6d5cd4408bc6e94d83137
+  metadata.gz: 88732a68654b5fddbe1272ee628654a5dddd2b23e4bfe6b45b6cd0f048a1333c
+  data.tar.gz: 28eae7d2cf17bc2a1bbb6e2414c9d040c785b2912297576f10b81104d38cdf60
 SHA512:
-  metadata.gz: df855650a9ba20ebf25a5b24b80802868a65c8883349639afe73ffe16c2adb00ec42483dc9627f023bb035b7b5c0422f4db8a2bc9bc97086c6055fb2d22f0e2f
-  data.tar.gz: bb152238bbd5b95af55dd6d1109087872edbb18fda3396ba71260bc596ceb4309bf2ecb3136f7969d0e6b1af73457190358c1b315f7da1cb16e788b013818a64
+  metadata.gz: f295623c3db9e80a1b6b22a598492c576d814a1edd54812492e930414a2ca56fc32de9057aa2a2fdb3bfcb245fec7065c2e16c24e00b7f8bab58685332a4aad3
+  data.tar.gz: 2839aca79b277694bfacefc3ac9d19edf5b9c3f370a465bcd1b5b8ad9cfa06e2a97a64e556f40332c1ab66617bfe964b88f15c2efbf68e016d244bd20c31d9bc

data/.github/workflows/docker-image.yml

@@ -0,0 +1,35 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker buildx create --use && docker buildx build --platform=linux/arm64,linux/amd64 . --file Dockerfile --tag firhq/fir-cli:latest
+      
+    - name: get version Number
+      id: show-version
+      run: echo "::set-output name=result::$(docker run firhq/fir-cli:latest version | awk '{print $3}')"
+    
+    - name: check version number
+      run: echo "the version is ${{ steps.show-version.outputs.result }}"
+    
+    - name: Tag image
+      run: docker tag firhq/fir-cli:latest firhq/fir-cli:${{ steps.show-version.outputs.result }}
+    
+    - name: Login Docker
+      run: docker login -u atpking -p ${{ secrets.DOCKER_ACCESS_TOKEN }}
+      
+    - name: Publish docker
+      run: docker push firhq/fir-cli:latest && docker push firhq/fir-cli:${{ steps.show-version.outputs.result }}
+    

data/.gitignore

@@ -26,3 +26,4 @@ Gemfile.lock
 lib/.byebug_history
 TAGS
 .vscode
+fir-cli-answer.json

data/README.md

@@ -1,23 +1,24 @@
 ✈ fir.im-cli
 ----
 
-![Build Status Images](https://travis-ci.org/FIRHQ/fir-cli.svg)
-[![Code Climate](https://codeclimate.com/github/FIRHQ/fir-cli/badges/gpa.svg)](https://codeclimate.com/github/FIRHQ/fir-cli)
-[![Test Coverage](https://codeclimate.com/github/FIRHQ/fir-cli/badges/coverage.svg)](https://codeclimate.com/github/FIRHQ/fir-cli/coverage)
-[![Gem Version](https://badge.fury.io/rb/fir-cli.svg)](http://badge.fury.io/rb/fir-cli)
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/FIRHQ/fir-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/FIRHQ/fir-cli/master/LICENSE.txt)
+[![最新版本的版本号](https://badge.fury.io/rb/fir-cli.svg)](http://badge.fury.io/rb/fir-cli)
 
 fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 
 ![fir-cli](http://7rf35s.com1.z0.glb.clouddn.com/fir-cli-new.gif)
 
-# 重大提醒
-- fir.im 更换域名至 betaqr.com 后, 需要升级至 `fir-cli` >= `2.0.4` 有部分用户反馈 2.0.2 无法直接使用 `gem update fir-cli` 升级到 2.0.4, 则可以尝试卸载后重新安装, 即 `gem uninstall fir-cli` 后 `gem install fir-cli`
 
-- 现也有一个go 版本的 go-fir-cli 供大家使用, 无需安装依赖, 可以直接使用. 具体请访问  [https://github.com/PGYER/go-fir-cli](https://github.com/PGYER/go-fir-cli). 注意! 该版本功能并不与fir-cli 完全重合.
+# 请注意
+- 如果您遇到了任何fir-cli 使用上的问题, 建议您首先使用 `gem install fir-cli ` 升级到最新版本的 fir-cli, 目前最新版本是 [![最新版本的版本号](https://badge.fury.io/rb/fir-cli.svg)](http://badge.fury.io/rb/fir-cli), 您要是不确定的话, 可以使用 `fir version` 查看当前版本号
+
+
+- 如果您在安装 fir-cli 过程中出现了各种问题, 但是着急使用的话, 现也有一个go 版本的 go-fir-cli 供大家使用, 无需安装依赖, 可以直接使用. 具体请访问  [https://github.com/PGYER/go-fir-cli](https://github.com/PGYER/go-fir-cli). 注意! 该版本功能并不与fir-cli 完全重合, 具体使用方式请参考该项目的 readme 文件.
+- 我们也提供 docker 版本的 fir-cli, 具体使用方式参见 **Docker 运行 fir-cli** 章节
 
 # 最近更新
+- (2.0.20) 新增参数 --save_uploaded_info, 可以将上传的结果存入当前目录下的 fir-cli-upload-info.json 文件中, 方便集成其他功能
+- (2.0.19) 修正了上传的图标不显示的问题
 - (2.0.18) 修复域名导致的飞书发送失败的问题
 - (2.0.17) 增加了上传百分比显示
 - (2.0.16) 更新了 thor
@@ -97,7 +98,9 @@ fir -v  # 查看 fir-cli 的版本
 
 ### 在 Circle CI, Travis CI 或 Github Actions 等境外服务上, 有概率超时, 能否解决?
 
-2.0.3 版本 及其以上, 可以申请海外加速内测资格, 开启后可以使用海外加速上传   `--oversea_turbo`
+fir-cli 在 2.0.18 版本已经支持自动判别用户是否是海外上传, 如果是海外ip, 则上传自动进行海外加速.
+
+[已废弃]2.0.3 版本 及其以上, 可以申请海外加速内测资格, 开启后可以使用海外加速上传   `--oversea_turbo`
 
 
 更多细节请参考 [https://github.com/FIRHQ/fir-cli/issues/260](https://github.com/FIRHQ/fir-cli/issues/260)

data/fir-cli.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.7'
   spec.add_development_dependency 'pry',      '~> 0.10'
 
-  spec.add_dependency 'admqr_knife',    '~> 0.1.5'
+  spec.add_dependency 'admqr_knife',    '~> 0.2.0'
   spec.add_dependency 'thor',           '~> 1.2.1'
   spec.add_dependency 'rest-client',    '~> 2.0'
   spec.add_dependency 'ruby_android_apk',   '~> 0.7.7.1'

data/lib/fir/cli.rb

@@ -142,6 +142,8 @@ module FIR
 
     method_option :bundletool_jar_path, type: :string, desc: "upload aab file command:  to specify bundletool.jar if command bundletool can not run directly"
     method_option :auto_download_bundletool_jar, type: :boolean, default: false, desc: "upload aab file command: would download bundletool when invoke bundletool failure"
+
+    method_option :save_uploaded_info, type: :boolean, default: false, desc: 'save uploaded info to local file named fir-cli-answer.json'
     def publish(*args)
       prepare :publish
 

data/lib/fir/util/ali_uploader.rb

@@ -53,10 +53,10 @@ module FIR
     def put_file(url, file, headers, need_progress = true)
 
       uri = URI(url)
-      hostname = uri.hostname 
+      hostname = uri.hostname
 
 
-      File.open(file_path, 'rb') do |io|
+      File.open(file.path, 'rb') do |io|
         t = Time.now
         http = Net::HTTP.new(hostname, 443)
         http.use_ssl = true

data/lib/fir/util/feishu_helper.rb

@@ -24,7 +24,6 @@ class FeishuHelper
   def v2_request
     url = "https://open.feishu.cn/open-apis/bot/v2/hook/#{feishu_access_token}"
     x = build_v2_info
-    # byebug
     DefaultRest.post(url, x, {timeout: ENV['FEISHU_TIMEOUT'] ? ENV['FEISHU_TIMEOUT'].to_i : 30 })
   end
 

data/lib/fir/util/publish.rb

@@ -17,6 +17,8 @@ module FIR
 
       logger.info 'begin to upload ...'
       logger.info "fir-cli version #{FIR::VERSION} (#{RUBY_VERSION} @ #{RUBY_PLATFORM})"
+      # 开始上传
+
       received_app_info = upload_app
 
       short = received_app_info[:short]
@@ -40,11 +42,18 @@ module FIR
 
       logger_info_blank_line
 
-      {
+      answer = {
         app_id: @app_id,
+        short: short,
         release_id: release_id,
-        short: short
+        download_url: download_url,
+        time: Time.now.strftime("%F %T%:z")
       }
+
+      if options[:save_uploaded_info]
+        write_uploaded_info(answer)
+      end
+
     end
 
     def fetch_app_info
@@ -111,6 +120,12 @@ module FIR
       )
     end
 
+    def write_uploaded_info(answer)
+      File.open('fir-cli-answer.json', 'w') do |f|
+        f.write(answer.to_json)
+      end
+    end
+
     def upload_device_info
       return if @app_info[:devices].blank?
 

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "2.0.18"
+  VERSION = "2.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.20
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,7 @@ files:
 - ".codeclimate.yml"
 - ".dockerignore"
 - ".flow-plugin.yml"
+- ".github/workflows/docker-image.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG
@@ -289,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: fir.im command tool