fir-cli 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1cc30a7a258c5ed2349009e07307b42bc69d076
-  data.tar.gz: d2b79e6409a92803b19401771eb47881df1d5eca
+  metadata.gz: ea56efea5d40f829e8dda5577bedc83315e7dadb
+  data.tar.gz: 5d672c450dd8cc2115b26fdc4681cb7031e20a89
 SHA512:
-  metadata.gz: 8d58f484f0618482a0502fa39bfcd87f5877e9c209363343548f9100da03caee367efbe791a893c07b9f78cac4232fa6100c23d63daef6df042a81318db818a2
-  data.tar.gz: d5ac3c65f17bbe158f07b98ed7b95e72515635bb0c9e1c03415243835e8b058608a570dff2f017b00886d21e962be6413b552b62c08af8beb1d7676549469f88
+  metadata.gz: d5e5d7e67186cb666fe8b96576a3046bffdfc985028d8d4b4b61713bc96c4e7a89417c39f37209be8a64df1c4dc2b09797fd34f7f23c3f00316296161a97a7d0
+  data.tar.gz: 911c4e30e32238144e65819b84725f9cb70191ff245d4e2ac4ed2a081ead711a3a53ec8fac951d475c13a5d069dde8e35ab78d45c4a963df389ca977f72d694e

data/Gemfile

@@ -8,4 +8,4 @@ end
 # Specify your gem's dependencies in fir.gemspec
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -1,4 +1,4 @@
-FIR.im CLI
+fir.im-cli
 ---
 
 
