fir-cli 1.2.2 → 1.2.3

data/lib/fir/util/mapping.rb

@@ -3,23 +3,16 @@
 module FIR
   module Mapping
 
-    def mapping *args, options
-      @file_path = File.absolute_path(args.first.to_s)
-      @token     = options[:token] || current_token
-      @proj      = options[:proj].to_s
-      @version   = options[:version].to_s
-      @build     = options[:build].to_s
-
-      check_file_exist @file_path
-      check_token_cannot_be_blank @token
-      check_project_id_cannot_be_blank
+    def mapping(*args, options)
+      initialize_and_check_mapping_options(args, options)
+      check_file_and_token
 
       logger.info "Creating bughd project's version......."
       logger_info_dividing_line
 
       @full_version = find_or_create_bughd_full_version
 
-      logger.info "Uploading mapping file......."
+      logger.info 'Uploading mapping file.......'
 
       upload_mapping_file
       logger_info_dividing_line
@@ -42,51 +35,64 @@ module FIR
 
     private
 
-      def check_project_id_cannot_be_blank
-        if @proj.blank?
-          logger.error "Project id can't be blank"
-          exit 1
-        end
-      end
+    def initialize_and_check_mapping_options(args, options)
+      @file_path = File.absolute_path(args.first.to_s)
+      @token     = options[:token] || current_token
+      @proj      = options[:proj].to_s
+      @version   = options[:version].to_s
+      @build     = options[:build].to_s
+    end
 
-      def uuid
-        @uuid ||= fetch_user_uuid(@token)
-      end
+    def check_file_and_token
+      check_file_exist(@file_path)
+      check_token_cannot_be_blank(@token)
+      check_project_id_cannot_be_blank
+    end
 
-      def generate_temp_mapping_file
-        tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli"
-        FileUtils.cp(@file_path, tmp_file_path)
+    def check_project_id_cannot_be_blank
+      return unless @proj.blank?
 
-        tmp_file_path = zip_mapping_file(tmp_file_path)
-        tmp_file_path = dsym_or_txt_file(tmp_file_path)
+      logger.error "Project id can't be blank"
+      exit 1
+    end
 
-        tmp_file_path
-      end
+    def uuid
+      @uuid ||= fetch_user_uuid(@token)
+    end
+
+    def generate_temp_mapping_file
+      tmp_file_path = "#{Dir.tmpdir}/#{File.basename(@file_path)}-fircli"
+      FileUtils.cp(@file_path, tmp_file_path)
+
+      tmp_file_path = zip_mapping_file(tmp_file_path)
+      tmp_file_path = dsym_or_txt_file(tmp_file_path)
 
-      def zip_mapping_file tmp_file_path
-        if File.size?(tmp_file_path) > 50*1000*1000
-          logger.info "Zipping mapping file......."
+      tmp_file_path
+    end
 
-          system("zip -qr #{tmp_file_path}.zip #{tmp_file_path}")
-          tmp_file_path = tmp_file_path + '.zip'
+    def zip_mapping_file(tmp_file_path)
+      if File.size?(tmp_file_path) > 50 * 1000 * 1000
+        logger.info 'Zipping mapping file.......'
 
-          logger.info "Zipped Mapping file size - #{File.size?(tmp_file_path)}"
-        end
+        system("zip -qr #{tmp_file_path}.zip #{tmp_file_path}")
+        tmp_file_path += '.zip'
 
-        tmp_file_path
+        logger.info "Zipped Mapping file size - #{File.size?(tmp_file_path)}"
       end
 
-      def dsym_or_txt_file tmp_file_path
-        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
 
-        tmp_file_path
+    def dsym_or_txt_file(tmp_file_path)
+      if File.dsym?(@file_path)
+        FileUtils.mv(tmp_file_path, tmp_file_path + '.dSYM')
+        tmp_file_path += '.dSYM'
+      elsif File.text?(@file_path)
+        FileUtils.mv(tmp_file_path, tmp_file_path + '.txt')
+        tmp_file_path += '.txt'
       end
 
