fir-cli 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40ee16eab22f396737b2b5df0c7a5f9f1d17eae9
-  data.tar.gz: 8e6ddc3b9bd00b151f8f3aea69aea221f5fa33d8
+  metadata.gz: 5e2c2eb4c08bfe43c5e1237dda28ad11f9899dce
+  data.tar.gz: edabc62959f3098a21ecf84861d7c7d39a170b65
 SHA512:
-  metadata.gz: 691ee0f6f1b4e79c501cb115c6525a60cc073249a6c79a3040ac40fe2e1144a815b0e65cedf409e8f1c401b921820be615e885662b3ecc80d5e62088f2e3345c
-  data.tar.gz: 63aa7c7cbda4cd0521eafc7fe03dd3a2e16709e9315c399dadd23c177761e3b943f57f54fe7575ad6c53a6790f4be1918933300f6ab6afa189305e85b32c40a4
+  metadata.gz: 6c30e3dd5ff254e45401208381ec8d5d0ebd61cf7d56dcab5d353248454c95b4693f1a60ba280224d7585433ac3f81a7eb82a230004a49aa8c7efd0696006975
+  data.tar.gz: 5fb9eaf4199ab0d6c750f25704a2cf5b017691e46120b01a8e4604aa2b8506d23b9523287006cdc097add4c7d2dec91d440d86ee08e6a6e83f491946579f9908

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### fir-cli 1.3.5
+- 修复转换 icon 的 bug
+
 ### fir-cli 1.3.4
 - 上传增加 distribution_name 信息
 

data/fir-cli.gemspec

@@ -27,9 +27,8 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.3.4
-  - 修正解析 inhouse 错误的现象
-  - 上传增加 distribution_name 信息
+  ### fir-cli 1.3.5
+  - 修复转换 icon 的 bug
   - 详细更新记录, 请查看: 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.rb

@@ -4,6 +4,7 @@ require_relative './util/http'
 require_relative './util/config'
 require_relative './util/parser/apk'
 require_relative './util/parser/ipa'
+require_relative './util/parser/pngcrush'
 require_relative './util/login'
 require_relative './util/me'
 require_relative './util/info'

data/lib/fir/util/parser/apk.rb

@@ -29,9 +29,9 @@ module FIR
         }
       end
 
-      # @apk.icon is a hash, { icon_name: icon_data }
+      # @apk.icon is a hash, { icon_name: icon_binary_data }
       def tmp_icons
-        @apk.icon.map { |_, data| generate_tmp_icon(data) }
+        @apk.icon.map { |_, data| generate_tmp_icon(data, :apk) }
       end
     end
   end

data/lib/fir/util/parser/common.rb

@@ -4,9 +4,19 @@ module FIR
   module Parser
     module Common
 
-      def generate_tmp_icon data
+      # when type is ipa, the icon data is a png file.
+      # when type is apk, the icon data is a binary data.
+      def generate_tmp_icon data, type
         tmp_icon_path = "#{Dir.tmpdir}/icon-#{SecureRandom.hex[4..9]}.png"
-        File.open(tmp_icon_path, 'w+') { |f| f << data }
+
+        if type == :ipa
+          FileUtils.cp(data, tmp_icon_path)
+        elsif type == :apk
+          File.open(tmp_icon_path, 'w+') { |f| f << data }
+        else
+          return
+        end
+
         tmp_icon_path
       end
     end

data/lib/fir/util/parser/ipa.rb

@@ -113,7 +113,7 @@ module FIR
         end
 
         def tmp_icons
-          icons.map { |data| generate_tmp_icon(data) }
+          icons.map { |data| generate_tmp_icon(data, :ipa) }
         end
 
         def icons

data/lib/fir/util/parser/pngcrush.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module FIR
+  module Parser
+    module Pngcrush
+
+      class << self
+
+        def png_bin
+          @png_bin ||= File.expand_path('../bin/pngcrush', __FILE__)
+        end
+
+        def uncrush_icon crushed_icon_path, uncrushed_icon_path
+          system("#{png_bin} -revert-iphone-optimizations #{crushed_icon_path} #{uncrushed_icon_path} &> /dev/null")
+        end
+
+        def crush_icon uncrushed_icon_path, crushed_icon_path
+          system("#{png_bin} -iphone #{uncrushed_icon_path} #{crushed_icon_path} &> /dev/null")
+        end
+      end
+    end
+  end
+end

data/lib/fir/util/publish.rb

@@ -54,12 +54,13 @@ module FIR
     end
 
     def uploading_icon_info
-      icon = @app_info[:icons].max_by { |f| File.size(f) }
+      large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
+      uncrushed_icon_path = convert_icon(large_icon_path)
 
       {
         key:   @icon_cert[:key],
         token: @icon_cert[:token],
-        file:  File.new(icon, 'rb')
+        file:  File.new(uncrushed_icon_path, 'rb')
       }
     end
 
@@ -163,5 +164,17 @@ module FIR
       check_token_cannot_be_blank(@token)
       fetch_user_info(@token)
     end
+
+    def convert_icon origin_path
+      logger.info "Converting app's icon......"
+
+      if @app_info[:type] == 'ios'
+        output_path = Tempfile.new(['uncrushed_icon', '.png']).path
+        FIR::Parser::Pngcrush.uncrush_icon(origin_path, output_path)
+        origin_path = output_path if File.size(output_path) != 0
+      end
+
+      origin_path
+    end
   end
 end

data/lib/fir/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -173,8 +173,10 @@ files:
 - lib/fir/util/mapping.rb
 - lib/fir/util/me.rb
 - lib/fir/util/parser/apk.rb
+- lib/fir/util/parser/bin/pngcrush
 - lib/fir/util/parser/common.rb
 - lib/fir/util/parser/ipa.rb
+- lib/fir/util/parser/pngcrush.rb
 - lib/fir/util/publish.rb
 - lib/fir/version.rb
 - lib/fir_cli.rb
@@ -196,10 +198,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.3.4\n  - 修正解析 inhouse 错误的现象\n  - 上传增加 distribution_name
-  信息\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
-  \ "
+  \ ## 更新记录\n  ### fir-cli 1.3.5\n  - 修复转换 icon 的 bug\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: []
 require_paths:
 - lib