fir-cli 1.2.2 → 1.2.3

data/lib/fir/patches/os_patch.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 
 module OS
-
   class << self
+
     def windows?
-      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
+      !(/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM).nil?
     end
 
     def mac?
-     (/darwin/ =~ RUBY_PLATFORM) != nil
+      !(/darwin/ =~ RUBY_PLATFORM).nil?
     end
 
     def unix?
@@ -18,5 +18,11 @@ module OS
     def linux?
       OS.unix? && !OS.mac?
     end
+
+    def set_locale
+      system 'export LC_ALL=en_US.UTF-8'
+      system 'export LC_CTYPE=en_US.UTF-8'
+      system 'export LANG=en_US.UTF-8'
+    end
   end
 end

data/lib/fir/util/build_apk.rb

@@ -3,18 +3,17 @@
 module FIR
   module BuildApk
 
-    def build_apk *args, options
+    def build_apk(*args, options)
       initialize_build_common_options(args, options)
 
       Dir.chdir(@build_dir)
 
-      @build_cmd   = initialize_apk_build_cmd(args, options)
-      @output_path = options[:output].blank? ? "#{@build_dir}/build/outputs/apk" : File.absolute_path(options[:output].to_s)
+      @build_cmd = initialize_apk_build_cmd
 
       logger_info_and_run_build_command
 
-      @builded_app_path ||= Dir[@output_path].find { |i| i =~ /release/ }
-      @builded_app_path ||= Dir["#{@output_path}/*.apk"].first
+      output_apk
+      @builded_app_path = Dir["#{@output_path}/*.apk"].first
 
       publish_build_app if options.publish?
 
@@ -23,18 +22,41 @@ module FIR
 
     private
 
-      def initialize_apk_build_cmd args, options
-        check_build_gradle_exist
+    def initialize_apk_build_cmd
+      check_build_gradle_exist
 
-        apk_build_cmd = "gradle clean;gradle build"
-        apk_build_cmd
-      end
+      apk_build_cmd = 'gradle clean;gradle build'
+      apk_build_cmd
+    end
+
+    def gradle_build_path
+      "#{@build_dir}/build/outputs/apk"
+    end
+
+    def output_apk
+      @builded_apk ||= Dir["#{gradle_build_path}/*.apk"].find { |i| i =~ /release/ }
+      @builded_apk ||= Dir["#{@build_dir}/*.apk"].find { |i| i =~ /release/ }
+
+      check_no_output_apk
+
+      apk_info = FIR.apk_info(@builded_apk)
+      apk_name = "#{apk_info[:name]}-#{apk_info[:version]}-Build-#{apk_info[:build]}"
 
-      def check_build_gradle_exist
-        unless File.exist?("#{@build_dir}/build.gradle")
-          logger.error "The build.gradle is not exit, please use gradle and edit"
-          exit 1
-        end
+      FileUtils.cp(@builded_apk, "#{@output_path}/#{apk_name}.apk")
+    end
+
+    def check_no_output_apk
+      unless @builded_apk
+        logger.error 'Builded has no output apk'
+        exit 1
       end
+    end
+
+    def check_build_gradle_exist
+      return if File.exist?("#{@build_dir}/build.gradle")
+
+      logger.error "The build.gradle isn't exit, please use gradle and edit"
+      exit 1
+    end
   end
 end

data/lib/fir/util/build_common.rb

@@ -3,17 +3,31 @@
 module FIR
   module BuildCommon
 
-    def initialize_build_common_options args, options
+    def initialize_build_common_options(args, options)
+      @build_dir   = initialize_build_dir(args)
+      @output_path = initialize_output_path(options)
+      @token       = options[:token] || current_token
+      @changelog   = options[:changelog].to_s
+      @short       = options[:short].to_s
+      @proj        = options[:proj].to_s
+    end
+
+    def initialize_build_dir(args)
       if args.first.blank? || !File.exist?(args.first)
-        @build_dir = Dir.pwd
+        Dir.pwd
       else
-        @build_dir = File.absolute_path(args.shift.to_s) # pop the first param
+        File.absolute_path(args.shift.to_s) # pop the first param
       end
+    end
 
-      @token     = options[:token] || current_token
-      @changelog = options[:changelog].to_s
-      @short     = options[:short].to_s
-      @proj      = options[:proj].to_s
+    def initialize_output_path(options)
+      if options[:output].blank?
+        output_path = "#{@build_dir}/fir_build"
+        FileUtils.mkdir_p(output_path) unless File.exist?(output_path)
+        output_path
+      else
+        File.absolute_path(options[:output].to_s)
+      end
     end
 
     def publish_build_app