+      tmp_file_path
+    end
   end
 end

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

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+require_relative './common'
+
+module FIR
+  module Parser
+    class Apk
+      include Parser::Common
+
+      def initialize(path)
+        @apk = ::Android::Apk.new(path)
+      end
+
+      def full_info(options)
+        if options.fetch(:full_info, false)
+          basic_info.merge!(icons: tmp_icons)
+        end
+
+        basic_info
+      end
+
+      def basic_info
+        @basic_info ||= {
+          type:       'android',
+          identifier: @apk.manifest.package_name,
+          name:       @apk.label,
+          build:      @apk.manifest.version_code.to_s,
+          version:    @apk.manifest.version_name.to_s
+        }
+      end
+
+      # @apk.icon is a hash, { icon_name: icon_data }
+      def tmp_icons
+        @apk.icon.map { |_, data| generate_tmp_icon(data) }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+module FIR
+  module Parser
+    module Common
+
+      def generate_tmp_icon data
+        tmp_icon_path = "#{Dir.tmpdir}/icon-#{SecureRandom.hex[4..9]}.png"
+        File.open(tmp_icon_path, 'w+') { |f| f << data }
+        tmp_icon_path
+      end
+    end
+  end
+end

data/lib/fir/util/{parser.rb → parser/ipa.rb}

@@ -1,9 +1,11 @@
 # encoding: utf-8
 
+require_relative './common'
+
 module FIR
   module Parser
-
     class Ipa
+      include Parser::Common
 
       def initialize(path)
         @path = path
@@ -29,7 +31,7 @@ module FIR
       end
 
       def has_metadata?
-        File.file? metadata_path
+        File.file?(metadata_path)
       end
 
       def metadata_path
@@ -56,11 +58,32 @@ module FIR
       end
 
       class App
-
         def initialize(path)
           @path = path
         end
 
+        def full_info(options)
+          if options.fetch(:full_info, false)
+            basic_info.merge!(icons: tmp_icons)
+          end
+
+          basic_info
+        end
+
+        def basic_info
+          @basic_info ||= {
+            type:              'ios',
+            identifier:        identifier,
+            name:              name,
+            display_name:      display_name,
+            build:             version.to_s,
+            version:           short_version.to_s,
+            devices:           devices,
+            release_type:      release_type,
+            distribution_name: distribution_name
+          }
+        end
+
         def info
           @info ||= CFPropertyList.native_types(
             CFPropertyList::List.new(file: File.join(@path, 'Info.plist')).value)
@@ -86,6 +109,10 @@ module FIR
           info['CFBundleShortVersionString']
         end
 
+        def tmp_icons
+          icons.map { |data| generate_tmp_icon(data) }
+        end
+
         def icons
           @icons ||= begin
             icons = []
@@ -93,7 +120,7 @@ module FIR
               icons << get_image(name)
               icons << get_image("#{name}@2x")
             end
-            icons.delete_if { |i| !i }
+            icons.delete_if &:!
           rescue NoMethodError
             []
           end
@@ -143,15 +170,12 @@ module FIR
 
         private
 
-          def get_image name
-            path = File.join(@path, "#{name}.png")
-            return nil unless File.exist?(path)
-            path
-          end
+        def get_image(name)
+          path = File.join(@path, "#{name}.png")
+          return nil unless File.exist?(path)
+          path
+        end
       end
     end
-
-    class Apk
-    end
   end
 end

data/lib/fir/util/publish.rb

@@ -3,20 +3,14 @@
 module FIR
   module Publish
 
-    def publish *args, options
-      @file_path = File.absolute_path(args.first.to_s)
-      @token     = options[:token] || current_token
-      @changelog = options[:changelog].to_s.to_utf8
-      @short     = options[:short].to_s
-
+    def publish(*args, options)
+      initialize_publish_options(args, options)
       check_supported_file_and_token
 
-      logger.info "Publishing app......."
+      logger.info 'Publishing app.......'
       logger_info_dividing_line
 
-      file_type = File.extname(@file_path).delete(".")
-
-      @app_info       = send("#{file_type}_info", @file_path, true)
+      @app_info       = send("#{@file_type}_info", @file_path, full_info: true)
       @uploading_info = fetch_uploading_info
       @app_id         = @uploading_info[:id]
 
@@ -25,15 +19,7 @@ module FIR
       logger_info_dividing_line
       logger.info "Published succeed: #{fir_api[:domain]}/#{fetch_app_info[:short]}"
 
-      if options[:mappingfile] && options[:proj]
-        logger_info_blank_line
-
-        mapping options[:mappingfile], proj:    options[:proj],
-                                       build:   @app_info[:build],
-                                       version: @app_info[:version],
-                                       token:   @token
-      end
-
+      upload_mapping_file_with_publish(options)
       logger_info_blank_line
     end
 
@@ -41,77 +27,79 @@ module FIR
       @icon_cert   = @uploading_info[:cert][:icon]
       @binary_cert = @uploading_info[:cert][:binary]
 
