fir-cli 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8c6da4ee5e12418303fdb4050554e145e04ce70b033e4460f6ca390d1fd9e18
-  data.tar.gz: ce18cbd160ac0018f5e04d1c02076281d162107449b6d3bdc5d647d5728aa1d9
+  metadata.gz: f519307fd500f9c5abcb1f9e58bb07a400b1c2d4e83c86bd497f78bdbe697872
+  data.tar.gz: d1fb7013596a6f40b9604d9ada08b72e473b4eaaa63f1b84e2428e914f7155d4
 SHA512:
-  metadata.gz: df1656d6250cdc7224eb7f4a5f1fe6a83df2cc3a6bd12d73b9d0a9c4582c5139ab575e5911d9077209700225865256a668e122310f77077d30fe0fd2cdf1ce73
-  data.tar.gz: f6f70fc679141dad2be96059a31b64542cd1f22f7d98538cedcb5642c72db41b26e873f8e156bf56d4e5c01ccd5d63cdec652ddd9b5d7ec0112a8cc4eb8a599d
+  metadata.gz: 227a5f10ffb7fa3de80000b3e49549a39978df87dcf3a3d271bca90eabf89fd25baa8b758fbd88b88ca3fd9bcabb0cce809347c8b83115fe63091d57c28ac05a
+  data.tar.gz: 34374e11164cb8d8213ae3f71d0cafa66e4232673f01478fd94f72f9157b4ec099192a0522b5cf5a3265b90da8d7728dc982b7e1292e07032644c65fc3eeb577

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.4.2
+FROM ruby:2.6.1
 RUN gem install bundler
 ENV LANG=C.UTF-8 
 ENV WORKDIR=/fir-cli

data/Gemfile

@@ -1,12 +1,10 @@
 # coding: utf-8
-if ENV['USE_OFFICIAL_GEM_SOURCE']
-  source 'https://rubygems.org'
-else
+if ENV['USE_CHINA_GEM_SOURCE']
   source 'http://gems.ruby-china.com'
+else
+  source 'https://rubygems.org'
 end
 
-# gem 'byebug'
 # Specify your gem's dependencies in fir.gemspec
 gemspec
