fir-cli 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a54b86beb839fc05c906644de84e9ad608bd4af7
-  data.tar.gz: 2a88b3488a574fd21003dfa5a36daf79c64d63fe
+  metadata.gz: 246352dde6de24af1e32a1e0128bcb520526537f
+  data.tar.gz: 5321f7bfdf10cb2863cdeefd6bc01c898e7e9b7d
 SHA512:
-  metadata.gz: 661ab259e7b88e109e7017a1d6e80f9b6bbb186c20ba0506511fe97e4b549a039833cae765c389dc896dc6a38025d0f89e137f6db2eadfa6705823f375ae7a1d
-  data.tar.gz: 83a661e7e9614a76bdf65d3f785575ce8178f5c2e8f7c4eaecac885c2a6251ce1d21d6344525da22853ad82e1cdec6e58cc254c0f5ba69e63aa74f1818f3b32b
+  metadata.gz: 9f94e52edcbd93b3f2f9e75368722bc40ff64f54a3b07bf1bf9040e721cd2ec98beedbaa1fc959b60b63eef76126b3482509e3b9d2d2b5d2a95154a2bc5c984a
+  data.tar.gz: 8a4e0a531bdb8a1e32a4724838479f7cf613198d1cb86e24826cb2a16b02125f04080bf7f5950f87706ef0eb80579fb4a503bc3d01c464c5b25a7468a184cf46

data/.codeclimate.yml

@@ -0,0 +1,8 @@
+# Save as .codeclimate.yml (note leading .) in project root directory
+languages:
+  Ruby: true
+  JavaScript: true
+  PHP: true
+  Python: true
+# exclude_paths:
+# - "foo/bar.rb"

data/.gitignore

@@ -8,6 +8,7 @@
 /spec/reports/
 /tmp/
 /fir-cli_tmp/
+/test/build_project/
 *.bundle
 *.so
 *.o

data/CHANGELOG

@@ -1,5 +1,15 @@
 ## 更新记录
 
+### FIR-CLI 1.1.7
+- 增加符号表上传指令, `fir mapping(alias m)`
+- 有一下三种方式上传符号表(目前已经支持 dSYM 和 txt 两种格式的符号表文件上传)
+  - 1. 指定 version 和 build 上传: `fir m <mapping file path> -P <bughd project id> -v <app version> -b <app build> -T <your api token>`
+  - 2. 在 publish 的时候自动上传: `fir p <app file path> -m <mapping file path> -P <bughd project id> -T <your api token>`
+  - 3. 在 build_ipa 的时候自动上传: `fir b <project dir> -P <bughd project id> -M -p -T <your api token>`
+
+### FIR-CLI 1.1.6
+- 不再转换 icon
+
 ### FIR-CLI 1.1.5
 - 增加团队成员直接上传 app
 

data/README.md

@@ -1,8 +1,8 @@
 FIR.im CLI
 ---
 
