fir-cli 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65f2f42e7fc9ae3c427e46dfa310f8164ff68e76
-  data.tar.gz: 7d7e364838e109822188fc66c11d2a58e6061c67
+  metadata.gz: 5f48c14176fce237d55a83aec0c5b3c4435218fa
+  data.tar.gz: 11d59615e787d455342963f7acebb1d622ec0752
 SHA512:
-  metadata.gz: 3f764673c175d9286070bbc01999316ac8faba57d416e6f7120fb397a8a822dd07da8a9bce31226f0f7ba303d625fc0fa04f7ec1d5304e7181302cd34c5edd09
-  data.tar.gz: 95d7454fd3c5cc4788eea5bfc7506aac3ba7271347e1f1e40715f0d9ca5fecc5f667209229d95e6ad767a76ec512eee5724c725347f7114b3c3fb228d4fe31f3
+  metadata.gz: 79404fa3ae49d5eeac17d98c07565f260b0d9661bca12d7de07b0688575e0b40f0cfd9bbfa07e018a4d405c07677df9bba7cd050fdfcfcf2dcecee8f0148e628
+  data.tar.gz: 89874e9aaa92023046bdd504150a2e6e07a5d868252410f1069d37ecc9beeae72017e47b17d3234c5c3a2d79455d70fd6f2f90373c5924ae763464ed2725298c

data/CHANGELOG

@@ -1,5 +1,10 @@
 ## 更新记录
 
+### fir-cli 1.2.6
+- 增加导出二维码功能
+- 使用 `fir p <app file path> -Q`
+- 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片
+
 ### fir-cli 1.2.5
 - 修正解析 ipa 时候 `NoMethodError` 异常
 

data/fir-cli.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.2.5
-  - 修正 `build_apk` 无法找到 apk 的 bug
-  - build 完毕后, ipa 和 apk 均以 $name-$version-Build-$build 形式命名
-  - 修正解析 ipa 时候 NoMethodError 异常
+  ### fir-cli 1.2.6
+  - 增加导出二维码功能
+  - 使用 `fir p <app file path> -Q`
+  - 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
   )
@@ -44,4 +44,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'CFPropertyList', '~> 2.3'
   spec.add_dependency 'rest-client',    '~> 1.7'
   spec.add_dependency 'ruby_android',   '~> 0.7'
+  spec.add_dependency 'rqrcode',        '~> 0.7'
 end

data/lib/fir/cli.rb

@@ -16,11 +16,11 @@ module FIR
 
       Example:
 
-      $ fir bi <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 -Q -T <your api token>]
 
-      $ fir bi <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 -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 -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 :workspace,     type: :boolean, aliases: '-w', desc: 'true/false if build workspace'
@@ -32,6 +32,7 @@ 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 :qrcode,        type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
     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)
@@ -48,13 +49,14 @@ module FIR
 
       Example:
 
-      $ fir ba <project dir> [-o <apk output dir> -c <changelog> -p -T <your api token>]
+      $ fir ba <project dir> [-o <apk output dir> -c <changelog> -p -Q -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'
+    method_option :qrcode,    type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
     def build_apk(*args)
       prepare :build_apk
 
@@ -76,15 +78,16 @@ module FIR
 
       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> -Q -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>]
