fir-cli 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 246352dde6de24af1e32a1e0128bcb520526537f
-  data.tar.gz: 5321f7bfdf10cb2863cdeefd6bc01c898e7e9b7d
+  metadata.gz: 0c92eba76896df79468053134c355bdfbb0d2031
+  data.tar.gz: 38284b8643672070bc2078f6f05800b97c6c10bb
 SHA512:
-  metadata.gz: 9f94e52edcbd93b3f2f9e75368722bc40ff64f54a3b07bf1bf9040e721cd2ec98beedbaa1fc959b60b63eef76126b3482509e3b9d2d2b5d2a95154a2bc5c984a
-  data.tar.gz: 8a4e0a531bdb8a1e32a4724838479f7cf613198d1cb86e24826cb2a16b02125f04080bf7f5950f87706ef0eb80579fb4a503bc3d01c464c5b25a7468a184cf46
+  metadata.gz: 7541e7985bc256321aa403f2969bdaaa2c7623542ab22b87b5bcfc0774efefbc31ac903b9165cef26aaf5a79dc70b514677865885047061630893e1aa31bfeaa
+  data.tar.gz: f10503990d06c2d513e268284ce376c52ff8c12e67f43f9eed3967ee16dc6721512b4ac3d2ac4432046f5c670f6d225452d283c812af500a3e2e9ab2edd52f0d

data/.gitignore

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

data/CHANGELOG

@@ -1,5 +1,9 @@
 ## 更新记录
 
+### FIR-CLI 1.1.8
+- 支持 gradle 打包 apk 文件并自动上传至 fir.im, `fir build_apk(alias ba)`
+  - `fir ba <project dir> [-o <apk output dir> -c <changelog> -p -T <your api token>]`
+
 ### FIR-CLI 1.1.7
 - 增加符号表上传指令, `fir mapping(alias m)`
 - 有一下三种方式上传符号表(目前已经支持 dSYM 和 txt 两种格式的符号表文件上传)

data/README.md

@@ -115,7 +115,7 @@ $ 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"
+$ fir bi path/to/workspace -o path/to/output -w -C Release -t allTargets GCC_PREPROCESSOR_DEFINITIONS="FOO=bar"
 ```
 
 该指令在指向的目录中，找到第一个 workspace 文件，对其进行编译。使用 `Release` 设置，编译策略为 `allTargets`，同时设置了预编译参数 `FOO`。
@@ -123,8 +123,15 @@ $ fir b path/to/workspace -o path/to/output -w -C Release -t allTargets GCC_PREP
 ### 编译用 CocoaPods 做依赖管理的 .ipa包
 
 ```shell
-$ fir b path/to/workspace -w -S <scheme name>
+$ fir bi path/to/workspace -w -S <scheme name>
 ```
+
+### 编译用 Gradle 打包 apk
+
+```shell
+$ fir ba path/to/project
+```
+
 ### 一步, 从源代码到 FIR.im
 > 只需要输入 -p -T
 

data/fir-cli.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.1.7
+  ### FIR-CLI 1.1.8
   - 完全兼容新版 API ✔
   - 请使用新版 API Token
   - 新版 API Token 查看地址: `http://fir.im/user/info`
@@ -37,7 +37,9 @@ Gem::Specification.new do |spec|
     - 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
+  - 支持 gradle 打包 apk 文件并自动上传至 fir.im, `fir build_apk(alias ba)`
+    - `fir ba <project dir> [-o <apk output dir> -c <changelog> -p -T <your api token>]`
+  - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源, 欢迎 fork, issue 和 pull request
   )
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/fir/cli.rb

@@ -8,7 +8,7 @@ module FIR
     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: 'b')."
+    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.
@@ -16,13 +16,13 @@ module FIR
 
       Example:
 
-      $ fir b <project dir> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your api token>]
+      $ fir bi <project dir> [-C <configuration>] [-t <target name>] [-o <ipa output dir>] [settings] [-c <changelog>] [-p -T <your api token>]
 
-      $ fir b <project dir> [-c <changelog> -P <bughd project id> -M -p -T <your api token>]
+      $ fir bi <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>]
+      $ 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", "build"] => :build_ipa
+    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"
@@ -40,6 +40,27 @@ module FIR
       FIR.build_ipa(*args, options)
     end
 
+    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.
+      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
+      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"