-gem 'byebug'
 gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -13,9 +13,10 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 ![fir-cli](http://7rf35s.com1.z0.glb.clouddn.com/fir-cli-new.gif)
 
 
-# 重要提示
+# 最近更新
+- 官方支持 钉钉推送, 使用方法为 在publish 中增加 --dingtalk_access_token=xxxxxxxxxxxxxxxxxxx (或者 -D=xxxxxxx)  
+- 官方支持 上传完毕后, 返回精确的版本的下载地址, 使用方案为 在 publish 后增加 --need_release_id (特定版本支持近期30个以内的任意版本)
 - 已过期 build_ipa 功能, 推荐用户使用 fastlane (fastlane gym)进行打包,生成好 ipa 文件后,再使用 `fir publish` 上传生成的ipa [2019年03月21日]
-- 由于 CDN 厂商技术原因, 部分老版本用户会出现 579 错误,解决该问题请升级fir-cli 至最新版
 - 由于部分地区上传时遇到的证书问题, 新版本默认忽略证书校验. 如需打开, 请在命令前加入`UPLOAD_VERIFY_SSL=1`
 - 现已添加 docker 版本, 具体请见 `Docker 运行 fir-cli ` 说明
 - 关于因为境外到境内网络不佳的而在上传出现 `stream closed`的问题, 我们已经联系了 CDN 厂商处理, 并将超时时间改为了 300 (秒), 如需修改, 可传入环境变量 `FIR_TIMEOUT=xxx` 
@@ -23,8 +24,6 @@ fir.im-cli 可以通过指令查看, 上传, iOS/Android 应用.
 ## 文档
 
 - [安装及常见安装问题](https://github.com/FIRHQ/fir-cli/blob/master/doc/install.md)
-- [fir help 相关指令帮助](https://github.com/FIRHQ/fir-cli/blob/master/doc/help.md)
-- [fir info 查看 ipa/apk 信息](https://github.com/FIRHQ/fir-cli/blob/master/doc/info.md)
 - [fir login & fir me 登录相关](https://github.com/FIRHQ/fir-cli/blob/master/doc/login.md)
 - [fir publish 发布应用到 fir.im](https://github.com/FIRHQ/fir-cli/blob/master/doc/publish.md)
 - [fir upgrade 升级相关](https://github.com/FIRHQ/fir-cli/blob/master/doc/upgrade.md)
@@ -57,6 +56,7 @@ fir help
 ```
 
 ## 最近更新
+- (1.7.1) 新增发布后可选返回精确到版本的下载地址, 以及支持钉钉推送
 - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
 - (1.6.13) 上传图标逻辑修改
 - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题

data/doc/publish.md

@@ -15,6 +15,8 @@ Options:
       [--password=PASSWORD]        # Set password for app
   -T, [--token=TOKEN]              # User's API Token at fir.im
   -L, [--logfile=LOGFILE]          # Path to writable logfile
+  -R, [--need_release_id]          # show release_id in download_url
+  -D, [--dingtalk_accesss_token=DINGTALK_ACCESS_TOKEN] # dingtalk notification
   -V, [--verbose], [--no-verbose]  # Show verbose
                                    # Default: true
   -q, [--quiet], [--no-quiet]      # Silence commands
@@ -28,6 +30,8 @@ Options:
 - `-Q` 参数, 是否生成发布后二维码, 默认为不生成, 加上 `-Q` 参数后会在当前目录生成一张二维码图片, 扫描该图片即可下载该应用.
 - `-m` 参数, 上传当前应用的符号表文件, 配合 `-P` 参数使用.
 - `-P` 参数, [BugHD.com](http://bughd.com) 上相对应的 Project id.
+- `-R` 参数, 显示具体版本, 会在发布结束后的下载地址中生成指定的版本
+- `-D` 参数, 钉钉机器人的access_token, 填写后当上传完毕, 会发送至钉钉机器人 
 - `--open` 参数, 设置发布后的应用是否开放给所有人下载, 关闭开放使用 `--no-open` 参数.
 - `--password` 参数, 设置发布后的应用密码
 

data/fir-cli.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
+  - (1.7.1) 增加了 钉钉推送 , 增加了返回指定版本下载地址
   - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
   - (1.6.13) 上传图标逻辑修改
   - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题
@@ -35,8 +36,8 @@ Gem::Specification.new do |spec|
   - 欢迎 fork, issue 和 pull request
   )
 
-  spec.add_development_dependency 'bundler',  '~> 1.7'
-  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', '~> 5.7'
   spec.add_development_dependency 'pry',      '~> 0.10'
 
@@ -45,6 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ruby_android',   '~> 0.7.7'
   spec.add_dependency 'rqrcode',        '~> 0.7'
   spec.add_dependency 'CFPropertyList'
-  spec.add_dependency 'api_tools'
-  spec.add_dependency 'byebug'
+  spec.add_dependency 'api_tools', '~> 0.1.0'
 end

data/lib/fir/cli.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FIR
   class CLI < Thor
@@ -24,7 +24,7 @@ module FIR
 
       $ fir bi <workspace dir> -w -S <scheme name> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -Q -T <your api token>]
     LONGDESC
-    map ['b', 'bi'] => :build_ipa
+    map %w[b bi] => :build_ipa
     method_option :branch,        type: :string,  aliases: '-B', desc: 'Set branch if project is a git repo, the default is `master`'
     method_option :workspace,     type: :boolean, aliases: '-w', desc: 'true/false if build workspace'
     method_option :scheme,        type: :string,  aliases: '-S', desc: 'Set the scheme NAME if build workspace'
@@ -32,7 +32,7 @@ module FIR
     method_option :destination,   type: :string,  aliases: '-d', desc: 'Set the destination specifier'
     method_option :target,        type: :string,  aliases: '-t', desc: 'Build the target specified by target name'
     method_option :export_method, type: :string,  aliases: '-E', desc: 'for exportOptionsPlist method, ad-hoc as default'
-    method_option :optionPlistPath, type: :string,  aliases: '-O', desc: 'User defined exportOptionsPlist path'
+    method_option :optionPlistPath, type: :string, aliases: '-O', desc: 'User defined exportOptionsPlist path'
     method_option :profile,       type: :string,  aliases: '-f', desc: 'Set the export provisioning profile'
     method_option :output,        type: :string,  aliases: '-o', desc: 'IPA output path, the default is: BUILD_DIR/fir_build_ipa'
     method_option :publish,       type: :boolean, aliases: '-p', desc: 'true/false if publish to fir.im'
@@ -107,9 +107,11 @@ 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 :mappingfile, type: :string,  aliases: '-m', desc: 'App mapping file'
-    method_option :proj,        type: :string,  aliases: '-P', desc: 'Project id in BugHD.com if upload 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 :open,        type: :boolean, desc: 'true/false if open for everyone'
     method_option :password,    type: :string,  desc: 'Set password for app'
     def publish(*args)
@@ -171,7 +173,7 @@ module FIR
     def prepare(task)
       if options.help?
         help(task.to_s)
-        fail SystemExit
+        raise SystemExit
       end
       $DEBUG = true if ENV['DEBUG']
     end

data/lib/fir/util/parser/apk.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require_relative './common'
-
-require 'byebug'
 module FIR
   module Parser
     class Apk

data/lib/fir/util/publish.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-
-#require 'byebug'
-
 module FIR
   module Publish
     def publish(*args, options)
@@ -18,10 +15,10 @@ module FIR
       upload_app
 
       logger_info_dividing_line
-      logger_info_app_short_and_qrcode
+      logger_info_app_short_and_qrcode(options)
 
+      dingtalk_notifier(options)
       upload_mapping_file_with_publish(options)
-
       logger_info_blank_line
     end
 
@@ -73,16 +70,16 @@ module FIR
       large_icon_path = @app_info[:icons].max_by { |f| File.size(f) }
       @uncrushed_icon_path = convert_icon(large_icon_path)
       {
-        key:   @icon_cert[:key],
+        key: @icon_cert[:key],
         token: @icon_cert[:token],
-        file:  File.new(@uncrushed_icon_path, 'rb'),
+        file: File.new(@uncrushed_icon_path, 'rb'),
         'x:is_converted' => '1'
       }
     end
 
     def icon_information
       {
-        key:   @icon_cert[:key],
+        key: @icon_cert[:key],
         token: @icon_cert[:token],
         origin: 'fir-cli',
         parent_id: @app_id,
@@ -112,15 +109,15 @@ module FIR
 
     def uploading_binary_info
       {
-        key:   @binary_cert[:key],
+        key: @binary_cert[:key],
         token: @binary_cert[:token],
-        file:  File.new(@file_path, 'rb'),
+        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: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]
       }
     end
@@ -130,8 +127,8 @@ module FIR
 
       logger.info 'Updating devices info......'
 
-      post fir_api[:udids_url], key:       @binary_cert[:key],
-                                udids:     @app_info[:devices].join(','),
+      post fir_api[:udids_url], key: @binary_cert[:key],
+                                udids: @app_info[:devices].join(','),
                                 api_token: @token
       end
 
@@ -149,7 +146,7 @@ module FIR
       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],
+      post fir_api[:app_url], type: @app_info[:type],
                               bundle_id: @app_info[:identifier],
                               manual_callback: true,
                               api_token: @token
@@ -172,27 +169,43 @@ module FIR
 
       logger_info_blank_line
 
-      mapping options[:mappingfile], proj:    options[:proj],
-                                     build:   @app_info[:build],
+      mapping options[:mappingfile], proj: options[:proj],
+                                     build: @app_info[:build],
                                      version: @app_info[:version],
-                                     token:   @token
+                                     token: @token
     end
 
-    def logger_info_app_short_and_qrcode
-      short = "#{fir_api[:domain]}/#{@fir_app_info[:short]}"
+    def logger_info_app_short_and_qrcode(options)
+      @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: #{short}"
+      logger.info "Published succeed: #{@download_url}"
 
-      if @export_qrcode
-        qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
-        FIR.generate_rqrcode(short, qrcode_path)
+      @qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
+      FIR.generate_rqrcode(@qrcode_path, @qrcode_path)
 
-        logger.info "Local qrcode file: #{qrcode_path}"
-      end
+      logger.info "Local qrcode file: #{@qrcode_path}" if @export_qrcode
     end
 
     private
 
+    def dingtalk_notifier(options)
+      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)))})"
+          }
+        }
+        url = "https://oapi.dingtalk.com/robot/send?access_token=#{options[:dingtalk_access_token]}"
+        DefaultRest.post(url, payload)
+      end
+    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('.')
@@ -206,6 +219,7 @@ module FIR
 
     def read_changelog(changelog)
       return if changelog.blank?
+
       File.exist?(changelog) ? File.read(changelog) : changelog
     end
 
@@ -219,7 +233,7 @@ module FIR
     def convert_icon(origin_path)
       # 兼容性不太好, 蔽掉转化图标
       return origin_path
-      
+
       logger.info "Converting app's icon......"
 
       if @app_info[:type] == 'ios'

data/lib/fir/version.rb

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

data/lib/fir.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'thor'
-# require 'byebug'
 require 'logger'
 require 'yaml'
 require 'rest-client'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -141,30 +141,16 @@ dependencies:
   name: api_tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0
 description: fir.im command tool, support iOS and Android
 email:
 - atpking@gmail.com
@@ -248,10 +234,10 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\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.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
@@ -266,8 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: fir.im command tool