fir-cli 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d1e0ac63ead35ff04149c8c471bb20818006c6
-  data.tar.gz: 9aebd79f93f24e5411b837d4999df922cb7abb3e
+  metadata.gz: 83fa44d61b04246a7a2402bdca1eff4b99aef2ce
+  data.tar.gz: b7e1b903ce095e4d99b312c70a984a5b0df4751a
 SHA512:
-  metadata.gz: 61af691a4a071fd07c68b3b5029d4a7ef95a25736aab7ff6b08b7bc3d0dc18721584434b6b8f100185a8805d31ae753a923991dba1d184bbcd23d6c420936b04
-  data.tar.gz: 329ffbcfdacf5bc61b348c9dfa80978c1af63da95fc867d83e1559c5f7ddd619b32a430daa7694041cb47922a71eff296d555eac22aac34a416a95ea9ffe8b3b
+  metadata.gz: 4ceb95e406746dce90890a6271a29c357a1fac046df4c192fc28a85c9164ab76777f7d739dbb1b9e46e50752be8cf8d58c93245378f653a292c49064613cc314
+  data.tar.gz: ccd0ed1f05ed39ff3a2573f325c8c69b54defb2943293c1eef84e3710d1e1d8b6d6f9b8ffbc66e291beb7b4c5feade1f97f11b71cb27c1a1d96c01275057cedf

data/.gitignore

@@ -19,3 +19,5 @@ mkmf.log
 Gemfile.lock
 .DS_Store
 /test/cases/*.png
+/build_apk_example_*
+/build_ipa_example_*

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### fir-cli 1.4.1
+- 支持远程 git 项目打包编译
+
 ### fir-cli 1.4.0
 - 使用 cli 转换 icon 后不再回调后台 icon 转换器
 

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+require 'bundler/setup'
+require 'fir'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+require 'pry'
+Pry.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/fir-cli.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'fir-cli'
   spec.version       = FIR::VERSION
   spec.authors       = ['NaixSpirit']
-  spec.email         = ['dev@fir.im']
+  spec.email         = ['neverlandxy.naix@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'
@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.4.0
-  - 使用 cli 转换 icon 后不再回调后台 icon 转换器
-  - 修正 build 后生成多个 dsym 文件导致上传 bughd 失败的 bug
+  ### fir-cli 1.4.1
+  - 支持远程 git 项目打包编译, enjoy.
+  - `$ fir bi/ba <git ssh url> -B develop -c <changelog> -p`
   - 详细更新记录, 请查看: 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

@@ -20,9 +20,12 @@ module FIR
 
       $ fir bi <project dir> [-c <changelog> -P <bughd project id> -M -p -Q -T <your api token>]
 
+      $ fir bi <git ssh url> [-B develop -c <changelog> -P <bughd project id> -M -p -Q -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 -Q -T <your api token>]
     LONGDESC
     map ['b', 'bi'] => :build_ipa
+    method_option :branch,        type: :string,  aliases: '-B', desc: 'Set branch if project is a git repo, the default is `master`'
     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'
@@ -50,8 +53,11 @@ module FIR
       Example:
 
       $ fir ba <project dir> [-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 :short,     type: :string,  aliases: '-s', desc: 'Set custom short link if publish to fir.im'

data/lib/fir/util/build_common.rb

@@ -4,7 +4,7 @@ module FIR
   module BuildCommon
 
     def initialize_build_common_options(args, options)
-      @build_dir     = initialize_build_dir(args)
+      @build_dir     = initialize_build_dir(args, options)
       @output_path   = initialize_output_path(options)
       @token         = options[:token] || current_token
       @changelog     = options[:changelog].to_s
@@ -14,11 +14,30 @@ module FIR
       @export_qrcode = options[:qrcode]
     end
 
-    def initialize_build_dir(args)
-      if args.first.blank? || !File.exist?(args.first)
+    def initialize_build_dir(args, options)
+      build_dir = args.first.to_s
+      if File.extname(build_dir) == '.git'
+        args.shift && git_clone_build_dir(build_dir, options)
+      elsif build_dir.blank? || !File.exist?(build_dir)
         Dir.pwd
       else
-        File.absolute_path(args.shift.to_s) # pop the first param
+        args.shift && File.absolute_path(build_dir)
+      end
+    end
+
+    def git_clone_build_dir(ssh_url, options)
+      repo_name = File.basename(ssh_url, '.git') + "_#{Time.now.strftime('%Y%m%dT%H%M%S')}"
+      branch    = options[:branch].blank? ? 'master' : options[:branch]
+      git_cmd   = "git clone --depth=50 --branch=#{branch} #{ssh_url} #{repo_name}"
+
+      logger.info git_cmd
+      logger_info_dividing_line
+
+      if system(git_cmd)
+        File.absolute_path(repo_name)
+      else
+        logger.error 'Git clone failed'
+        exit 1
       end
     end
 

data/lib/fir/version.rb

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

data/test/build_ipa_test.rb

@@ -9,6 +9,9 @@ class BuildAppTest < Minitest::Test
 
       assert FIR.build_ipa(default_ipa_project, options)
       assert FIR.build_apk(default_apk_project, options)
+
+      assert FIR.build_ipa(default_ipa_git_url, options)
+      assert FIR.build_apk(default_apk_git_url, options)
     end
   end
 end

data/test/test_helper.rb

@@ -35,6 +35,14 @@ class Minitest::Test
     File.expand_path('../projects', __FILE__) + '/apk'
   end
 
+  def default_ipa_git_url
+    'git@github.com:NaixSpirit/build_ipa_example.git'
+  end
+
+  def default_apk_git_url
+    'git@github.com:NaixSpirit/build_apk_example.git'
+  end
+
   def default_bughd_project_ios_id
     '55bb2839692d647a46000004'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,9 +138,11 @@ dependencies:
         version: '0.7'
 description: fir.im command tool, support iOS and Android
 email:
-- dev@fir.im
+- neverlandxy.naix@gmail.com
 executables:
+- console
 - fir
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,7 +155,9 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - bin/fir
+- bin/setup
 - fir-cli.gemspec
 - lib/fir-cli.rb
 - lib/fir.rb
@@ -199,8 +203,8 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.4.0\n  - 使用 cli 转换 icon 后不再回调后台 icon 转换器\n  - 修正 build
-  后生成多个 dsym 文件导致上传 bughd 失败的 bug\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
+  \ ## 更新记录\n  ### fir-cli 1.4.1\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
   \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
   request\n  "
 rdoc_options: []