data/lib/fir/util/build_apk.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+module FIR
+  module BuildApk
+
+    def build_apk *args, options
+      initialize_build_common_options(args, options)
+
+      Dir.chdir(@build_dir)
+
+      @build_cmd   = initialize_apk_build_cmd(args, options)
+      @output_path = options[:output].blank? ? "#{@build_dir}/build/outputs/apk" : File.absolute_path(options[:output].to_s)
+
+      logger_info_and_run_build_command
+
+      @builded_app_path ||= Dir[@output_path].find { |i| i =~ /release/ }
+      @builded_app_path ||= Dir["#{@output_path}/*.apk"].first
+
+      publish_build_app if options.publish?
+
+      logger_info_blank_line
+    end
+
+    private
+
+      def initialize_apk_build_cmd args, options
+        check_build_gradle_exist
+
+        apk_build_cmd = "gradle clean;gradle build"
+        apk_build_cmd
+      end
+
+      def check_build_gradle_exist
+        unless File.exist?("#{@build_dir}/build.gradle")
+          logger.error "The build.gradle is not exit, please use gradle and edit"
+          exit 1
+        end
+      end
+  end
+end

data/lib/fir/util/build_common.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+module FIR
+  module BuildCommon
+
+    def initialize_build_common_options args, options
+      if args.first.blank? || !File.exist?(args.first)
+        @build_dir = Dir.pwd
+      else
+        @build_dir = File.absolute_path(args.shift.to_s) # pop the first param
+      end
+
+      @token     = options[:token] || current_token
+      @changelog = options[:changelog].to_s
+      @short     = options[:short].to_s
+      @proj      = options[:proj].to_s
+    end
+
+    def publish_build_app
+      logger_info_blank_line
+      publish @builded_app_path, short:     @short,
+                                 changelog: @changelog,
+                                 token:     @token
+    end
+
+    def logger_info_and_run_build_command
+      puts @build_cmd if $DEBUG
+
+      logger.info "Building......"
+      logger_info_dividing_line
+
+      logger.info `#{@build_cmd}`
+    end
+  end
+end

data/lib/fir/util/{build.rb → build_ipa.rb}

@@ -1,45 +1,25 @@
 # encoding: utf-8
 
 module FIR
-  module Build
+  module BuildIpa
 
     def build_ipa *args, options
-      # check build environment and make build cmd
-      check_osx
-
-      if args.first.blank? || !File.exist?(args.first)
-        @build_dir = Dir.pwd
-      else
-        @build_dir = File.absolute_path(args.shift.to_s) # pop the first param
-      end
-
-      @token     = options[:token] || current_token
-      @changelog = options[:changelog].to_s
-      @short     = options[:short].to_s
-      @proj      = options[:proj].to_s
+      initialize_build_common_options(args, options)
 
       @build_tmp_dir = Dir.mktmpdir
       @output_path   = options[:output].blank? ? "#{@build_dir}/fir_build_ipa" : File.absolute_path(options[:output].to_s)
-      @ipa_build_cmd = initialize_ipa_build_cmd(args, options)
-
-      puts @ipa_build_cmd if $DEBUG
+      @build_cmd     = initialize_ipa_build_cmd(args, options)
 
-      logger.info "Building......"
-      logger_info_dividing_line
-
-      logger.info `#{@ipa_build_cmd}`
+      logger_info_and_run_build_command
 
       output_ipa
-
-      publish_build_ipa if options.publish?
-      upload_build_mapping_file if options.mapping?
+      @builded_app_path = Dir["#{@output_path}/*.ipa"].first
+      publish_build_app if options.publish?
+      upload_build_dsym_mapping_file if options.mapping?
 
       logger_info_blank_line
     end
 
-    def build_apk *args, options
-    end
-
     private
 
       def initialize_ipa_build_cmd args, options
@@ -98,17 +78,10 @@ module FIR
         logger.info "Build Success"
       end
 
-      def publish_build_ipa
-        logger_info_blank_line
-        publish Dir["#{@output_path}/*.ipa"].first, short:     @short,
-                                                    changelog: @changelog,
-                                                    token:     @token
-      end
-
-      def upload_build_mapping_file
+      def upload_build_dsym_mapping_file
         logger_info_blank_line
 
-        @app_info     = ipa_info(Dir["#{@output_path}/*.ipa"].first)
+        @app_info     = ipa_info(@builded_app_path)
         @mapping_file = Dir["#{@output_path}/*.dSYM/Contents/Resources/DWARF/*"].first
 
         mapping @mapping_file, proj:    @proj,
@@ -128,13 +101,6 @@ module FIR
         hash
       end
 
