fir-cli 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c92eba76896df79468053134c355bdfbb0d2031
-  data.tar.gz: 38284b8643672070bc2078f6f05800b97c6c10bb
+  metadata.gz: 849113cc22122894e41d6f9fb313812fbd64c97b
+  data.tar.gz: 001404da307f8e5150590a597dd187b2f55723d4
 SHA512:
-  metadata.gz: 7541e7985bc256321aa403f2969bdaaa2c7623542ab22b87b5bcfc0774efefbc31ac903b9165cef26aaf5a79dc70b514677865885047061630893e1aa31bfeaa
-  data.tar.gz: f10503990d06c2d513e268284ce376c52ff8c12e67f43f9eed3967ee16dc6721512b4ac3d2ac4432046f5c670f6d225452d283c812af500a3e2e9ab2edd52f0d
+  metadata.gz: 316b2e5b3febc05fa320d66b8cec8d5e8da64c23ea1f5a3954cf14fd98621becf10ab1ed6c872ca764974a4b44a84d87bbbb7e59f42ec74163ee6d00e444cd5b
+  data.tar.gz: 5474a245a6082418d90147169ef5595d6918d67c9de1a02df7a1ec9e0c5a50ced1408c10ea6371d493dde98ed8af98f41537b133ef1ca2d30234a925c3a111d3

data/.travis.yml

@@ -8,7 +8,6 @@ rvm:
   - rbx-2
   - jruby
   - jruby-head
-
 matrix:
   allow_failures:
     - rvm: ruby-head
@@ -18,7 +17,9 @@ matrix:
 notifications:
   recipients:
     - hxy@fir.im
-
 branches:
   only:
     - master
+addons:
+  code_climate:
+    repo_token: 7158bd5d0218441524b8663790dd28edba8a870387ed000a1b56968e3315af2a

data/CHANGELOG

@@ -1,5 +1,8 @@
 ## 更新记录
 
+### FIR-CLI 1.1.9
+- 修改显示上的一些小问题
+
 ### FIR-CLI 1.1.8
 - 支持 gradle 打包 apk 文件并自动上传至 fir.im, `fir build_apk(alias ba)`
   - `fir ba <project dir> [-o <apk output dir> -c <changelog> -p -T <your api token>]`

data/Gemfile

@@ -7,3 +7,5 @@ end
 
 # Specify your gem's dependencies in fir.gemspec
 gemspec
+
+gem "codeclimate-test-reporter", group: :test, require: nil

data/README.md

