fir-cli-xsl 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8470b2eac1f2d31afcd895a595dfdf681b2af502
-  data.tar.gz: 2be1a84161a970d693858f3fd5041fce4a53e5c0
+  metadata.gz: 52432d4ece0aa4efc7f5504151911619771e4514
+  data.tar.gz: 2a05e62d515b41df940f499e97f2502f0d7e7f36
 SHA512:
-  metadata.gz: 9bbe5b17495cad7f59ea4336398648060e9dbf49a8caa81ca907d15a3a12c99ebbf9f51b83e4d00e70e2396736c410bcd1dc351ee40949ec511ca7abdc676bec
-  data.tar.gz: a96a8fdbbcc6f6cc37c27b7bf4a7ce4ec7b9c3c8a0e6ae6c478cf81ba0b5ec665230e05125d8f0ac8d9a60834cd247eec87dfe8ddf79d88e9d38e439fbe6d0db
+  metadata.gz: e4618e8a988d29876efdb11c69c3861d52e972a74b642add437f5a8c77bf65c9fb4cdfcd1fe75da9b130900849f851d7beaf683501a94d995f8d3f6bb671f160
+  data.tar.gz: 526170d7de9c5f5dd754c91eda9994d9cf018023ed3cca93841add0609980bc970bbc59dedbc8df31df09c4d03f315ae8f265fd26f7796ec91f3f75b23e13d43

data/fir-cli.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   - [fir-cli](https://github.com/iamjia/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
   - xiangshaolong 专用
+  - (2.0.3) 鉴于 fir.im 最多只能保留 30 个版本，所以增加了删除同 build 号的其他版本的功能，一个版本只保留一个可追溯的安装包
   )
 
   spec.add_development_dependency 'bundler'

data/lib/fir/cli.rb

@@ -117,6 +117,7 @@ module FIR
     method_option :open,        type: :boolean, desc: 'true/false if open for everyone'
     method_option :password,    type: :string,  desc: 'Set password for app'
     method_option :dingtalk_notify,    type: :boolean, aliases: '-dn', desc: 'enable dingtalk robot notify', default: true
+    method_option :delete_latest_version, type: :boolean, aliases: '-dlv', desc: '删除上一个版本'
 
     def publish(*args)
       prepare :publish

data/lib/fir/util/publish.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 module FIR
   module Publish
+    
     def dingtalk(*args, options)
       if options[:dingtalk_access_token]
         payload = {
@@ -26,9 +27,45 @@ module FIR
       # @app_id         = '5be4f90f959d69333dd5ab5a'
 
       release_info = get(fir_api[:app_url] + "/#{@app_id}" + "/releases", api_token: @token, page: 1)
+      
+      logger.info ">>>> #{@release_info}"
+
       for temp_obj in release_info[:datas]
+        logger.info ">>>> #{@release_info}"
         temp_id = temp_obj[:id]
-          patch fir_api[:app_url] + "/#{@app_id}" + "/releases" + "/#{temp_id}", api_token: @token, is_history: false
+        patch fir_api[:app_url] + "/#{@app_id}" + "/releases" + "/#{temp_id}", api_token: @token, is_history: false
+      end
+    end
+
+    def delete_latest_version
+      # @file_type     = "ipa"
+      # @token         = options[:token] || current_token
+      # # @app_info = {"type": 'ipa', "identifier": 'com.sudiyi.appCourier', "name":'速递易快递', "version":'3.1.1', "build": 'haha'}
+      # # @user_info      = fetch_user_info(@token)
+      # # logger.info ">>>> #{@user_info}"
+      # # @uploading_info = fetch_uploading_info
+      # # logger.info ">>>> uploading_info #{@uploading_info}"
+      # @app_id         = '5be4f90f959d69333dd5ab5a'
+
+      logger.info ">>>> app_info #{@app_info}"
+      current_version = @app_info[:version]
+      current_build = @app_info[:build]
+
+      logger.info ">>>> current_version #{current_version}"
+      release_info = get(fir_api[:app_url] + "/#{@app_id}" + "/releases", api_token: @token, page: 1)
+      for temp_obj in release_info[:datas]
+        logger.info ">>>> current_build #{current_build} #{temp_obj[:build]}"
+        if temp_obj[:build] == current_build
+          next
+        end
+
+        if temp_obj[:version] == current_version
+          temp_id = temp_obj[:id]
+          api = fir_api[:app_url] + "/#{@app_id}" + "/releases" + "/#{temp_id}"
+          logger.info ">>>> app_info #{api} #{@token}"
+          RestClient.delete(fir_api[:app_url] + "/#{@app_id}" + "/releases" + "/#{temp_id}", headers={"accesstoken": "c0f6dc8a7d7704d919cbc5d69e6cb2852d1783a1c9"})
+          # delete fir_api[:app_url] + "/#{@app_id}" + "/releases" + "/#{temp_id}", accesstoken: 'c0f6dc8a7d7704d919cbc5d69e6cb2852d1783a1c9'
+        end
       end
     end
 
@@ -47,9 +84,11 @@ module FIR
       @uploading_info = fetch_uploading_info
       @app_id         = @uploading_info[:id]
 
-      turn_off_history
+      # if options[:delete_latest_version]
       upload_app
-
+      delete_latest_version
+      # turn_off_history
+      
       logger_info_dividing_line
       logger_info_app_short_and_qrcode(options)
 

data/lib/fir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli-xsl
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,7 +238,8 @@ post_install_message: "\n        ______________        ________    ____\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/iamjia/fir-cli)
-  已经开源\n  - 欢迎 fork, issue 和 pull request\n  - xiangshaolong 专用\n  "
+  已经开源\n  - 欢迎 fork, issue 和 pull request\n  - xiangshaolong 专用\n  - (2.0.3) 鉴于 fir.im
+  最多只能保留 30 个版本，所以增加了删除同 build 号的其他版本的功能，一个版本只保留一个可追溯的安装包\n  "
 rdoc_options: []
 require_paths:
 - lib