-      upload_app_icon
+      upload_app_icon unless @app_info[:icons].blank?
       upload_app_binary
       upload_device_info
       update_app_info
     end
 
     def upload_app_icon
-      unless @app_info[:icons].blank?
-        logger.info "Uploading app's icon......"
+      logger.info 'Uploading app icon......'
 
-        icon_path = @app_info[:icons].max_by { |f| File.size(f) }
+      uploaded_info = post(@icon_cert[:upload_url], uploading_icon_info)
 
-        hash = {
-          key:   @icon_cert[:key],
-          token: @icon_cert[:token],
-          file:  File.new(icon_path, "rb")
-        }
+      return if uploaded_info[:is_completed]
 
-        uploaded_info = post(@icon_cert[:upload_url], hash)
+      logger.error 'Upload app icon failed'
+      exit 1
+    end
+
+    def uploading_icon_info
+      icon = @app_info[:icons].max_by { |f| File.size(f) }
 
-        unless uploaded_info[:is_completed]
-          logger.error "Upload app icon failed"
-          exit 1
-        end
-      end
+      {
+        key:   @icon_cert[:key],
+        token: @icon_cert[:token],
+        file:  File.new(icon, 'rb')
+      }
     end
 
     def upload_app_binary
-      logger.info "Uploading app......"
+      logger.info 'Uploading app binary......'
+
+      uploaded_info = post(@binary_cert[:upload_url], uploading_binary_info)
+
+      return if uploaded_info[:is_completed]
+
+      logger.error 'Upload app binary failed'
+      exit 1
+    end
 
