fir-cli 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 849113cc22122894e41d6f9fb313812fbd64c97b
-  data.tar.gz: 001404da307f8e5150590a597dd187b2f55723d4
+  metadata.gz: 85cb3f2688de5e0dd74a001f357796100a54d6c8
+  data.tar.gz: eae5c2263e4feffdc6a19481f85a617e97359e91
 SHA512:
-  metadata.gz: 316b2e5b3febc05fa320d66b8cec8d5e8da64c23ea1f5a3954cf14fd98621becf10ab1ed6c872ca764974a4b44a84d87bbbb7e59f42ec74163ee6d00e444cd5b
-  data.tar.gz: 5474a245a6082418d90147169ef5595d6918d67c9de1a02df7a1ec9e0c5a50ced1408c10ea6371d493dde98ed8af98f41537b133ef1ca2d30234a925c3a111d3
+  metadata.gz: b1166ed1b1795df22622890b833fca45deb94be99bd476864725245c272958413ad79bdeaab2c5e3b9966750ca641c809f53928102df60e0c9597c2d7aa7d24c
+  data.tar.gz: 68d673c6d73dea305ff54dafe6c37f875893ee0e78f205a258522ddcaafec10c773337235c4a58087a7fb8c77416ba2fe1997a1d63bcfd86e8014b16779a698e

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### FIR-CLI 1.2.0
+- 支持 zip 符号表文件上传
+
 ### FIR-CLI 1.1.9
 - 修改显示上的一些小问题
 

data/fir-cli.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.1.9
+  ### FIR-CLI 1.2.0
   - 完全兼容新版 API ✔
   - 请使用新版 API Token
   - 新版 API Token 查看地址: `http://fir.im/user/info`
   - 增加符号表上传指令, `fir mapping(alias m)`
-  - 有以下三种方式上传符号表(目前已经支持 dSYM 和 txt 两种格式的符号表文件上传)
+  - 有以下三种方式上传符号表(目前已经支持 dSYM, txt 和 zip 三种格式的符号表文件上传)
     - 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>`

data/lib/fir/util/build_ipa.rb

@@ -134,18 +134,16 @@ module FIR
         end
       end
 
-      private
-
-        # convert ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }
-        def parse_ipa_custom_settings args
-          hash = {}
-          args.each do |setting|
-            k, v = setting.split('=', 2).map(&:strip)
-            hash[k] = v
-          end
-
-          hash
+      # convert ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }
+      def parse_ipa_custom_settings args
+        hash = {}
+        args.each do |setting|
+          k, v = setting.split('=', 2).map(&:strip)
+          hash[k] = v
         end
 
+        hash
+      end
+
   end
 end

data/lib/fir/util/mapping.rb

@@ -20,9 +20,9 @@ module FIR
       @full_version = find_or_create_bughd_full_version
 
       logger.info "Uploading mapping file......."
-      logger_info_dividing_line
 
       upload_mapping_file
+      logger_info_dividing_line
 
       logger.info "Uploaded succeed: #{bughd_api[:domain]}/project/#{@proj}/settings"
       logger_info_blank_line
@@ -34,15 +34,7 @@ module FIR
     end
 
     def upload_mapping_file
-      if File.is_dsym?(@file_path)
-        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli.dSYM"
-        FileUtils.cp(@file_path, tmp_file_path)
-      elsif File.is_txt?(@file_path)
-        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli.txt"
-        FileUtils.cp(@file_path, tmp_file_path)
-      else
-        tmp_file_path = @file_path
-      end
+      tmp_file_path = rename_and_zip_mapping_file
 
       url = bughd_api[:full_version_url] + "/#{@full_version[:id]}"
       patch url, file: File.new(tmp_file_path, 'rb'), project_id: @proj, uuid: uuid
@@ -61,5 +53,34 @@ module FIR
         @uuid ||= fetch_user_uuid(@token)
       end
 
+      def rename_and_zip_mapping_file
+        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli"
+        FileUtils.cp(@file_path, tmp_file_path)
+
+        mapping_file_size = File.size?(tmp_file_path)
+
+        logger.info "Mapping file size - #{mapping_file_size}"
+
+       if mapping_file_size > 50*1000*1000
+          logger.info "Zipping mapping file......."
+
+          system("zip -qr #{tmp_file_path}.zip #{tmp_file_path}")
+
+          tmp_file_path = tmp_file_path + '.zip'
+
+          logger.info "Zipped Mapping file size - #{File.size?(tmp_file_path)}"
+        end
+
+        if File.is_dsym?(@file_path)
+          FileUtils.mv(tmp_file_path, tmp_file_path + '.dSYM')
+          tmp_file_path = tmp_file_path + '.dSYM'
+        elsif File.is_txt?(@file_path)
+          FileUtils.mv(tmp_file_path, tmp_file_path + '.txt')
+          tmp_file_path = tmp_file_path + '.txt'
+        end
+
+        tmp_file_path
+      end
+
   end
 end

data/lib/fir/version.rb

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

data/test/mapping_test.rb

@@ -12,6 +12,7 @@ class MappingTest < Minitest::Test
     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))
+      assert FIR.mapping(bigger_txt_mapping,  options.merge(proj: default_bughd_project_android_id))
     end
   end
 end

data/test/test_helper.rb

@@ -51,6 +51,10 @@ class Minitest::Test
     File.expand_path('../cases', __FILE__) + '/test_apk_txt'
   end
 
+  def bigger_txt_mapping
+    File.expand_path('../projects', __FILE__) + '/biggggger.txt'
+  end
+
   def default_device_udid
     "cf8b87e3f469d7b185fd64c057778aecbc2017a6"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,12 +181,12 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.1.9\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
+  \ ## 更新记录\n  ### FIR-CLI 1.2.0\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 的时候自动上传:
+  有以下三种方式上传符号表(目前已经支持 dSYM, txt 和 zip 三种格式的符号表文件上传)\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  - 支持 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)