fir-cli 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88492e7b3365d96d0c3327c8e26c60c538213b6f
-  data.tar.gz: 570581ec73ffa6b3d7b97bf392047b0333fd4498
+  metadata.gz: 664504e23e1b1fcc58ff6b939d8f9dcc77f18b49
+  data.tar.gz: 6443da78833ee29a028db393113e02caa037eac2
 SHA512:
-  metadata.gz: 9a78e1a3bf944283ccf9d8ca59733a2b5386327856d602e7cc2739f8f8d57265b8f9c9193a5af1b90d96f14ac3c30f9f65dd01c06579dd27c22508ada78d487a
-  data.tar.gz: c7367a479a46ebb1844bf2009751fa558db497666df9f30f9410515b2bbdf4f9674420f4e113c527575b354dce0d5ef4334a9daa37b126d295ede9d9b41c5454
+  metadata.gz: 7dad7e41ec18ba1d7c1de78f328a525bf5ad2b17f0a5e1ef19a0bd4360be01aa70168582a82afc6cfa9f04f1f1747b7574a1b0c3fff73e1dfc24993eb00e734e
+  data.tar.gz: 87aa90d1ebbe5dba4e7ef488b677b9e33372b4ba50c9ef1c98bebfd565cf382fdafd76a4fd482aa35ecd32af24086a34b2b5365cc49689857a8f01cd450e76e6

data/CHANGELOG

@@ -1,5 +1,9 @@
 ## 更新记录
 
