fir-cli-x 1.7.2.1

data/doc/help.md

@@ -0,0 +1,34 @@
+### 相关指令帮助
+
+`fir help` 命令不仅可以运行在 `fir` 主命令上, 还可以运行在相应子命令上查看相关的帮助.
+
+```sh
+$ fir help
+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 (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: `...
+  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
+```
+#### 全局参数说明
+
+- `alias <short command>` 意味着可以用 alias 别名来代替该指令, 例如 `fir b`
+- `-T` 用户在 fir.im 上的 api_token
+- `-L` 指定 fir-cli 的输出 log, 默认为 STDOUT
+- `-V` Verbose, 默认为输出所有信息( INFO 和 ERROR), 如果设置 `--no-verbose`, 则只输出 ERROR 信息
+- `-q` 静默模式, 默认关闭
+- `-h` 查看相关命令帮助

data/doc/info.md

@@ -0,0 +1,44 @@
+### fir info
+
+`fir info` 命令用于查看当前 ipa/apk 相关信息.
+
+```sh
+$ fir info --help
+Usage:
+  fir info APP_FILE_PATH
+
+Show iOS/Android app info, support ipa/apk file (aliases: `i`).
+```
+
+#### 查看 ipa 相关信息
+
+```sh
+$ fir info ./build_ipa.ipa
+
+I, [2016-03-08T12:28:29.310846 #11961]  INFO -- : Analyzing ipa file......
+I, [2016-03-08T12:28:29.310932 #11961]  INFO -- : ✈ -------------------------------------------- ✈
+I, [2016-03-08T12:28:29.395706 #11961]  INFO -- : type: ios
+I, [2016-03-08T12:28:29.395775 #11961]  INFO -- : identifier: xx.xxx.build-ipa
+I, [2016-03-08T12:28:29.395793 #11961]  INFO -- : name: build_ipa
+I, [2016-03-08T12:28:29.395805 #11961]  INFO -- : display_name: build_ipa
+I, [2016-03-08T12:28:29.395817 #11961]  INFO -- : build: 1
+I, [2016-03-08T12:28:29.395829 #11961]  INFO -- : version: 1.0
+I, [2016-03-08T12:28:29.396007 #11961]  INFO -- : devices: ["fasdfafaf3f4xxxxxxx78aecbc1234567"]
+I, [2016-03-08T12:28:29.396057 #11961]  INFO -- : release_type: adhoc
+I, [2016-03-08T12:28:29.396086 #11961]  INFO -- : distribution_name: iOSTeam Provisioning Profile: xx.xxx.* - xxx xx xxxxxx LLC.
+I, [2016-03-08T12:28:29.396111 #11961]  INFO -- :
+```
+
+#### 查看 apk 相关信息
+
+```sh
+$ fir info ./test_apk.apk
+I, [2016-03-08T12:30:25.241278 #12073]  INFO -- : Analyzing apk file......
+I, [2016-03-08T12:30:25.241363 #12073]  INFO -- : ✈ -------------------------------------------- ✈
+I, [2016-03-08T12:30:25.250430 #12073]  INFO -- : type: android
+I, [2016-03-08T12:30:25.250477 #12073]  INFO -- : identifier: com.xxx.myapplication
+I, [2016-03-08T12:30:25.250496 #12073]  INFO -- : name: My Application
+I, [2016-03-08T12:30:25.250509 #12073]  INFO -- : build: 1
+I, [2016-03-08T12:30:25.250520 #12073]  INFO -- : version: 1.0
+I, [2016-03-08T12:30:25.250532 #12073]  INFO -- :
+```

data/doc/install.md

@@ -0,0 +1,67 @@
+### 安装
+
+fir-cli 使用 Ruby 构建, 无需编译, 只要安装相应 gem 即可.
+
+```sh
+$ ruby -v # > 2.6.1
+$ gem install fir-cli
+```
+
+#### 常见的安装问题
+
+- ruby 要求最低版本为 2.3
+
+- 使用系统自带的 Ruby 安装, 需确保 ruby-dev 已被正确的安装:
+
+  ```sh
+  $ xcode-select --install        # OS X 系统
+  $ sudo apt-get install ruby-dev # Linux 系统
+  ```
+
+- 出现 `Permission denied` 相关错误:
+
+  在命令前加上 `sudo`
+
+- 出现 `Gem::RemoteFetcher::FetchError` 相关错误:
+
+  更换 Ruby 的源(由于国内网络原因, 你懂的), 并升级下系统自带的 gem
+
+  ```sh
+  $ gem sources --remove https://rubygems.org/
+  $ gem sources -a https://gems.ruby-china.com/
+  $ gem sources -l
+  *** CURRENT SOURCES ***
+
+  https://gems.ruby-china.com
+  # 请确保只有 gems.ruby-china.com, 如果有其他的源, 请 remove 掉
+
+  gem update --system
+  gem install fir-cli
+  ```
+
+- Mac OS X 10.11 以后的版本, 由于10.11引入了 `rootless`, 无法直接安装 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
+
+  $ gem install fir-cli
+  ```
+
+  2\. 指定 fir-cli 中 bin 文件的 PATH
+
+  ```sh
+  $ export PATH=/usr/local/bin:$PATH;gem install -n /usr/local/bin fir-cli
+  ```
+
+  3\. 重写 Ruby Gem 的 bindir
+
+  ```sh
+  $ echo 'gem: --bindir /usr/local/bin' >> ~/.gemrc
+  $ gem install fir-cli
+  ```

data/doc/login.md

@@ -0,0 +1,19 @@
+### fir login & fir me
+
+`fir login` 命令用于使用 API token 登录 fir.im, 并使用发布应用等相关命令.
+
+`fir me` 命令用于查看当前登录用户信息.
+
+用户的 API token 可在 **[这里](http://fir.im/apps/apitoken)** 查看, 当使用 fir login 登录了之后, 后续命令都不需要加上 `-T` 参数, 会默认使用 **当前用户的 token** 进行相关操作.
+
+```sh
+$ fir login XXX_YOUR_API_TOKEN_XXX
+I, [2016-03-08T12:48:56.499435 #13043]  INFO -- : Login succeed, previous user's email: xxx@fir.im
+I, [2016-03-08T12:48:56.507044 #13043]  INFO -- : Login succeed, current  user's email: xxx@fir.im
+I, [2016-03-08T12:48:56.507147 #13043]  INFO -- :
+
+$ fir me
+I, [2016-03-08T12:48:14.175488 #12986]  INFO -- : Login succeed, current user's email: xxx@fir.im
+I, [2016-03-08T12:48:14.175687 #12986]  INFO -- : Login succeed, current user's name:  xxx
+I, [2016-03-08T12:48:14.175765 #12986]  INFO -- :
+```

data/doc/publish.md

@@ -0,0 +1,35 @@
+### fir publish
+
+`fir publish` 命令用于可以发布应用到 fir.im, 支持 ipa 和 apk 文件.
+
+```sh
+$ fir publish --help
+Usage:
+  fir publish APP_FILE_PATH
+
+Options:
+  -s, [--short=SHORT]              # Set custom short link
+  -c, [--changelog=CHANGELOG]      # Set changelog
+  -Q, [--qrcode], [--no-qrcode]    # Generate qrcode
+      [--open], [--no-open]        # true/false if open for everyone
+      [--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
+  -h, [--help], [--no-help]        # Show this help message and quit
+```
+
+相关参数详解:
+
+- `-s` 参数, 自定义发布后的短链接地址.
+- `-c` 参数, 自定义发布时的 changelog, 支持字符串与文件两种方式, 即 `--changelog='this is changelog'` 和 `--changelog='/Users/fir-cli/changelog'`.
+- `-Q` 参数, 是否生成发布后二维码, 默认为不生成, 加上 `-Q` 参数后会在当前目录生成一张二维码图片, 扫描该图片即可下载该应用.
+- `-R` 参数, 显示具体版本, 会在发布结束后的下载地址中生成指定的版本
+- `-D` 参数, 钉钉机器人的access_token, 填写后当上传完毕, 会发送至钉钉机器人 
+- `--open` 参数, 设置发布后的应用是否开放给所有人下载, 关闭开放使用 `--no-open` 参数.
+- `--password` 参数, 设置发布后的应用密码
+

data/doc/upgrade.md

@@ -0,0 +1,7 @@
+#### fir upgrade
+
+`fir upgrade` 指令用于升级最新版本的 fir-cli
+
+```sh
+$ fir upgrade
+```

data/fir-cli.gemspec

@@ -0,0 +1,52 @@
+# coding: utf-8
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fir/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'fir-cli-x'
+  spec.version       = FIR::VERSION
+  spec.authors       = ['sparkrico','NaixSpirit', 'atpking']
+  spec.email         = ['sparkrico@gmail.com']
+  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      = 'https://github.com/sparkrico/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.post_install_message = %q(
+        ______________        ________    ____
+       / ____/  _/ __ \      / ____/ /   /  _/
+      / /_   / // /_/ /_____/ /   / /    / /
+     / __/ _/ // _, _/_____/ /___/ /____/ /
+    /_/   /___/_/ |_|      \____/_____/___/
+
+  ## 更新记录
+  - (1.7.2.1) 修复label nil 的问题，更新了ruby_android_apk库
+  - (1.7.2) 修正了无论是否加参数都固定出现二维码图片的bug
+  - (1.7.1) 增加了 钉钉推送 , 增加了返回指定版本下载地址
+  - (1.7.0) 过期了ipa_build 功能, 增加了对 android manifest instant run 的兼容
+  - (1.6.13) 上传图标逻辑修改
+  - (1.6.12) 修复了部分机器没有默认安装 byebug 的问题
+  - (1.6.11) 变化了 ruby gem 仓库地址
+  - [fir-cli](https://github.com/firhq/fir-cli) 已经开源
+  - 欢迎 fork, issue 和 pull request
+  )
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 5.7'
+  spec.add_development_dependency 'pry',      '~> 0.10'
+
+  spec.add_dependency 'thor',           '~> 0.19'
+  spec.add_dependency 'rest-client',    '~> 2.0'
+  spec.add_dependency 'ruby_android_apk',   '~> 0.7.7.1'
+  spec.add_dependency 'rqrcode',        '~> 0.7'
+  spec.add_dependency 'CFPropertyList'
+  spec.add_dependency 'api_tools', '~> 0.1.0'
+end

data/fir.sh

@@ -0,0 +1,46 @@
+#!/bin/sh
+#  because fir-cli dependent ruby enviroment, this shell is dependent ruby docker
+#  so xcode and gradle not use
+#  this shell only use to publish apk or ipa , build is not run
+#  fir publish **.apk
+#  echo $(curl https://raw.githubusercontent.com/FIRHQ/fir-cli/master/fir.sh) > /usr/local/bin/fir
+
+mountFolder=$HOME/fir-cli/data
+destFolder=/fir-cli
+
+mkdir -p $mountFolder
+
+# find path file name
+function findFileName() {
+	echo ${1##*/}
+}
+
+# move file to mount folder 
+tmpFiles=()
+cmds=()
+for i in $@; do 
+	if [ -d $i ];then
+	   cp -r $i $mountFolder
+	elif [ -f $i ];then
+	   cp $i $mountFolder
+	else
+		cmds+=($i)
+		continue
+	fi
+	destFile=$destFolder/$(findFileName $i)
+	cmds+=($destFile)
+	tmpFiles+=($mountFolder/$(findFileName $i))
+done  
+
+# start docker to run fir cmd
+docker run -v $HOME/fir-cli/data:/fir-cli  flowci/fir-cli fir ${cmds[@]}
+
+# clean folder
+for i in ${tmpFiles}; do
+	if [ -d $i ];then
+	   rm -rf $i
+	elif [ -f $i ];then
+	   rm $i
+	fi
+done
+

data/install.sh

@@ -0,0 +1,210 @@
+#!/usr/bin/env bash
+#
+# Copy from:        ruby-bootstrap.sh
+# Description:  This script bootstraps rvm, Ruby
+
+RVM_FRESH_INSTALL=0 # 0=false, 1=true
+MIRROR_CHINA_INSTALL=1 # 0=false, 1=true
+
+
+###
+### Helper variables and functions
+###
+
+# Make the operating system of this host available as $OS.
+OS_UNKNOWN="os-unknown"
+OS_MAC="mac"
+OS_LINUX="linux"
+case `uname` in
+  Linux*)
+    OS=$OS_LINUX
+    ;;
+  Darwin*)
+    OS=$OS_MAC
+    ;;
+  *)
+    OS=$OS_UNKNOWN
+    ;;
+esac
+
+# Colors for shell output
+if [ "$OS" = "$OS_MAC" ]; then
+  red='\x1B[1;31m'
+  green='\x1B[1;32m'
+  yellow='\x1B[1;33m'
+  blue='\x1B[1;34m'
+  nocolor='\x1B[0m'
+else
+  red='\e[1;31m'
+  green='\e[1;32m'
+  yellow='\e[1;33m'
+  blue='\e[1;34m'
+  nocolor='\e[0m'
+fi
+
+function puts() {
+  local opts=''
+  if [ "$1" = "-n" ]; then
+    opts='-n'
+    shift
+  fi
+  msg="$@"
+  echo -e $opts "${blue}${msg}${nocolor}"
+}
+
+function warn() {
+  local opts=''
+  if [ "$1" = "-n" ]; then
+    opts='-n'
+    shift
+  fi
+  msg="$@"
+  echo -e $opts "${yellow}${msg}${nocolor}"
+}
+
+function error() {
+  local opts=''
+  if [ "$1" = "-n" ]; then
+    opts='-n'
+    shift
+  fi
+  msg="$@"
+  echo -e $opts "${red}${msg}${nocolor}"
+}
+
+function success() {
+  local opts=''
+  if [ "$1" = "-n" ]; then
+    opts='-n'
+    shift
+  fi
+  msg="$@"
+  echo -e $opts "${green}${msg}${nocolor}"
+}
+
+function rvm_post_install_message() {
+  warn "Important: We performed a fresh install of rvm for you."
+  warn "           This means you manually perform two tasks now."
+  warn
+  warn "Task 1 of 2:"
+  warn "------------"
+  warn "Please run the following command in all your open shell windows to"
+  warn "start using rvm.  In rare cases you need to reopen all shell windows."
+  warn
+  warn "    source ~/.rvm/scripts/rvm"
+  warn
+  warn
+  warn "Task 2 of 2:"
+  warn "------------"
+  warn "Permanently update your shell environment to source/add rvm."
+  warn "The example below shows how to do this for Bash."
+  warn
+  warn "Add the following two lines to your ~/.bashrc:"
+  warn
+  warn "    PATH=\$PATH:\$HOME/.rvm/bin # Add RVM to PATH for scripting"
+  warn "    [[ -s \"\$HOME/.rvm/scripts/rvm\" ]] && source \"\$HOME/.rvm/scripts/rvm\" # Load RVM into a shell session *as a function*"
+  warn
+  warn "That's it!  Sorry for the extra work but this is the safest"
+  warn "way to update your environment without breaking anything."
+}
+
+function find_ruby_version_file() {
+  local filename=".ruby-version"
+  local curr_dir=$1
+  curr_dir=`cd "$curr_dir"; pwd`
+  local candidate_file="$curr_dir/$filename"
+  while [ ! -f "$candidate_file" ]; do
+    parent_dir=`cd ..; pwd`
+    if [ "$parent_dir" = "$curr_dir" ]; then
+      # We have reached /, we can't go up any further.
+      candidate_file=""
+      break
+    else
+      curr_dir="$parent_dir"
+      candidate_file="$curr_dir/$filename"
+    fi
+  done
+  echo $candidate_file
+}
+
+function detect_desired_ruby_version() {
+  local desired_ruby_version=""
+  ruby_version_file=`find_ruby_version_file $(pwd)`
+  if [ -n "$ruby_version_file" ]; then
+    desired_ruby_version=`head -n 1 $ruby_version_file`
+  fi
+  echo $desired_ruby_version
+}
+
+# We must detect the desired Ruby version before rvm "manipulates" the shell environment for its own purposes.
+# I assume the cause of the problem is rvm's variant of the 'cd' command (~/.rvm/scripts/cd), which may alter the
+# normal behavior of 'cd' in a way that breaks our usage of 'cd' in the function 'find_ruby_version_file' above.
+puts -n "Detecting desired Ruby version: "
+
+RUBY_VERSION=`detect_desired_ruby_version`
+
+if [ -z "$RUBY_VERSION" ]; then
+  warn "FAILED (could not find .ruby-version) -- falling back to latest stable Ruby version"
+  RUBY_VERSION="ruby" # 'ruby' defaults to latest stable version
+else
+  success "OK ($RUBY_VERSION)"
+fi
+
+
+###
+### Bootstrap RVM
+###
+puts -n "Checking for rvm: "
+which rvm &>/dev/null
+if [ $? -ne 0 ]; then
+  error "NOT FOUND (If you already ran ruby-bootstrap: have you performed the post-installation steps?)"
+  puts "Installing latest stable version of rvm..."
+  RVM_FRESH_INSTALL=1
+  curl -L https://get.rvm.io | bash -s stable --autolibs=enable --ignore-dotfiles || exit 1
+else
+  success "OK"
+fi
+
+if [ -d ~/.rvm/bin ]; then
+  PATH=$PATH:~/.rvm/bin
+fi
+
+source ~/.rvm/scripts/rvm
+
+if [ $MIRROR_CHINA_INSTALL -eq 1 ]; then
+  echo "ruby_url=https://cache.ruby-china.org/pub/ruby" > ~/.rvm/user/db
+fi
+###
+### Install Ruby
+###
+puts "Installing Ruby version ${RUBY_VERSION}..."
+
+rvm install $RUBY_VERSION
+
+if [ $? -ne 0 -a $RVM_FRESH_INSTALL -eq 1 ]; then
+  rvm_post_install_message
+  exit 2
+fi
+if [ $MIRROR_CHINA_INSTALL -eq 1 ]; then
+  gem sources --add https://gems.ruby-china.org/ --remove https://rubygems.org/
+fi
+
+###
+### Install Bundler
+###
+puts "Installing bundler..."
+gem install bundler
+if [ $? -ne 0 -a $RVM_FRESH_INSTALL -eq 1 ]; then
+  rvm_post_install_message
+  exit 3
+fi
+
+puts "Installing fir-cli gem"
+gem install fir-cli --no-rdoc --no-ri
+if [ $? -ne 0 -a $RVM_FRESH_INSTALL -eq 1 ]; then
+  rvm_post_install_message
+  exit 4
+fi
+
+
+puts "run fir -v to check"