@@ -26,10 +40,26 @@ module FIR
     def logger_info_and_run_build_command
       puts @build_cmd if $DEBUG
 
-      logger.info "Building......"
+      logger.info 'Building......'
       logger_info_dividing_line
 
       logger.info `#{@build_cmd}`
     end
+
+    # split ['a=1', 'b=2'] => { 'a' => '1', 'b' => '2' }
+    def split_assignment_array_to_hash(arr)
+      hash = {}
+      arr.each do |assignment|
+        k, v = assignment.split('=', 2).map(&:strip)
+        hash[k] = v
+      end
+
+      hash
+    end
+
+    # convert { "a" => "1", "b" => "2" } => "a='1' b='2'"
+    def convert_hash_to_assignment_string(hash)
+      hash.collect { |k, v| "#{k}='#{v}'" }.join(' ')
+    end
   end
 end

data/lib/fir/util/build_ipa.rb

@@ -3,17 +3,17 @@
 module FIR
   module BuildIpa
 
-    def build_ipa *args, options
+    def build_ipa(*args, options)
       initialize_build_common_options(args, options)
 
       @build_tmp_dir = Dir.mktmpdir
-      @output_path   = options[:output].blank? ? "#{@build_dir}/fir_build_ipa" : File.absolute_path(options[:output].to_s)
       @build_cmd     = initialize_ipa_build_cmd(args, options)
 
       logger_info_and_run_build_command
 
       output_ipa
       @builded_app_path = Dir["#{@output_path}/*.ipa"].first
+
       publish_build_app if options.publish?
       upload_build_dsym_mapping_file if options.mapping?
 
@@ -22,128 +22,123 @@ module FIR
 
     private
 
-      def initialize_ipa_build_cmd args, options
-        ipa_build_cmd = "xcodebuild build -sdk iphoneos"
+    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)
+      build_cmd += " -configuration '#{@configuration}'" unless @configuration.blank?
+      build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
+      build_cmd += " #{ipa_custom_settings(args)} 2>&1"
+      build_cmd
+    end
 
-        @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?
+    def ipa_custom_settings(args)
+      custom_settings = split_assignment_array_to_hash(args)
 
-        ipa_build_cmd += initialize_xcode_build_path(options)
-        ipa_build_cmd += " -configuration '#{@configuration}'" unless @configuration.blank?
-        ipa_build_cmd += " -target '#{@target_name}'" unless @target_name.blank?
-        ipa_build_cmd += " #{ipa_custom_settings(args)} 2>&1"
+      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
 
-        ipa_build_cmd
-      end
+    def output_ipa
+      Dir.chdir(@build_tmp_dir) do
+        apps = Dir['*.app']
+        check_no_output_app(apps)
 
-      def ipa_custom_settings args
-        custom_settings = parse_ipa_custom_settings(args)
-
-        # convert { "a" => "1", "b" => "2" } => "a='1' b='2'"
-        setting_str =  custom_settings.collect { |k, v| "#{k}='#{v}'" }.join(' ')
-        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
+        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]}"
 
-      def output_ipa
-        FileUtils.mkdir_p(@output_path) unless File.exist?(@output_path)
-        Dir.chdir(@build_tmp_dir) do
-          apps = Dir["*.app"]
-          if apps.length == 0
-            logger.error "Builded has no output app, Can not be packaged"
-            exit 1
-          end
-
-          apps.each do |app|
-            ipa_path = File.join(@output_path, "#{File.basename(app, '.app')}.ipa")
-            zip_app2ipa(File.join(@build_tmp_dir, app), ipa_path)
-          end
+          FileUtils.cp(temp_ipa, "#{@output_path}/#{ipa_name}.ipa")
         end
-
-        logger.info "Build Success"
       end
 
-      def upload_build_dsym_mapping_file
-        logger_info_blank_line
+      logger.info 'Build Success'
+    end
 
-        @app_info     = ipa_info(@builded_app_path)
-        @mapping_file = Dir["#{@output_path}/*.dSYM/Contents/Resources/DWARF/*"].first
+    def upload_build_dsym_mapping_file
+      logger_info_blank_line
 
-        mapping @mapping_file, proj:    @proj,
-                               build:   @app_info[:build],
-                               version: @app_info[:version],
-                               token:   @token
-      end
+      @app_info     = ipa_info(@builded_app_path)
+      @mapping_file = Dir["#{@output_path}/*.dSYM/Contents/Resources/DWARF/*"].first
 