+### fir-cli 1.4.5
+- 增加 Android flavor 打包(感谢 [msdx](https://github.com/msdx) 的热心帮助)
+- `$ fir ba <project dir> -f <flavor>`
+
 ### fir-cli 1.4.4
 - Publish 时候增加 app 相关信息
 

data/README.md

@@ -27,9 +27,12 @@ $ gem install fir-cli
 
 **注意: 如果你的系统是 Mac OS X 10.11 以后的版本, 由于10.11引入了 `rootless`, 无法直接安装 fir-cli, 有以下三种解决办法:**
 
-1\. 使用 [RVM](https://rvm.io/) 安装 Ruby, 再安装 fir-cli(推荐)
+1\. 使用 [Homebrew](http://brew.sh/) 及 [RVM](https://rvm.io/) 安装 Ruby, 再安装 fir-cli(推荐)
 
 ```sh
+# Install Homebrew:
+$ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
 # Install RVM:
 $ \curl -sSL https://get.rvm.io | bash -s stable --ruby
 
@@ -127,7 +130,7 @@ $ fir publish path/to/application -T YOUR_FIR_TOKEN
 $ fir login
 ```
 
-这时系统会提示输入用户 API token, 用户的 API token 可在 **[fir.im 应用管理页](http://fir.im/apps)** 的右上角查看
+这时系统会提示输入用户 API token, 用户的 API token 可在 **[这里](http://fir.im/apps/apitoken)** 的右上角查看
 
 ```sh
 Please enter your fir.im API Token:
@@ -167,7 +170,17 @@ $ fir build_ipa path/to/workspace -w -S <scheme name>
 #### 编译用 Gradle 打包 apk
 
 ```sh
+# 简单打包
 $ fir build_apk path/to/project
+
+# 打包并上传
+$ fir ba <project dir> [-o <apk output dir> -c <changelog> -p -Q -T <your api token>]
+
+# 打包指定的 flavor
+$ fir ba <project dir> [-f <flavor> -o <apk output dir> -c <changelog> -p -Q -T <your api token>]
+
+# 打包指定的 git branch
+$ fir ba <git ssh url> [-B develop -o <apk output dir> -c <changelog> -p -Q -T <your api token>]
 ```
 
 #### 编译并且上传至 fir.im
@@ -231,4 +244,3 @@ $ fir upgrade
 如果你觉得 fir-cli 对你有所帮助, 欢迎微信打赏支持作者:smile:
 
 ![](http://7rf35s.com1.z0.glb.clouddn.com/coffee.png)
-

data/fir-cli.gemspec

@@ -27,11 +27,9 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.4.4
-  - Publish 时候增加 app 相关信息
-  - 修复 @build_cmd 中的输出显示, 使用 `$?` 获取 Process::Status
-  - 支持远程 git 项目打包编译, enjoy.
-  - `$ fir bi/ba <git ssh url> -B develop -c <changelog> -p`
+  ### fir-cli 1.4.5
+  - 增加 Android flavor 打包(感谢 [msdx](https://github.com/msdx) 的热心帮助)
+  - `$ fir ba <project dir> -f <flavor>`
   - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request

data/lib/fir/cli.rb

@@ -54,12 +54,15 @@ module FIR
 
       $ fir ba <project dir> [-o <apk output dir> -c <changelog> -p -Q -T <your api token>]
 
+      $ fir ba <project dir> [-f <flavor> -o <apk output dir> -c <changelog> -p -Q -T <your api token>]
+
       $ fir ba <git ssh url> [-B develop -o <apk output dir> -c <changelog> -p -Q -T <your api token>]
     LONGDESC
     map ['ba'] => :build_apk
     method_option :branch,    type: :string,  aliases: '-B', desc: 'Set branch if project is a git repo, the default is `master`'
     method_option :output,    type: :string,  aliases: '-o', desc: 'APK output path, the default is: BUILD_DIR/build/outputs/apk'
     method_option :publish,   type: :boolean, aliases: '-p', desc: 'true/false if publish to fir.im'
+    method_option :flavor,    type: :string,  aliases: '-f', desc: 'Set flavor if have productFlavors'
     method_option :short,     type: :string,  aliases: '-s', desc: 'Set custom short link if publish to fir.im'
     method_option :name,      type: :string,  aliases: '-n', desc: 'Set custom apk name when builded'
     method_option :changelog, type: :string,  aliases: '-c', desc: 'Set changelog if publish to fir.im, support string/file'

data/lib/fir/util/build_apk.rb

@@ -5,16 +5,14 @@ module FIR
 
     def build_apk(*args, options)
       initialize_build_common_options(args, options)
+      set_flavor(options)
 
       Dir.chdir(@build_dir)
-
       @build_cmd = initialize_apk_build_cmd
 
       logger_info_and_run_build_command
 
       output_apk
-      @builded_app_path = Dir["#{@output_path}/*.apk"].first
-
       publish_build_app if options.publish?
 
       logger_info_blank_line
@@ -22,11 +20,21 @@ module FIR
 
     private
 
+    def set_flavor(options)
+      unless options.flavor.blank?
+        @flavor = options.flavor
+        unless @flavor =~ /^assemble(.+)/
+          @flavor = "assemble#{@flavor}Release"
+        end
+      end
+    end
+
     def initialize_apk_build_cmd
       check_build_gradle_exist
 
-      apk_build_cmd = 'gradle clean;gradle build'
-      apk_build_cmd
+      cmd = "./gradlew build"
+      cmd = "./gradlew #{@flavor}" unless @flavor.blank?
+      cmd
     end
 
     def gradle_build_path
@@ -44,15 +52,11 @@ module FIR
 
       check_no_output_apk
 
-      apk_info = FIR.apk_info(@builded_apk)
-
-      if @name.blank?
-        apk_name = "#{apk_info[:name]}-#{apk_info[:version]}-Build-#{apk_info[:build]}"
-      else
-        apk_name = @name
-      end
+      apk_info  = FIR.apk_info(@builded_apk)
+      @apk_name = @name.blank? ? "#{apk_info[:name]}-#{apk_info[:version]}-Build-#{apk_info[:build]}" : @name
 
-      FileUtils.cp(@builded_apk, "#{@output_path}/#{apk_name}.apk")
+      @builded_app_path = "#{@output_path}/#{@apk_name}.apk"
+      FileUtils.cp(@builded_apk, @builded_app_path)
     end
 
     def check_no_output_apk

data/lib/fir/util/build_ipa.rb

@@ -12,7 +12,6 @@ module FIR
       logger_info_and_run_build_command
 
       output_ipa_and_dsym
-
       publish_build_app if options.publish?
       upload_build_dsym_mapping_file if options.mapping?
 

data/lib/fir/util.rb

@@ -77,7 +77,7 @@ module FIR
         logger.info '✈ -------------------------------------------- ✈'
       end
 
-      def generate_rqrcode string, png_file_path
+      def generate_rqrcode(string, png_file_path)
         qrcode = ::RQRCode::QRCode.new(string.to_s)
         qrcode.as_png(size: 500, border_modules: 2, file: png_file_path)
         png_file_path

data/lib/fir/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,9 +202,8 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.4.4\n  - Publish 时候增加 app 相关信息\n  - 修复 @build_cmd 中的输出显示,
-  使用 `$?` 获取 Process::Status\n  - 支持远程 git 项目打包编译, enjoy.\n  - `$ fir bi/ba <git ssh
-  url> -B develop -c <changelog> -p`\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
+  \ ## 更新记录\n  ### fir-cli 1.4.5\n  - 增加 Android flavor 打包(感谢 [msdx](https://github.com/msdx)
+  的热心帮助)\n  - `$ fir ba <project dir> -f <flavor>`\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
   \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
   request\n  "
 rdoc_options: []
@@ -222,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: fir.im command tool