-[![Join the chat at https://gitter.im/FIRHQ/fir-cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/FIRHQ/fir-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 ![Build Status Images](https://travis-ci.org/FIRHQ/fir-cli.svg)
+[![Code Climate](https://codeclimate.com/github/FIRHQ/fir-cli/badges/gpa.svg)](https://codeclimate.com/github/FIRHQ/fir-cli)
 
 > FIR.im CLI 可以通过指令查看, 上传, 编译应用
 
@@ -15,16 +15,19 @@ FIR.im CLI 使用 Ruby 构建，只要安装相应 ruby gem 即可:
 $ sudo gem install fir-cli
 ```
 
-如果出现无法安装的现象, 请先升级下系统自带的 gem 包后再执行命令安装 fir-cli
+如果出现无法安装的现象, 请先更换 Ruby 的淘宝源(由于国内网络原因, 你懂的), 并升级下系统自带的 gem
 
 ```shell
-sudo gem update --system
-```
+sudo gem sources --remove https://rubygems.org/
+sudo gem sources -a https://ruby.taobao.org/
+sudo gem sources -l
+*** CURRENT SOURCES ***
 
-如果出现无法安装的现象, 请先升级下系统自带的 gem 包后再执行命令安装 fir-cli
+https://ruby.taobao.org
+# 请确保只有 ruby.taobao.org, 如果有其他的源, 请 remove 掉
 
-```shell
 sudo gem update --system
+sudo gem install fir-cli
 ```
 
 安装后，你可以在命令行执行指令
@@ -36,6 +39,8 @@ Commands:
   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 me                                        # Show current user info if user is logined (aliases: 'm').
   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)
@@ -52,7 +57,7 @@ Options:
 ### 参数说明
 
 - `alias <short command>` 意味着可以用 alias 别名来代替该指令, 例如 `fir b`
-- `-T` 用户在 FIR.im 上的 token, `publish` 需要使用此参数
+- `-T` 用户在 FIR.im 上的 api_token, `publish` 需要使用此参数
 - `-L` 指定 FIR-CLI 的输出 log, 默认为 STDOUT
 - `-V` Verbose, 默认为输出所有信息( INFO 和 ERROR), 如果设置 `--no-verbose`, 则只输出 ERROR 信息
 - `-q` 静默模式, 默认关闭
@@ -87,7 +92,7 @@ $ fir p path/to/application -T YOUR_FIR_TOKEN
 $ fir l
 ```
 
-这时系统会提示输入用户 token, 用户 token 可在[这里](http://fir.im/user/info)查看
+这时系统会提示输入用户 token, 用户 token 可在 **[这里](http://fir.im/user/info)** 查看
 
 ```shell
 > Please enter your FIR.im token:
@@ -108,16 +113,22 @@ $ fir build_ipa path/to/project -o path/to/output
 ```
 
 ### 复杂一点
-```
+
+```shell
 $ fir b path/to/workspace -o path/to/output -w -C Release -t allTargets GCC_PREPROCESSOR_DEFINITIONS="FOO=bar"
 ```
 
 该指令在指向的目录中，找到第一个 workspace 文件，对其进行编译。使用 `Release` 设置，编译策略为 `allTargets`，同时设置了预编译参数 `FOO`。
 
+### 编译用 CocoaPods 做依赖管理的 .ipa包
+
+```shell
+$ fir b path/to/workspace -w -S <scheme name>
+```
 ### 一步, 从源代码到 FIR.im
 > 只需要输入 -p -T
 
-```
+```shell
 $ fir build_ipa path/to/project -o path/to/output -p -T YOUR_FIR_TOKEN
 > I, [2015-02-28T23:14:33.501293 #36861]  INFO -- : Building......
 > I, [2015-02-28T23:14:33.501400 #36861]  INFO -- : ✈ -------------------------------------------- ✈
@@ -131,6 +142,27 @@ $ fir build_ipa path/to/project -o path/to/output -p -T YOUR_FIR_TOKEN
 > I, [2015-02-28T23:14:48.311900 #36861]  INFO -- : Published succeed: http://fir.im/xxx
 ```
 
+### 上传符号表
+
+有以下三种方式上传符号表至 [BugHD.com](http://bughd.com) 所对应的项目, 目前已经支持 dSYM 和 txt 两种格式的符号表文件上传
+
+> 指定 version 和 build 上传:
+
+```shell
+$ fir m <mapping file path> -P <bughd project id> -v <app version> -b <app build> -T <your api token>
+```
+
+> 在 publish 的时候自动上传:
+
+```shell
+$ fir p <app file path> -m <mapping file path> -P <bughd project id> -T <your api token>
+```
+> 在 build_ipa 的时候自动上传:
+
+```shell
+$ fir b <project dir> -P <bughd project id> -M -p -T <your api token>
+```
+
 ## 需要帮助?
 
 输入以下指令获取全面功能介绍
@@ -140,7 +172,7 @@ $ fir -h
 $ fir publish -h
 ```
 
-如果还有疑问随时发邮件至[fir-cli](mailto: hi@fir.im)
+如果还有疑问随时发邮件至 [fir-cli](mailto: dev@fir.im)
 
 ## 永远使用最新功能
 

data/Rakefile

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

data/fir-cli.gemspec

@@ -28,18 +28,22 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.1.5
+  ### FIR-CLI 1.1.7
   - 完全兼容新版 API ✔
   - 请使用新版 API Token
   - 新版 API Token 查看地址: `http://fir.im/user/info`
-  - 增加 `fir me` 指令查看当前登录用户
-  - 增加团队成员直接上传 app
+  - 增加符号表上传指令, `fir mapping(alias m)`
+  - 有以下三种方式上传符号表(目前已经支持 dSYM 和 txt 两种格式的符号表文件上传)
+    - 1. 指定 version 和 build 上传: `fir m <mapping file path> -P <bughd project id> -v <app version> -b <app build> -T <your api token>`
+    - 2. 在 publish 的时候自动上传: `fir p <app file path> -m <mapping file path> -P <bughd project id> -T <your api token>`
+    - 3. 在 build_ipa 的时候自动上传: `fir b <project dir> -P <bughd project id> -M -p -T <your api token>`
   - https://github.com/FIRHQ/fir-cli
   )
 
   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"

data/lib/fir/api.yml

@@ -1,5 +1,11 @@
-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'
+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'
+  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'
+  full_version_url: 'http://api.bughd.com/full_versions'

data/lib/fir/cli.rb

@@ -2,7 +2,7 @@
 
 module FIR
   class CLI < Thor
-    class_option :token,   type: :string,  aliases: "-T", desc: "User's api_token at FIR.im"
+    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"
@@ -16,9 +16,11 @@ module FIR
 
       Example:
 
-      $ fir b <project dir> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your token>]
+      $ fir b <project dir> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your api token>]
 
-      $ fir b <workspace dir> -w -S <scheme name> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your token>]
+      $ fir b <project dir> [-c <changelog> -P <bughd project id> -M -p -T <your api token>]
+
+      $ fir b <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", "build"] => :build_ipa
     method_option :workspace,     type: :boolean, aliases: "-w", desc: "true/false if build workspace"
@@ -30,6 +32,8 @@ module FIR
     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
       prepare :build_ipa
 
@@ -46,9 +50,19 @@ module FIR
     end
 
     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.
+
+      Example:
+
+      $ fir p <app file path> [-c <changelog> -s <custom short link> -T <your api token>]
+      $ 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 :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
       prepare :publish
 
@@ -60,18 +74,35 @@ module FIR
     def login *args
       prepare :login
 
-      token = options[:token] || args.first || ask("Please enter your FIR.im 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 (aliases: 'm')."
-    map "m" => :me
+    desc "me", "Show current user info if user is logined."
     def me *args
       prepare :me
 
       FIR.me
     end
 
+    desc "mapping MAPPING_FILE_PATH", "Upload app's 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.
+
+      Example:
+
+      $ 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
+      prepare :mapping
+
+      FIR.mapping(*args, options)
+    end
+
     desc "upgrade", "Upgrade FIR-CLI and quit (aliases: u)."
     map "u" => :upgrade
     def upgrade

data/lib/fir/patches/concern.rb

@@ -0,0 +1,144 @@
+# encoding: utf-8
+
+module ActiveSupport
+  # A typical module looks like this:
+  #
+  #   module M
+  #     def self.included(base)
+  #       base.extend ClassMethods
+  #       base.class_eval do
+  #         scope :disabled, -> { where(disabled: true) }
+  #       end
+  #     end
+  #
+  #     module ClassMethods
+  #       ...
+  #     end
+  #   end
+  #
+  # By using <tt>ActiveSupport::Concern</tt> the above module could instead be
+  # written as:
+  #
+  #   require 'active_support/concern'
+  #
+  #   module M
+  #     extend ActiveSupport::Concern
+  #
+  #     included do
+  #       scope :disabled, -> { where(disabled: true) }
+  #     end
+  #
+  #     class_methods do
+  #       ...
+  #     end
+  #   end
+  #
+  # Moreover, it gracefully handles module dependencies. Given a +Foo+ module
+  # and a +Bar+ module which depends on the former, we would typically write the
+  # following:
+  #
+  #   module Foo
+  #     def self.included(base)
+  #       base.class_eval do
+  #         def self.method_injected_by_foo
+  #           ...
+  #         end
+  #       end
+  #     end
+  #   end
+  #
+  #   module Bar
+  #     def self.included(base)
+  #       base.method_injected_by_foo
+  #     end
+  #   end
+  #
+  #   class Host
+  #     include Foo # We need to include this dependency for Bar
+  #     include Bar # Bar is the module that Host really needs
+  #   end
+  #
+  # But why should +Host+ care about +Bar+'s dependencies, namely +Foo+? We
+  # could try to hide these from +Host+ directly including +Foo+ in +Bar+:
+  #
+  #   module Bar
+  #     include Foo
+  #     def self.included(base)
+  #       base.method_injected_by_foo
+  #     end
+  #   end
+  #
+  #   class Host
+  #     include Bar
+  #   end
+  #
+  # Unfortunately this won't work, since when +Foo+ is included, its <tt>base</tt>
+  # is the +Bar+ module, not the +Host+ class. With <tt>ActiveSupport::Concern</tt>,
+  # module dependencies are properly resolved:
+  #
+  #   require 'active_support/concern'
+  #
+  #   module Foo
+  #     extend ActiveSupport::Concern
+  #     included do
+  #       def self.method_injected_by_foo
+  #         ...
+  #       end
+  #     end
+  #   end
+  #
+  #   module Bar
+  #     extend ActiveSupport::Concern
+  #     include Foo
+  #
+  #     included do
+  #       self.method_injected_by_foo
+  #     end
+  #   end
+  #
+  #   class Host
+  #     include Bar # It works, now Bar takes care of its dependencies
+  #   end
+  module Concern
+    class MultipleIncludedBlocks < StandardError #:nodoc:
+      def initialize
+        super "Cannot define multiple 'included' blocks for a Concern"
+      end
+    end
+
+    def self.extended(base) #:nodoc:
+      base.instance_variable_set(:@_dependencies, [])
+    end
+
+    def append_features(base)
+      if base.instance_variable_defined?(:@_dependencies)
+        base.instance_variable_get(:@_dependencies) << self
+        return false
+      else
+        return false if base < self
+        @_dependencies.each { |dep| base.send(:include, dep) }
+        super
+        base.extend const_get(:ClassMethods) if const_defined?(:ClassMethods)
+        base.class_eval(&@_included_block) if instance_variable_defined?(:@_included_block)
+      end
+    end
+
+    def included(base = nil, &block)
+      if base.nil?
+        raise MultipleIncludedBlocks if instance_variable_defined?(:@_included_block)
+
+        @_included_block = block
+      else
+        super
+      end
+    end
+
+    def class_methods(&class_methods_module_definition)
+      mod = const_defined?(:ClassMethods, false) ?
+        const_get(:ClassMethods) :
+        const_set(:ClassMethods, Module.new)
+
+      mod.module_eval(&class_methods_module_definition)
+    end
+  end
+end

data/lib/fir/patches/native_patch.rb

@@ -197,3 +197,22 @@ class Hash
       end
     end
 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/)
+    end
+
+    # A file is ASCII text
+    #
+    # @return [true, false]
+    def is_txt? file_path
+      !!(`file -b #{file_path}` =~ /text/)
+    end
+  end
+end

data/lib/fir/patches.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
+require_relative './patches/concern'
 require_relative './patches/native_patch'
 require_relative './patches/os_patch'
-require_relative './patches/parser_patch'