-      hash = {
+    def uploading_binary_info
+      {
         key:   @binary_cert[:key],
         token: @binary_cert[:token],
-        file:  File.new(@file_path, "rb"),
+        file:  File.new(@file_path, 'rb'),
         # Custom variables
-        "x:name"         => @app_info[:display_name] || @app_info[:name],
-        "x:build"        => @app_info[:build],
-        "x:version"      => @app_info[:version],
-        "x:changelog"    => @changelog,
-        "x:release_type" => @app_info[:release_type],
+        'x:name'         => @app_info[:display_name] || @app_info[:name],
+        'x:build'        => @app_info[:build],
+        'x:version'      => @app_info[:version],
+        'x:changelog'    => @changelog,
+        'x:release_type' => @app_info[:release_type]
       }
-
-      uploaded_info = post(@binary_cert[:upload_url], hash)
-
-      unless uploaded_info[:is_completed]
-        logger.error "Upload app binary failed"
-        exit 1
-      end
     end
 
     def upload_device_info
-      unless @app_info[:devices].blank?
-        logger.info "Updating devices info......"
+      return if @app_info[:devices].blank?
 
-        post fir_api[:udids_url], key:       @binary_cert[:key],
-                                  udids:     @app_info[:devices].join(","),
-                                  api_token: @token
-      end
+      logger.info 'Updating devices info......'
+
+      post fir_api[:udids_url], key:       @binary_cert[:key],
+                                udids:     @app_info[:devices].join(','),
+                                api_token: @token
     end
 
     def update_app_info
-      unless @short.blank?
-        logger.info "Updating app info......"
+      return if @short.blank?
+
+      logger.info 'Updating app info......'
 
-        patch fir_api[:app_url] + "/#{@app_id}", short:     @short,
-                                                 api_token: @token
-      end
+      patch fir_api[:app_url] + "/#{@app_id}", short:     @short,
+                                               api_token: @token
     end
 
     def fetch_uploading_info
-      logger.info "Fetching #{@app_info[:identifier]}@FIR.im uploading info......"
+      logger.info "Fetching #{@app_info[:identifier]}@fir.im uploading info......"
 
       post fir_api[:app_url], type:      @app_info[:type],
                               bundle_id: @app_info[:identifier],
@@ -119,19 +107,37 @@ module FIR
     end
 
     def fetch_app_info
-      logger.info "Fetch app info from FIR.im"
+      logger.info 'Fetch app info from fir.im'
 
       get fir_api[:app_url] + "/#{@app_id}", api_token: @token
     end
 
+    def upload_mapping_file_with_publish(options)
+      return if !options[:mappingfile] || !options[:proj]
+
+      logger_info_blank_line
+
+      mapping options[:mappingfile], proj:    options[:proj],
+                                     build:   @app_info[:build],
+                                     version: @app_info[:version],
+                                     token:   @token
+    end
+
     private
 
-      def check_supported_file_and_token
-        check_file_exist @file_path
-        check_supported_file @file_path
-        check_token_cannot_be_blank @token
-        fetch_user_info @token
-      end
+    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
+    end
 
+    def check_supported_file_and_token
+      check_file_exist(@file_path)
+      check_supported_file(@file_path)
+      check_token_cannot_be_blank(@token)
+      fetch_user_info(@token)
+    end
   end
 end

data/lib/fir/util.rb

@@ -2,7 +2,8 @@
 
 require_relative './util/http'
 require_relative './util/config'
-require_relative './util/parser'
+require_relative './util/parser/apk'
+require_relative './util/parser/ipa'
 require_relative './util/login'
 require_relative './util/me'
 require_relative './util/info'
@@ -30,49 +31,49 @@ module FIR
 
       attr_accessor :logger
 
-      def fetch_user_info token
+      def fetch_user_info(token)
         get fir_api[:user_url], api_token: token
       end
 
-      def fetch_user_uuid token
+      def fetch_user_uuid(token)
         user_info = fetch_user_info(token)
         user_info[:uuid]
       end
 
-      def check_file_exist path
-        unless File.file?(path)
-          logger.error "File does not exist"
-          exit 1
-        end
+      def check_file_exist(path)
+        return if File.file?(path)
+
+        logger.error 'File does not exist'
+        exit 1
       end
 
-      def check_supported_file path
-        unless APP_FILE_TYPE.include?(File.extname(path))
-          logger.error "Unsupported file type"
-          exit 1
-        end
+      def check_supported_file(path)
+        return if APP_FILE_TYPE.include?(File.extname(path))
+
+        logger.error 'Unsupported file type'
+        exit 1
       end
 
-      def check_token_cannot_be_blank token
-        if token.blank?
-          logger.error "Token can't be blank"
-          exit 1
-        end
+      def check_token_cannot_be_blank(token)
+        return unless token.blank?
+
+        logger.error 'Token can not be blank'
+        exit 1
       end
 
       def check_logined
-        if current_token.blank?
-          logger.error "Please use `fir login` first"
-          exit 1
-        end
+        return unless current_token.blank?
+
+        logger.error 'Please use `fir login` first'
+        exit 1
       end
 
       def logger_info_blank_line
-        logger.info ""
+        logger.info ''
       end
 
       def logger_info_dividing_line
-        logger.info "✈ -------------------------------------------- ✈"
+        logger.info '✈ -------------------------------------------- ✈'
       end
     end
   end

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = "1.2.2"
+  VERSION = '1.2.3'
 end

data/test/build_ipa_test.rb

@@ -5,7 +5,7 @@ class BuildAppTest < Minitest::Test
   def test_build_app
     if ENV['BUILD_TEST']
       options = OpenStruct.new
-      options.send("publish?=", true)
+      options.send('publish?=', true)
 
       assert FIR.build_ipa(default_ipa_project, options)
       assert FIR.build_apk(default_apk_project, options)

data/test/info_test.rb

@@ -3,7 +3,7 @@
 class InfoTest < Minitest::Test
 
   def test_apk_info
-    info = FIR.apk_info(default_apk, true)
+    info = FIR.apk_info(default_apk, full_info: true)
 
     assert_equal 'android',                 info[:type]
     assert_equal 'com.bughd.myapplication', info[:identifier]
@@ -17,7 +17,7 @@ class InfoTest < Minitest::Test
   end
 
   def test_ipa_info
-    info = FIR.ipa_info(default_ipa, true)
+    info = FIR.ipa_info(default_ipa, full_info: true)
 
     assert_equal 'ios',              info[:type]
     assert_equal 'im.fir.build-ipa', info[:identifier]
@@ -31,9 +31,6 @@ class InfoTest < Minitest::Test
     # assert_equal 'adhoc',                   info[:release_type]
     # assert_equal default_distribution_name, info[:distribution_name]
 
-    assert_equal true, info[:plist].is_a?(Hash)
-    assert_equal true, info[:mobileprovision].is_a?(Hash)
-
     assert FIR.info(default_ipa, {})
   end
 end

data/test/mapping_test.rb

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

data/test/test_helper.rb

@@ -6,7 +6,6 @@ require 'fir'
 require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
-
 FIR.logger = Logger.new(STDOUT)
 
 class Minitest::Test
@@ -56,7 +55,7 @@ class Minitest::Test
   end
 
   def default_device_udid
-    "cf8b87e3f469d7b185fd64c057778aecbc2017a6"
+    'cf8b87e3f469d7b185fd64c057778aecbc2017a6'
   end
 
   def default_distribution_name