-      def check_osx
-        unless OS.mac?
-          logger.error "Unsupported OS type, `build_ipa` only support for OSX"
-          exit 1
-        end
-      end
-
       def check_and_find_ios_project path
         unless File.exist?(path)
           logger.error "The first param BUILD_DIR must be a xcodeproj directory"

data/lib/fir/util.rb

@@ -6,7 +6,9 @@ require_relative './util/parser'
 require_relative './util/login'
 require_relative './util/me'
 require_relative './util/info'
-require_relative './util/build'
+require_relative './util/build_common'
+require_relative './util/build_ipa'
+require_relative './util/build_apk'
 require_relative './util/publish'
 require_relative './util/mapping'
 
@@ -20,7 +22,9 @@ module FIR
       include FIR::Login
       include FIR::Me
       include FIR::Info
-      include FIR::Build
+      include FIR::BuildCommon
+      include FIR::BuildIpa
+      include FIR::BuildApk
       include FIR::Publish
       include FIR::Mapping
 

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end

data/test/build_ipa_test.rb

@@ -1,9 +1,14 @@
 # encoding: utf-8
 
-class BuildIpaTest < Minitest::Test
+class BuildAppTest < Minitest::Test
 
-  def test_build_ipa
-    # Only for OSX
-    assert true
+  def test_build_app
+    if ENV['TEST_BUILD']
+      options = OpenStruct.new
+      options.send("publish?=", true)
+
+      assert FIR.build_ipa(default_ipa_project, options)
+      assert FIR.build_apk(default_apk_project, options)
+    end
   end
 end

data/test/mapping_test.rb

@@ -9,7 +9,9 @@ class MappingTest < Minitest::Test
       build:   '1'
     }
 
-    assert FIR.mapping(default_dsym_mapping, options.merge(proj: default_bughd_project_ios_id))
-    assert FIR.mapping(default_txt_mapping,  options.merge(proj: default_bughd_project_android_id))
+    if ENV['TEST_MAPPING']
+      assert FIR.mapping(default_dsym_mapping, options.merge(proj: default_bughd_project_ios_id))
+      assert FIR.mapping(default_txt_mapping,  options.merge(proj: default_bughd_project_android_id))
+    end
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'minitest/autorun'
+require 'ostruct'
 require 'fir'
 
 FIR.logger = Logger.new(STDOUT)
@@ -23,6 +24,14 @@ class Minitest::Test
     File.expand_path('../cases', __FILE__) + '/test_ipa.ipa'
   end
 
+  def default_ipa_project
+    File.expand_path('../projects', __FILE__) + '/ipa'
+  end
+
+  def default_apk_project
+    File.expand_path('../projects', __FILE__) + '/apk'
+  end
+
   def default_bughd_project_ios_id
     '55bb2839692d647a46000004'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,7 +150,9 @@ files:
 - lib/fir/patches/native_patch.rb
 - lib/fir/patches/os_patch.rb
 - lib/fir/util.rb
-- lib/fir/util/build.rb
+- lib/fir/util/build_apk.rb
+- lib/fir/util/build_common.rb
+- lib/fir/util/build_ipa.rb
 - lib/fir/util/config.rb
 - lib/fir/util/http.rb
 - lib/fir/util/info.rb
@@ -179,14 +181,16 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.1.7\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
+  \ ## 更新记录\n  ### FIR-CLI 1.1.8\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
   Token 查看地址: `http://fir.im/user/info`\n  - 增加符号表上传指令, `fir mapping(alias m)`\n  -
   有以下三种方式上传符号表(目前已经支持 dSYM 和 txt 两种格式的符号表文件上传)\n    - 1. 指定 version 和 build 上传: `fir
   m <mapping file path> -P <bughd project id> -v <app version> -b <app build> -T <your
   api token>`\n    - 2. 在 publish 的时候自动上传: `fir p <app file path> -m <mapping file
   path> -P <bughd project id> -T <your api token>`\n    - 3. 在 build_ipa 的时候自动上传:
-  `fir b <project dir> -P <bughd project id> -M -p -T <your api token>`\n  - https://github.com/FIRHQ/fir-cli\n
-  \ "
+  `fir b <project dir> -P <bughd project id> -M -p -T <your api token>`\n  - 支持 gradle
+  打包 apk 文件并自动上传至 fir.im, `fir build_apk(alias ba)`\n    - `fir ba <project dir> [-o
+  <apk output dir> -c <changelog> -p -T <your api token>]`\n  - [fir-cli](https://github.com/FIRHQ/fir-cli)
+  已经开源, 欢迎 fork, issue 和 pull request\n  "
 rdoc_options: []
 require_paths:
 - lib