@@ -3,6 +3,8 @@ FIR.im CLI
 
 ![Build Status Images](https://travis-ci.org/FIRHQ/fir-cli.svg)
 [![Code Climate](https://codeclimate.com/github/FIRHQ/fir-cli/badges/gpa.svg)](https://codeclimate.com/github/FIRHQ/fir-cli)
+[![Test Coverage](https://codeclimate.com/github/FIRHQ/fir-cli/badges/coverage.svg)](https://codeclimate.com/github/FIRHQ/fir-cli/coverage)
+[![Gem Version](https://badge.fury.io/rb/fir-cli.svg)](http://badge.fury.io/rb/fir-cli)
 
 > FIR.im CLI 可以通过指令查看, 上传, 编译应用
 

data/fir-cli.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.1.8
+  ### FIR-CLI 1.1.9
   - 完全兼容新版 API ✔
   - 请使用新版 API Token
   - 新版 API Token 查看地址: `http://fir.im/user/info`

data/lib/fir/cli.rb

@@ -77,6 +77,7 @@ module FIR
       Example:
 
       $ fir p <app file path> [-c <changelog> -s <custom short link> -T <your api token>]
+
       $ fir p <app file path> [-c <changelog> -s <custom short link> -m <mapping file path> -P <bughd project id> -T <your api token>]
     LONGDESC
     map "p" => :publish

data/lib/fir/util/build_ipa.rb

@@ -31,15 +31,7 @@ module FIR
         @scheme_name   = options[:scheme]
         @dsym_name     = @wrapper_name + '.dSYM' unless @wrapper_name.blank?
 
-        if options.workspace?
-          workspace = check_and_find_ios_workspace(@build_dir)
-          check_ios_scheme(@scheme_name)
-          ipa_build_cmd += " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
-        else
-          project = check_and_find_ios_project(@build_dir)
-          ipa_build_cmd += " -project '#{project}'"
-        end
-
+        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"
@@ -90,53 +82,38 @@ module FIR
                                token:   @token
       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 initialize_xcode_build_path options
+        if options.workspace?
+          workspace = check_and_find_ios_xcworkspace(@build_dir)
+          check_ios_scheme(@scheme_name)
 
-        hash
-      end
+          return " -workspace '#{workspace}' -scheme '#{@scheme_name}'"
+        else
+          project = check_and_find_ios_xcodeproj(@build_dir)
 
-      def check_and_find_ios_project path
-        unless File.exist?(path)
-          logger.error "The first param BUILD_DIR must be a xcodeproj directory"
-          exit 1
+          return " -project '#{project}'"
         end
+      end
 
-        if is_ios_project?(path)
-          project = path
-        else
-          project = Dir["#{path}/*.xcodeproj"].first
-          if project.blank?
-            logger.error "The xcodeproj file is missing, check the BUILD_DIR"
+      %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
-        end
-
-        project
-      end
 
-      def check_and_find_ios_workspace path
-        unless File.exist?(path)
-          logger.error "The first param BUILD_DIR must be a xcworkspace directory"
-          exit 1
-        end
-
-        if is_ios_workspace?(path)
-          workspace = path
-        else
-          workspace = Dir["#{path}/*.xcworkspace"].first
-          if workspace.blank?
-            logger.error "The xcworkspace file is missing, check the BUILD_DIR"
-            exit 1
+          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
           end
-        end
 
-        workspace
+          build_dir
+        end
       end
 
       def check_ios_scheme scheme_name
@@ -146,14 +123,6 @@ module FIR
         end
       end
 
-      def is_ios_project? path
-        File.extname(path) == '.xcodeproj'
-      end
-
-      def is_ios_workspace? path
-        File.extname(path) == '.xcworkspace'
-      end
-
       def zip_app2ipa app_path, ipa_path
         Dir.mktmpdir do |tmpdir|
           Dir.chdir(tmpdir) do
@@ -165,5 +134,18 @@ 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
+        end
+
   end
 end

data/lib/fir/util/publish.rb

@@ -9,10 +9,7 @@ module FIR
       @changelog = options[:changelog].to_s
       @short     = options[:short].to_s
 
-      check_file_exist @file_path
-      check_supported_file @file_path
-      check_token_cannot_be_blank @token
-      fetch_user_info @token
+      check_supported_file_and_token
 
       logger.info "Publishing app......."
       logger_info_dividing_line
@@ -40,93 +37,101 @@ module FIR
       logger_info_blank_line
     end
 
-    private
-
-      def upload_app
-        @icon_cert   = @uploading_info[:cert][:icon]
-        @binary_cert = @uploading_info[:cert][:binary]
-
-        upload_app_icon
-        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......"
-
-          icon_path = @app_info[:icons].max_by { |f| File.size(f) }
-
-          hash = {
-            key:   @icon_cert[:key],
-            token: @icon_cert[:token],
-            file:  File.new(icon_path, "rb")
-          }
+    def upload_app
+      @icon_cert   = @uploading_info[:cert][:icon]
+      @binary_cert = @uploading_info[:cert][:binary]
 
-          uploaded_info = post(@icon_cert[:upload_url], hash)
+      upload_app_icon
+      upload_app_binary
+      upload_device_info
+      update_app_info
+    end
 
-          unless uploaded_info[:is_completed]
-            logger.error "Upload app icon failed"
-            exit 1
-          end
-        end
-      end
+    def upload_app_icon
+      unless @app_info[:icons].blank?
+        logger.info "Uploading app's icon......"
 
-      def upload_app_binary
-        logger.info "Uploading app......"
+        icon_path = @app_info[:icons].max_by { |f| File.size(f) }
 
         hash = {
-          key:   @binary_cert[:key],
-          token: @binary_cert[:token],
-          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],
+          key:   @icon_cert[:key],
+          token: @icon_cert[:token],
+          file:  File.new(icon_path, "rb")
         }
 
-        uploaded_info = post(@binary_cert[:upload_url], hash)
+        uploaded_info = post(@icon_cert[:upload_url], hash)
 
         unless uploaded_info[:is_completed]
-          logger.error "Upload app binary failed"
+          logger.error "Upload app icon failed"
           exit 1
         end
       end
+    end
 
-      def upload_device_info
-        unless @app_info[:devices].blank?
-          logger.info "Updating devices info......"
-
-          post fir_api[:udids_url], key:       @binary_cert[:key],
-                                    udids:     @app_info[:devices].join(","),
-                                    api_token: @token
-        end
+    def upload_app_binary
+      logger.info "Uploading app......"
+
+      hash = {
+        key:   @binary_cert[:key],
+        token: @binary_cert[:token],
+        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],
+      }
+
+      uploaded_info = post(@binary_cert[:upload_url], hash)
+
+      unless uploaded_info[:is_completed]
+        logger.error "Upload app binary failed"
+        exit 1
       end
+    end
 
-      def update_app_info
-        unless @short.blank?
-          logger.info "Updating app info......"
+    def upload_device_info
+      unless @app_info[:devices].blank?
+        logger.info "Updating devices info......"
 
-          patch fir_api[:app_url] + "/#{@app_id}", short:     @short,
-                                                   api_token: @token
-        end
+        post fir_api[:udids_url], key:       @binary_cert[:key],
+                                  udids:     @app_info[:devices].join(","),
+                                  api_token: @token
       end
+    end
 
-      def fetch_uploading_info
-        logger.info "Fetching #{@app_info[:identifier]}@FIR.im uploading info......"
+    def update_app_info
+      unless @short.blank?
+        logger.info "Updating app info......"
 
-        post fir_api[:app_url], type:      @app_info[:type],
-                                bundle_id: @app_info[:identifier],
-                                api_token: @token
+        patch fir_api[:app_url] + "/#{@app_id}", short:     @short,
+                                                 api_token: @token
       end
+    end
+
+    def fetch_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],
+                              api_token: @token
+    end
+
+    def fetch_app_info
+      logger.info "Fetch app info from FIR.im"
+
+      get fir_api[:app_url] + "/#{@app_id}", api_token: @token
+    end
 
-      def fetch_app_info
-        logger.info "Fetch app info from FIR.im"
+    private
 
-        get fir_api[:app_url] + "/#{@app_id}", api_token: @token
+      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/version.rb

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

data/test/test_helper.rb

@@ -3,6 +3,9 @@
 require 'minitest/autorun'
 require 'ostruct'
 require 'fir'
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.start
+
 
 FIR.logger = Logger.new(STDOUT)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,7 +181,7 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.1.8\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
+  \ ## 更新记录\n  ### FIR-CLI 1.1.9\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