+      $ fir p <app file path> [-c <changelog> -s <custom short link> -m <mapping file path> -P <bughd project id> -Q -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 mapping file'
-    method_option :proj,        type: :string, aliases: '-P', desc: 'Project id in BugHD.com if upload app mapping file'
+    method_option :short,       type: :string,  aliases: '-s', desc: 'Set custom short link'
+    method_option :changelog,   type: :string,  aliases: '-c', desc: 'Set changelog'
+    method_option :qrcode,      type: :boolean, aliases: '-Q', desc: 'Generate qrcode'
+    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
 

data/lib/fir/util/build_common.rb

@@ -4,12 +4,13 @@ module FIR
   module BuildCommon
 
     def initialize_build_common_options(args, options)
-      @build_dir   = initialize_build_dir(args)
-      @output_path = initialize_output_path(options)
-      @token       = options[:token] || current_token
-      @changelog   = options[:changelog].to_s
-      @short       = options[:short].to_s
-      @proj        = options[:proj].to_s
+      @build_dir     = initialize_build_dir(args)
+      @output_path   = initialize_output_path(options)
+      @token         = options[:token] || current_token
+      @changelog     = options[:changelog].to_s
+      @short         = options[:short].to_s
+      @proj          = options[:proj].to_s
+      @export_qrcode = options[:qrcode]
     end
 
     def initialize_build_dir(args)
@@ -34,7 +35,8 @@ module FIR
       logger_info_blank_line
       publish @builded_app_path, short:     @short,
                                  changelog: @changelog,
-                                 token:     @token
+                                 token:     @token,
+                                 qrcode:    @export_qrcode
     end
 
     def logger_info_and_run_build_command

data/lib/fir/util/publish.rb

@@ -17,7 +17,7 @@ module FIR
       upload_app
 
       logger_info_dividing_line
-      logger.info "Published succeed: #{fir_api[:domain]}/#{fetch_app_info[:short]}"
+      logger_info_app_short_and_qrcode
 
       upload_mapping_file_with_publish(options)
       logger_info_blank_line
@@ -123,14 +123,28 @@ module FIR
                                      token:   @token
     end
 
+    def logger_info_app_short_and_qrcode
+      short = "#{fir_api[:domain]}/#{fetch_app_info[:short]}"
+
+      logger.info "Published succeed: #{short}"
+
+      if @export_qrcode
+        qrcode_path = "#{File.dirname(@file_path)}/fir-#{@app_info[:name]}.png"
+        FIR.generate_rqrcode(short, qrcode_path)
+
+        logger.info "Local qrcode file: #{qrcode_path}"
+      end
+    end
+
     private
 
     def initialize_publish_options(args, options)
-      @file_path = File.absolute_path(args.first.to_s)
-      @file_type = File.extname(@file_path).delete('.')
-      @token     = options[:token] || current_token
-      @changelog = options[:changelog].to_s.to_utf8
-      @short     = options[:short].to_s
+      @file_path     = File.absolute_path(args.first.to_s)
+      @file_type     = File.extname(@file_path).delete('.')
+      @token         = options[:token] || current_token
+      @changelog     = options[:changelog].to_s.to_utf8
+      @short         = options[:short].to_s
+      @export_qrcode = !!options[:qrcode]
     end
 
     def check_supported_file_and_token

data/lib/fir/util.rb

@@ -75,6 +75,12 @@ module FIR
       def logger_info_dividing_line
         logger.info '✈ -------------------------------------------- ✈'
       end
+
+      def generate_rqrcode string, png_file_path
+        qrcode = ::RQRCode::QRCode.new(string.to_s)
+        qrcode.as_png(size: 500, border_modules: 2, file: png_file_path)
+        png_file_path
+      end
     end
   end
 end

data/lib/fir/version.rb

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

data/lib/fir.rb

@@ -9,6 +9,7 @@ require 'securerandom'
 require 'fileutils'
 require 'cfpropertylist'
 require 'tempfile'
+require 'rqrcode'
 
 # TODO: remove rescue when https://github.com/tajchert/ruby_apk/pull/4 merged
 begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rqrcode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: fir.im command tool, support iOS and Android
 email:
 - dev@fir.im
@@ -182,10 +196,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.2.5\n  - 修正 `build_apk` 无法找到 apk 的 bug\n  - build 完毕后,
-  ipa 和 apk 均以 $name-$version-Build-$build 形式命名\n  - 修正解析 ipa 时候 NoMethodError 异常\n
-  \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
-  request\n  "
+  \ ## 更新记录\n  ### fir-cli 1.2.6\n  - 增加导出二维码功能\n  - 使用 `fir p <app file path> -Q`\n
+  \ - 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片\n  - [fir-cli](https://github.com/FIRHQ/fir-cli)
+  已经开源\n  - 欢迎 fork, issue 和 pull request\n  "
 rdoc_options: []
 require_paths:
 - lib