fir-cli 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae37560a32f8148019401781f25a6178eb42928
-  data.tar.gz: 9d7ea5da155442ecb9dbb3d403d6fd92d8df2dd5
+  metadata.gz: 1e71b65b2924de16756c2864e7a094de63c956d8
+  data.tar.gz: 7bac50ecf47385a4910edc0a2880e728ff15cd2d
 SHA512:
-  metadata.gz: 450db2d41ecb6a4387b98da3ff8cd8d7d940dc7dbddb5c8d83a30a9eaf529fd23b4b3d216b4923a24cd23507357f56bf97c1b019f6bcd42bdc41d3d7ceba7cb4
-  data.tar.gz: 1f80cf0bf64c316b23a1fbc2b069333caff25b638bd3984e41413e02aa6c605208499914f726533e45c7419c620b1074664391e58c1f18f30136c068495ccf3a
+  metadata.gz: 1f0b6fe17268b80f01364036396c1852deaf460d7b10210df7fa78cffb6be1d3532d46aa198924f33426d0ba32aaca7729066954df43d06dbc71511ebbd4102d
+  data.tar.gz: cba928b8e03b835180a6a72291766f810aa69df817a737ff0fee2ba4975dffd397ae19d46da31a88cb6bc4da945ec76b119e8c4f2d3140189667a299ac0ca858

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### fir-cli 1.2.8
+- 统一 build 后, ipa 和 dSYM 文件的命名
+
 ### fir-cli 1.2.7
 - publish 时增加更多信息
 

data/fir-cli.gemspec

@@ -27,11 +27,13 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.2.7
+  ### fir-cli 1.2.8
+  - 统一 build 后, ipa 和 dSYM 文件的命名
   - publish 时增加更多信息
   - 增加导出二维码功能
   - 使用 `fir p <app file path> -Q`
   - 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片
+  - 详细更新记录, 请查看: 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

@@ -28,7 +28,6 @@ module FIR
     method_option :configuration, type: :string,  aliases: '-C', desc: 'Use the build configuration NAME for building each target'
     method_option :target,        type: :string,  aliases: '-t', desc: 'Build the target specified by targetname'
     method_option :output,        type: :string,  aliases: '-o', desc: 'IPA output path, the default is: BUILD_DIR/fir_build_ipa'
-    method_option :name,          type: :string,  aliases: '-n', desc: 'IPA name, the default is: YOUR PROJECT NAME'
     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'

data/lib/fir/util/build_ipa.rb

@@ -11,7 +11,7 @@ module FIR
 
       logger_info_and_run_build_command
 
-      output_ipa
+      output_ipa_and_dsym
       @builded_app_path = Dir["#{@output_path}/*.ipa"].first
 
       publish_build_app if options.publish?
@@ -24,10 +24,8 @@ module FIR
 
     def initialize_ipa_build_cmd(args, options)
       @configuration = options[:configuration]
-      @wrapper_name  = File.basename(options[:name].to_s, '.*') + '.app' unless options[:name].blank?
       @target_name   = options[:target]
       @scheme_name   = options[:scheme]
-      @dsym_name     = @wrapper_name + '.dSYM' unless @wrapper_name.blank?
 
       build_cmd =  'xcodebuild build -sdk iphoneos'
       build_cmd += initialize_xcode_build_path(options)
@@ -41,25 +39,27 @@ module FIR
       custom_settings = split_assignment_array_to_hash(args)
 
       setting_str =  convert_hash_to_assignment_string(custom_settings)
-      setting_str += " WRAPPER_NAME='#{@wrapper_name}'" unless @wrapper_name.blank?
       setting_str += " TARGET_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['TARGET_BUILD_DIR']
       setting_str += " CONFIGURATION_BUILD_DIR='#{@build_tmp_dir}'" unless custom_settings['CONFIGURATION_BUILD_DIR']
       setting_str += " DWARF_DSYM_FOLDER_PATH='#{@output_path}'" unless custom_settings['DWARF_DSYM_FOLDER_PATH']
-      setting_str += " DWARF_DSYM_FILE_NAME='#{@dsym_name}'" unless @dsym_name.blank?
       setting_str
     end
 
-    def output_ipa
+    def output_ipa_and_dsym
       Dir.chdir(@build_tmp_dir) do
         apps = Dir['*.app']
         check_no_output_app(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]}"
+          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"
 
           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
         end
       end
 

data/lib/fir/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - NaixSpirit
@@ -196,8 +196,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.2.7\n  - publish 时增加更多信息\n  - 增加导出二维码功能\n  - 使用 `fir
-  p <app file path> -Q`\n  - 或者 `fir bi(ba) <project dir> -p -Q` 即可导出当前 app 的二维码图片\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
   \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
   request\n  "
 rdoc_options: []