-      def initialize_xcode_build_path options
-        if options.workspace?
-          workspace = check_and_find_ios_xcworkspace(@build_dir)
-          check_ios_scheme(@scheme_name)
+      mapping @mapping_file, proj:    @proj,
+                             build:   @app_info[:build],
+                             version: @app_info[:version],
+                             token:   @token
+    end
 
-          return " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
-        else
-          project = check_and_find_ios_xcodeproj(@build_dir)
+    def initialize_xcode_build_path(options)
+      if options.workspace?
+        workspace = check_and_find_ios_xcworkspace(@build_dir)
+        check_ios_scheme(@scheme_name)
 
-          return " -project '#{project}'"
-        end
+        return " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
+      else
+        project = check_and_find_ios_xcodeproj(@build_dir)
+
+        return " -project '#{project}'"
       end
+    end
 
-      %w(xcodeproj xcworkspace).each do |workplace|
-        define_method "check_and_find_ios_#{workplace}" do |path|
-          unless File.exist?(path)
-            logger.error "The first param BUILD_DIR must be a #{workplace} directory"
-            exit 1
-          end
+    %w(xcodeproj xcworkspace).each do |workplace|
+      define_method "check_and_find_ios_#{workplace}" do |path|
+        unless File.exist?(path)
+          logger.error "The first param BUILD_DIR must be a #{workplace} directory"
+          exit 1
+        end
 
-          if File.extname(path) == ".#{workplace}"
-            build_dir = path
-          else
-            build_dir = Dir["#{path}/*.#{workplace}"].first
-            if build_dir.blank?
-              logger.error "The #{workplace} file is missing, check the BUILD_DIR"
-              exit 1
-            end
+        if File.extname(path) == ".#{workplace}"
+          build_dir = path
+        else
+          build_dir = Dir["#{path}/*.#{workplace}"].first
+          if build_dir.blank?
+            logger.error "The #{workplace} file is missing, check the BUILD_DIR"
+            exit 1
           end
-
-          build_dir
         end
+
+        build_dir
       end
+    end
 
-      def check_ios_scheme scheme_name
-        if scheme_name.blank?
-          logger.error "Must provide a scheme by `-S` option when build a workspace"
-          exit 1
-        end
+    def check_ios_scheme(scheme_name)
+      if scheme_name.blank?
+        logger.error 'Must provide a scheme by `-S` option when build a workspace'
+        exit 1
       end
+    end
 
-      def zip_app2ipa app_path, ipa_path
-        Dir.mktmpdir do |tmpdir|
-          Dir.chdir(tmpdir) do
-            Dir.mkdir("Payload")
-            FileUtils.cp_r(app_path, "Payload")
-            system("rm -rf #{ipa_path}") if File.file? ipa_path
-            system("zip -qr #{ipa_path} Payload")
-          end
-        end
+    def check_no_output_app(apps)
+      if apps.length == 0
+        logger.error 'Builded has no output app, Can not be packaged'
+        exit 1
       end
+    end
 
-      # 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
+    def zip_app2ipa(app_path)
+      ipa_path = Tempfile.new(['temp', '.ipa']).path
 
-        hash
+      Dir.mktmpdir do |tmpdir|
+        Dir.chdir(tmpdir) do
+          Dir.mkdir('Payload')
+          FileUtils.cp_r(app_path, 'Payload')
+          system("rm -rf #{ipa_path}") if File.file?(ipa_path)
+          system("zip -qr #{ipa_path} Payload")
+        end
       end
 
+      ipa_path
+    end
   end
 end

data/lib/fir/util/config.rb

@@ -3,7 +3,7 @@
 module FIR
   module Config
     CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
-    API_YML_PATH  = File.expand_path("../../", __FILE__) + '/api.yml'
+    API_YML_PATH  = File.expand_path('../../', __FILE__) + '/api.yml'
     APP_FILE_TYPE = %w(.ipa .apk).freeze
 
     def fir_api
@@ -15,14 +15,15 @@ module FIR
     end
 
     def config
-      @config ||= YAML.load_file(CONFIG_PATH).deep_symbolize_keys if File.exist?(CONFIG_PATH)
+      return unless File.exist?(CONFIG_PATH)
+      @config ||= YAML.load_file(CONFIG_PATH).deep_symbolize_keys
     end
 
     def reload_config
       @config = YAML.load_file(CONFIG_PATH).deep_symbolize_keys
     end
 
