fir-cli 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e71b65b2924de16756c2864e7a094de63c956d8
-  data.tar.gz: 7bac50ecf47385a4910edc0a2880e728ff15cd2d
+  metadata.gz: ba21bf45fa66a3258e0487843c45b2c5fa3aa079
+  data.tar.gz: 1817005f1c05b9665443c9fe27a768ff515dfb96
 SHA512:
-  metadata.gz: 1f0b6fe17268b80f01364036396c1852deaf460d7b10210df7fa78cffb6be1d3532d46aa198924f33426d0ba32aaca7729066954df43d06dbc71511ebbd4102d
-  data.tar.gz: cba928b8e03b835180a6a72291766f810aa69df817a737ff0fee2ba4975dffd397ae19d46da31a88cb6bc4da945ec76b119e8c4f2d3140189667a299ac0ca858
+  metadata.gz: 64ae9b0ae7f0f1e33559ff95f3948f68f09aace41ce7632283e63637fa4540eaea045799f2ec35d00dee4071abcc9f1f35f528de454e2f2500bc65ba59789087
+  data.tar.gz: 235d964b9effb042741f32408fa36f242e197cb7a3067e2523e698e30ac44c1ff77e4020d8f9bc6166beedc8882152e66eae923c813f936438b8fb3033779d8c

data/CHANGELOG

@@ -1,5 +1,9 @@
 ## 更新记录
 
+### fir-cli 1.2.9
+- 修复指定 output_path 后, publish 默认查找第一个 app 的 bug
+- 暂时不支持 build multi apps
+
 ### fir-cli 1.2.8
 - 统一 build 后, ipa 和 dSYM 文件的命名
 

data/README.md

@@ -1,7 +1,6 @@
 fir.im-cli
 ---
 
-
 ![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)
 [![Test Coverage](https://codeclimate.com/github/FIRHQ/fir-cli/badges/coverage.svg)](https://codeclimate.com/github/FIRHQ/fir-cli/coverage)
@@ -19,6 +18,12 @@ fir.im-cli 使用 Ruby 构建，只要安装相应 ruby gem 即可:
 $ sudo gem install fir-cli
 ```
 
+如果是 OS X 系统, 需要提前安装好 osx command line tools:
+
+```shell
+$ xcode-select --install
+```
+
 如果出现无法安装的现象, 请先更换 Ruby 的淘宝源(由于国内网络原因, 你懂的), 并升级下系统自带的 gem
 
 ```shell

data/fir-cli.gemspec

@@ -27,12 +27,9 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.2.8
-  - 统一 build 后, ipa 和 dSYM 文件的命名
-  - publish 时增加更多信息
-  - 增加导出二维码功能
-  - 使用 `fir p <app file path> -Q`
-  - 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片
+  ### fir-cli 1.2.9
+  - 修复指定 output_path 后, publish 默认查找第一个 app 的 bug
+  - 暂时不支持 build multi apps
   - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request

data/lib/fir/util/build_ipa.rb

@@ -12,7 +12,6 @@ module FIR
       logger_info_and_run_build_command
 
       output_ipa_and_dsym
-      @builded_app_path = Dir["#{@output_path}/*.ipa"].first
 
       publish_build_app if options.publish?
       upload_build_dsym_mapping_file if options.mapping?
@@ -48,18 +47,18 @@ module FIR
     def output_ipa_and_dsym
       Dir.chdir(@build_tmp_dir) do
         apps = Dir['*.app']
-        check_no_output_app(apps)
+        check_no_output_app_and_multi_apps(apps)
 
-        apps.each do |app|
-          temp_ipa  = zip_app2ipa(File.join(@build_tmp_dir, app))
-          ipa_info  = FIR.ipa_info(temp_ipa)
-          ipa_name  = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
-          dsym_name = "#{@output_path}/#{ipa_info[:name]}.app.dSYM"
+        temp_ipa  = zip_app2ipa(File.join(@build_tmp_dir, apps.first))
+        ipa_info  = FIR.ipa_info(temp_ipa)
+        ipa_name  = "#{ipa_info[:name]}-#{ipa_info[:version]}-build-#{ipa_info[:build]}"
+        dsym_name = "#{@output_path}/#{ipa_info[:name]}.app.dSYM"
 
-          FileUtils.cp(temp_ipa, "#{@output_path}/#{ipa_name}.ipa")
-          if File.exist?(dsym_name)
-            FileUtils.mv(dsym_name, "#{@output_path}/#{ipa_name}.app.dSYM")
-          end
+        @builded_app_path = "#{@output_path}/#{ipa_name}.ipa"
+
+        FileUtils.mv(temp_ipa, @builded_app_path, force: true)
+        if File.exist?(dsym_name)
+          FileUtils.mv(dsym_name, "#{@output_path}/#{ipa_name}.app.dSYM", force: true)
         end
       end
 
@@ -119,11 +118,16 @@ module FIR
       end
     end
 
-    def check_no_output_app(apps)
+    def check_no_output_app_and_multi_apps(apps)
       if apps.length == 0
         logger.error 'Builded has no output app, Can not be packaged'
         exit 1
       end
+
+      if apps.length > 1
+        logger.error 'Builded multi apps, Not supported'
+        exit 1
+      end
     end
 
     def zip_app2ipa(app_path)

data/lib/fir/version.rb

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

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 require 'minitest/autorun'
 require 'ostruct'
 require 'fir'
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
 
 FIR.logger = Logger.new(STDOUT)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -196,9 +196,8 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.2.8\n  - 统一 build 后, ipa 和 dSYM 文件的命名\n  - publish 时增加更多信息\n
-  \ - 增加导出二维码功能\n  - 使用 `fir p <app file path> -Q`\n  - 或者 `fir bi(ba) <project dir>
-  -p -Q` 即可导出当前 app 的二维码图片\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
+  \ ## 更新记录\n  ### fir-cli 1.2.9\n  - 修复指定 output_path 后, publish 默认查找第一个 app 的 bug\n
+  \ - 暂时不支持 build multi apps\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: []