@@ -8,12 +8,12 @@ FIR.im CLI
 [![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)
 
-> FIR.im CLI 可以通过指令查看, 上传, 编译应用
+> fir.im-cli 可以通过指令查看, 上传, 编译应用
 
 ## 使用入门
 ### 从安装入手
 
-FIR.im CLI 使用 Ruby 构建，只要安装相应 ruby gem 即可:
+fir.im-cli 使用 Ruby 构建，只要安装相应 ruby gem 即可:
 
 ```shell
 $ sudo gem install fir-cli
@@ -34,21 +34,54 @@ sudo gem update --system
 sudo gem install fir-cli
 ```
 
+**注意: 如果你的系统是 mac OSX 10.11 以后的版本, 由于10.11引入了 `rootless`, 无法直接安装 fir-cli, 有以下三种解决办法:**
+
+1\. 使用 [RVM](https://rvm.io/) 安装 Ruby, 再安装 fir-cli(推荐)
+
+```shell
+# Install RVM:
+$ \curl -sSL https://get.rvm.io | bash -s stable --ruby
+
+$ gem install fir-cli
+```
+
+2\. 指定 fir-cli 中 bin 文件的 PATH
+
+```shell
+$ export PATH=/usr/local/bin:$PATH;sudo gem install -n /usr/local/bin fir-cli
+```
+
+3\. 重写 Ruby Gem 的 bindir
+
+```shell
+$ echo 'gem: --bindir /usr/local/bin' >> ~/.gemrc
+$ sudo gem install fir-cli
+```
+
 安装后，你可以在命令行执行指令
 
 ```shell
 $ fir
 Commands:
-  fir build_apk BUILD_DIR                       # Build Android app (alias: 'ba').
-  fir build_ipa BUILD_DIR [options] [settings]  # Build iOS app (alias: 'bi').
-  fir help                                      # Describe available commands or one specific command.
-  fir info APP_FILE_PATH                        # Show iOS/Android app's info, support ipa/apk file (aliases: 'i').
-  fir login                                     # Login FIR.im (aliases: 'l').
-  fir mapping MAPPING_FILE_PATH                 # Upload app's mapping file to BugHD.com (aliases: 'm').
+  fir build_apk BUILD_DIR                       # Build Android app (alias: `ba`).
+  fir build_ipa BUILD_DIR [options] [settings]  # Build iOS app (alias: `bi`).
+  fir help                                      # Describe available commands or one specific command (aliases: `h`).
+  fir info APP_FILE_PATH                        # Show iOS/Android app info, support ipa/apk file (aliases: `i`).
+  fir login                                     # Login fir.im (aliases: `l`).
+  fir mapping MAPPING_FILE_PATH                 # Upload app mapping file to BugHD.com (aliases: `m`).
   fir me                                        # Show current user info if user is logined.
-  fir publish APP_FILE_PATH                     # Publish iOS/Android app to FIR.im, support ipa/apk file (aliases: 'p').
-  fir upgrade                                   # Upgrade FIR-CLI and quit (aliases: u).
-  fir version                                   # Show FIR-CLI version number and quit (aliases: v)
+  fir publish APP_FILE_PATH                     # Publish iOS/Android app to fir.im, support ipa/apk file (aliases: `p`).
+  fir upgrade                                   # Upgrade fir-cli and quit (aliases: `u`).
+  fir version                                   # Show fir-cli version number and quit (aliases: `v`).
+
+Options:
+  -T, [--token=TOKEN]              # User's API Token at fir.im
+  -L, [--logfile=LOGFILE]          # Path to writable logfile
+  -V, [--verbose], [--no-verbose]  # Show verbose
+                                   # Default: true
+  -q, [--quiet], [--no-quiet]      # Silence commands
+  -h, [--help], [--no-help]        # Show this help message and quit
+
 
 Options:
   -T, [--token=TOKEN]              # User's API Token at FIR.im
@@ -62,8 +95,8 @@ Options:
 ### 参数说明
 
 - `alias <short command>` 意味着可以用 alias 别名来代替该指令, 例如 `fir b`
-- `-T` 用户在 FIR.im 上的 api_token, `publish` 需要使用此参数
-- `-L` 指定 FIR-CLI 的输出 log, 默认为 STDOUT
+- `-T` 用户在 fir.im 上的 api_token, `publish` 需要使用此参数
+- `-L` 指定 fir-cli 的输出 log, 默认为 STDOUT
 - `-V` Verbose, 默认为输出所有信息( INFO 和 ERROR), 如果设置 `--no-verbose`, 则只输出 ERROR 信息
 - `-q` 静默模式, 默认关闭
 - `-h` 查看帮助
@@ -81,11 +114,11 @@ $ fir p path/to/application -T YOUR_FIR_TOKEN
 ```shell
 I, [2015-08-26T10:08:35.447209 #6774]  INFO -- : Publishing app.......
 I, [2015-08-26T10:08:35.447334 #6774]  INFO -- : ✈ -------------------------------------------- ✈
-I, [2015-08-26T10:08:35.514378 #6774]  INFO -- : Fetching xxxx@FIR.im uploading info......
+I, [2015-08-26T10:08:35.514378 #6774]  INFO -- : Fetching xxxx@fir.im uploading info......
 I, [2015-08-26T10:08:35.692616 #6774]  INFO -- : Uploading app......
 I, [2015-08-26T10:08:36.920226 #6774]  INFO -- : Updating devices info......
 I, [2015-08-26T10:08:37.075149 #6774]  INFO -- : ✈ -------------------------------------------- ✈
-I, [2015-08-26T10:08:37.075238 #6774]  INFO -- : Fetch app info from FIR.im
+I, [2015-08-26T10:08:37.075238 #6774]  INFO -- : Fetch app info from fir.im
 I, [2015-08-26T10:08:37.235071 #6774]  INFO -- : Published succeed: http://fir.im/xxxx
 I, [2015-08-26T10:08:37.235155 #6774]  INFO -- :
 ```
@@ -101,7 +134,7 @@ $ fir l
 这时系统会提示输入用户 token, 用户 token 可在 **[这里](http://fir.im/user/info)** 查看
 
 ```shell
-Please enter your FIR.im API Token:
+Please enter your fir.im API Token:
 I, [2015-08-26T10:10:28.235295 #6833]  INFO -- : Login succeed, previous user's email: xxx@xxx.com
 I, [2015-08-26T10:10:28.245083 #6833]  INFO -- : Login succeed, current  user's email: xxx@xxx.com
 I, [2015-08-26T10:10:28.245152 #6833]  INFO -- :
@@ -142,7 +175,7 @@ $ fir bi path/to/workspace -w -S <scheme name>
 $ fir ba path/to/project
 ```
 
-### 一步, 从源代码到 FIR.im
+### 一步, 从源代码到 fir.im
 > 只需要输入 -p -T
 
 ```shell
@@ -157,11 +190,11 @@ I, [2015-08-26T10:12:00.893819 #7273]  INFO -- : Build Success
 I, [2015-08-26T10:12:00.894051 #7273]  INFO -- :
 I, [2015-08-26T10:12:01.026832 #7273]  INFO -- : Publishing app.......
 I, [2015-08-26T10:12:01.026905 #7273]  INFO -- : ✈ -------------------------------------------- ✈
-I, [2015-08-26T10:12:01.098759 #7273]  INFO -- : Fetching im.fir.OnlyiPad@FIR.im uploading info......
+I, [2015-08-26T10:12:01.098759 #7273]  INFO -- : Fetching im.fir.OnlyiPad@fir.im uploading info......
 I, [2015-08-26T10:12:01.249832 #7273]  INFO -- : Uploading app......
 I, [2015-08-26T10:12:01.859718 #7273]  INFO -- : Updating devices info......
 I, [2015-08-26T10:12:02.015517 #7273]  INFO -- : ✈ -------------------------------------------- ✈
-I, [2015-08-26T10:12:02.015588 #7273]  INFO -- : Fetch app info from FIR.im
+I, [2015-08-26T10:12:02.015588 #7273]  INFO -- : Fetch app info from fir.im
 I, [2015-08-26T10:12:02.210391 #7273]  INFO -- : Published succeed: http://fir.im/xxxx
 I, [2015-08-26T10:12:02.210459 #7273]  INFO -- :
 I, [2015-08-26T10:12:02.210520 #7273]  INFO -- :
@@ -201,7 +234,7 @@ $ fir publish -h
 
 ## 永远使用最新功能
 
-下面的指令会自动更新 FIR-CLI
+下面的指令会自动更新 fir-cli
 
 ```shell
 $ fir upgrade

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require File.expand_path('../test/test_helper', __FILE__)
 
-desc "Run the tests."
+desc 'Run the tests.'
 task :test do
-  $: << "lib" << "test"
-  Dir["test/*_test.rb"].each { |f| require f[5..-4] }
+  $LOAD_PATH << 'lib' << 'test'
+  Dir['test/*_test.rb'].each { |f| require f[5..-4] }
 end
 
 task default: :test

data/bin/fir

@@ -4,7 +4,7 @@
 require_relative '../lib/fir'
 
 begin
-  system "export LC_ALL=en_US.UTF-8;export LC_CTYPE=en_US.UTF-8;export LANG=en_US.UTF-8"
+  OS.set_locale
   FIR::CLI.start ARGV
 rescue => e
   raise e if $DEBUG

data/fir-cli.gemspec

@@ -5,20 +5,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fir/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fir-cli"
+  spec.name          = 'fir-cli'
   spec.version       = FIR::VERSION
-  spec.authors       = ["FIR.im", "NaixSpirit"]
-  spec.email         = ["dev@fir.im"]
-  spec.date          = Time.now.strftime("%Y-%m-%d")
-  spec.summary       = %q{FIR.im command tool}
-  spec.description   = %q{FIR.im command tool, support iOS and Android}
-  spec.homepage      = "http://blog.fir.im/fir_cli"
-  spec.license       = "MIT"
-
+  spec.authors       = ['NaixSpirit']
+  spec.email         = ['dev@fir.im']
+  spec.date          = Time.now.strftime('%Y-%m-%d')
+  spec.summary       = 'fir.im command tool'
+  spec.description   = 'fir.im command tool, support iOS and Android'
+  spec.homepage      = 'http://blog.fir.im/fir_cli'
+  spec.license       = 'MIT'
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.post_install_message = %q(
         ______________        ________    ____
@@ -28,21 +27,20 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.2.2
-  - 完全兼容新版 API ✔
-  - 请使用新版 API Token
-  - 新版 API Token 查看地址: `http://fir.im/user/info`
-  - 修正不同系统非 UTF-8 编码问题
-  - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源, 欢迎 fork, issue 和 pull request
+  ### fir-cli 1.2.3
+  - 修正 `build_apk` 无法找到 apk 的 bug
+  - build 完毕后, ipa 和 apk 均以 $name-$version-Build-$build 形式命名
+  - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
+  - 欢迎 fork, issue 和 pull request
   )
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.7"
-  spec.add_development_dependency "pry", "~> 0.10"
+  spec.add_development_dependency 'bundler',  '~> 1.7'
+  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.7'
+  spec.add_development_dependency 'pry',      '~> 0.10'
 
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "CFPropertyList", "~> 2.3"
-  spec.add_dependency "rest-client", "~> 1.7"
-  spec.add_dependency "ruby_android", "~> 0.7"
+  spec.add_dependency 'thor',           '~> 0.19'
+  spec.add_dependency 'CFPropertyList', '~> 2.3'
+  spec.add_dependency 'rest-client',    '~> 1.7'
+  spec.add_dependency 'ruby_android',   '~> 0.7'
 end

data/lib/fir/api.yml

@@ -1,11 +1,11 @@
 fir:
-  domain: 'http://fir.im'
-  base_url: 'http://api.fir.im'
-  user_url: 'http://api.fir.im/user'
-  app_url: 'http://api.fir.im/apps'
+  domain:    'http://fir.im'
+  base_url:  'http://api.fir.im'
+  user_url:  'http://api.fir.im/user'
+  app_url:   'http://api.fir.im/apps'
   udids_url: 'http://api.fir.im/devices/multi_udid'
 bughd:
-  domain: 'http://bughd.com'
-  base_url: 'http://api.bughd.com'
-  project_url: 'http://api.bughd.com/projects'
+  domain:           'http://bughd.com'
+  base_url:         'http://api.bughd.com'
+  project_url:      'http://api.bughd.com/projects'
   full_version_url: 'http://api.bughd.com/full_versions'

data/lib/fir/cli.rb

@@ -2,16 +2,16 @@
 
 module FIR
   class CLI < Thor
-    class_option :token,   type: :string,  aliases: "-T", desc: "User's API Token at FIR.im"
-    class_option :logfile, type: :string,  aliases: "-L", desc: "Path to writable logfile"
-    class_option :verbose, type: :boolean, aliases: "-V", desc: "Show verbose", default: true
-    class_option :quiet,   type: :boolean, aliases: "-q", desc: "Silence commands"
-    class_option :help,    type: :boolean, aliases: "-h", desc: "Show this help message and quit"
+    class_option :token,   type: :string,  aliases: '-T', desc: "User's API Token at fir.im"
+    class_option :logfile, type: :string,  aliases: '-L', desc: 'Path to writable logfile'
+    class_option :verbose, type: :boolean, aliases: '-V', desc: 'Show verbose', default: true
+    class_option :quiet,   type: :boolean, aliases: '-q', desc: 'Silence commands'
+    class_option :help,    type: :boolean, aliases: '-h', desc: 'Show this help message and quit'
 
-    desc "build_ipa BUILD_DIR [options] [settings]", "Build iOS app (alias: 'bi')."
+    desc 'build_ipa BUILD_DIR [options] [settings]', 'Build iOS app (alias: `bi`).'
     long_desc <<-LONGDESC
       `build_ipa` command will auto build your project/workspace to an ipa package
-      and it also can auto publish your built ipa to FIR.im if use `-p` option.
+      and it also can auto publish your built ipa to fir.im if use `-p` option.
       Internally, it use `xcodebuild` to accomplish these things, use `man xcodebuild` to get more information.
 
       Example:
@@ -22,57 +22,57 @@ module FIR
 
       $ fir bi <workspace dir> -w -S <scheme name> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your api token>]
     LONGDESC
-    map ["b", "bi"] => :build_ipa
-    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"
-    method_option :configuration, type: :string,  aliases: "-C", desc: "Use the build configuration NAME for building each target"
-    method_option :target,        type: :string,  aliases: "-t", desc: "Build the target specified by targetname"
-    method_option :output,        type: :string,  aliases: "-o", desc: "IPA output path, the default is: BUILD_DIR/fir_build_ipa"
-    method_option :name,          type: :string,  aliases: "-n", desc: "IPA name, the default is: YOUR PROJECT NAME"
-    method_option :publish,       type: :boolean, aliases: "-p", desc: "true/false if publish to FIR.im"
-    method_option :short,         type: :string,  aliases: "-s", desc: "Set custom short link if publish to FIR.im"
-    method_option :changelog,     type: :string,  aliases: "-c", desc: "Set changelog if publish to FIR.im"
-    method_option :mapping,       type: :boolean, aliases: "-M", desc: "true/false if upload app's mapping file to BugHD.com"
-    method_option :proj,          type: :string,  aliases: "-P", desc: "Project id in BugHD.com if upload app's mapping file"
-    def build_ipa *args
+    map ['b', 'bi'] => :build_ipa
+    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'
+    method_option :configuration, type: :string,  aliases: '-C', desc: 'Use the build configuration NAME for building each target'
+    method_option :target,        type: :string,  aliases: '-t', desc: 'Build the target specified by targetname'
+    method_option :output,        type: :string,  aliases: '-o', desc: 'IPA output path, the default is: BUILD_DIR/fir_build_ipa'
+    method_option :name,          type: :string,  aliases: '-n', desc: 'IPA name, the default is: YOUR PROJECT NAME'
+    method_option :publish,       type: :boolean, aliases: '-p', desc: 'true/false if publish to fir.im'
+    method_option :short,         type: :string,  aliases: '-s', desc: 'Set custom short link if publish to fir.im'
+    method_option :changelog,     type: :string,  aliases: '-c', desc: 'Set changelog if publish to fir.im'
+    method_option :mapping,       type: :boolean, aliases: '-M', desc: 'true/false if upload app mapping file to BugHD.com'
+    method_option :proj,          type: :string,  aliases: '-P', desc: 'Project id in BugHD.com if upload app mapping file'
+    def build_ipa(*args)
       prepare :build_ipa
 
       FIR.build_ipa(*args, options)
     end
 
-    desc "build_apk BUILD_DIR", "Build Android app (alias: 'ba')."
+    desc 'build_apk BUILD_DIR', 'Build Android app (alias: `ba`).'
     long_desc <<-LONGDESC
       `build_apk` command will auto build your project to an apk package
-      and it also can auto publish your built apk to FIR.im if use `-p` option.
+      and it also can auto publish your built apk to fir.im if use `-p` option.
       Internally, it use `gradle` to accomplish these things, use `gradle --help` to get more information.
 
       Example:
 
       $ fir ba <project dir> [-o <apk output dir> -c <changelog> -p -T <your api token>]
     LONGDESC
-    map ["ba"] => :build_apk
-    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 :short,     type: :string,  aliases: "-s", desc: "Set custom short link if publish to FIR.im"
-    method_option :changelog, type: :string,  aliases: "-c", desc: "Set changelog if publish to FIR.im"
-    def build_apk *args
+    map ['ba'] => :build_apk
+    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 :short,     type: :string,  aliases: '-s', desc: 'Set custom short link if publish to fir.im'
+    method_option :changelog, type: :string,  aliases: '-c', desc: 'Set changelog if publish to fir.im'
+    def build_apk(*args)
       prepare :build_apk
 
       FIR.build_apk(*args, options)
     end
 
-    desc "info APP_FILE_PATH", "Show iOS/Android app's info, support ipa/apk file (aliases: 'i')."
-    map "i" => :info
-    method_option :all, type: :boolean, aliases: "-a", desc: "Show all information in application"
-    def info *args
+    desc 'info APP_FILE_PATH', 'Show iOS/Android app info, support ipa/apk file (aliases: `i`).'
+    map 'i' => :info
+    method_option :all, type: :boolean, aliases: '-a', desc: 'Show all information in application'
+    def info(*args)
       prepare :info
 
       FIR.info(*args, options)
     end
 
-    desc "publish APP_FILE_PATH", "Publish iOS/Android app to FIR.im, support ipa/apk file (aliases: 'p')."
+    desc 'publish APP_FILE_PATH', 'Publish iOS/Android app to fir.im, support ipa/apk file (aliases: `p`).'
     long_desc <<-LONGDESC
-      `publish` command will publish your app file to FIR.im, also the command support to publish app's short & changelog.
+      `publish` command will publish your app file to fir.im, also the command support to publish app's short & changelog.
 
       Example:
 
@@ -80,34 +80,34 @@ module FIR
 
       $ fir p <app file path> [-c <changelog> -s <custom short link> -m <mapping file path> -P <bughd project id> -T <your api token>]
     LONGDESC
-    map "p" => :publish
-    method_option :short,       type: :string, aliases: "-s", desc: "Set custom short link"
-    method_option :changelog,   type: :string, aliases: "-c", desc: "Set changelog"
-    method_option :mappingfile, type: :string, aliases: "-m", desc: "App's mapping file"
-    method_option :proj,        type: :string, aliases: "-P", desc: "Project id in BugHD.com if upload app's mapping file"
-    def publish *args
+    map 'p' => :publish
+    method_option :short,       type: :string, aliases: '-s', desc: 'Set custom short link'
+    method_option :changelog,   type: :string, aliases: '-c', desc: 'Set changelog'
+    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'
+    def publish(*args)
       prepare :publish
 
       FIR.publish(*args, options)
     end
 
-    desc "login", "Login FIR.im (aliases: 'l')."
-    map "l" => :login
-    def login *args
+    desc 'login', 'Login fir.im (aliases: `l`).'
+    map 'l' => :login
+    def login(*args)
       prepare :login
 
-      token = options[:token] || args.first || ask("Please enter your FIR.im API Token:", :white, echo: true)
+      token = options[:token] || args.first || ask('Please enter your fir.im API Token:', :white, echo: true)
       FIR.login(token)
     end
 
-    desc "me", "Show current user info if user is logined."
-    def me *args
+    desc 'me', 'Show current user info if user is logined.'
+    def me
       prepare :me
 
       FIR.me
     end
 
-    desc "mapping MAPPING_FILE_PATH", "Upload app's mapping file to BugHD.com (aliases: 'm')."
+    desc 'mapping MAPPING_FILE_PATH', 'Upload app mapping file to BugHD.com (aliases: `m`).'
     long_desc <<-LONGDESC
       `mapping` command will upload your app's mapping file to BugHD.com if you have the same app/project in BugHD.com.
 
@@ -115,39 +115,39 @@ module FIR
 
       $ fir m <mapping file path> -P <bughd project id> -v <app version> -b <app build> -T <your fir api token>
     LONGDESC
-    map "m" => :mapping
-    method_option :proj,    type: :string, aliases: "-P", desc: "Project id in BugHD.com"
-    method_option :version, type: :string, aliases: "-v", desc: "App version"
-    method_option :build,   type: :string, aliases: "-b", desc: "App build"
-    def mapping *args
+    map 'm' => :mapping
+    method_option :proj,    type: :string, aliases: '-P', desc: 'Project id in BugHD.com'
+    method_option :version, type: :string, aliases: '-v', desc: 'App version'
+    method_option :build,   type: :string, aliases: '-b', desc: 'App build'
+    def mapping(*args)
       prepare :mapping
 
       FIR.mapping(*args, options)
     end
 
-    desc "upgrade", "Upgrade FIR-CLI and quit (aliases: u)."
-    map "u" => :upgrade
+    desc 'upgrade', 'Upgrade fir-cli and quit (aliases: `u`).'
+    map 'u' => :upgrade
     def upgrade
       prepare :upgrade
 
-      say "✈ Upgrade FIR-CLI (use `gem install fir-cli --no-ri --no-rdoc`)"
+      say '✈ Upgrade fir-cli (use `gem install fir-cli --no-ri --no-rdoc`)'
       say `gem install fir-cli --no-ri --no-rdoc`
     end
 
-    desc "version", "Show FIR-CLI version number and quit (aliases: v)"
-    map ["v", "-v", "--version"] => :version
+    desc 'version', 'Show fir-cli version number and quit (aliases: `v`).'
+    map ['v', '-v', '--version'] => :version
     def version
-      say "✈ FIR-CLI #{FIR::VERSION}"
+      say '✈ fir-cli #{FIR::VERSION}'
     end
 
-    desc "help", "Describe available commands or one specific command."
+    desc 'help', 'Describe available commands or one specific command (aliases: `h`).'
     map Thor::HELP_MAPPINGS => :help
-    def help command = nil, subcommand = false
+    def help(command = nil, subcommand = false)
       super
     end
 
     no_commands do
-      def invoke_command command, *args
+      def invoke_command(command, *args)
         logfile = options[:logfile].blank? ? STDOUT : options[:logfile]
         logfile = '/dev/null' if options[:quiet]
 
@@ -159,13 +159,12 @@ module FIR
 
     private
 
-      def prepare task
-        if options.help?
-          help(task.to_s)
-          raise SystemExit
-        end
-        $DEBUG = true if ENV["DEBUG"]
+    def prepare(task)
+      if options.help?
+        help(task.to_s)
+        fail SystemExit
       end
-
+      $DEBUG = true if ENV['DEBUG']
+    end
   end
 end

data/lib/fir/patches/concern.rb

@@ -125,7 +125,7 @@ module ActiveSupport
 
     def included(base = nil, &block)
       if base.nil?
-        raise MultipleIncludedBlocks if instance_variable_defined?(:@_included_block)
+        fail MultipleIncludedBlocks if instance_variable_defined?(:@_included_block)
 
         @_included_block = block
       else
@@ -134,9 +134,11 @@ module ActiveSupport
     end
 
     def class_methods(&class_methods_module_definition)
-      mod = const_defined?(:ClassMethods, false) ?
-        const_get(:ClassMethods) :
-        const_set(:ClassMethods, Module.new)
+      if const_defined?(:ClassMethods, false)
+        mod = const_get(:ClassMethods)
+      else
+        mod = const_set(:ClassMethods, Module.new)
+      end
 
       mod.module_eval(&class_methods_module_definition)
     end

data/lib/fir/patches/native_patch.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 class Object
-  # activesupport/lib/active_support/core_ext/object/blank.rb
   # An object is blank if it's false, empty, or a whitespace string.
   # For example, '', '   ', +nil+, [], and {} are all blank.
   #
@@ -15,7 +14,7 @@ class Object
   #
   # @return [true, false]
   def blank?
-    respond_to?(:empty?) ? !!empty? : !self
+    respond_to?(:empty?) ? empty? : !self
   end
 
   # An object is present if it's not blank.
@@ -155,7 +154,7 @@ class Hash
   #   hash.symbolize_keys
   #   # => {:name=>"Rob", :age=>"28"}
   def symbolize_keys
-    transform_keys{ |key| key.to_sym rescue key }
+    transform_keys { |key| key.to_sym rescue key }
   end
 
   # Returns a new hash with all keys converted by the block operation.
@@ -179,10 +178,11 @@ class Hash
   #   hash.deep_symbolize_keys
   #   # => {:person=>{:name=>"Rob", :age=>"28"}}
   def deep_symbolize_keys
-    deep_transform_keys{ |key| key.to_sym rescue key }
+    deep_transform_keys { |key| key.to_sym rescue key }
   end
 
   private
+
     # support methods for deep transforming nested hashes and arrays
     def _deep_transform_keys_in_object(object, &block)
       case object
@@ -191,7 +191,7 @@ class Hash
           result[yield(key)] = _deep_transform_keys_in_object(value, &block)
         end
       when Array
-        object.map {|e| _deep_transform_keys_in_object(e, &block) }
+        object.map { |e| _deep_transform_keys_in_object(e, &block) }
       else
         object
       end
@@ -199,30 +199,28 @@ class Hash
 end
 
 class File
-
   class << self
     # A binary file is Mach-O dSYM
     #
     # @return [true, false]
-    def is_dsym? file_path
-      !!(`file -b #{file_path}` =~ /dSYM/)
+    def dsym?(file_path)
+      !(`file -b #{file_path}` =~ /dSYM/).nil?
     end
 
     # A file is ASCII text
     #
     # @return [true, false]
-    def is_txt? file_path
-      !!(`file -b #{file_path}` =~ /text/)
+    def text?(file_path)
+      !(`file -b #{file_path}` =~ /text/).nil?
     end
   end
 end
 
 class String
-
   # Convert String encoding to UTF-8
   #
   # @return string
   def to_utf8
-    self.encode(Encoding.find('UTF-8'), invalid: :replace, undef: :replace, replace: '')
+    encode(Encoding.find('UTF-8'), invalid: :replace, undef: :replace, replace: '')
   end
 end