-    def write_config hash
+    def write_config(hash)
       File.open(CONFIG_PATH, 'w+') { |f| f << YAML.dump(hash) }
     end
 

data/lib/fir/util/http.rb

@@ -2,10 +2,9 @@
 
 module FIR
   module Http
-
     DEFAULT_TIMEOUT = 300
 
-    def get url, params = {}
+    def get(url, params = {})
       begin
         res = ::RestClient::Request.execute(
           method:  :get,
@@ -14,11 +13,11 @@ module FIR
           headers: default_headers.merge(params: params)
         )
       rescue => e
-        logger.error e.message.to_s + " - " + e.response.to_s
+        logger.error e.message.to_s + ' - ' + e.response.to_s
         exit 1
       end
 
-      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
+      JSON.parse(res.body.force_encoding('UTF-8'), symbolize_names: true)
     end
 
     %w(post patch put).each do |method|
@@ -32,18 +31,18 @@ module FIR
             headers: default_headers
           )
         rescue => e
-          logger.error e.message.to_s + " - " + e.response.to_s
+          logger.error e.message.to_s + ' - ' + e.response.to_s
           exit 1
         end
 
-        JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
+        JSON.parse(res.body.force_encoding('UTF-8'), symbolize_names: true)
       end
     end
 
     private
 
-      def default_headers
-        { content_type: :json, source: 'fir-cli', version: FIR::VERSION }
-      end
+    def default_headers
+      { content_type: :json, source: 'fir-cli', version: FIR::VERSION }
+    end
   end
 end

data/lib/fir/util/info.rb

@@ -3,7 +3,7 @@
 module FIR
   module Info
 
-    def info *args, options
+    def info(*args, options)
       file_path = File.absolute_path(args.first.to_s)
       is_all    = !options[:all].blank?
 
@@ -15,66 +15,24 @@ module FIR
       logger.info "Analyzing #{file_type} file......"
       logger_info_dividing_line
 
-      app_info  = send("#{file_type}_info", file_path, is_all)
+      app_info = send("#{file_type}_info", file_path, full_info: is_all)
       app_info.each { |k, v| logger.info "#{k}: #{v}" }
 
       logger_info_blank_line
     end
 
-    def ipa_info ipa_path, is_all = false
-      ipa = FIR::Parser::Ipa.new(ipa_path)
-      app = ipa.app
-
-      info = {
-        type:              'ios',
-        identifier:        app.identifier,
-        name:              app.name,
-        display_name:      app.display_name,
-        build:             app.version.to_s,
-        version:           app.short_version.to_s,
-        devices:           app.devices,
-        release_type:      app.release_type || ipa.release_type,
-        distribution_name: app.distribution_name
-      }
-
-      if is_all
-        info[:icons] = []
-        app.icons.each do |icon|
-          tmp_icon_path = "#{Dir.tmpdir}/icon-#{SecureRandom.hex[4..9]}.png"
-          FileUtils.cp(icon, tmp_icon_path)
-          info[:icons] << tmp_icon_path
-        end
-
-        app.hide_developer_certificates
-
-        info[:plist]           = app.info
-        info[:mobileprovision] = app.mobileprovision
-      end
+    def ipa_info(ipa_path, options = {})
+      ipa  = FIR::Parser::Ipa.new(ipa_path)
+      app  = ipa.app
+      info = app.full_info(options).merge(release_type: ipa.release_type)
 
       ipa.cleanup
       info
     end
 
-    def apk_info apk_path, is_all = false
-      apk  = Android::Apk.new(apk_path)
-      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
-      }
-
-      # apk.icon is a hash, { icon_name: icon_data }
-      if is_all
-        info[:icons] = []
-        apk.icon.each do |name, data|
-          tmp_icon_path = "#{Dir.tmpdir}/icon-#{SecureRandom.hex[4..9]}.png"
-          File.open(tmp_icon_path, 'w+') { |f| f << data }
-          info[:icons] << tmp_icon_path
-        end
-      end
-
+    def apk_info(apk_path, options = {})
+      apk  = FIR::Parser::Apk.new(apk_path)
+      info = apk.full_info(options)
       info
     end
   end

data/lib/fir/util/login.rb

@@ -3,7 +3,7 @@
 module FIR
   module Login
 
-    def login token
+    def login(token)
       check_token_cannot_be_blank token
 
       user_info = fetch_user_info(token)