fir-cli 1.1.5 → 1.1.7

data/lib/fir/util/publish.rb

@@ -4,110 +4,129 @@ 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
+      @file_path = File.absolute_path(args.first.to_s)
+      @token     = options[:token] || current_token
+      @changelog = options[:changelog].to_s
+      @short     = options[:short].to_s
 
-      check_supported_file file_path
-      check_token_cannot_be_blank token
-      fetch_user_info(token)
+      check_file_exist @file_path
+      check_supported_file @file_path
+      check_token_cannot_be_blank @token
+      fetch_user_info @token
 
       logger.info "Publishing app......."
       logger_info_dividing_line
 
-      file_type = File.extname(file_path).delete(".")
-      @app_info = send("#{file_type}_info", file_path, true)
+      file_type = File.extname(@file_path).delete(".")
 
-      uploading_info = fetch_uploading_info(type:      @app_info[:type],
-                                            bundle_id: @app_info[:identifier],
-                                            api_token: token)
+      @app_info       = send("#{file_type}_info", @file_path, true)
+      @uploading_info = fetch_uploading_info
+      @app_id         = @uploading_info[:id]
 
-      app_id      = uploading_info[:id]
-      icon_cert   = uploading_info[:cert][:icon]
-      binary_cert = uploading_info[:cert][:binary]
+      upload_app
 
-      unless @app_info[:icons].blank?
-        large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
-        uncrushed_icon_path = convert_icon(large_icon_path)
-        upload_app_icon(icon_cert, uncrushed_icon_path)
-      end
+      logger_info_dividing_line
+      logger.info "Published succeed: #{fir_api[:domain]}/#{fetch_app_info[:short]}"
 
-      uploaded_info = upload_app_binary(binary_cert, file_path, changelog)
+      if options[:mappingfile] && options[:proj]
+        logger_info_blank_line
 
-      if uploaded_info[:is_completed]
-        unless @app_info[:devices].blank?
-          upload_device_info(key:       binary_cert[:key],
-                             udids:     @app_info[:devices].join(","),
-                             api_token: token)
-        end
+        mapping options[:mappingfile], proj:    options[:proj],
+                                       build:   @app_info[:build],
+                                       version: @app_info[:version],
+                                       token:   @token
+      end
 
-        unless options[:short].blank?
-          update_app_info(app_id, short: options[:short], api_token: token)
-        end
+      logger_info_blank_line
+    end
 
-        published_app_info = fetch_app_info(app_id, api_token: token)
+    private
+
+      def upload_app
+        @icon_cert   = @uploading_info[:cert][:icon]
+        @binary_cert = @uploading_info[:cert][:binary]
 
-        logger_info_dividing_line
-        logger.info "Published succeed: #{api[:domain]}/#{published_app_info[:short]}"
+        upload_app_icon
+        upload_app_binary
+        upload_device_info
+        update_app_info
       end
-    end
 
-    private
+      def upload_app_icon
+        unless @app_info[:icons].blank?
+          logger.info "Uploading app's icon......"
 
-      def convert_icon origin_path
-        logger.info "Converting app's icon......"
-        output_path = Tempfile.new("uncrushed_icon.png").path
+          icon_path = @app_info[:icons].max_by { |f| File.size(f) }
 
-        Parser.uncrush_icon(origin_path, output_path) if @app_info[:type] == 'ios'
+          hash = {
+            key:   @icon_cert[:key],
+            token: @icon_cert[:token],
+            file:  File.new(icon_path, "rb")
+          }
 
-        File.size(output_path) == 0 ? origin_path : output_path
-      end
+          uploaded_info = post(@icon_cert[:upload_url], hash)
 
-      def upload_app_icon icon_cert, icon_path
-        logger.info "Uploading app's icon......"
-        hash = {
-          key:   icon_cert[:key],
-          token: icon_cert[:token],
-          file:  File.new(icon_path, "rb")
-        }
-        post icon_cert[:upload_url], hash
+          unless uploaded_info[:is_completed]
+            logger.error "Upload app icon failed"
+            exit 1
+          end
+        end
       end
 
-      def upload_app_binary binary_cert, file_path, changelog
+      def upload_app_binary
         logger.info "Uploading app......"
+
         hash = {
-          key:   binary_cert[:key],
-          token: binary_cert[:token],
-          file:  File.new(file_path, "rb"),
+          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:changelog"    => @changelog,
           "x:release_type" => @app_info[:release_type],
         }
-        post binary_cert[:upload_url], hash
+
+        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 hash
-        logger.info "Updating devices info......"
-        post api[:udids_url], hash
+      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
       end
 
-      def update_app_info id, hash
-        logger.info "Updating app info......"
-        patch api[:app_url] + "/#{id}", hash
+      def update_app_info
+        unless @short.blank?
+          logger.info "Updating app info......"
+
+          patch fir_api[:app_url] + "/#{@app_id}", short:     @short,
+                                                   api_token: @token
+        end
       end
 
-      def fetch_uploading_info hash
+      def fetch_uploading_info
         logger.info "Fetching #{@app_info[:identifier]}@FIR.im uploading info......"
 
-        post api[:app_url], hash
+        post fir_api[:app_url], type:      @app_info[:type],
+                                bundle_id: @app_info[:identifier],
+                                api_token: @token
       end
 
-      def fetch_app_info id, hash
+      def fetch_app_info
         logger.info "Fetch app info from FIR.im"
-        get api[:app_url] + "/#{id}", hash
+
+        get fir_api[:app_url] + "/#{@app_id}", api_token: @token
       end
   end
 end

data/lib/fir/util.rb

@@ -1,32 +1,50 @@
 # encoding: utf-8
 
+require_relative './util/http'
+require_relative './util/config'
+require_relative './util/parser'
 require_relative './util/login'
 require_relative './util/me'
 require_relative './util/info'
 require_relative './util/build'
 require_relative './util/publish'
+require_relative './util/mapping'
 
 module FIR
   module Util
-
-    def self.included base
-      base.extend ClassMethods
-      base.extend Login
-      base.extend Me
-      base.extend Info
-      base.extend Build
-      base.extend Publish
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
+      include FIR::Http
+      include FIR::Config
+      include FIR::Login
+      include FIR::Me
+      include FIR::Info
+      include FIR::Build
+      include FIR::Publish
+      include FIR::Mapping
+
+      attr_accessor :logger
 
       def fetch_user_info token
-        get api[:user_url], api_token: token
+        get fir_api[:user_url], api_token: token
+      end
+
+      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
       end
 
       def check_supported_file path
-        unless File.file?(path) || APP_FILE_TYPE.include?(File.extname(path))
-          logger.error "File does not exist or unsupported file type"
+        unless APP_FILE_TYPE.include?(File.extname(path))
+          logger.error "Unsupported file type"
           exit 1
         end
       end
@@ -45,6 +63,10 @@ module FIR
         end
       end
 
+      def logger_info_blank_line
+        logger.info ""
+      end
+
       def logger_info_dividing_line
         logger.info "✈ -------------------------------------------- ✈"
       end

data/lib/fir/version.rb

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

data/lib/fir.rb

@@ -23,83 +23,5 @@ require 'fir/version'
 require 'fir/cli'
 
 module FIR
-  CONFIG_PATH   = "#{ENV['HOME']}/.fir-cli"
-  API_YML_PATH  = "#{File.dirname(__FILE__)}/fir/api.yml"
-  APP_FILE_TYPE = %w(.ipa .apk).freeze
-
   include Util
-
-  class << self
-    attr_accessor :logger, :api, :config
-
-    def api
-      @api ||= YAML.load_file(API_YML_PATH).symbolize_keys
-    end
-
-    def config
-      @config ||= YAML.load_file(CONFIG_PATH).symbolize_keys if File.exist?(CONFIG_PATH)
-    end
-
-    def reload_config
-      @config = YAML.load_file(CONFIG_PATH).symbolize_keys
-    end
-
-    def write_config hash
-      File.open(CONFIG_PATH, 'w+') { |f| f << YAML.dump(hash) }
-    end
-
-    def current_token
-      @token ||= config[:token] if config
-    end
-
-    def get url, params = {}
-      begin
-        res = RestClient.get(url, default_headers.merge(params: params))
-      rescue => e
-        logger.error "#{e.class}\n#{e.message}"
-        exit 1
-      end
-
-      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
-    end
-
-    def post url, query
-      begin
-        res = RestClient.post(url, query, default_headers)
-      rescue => e
-        logger.error "#{e.class}\n#{e.message}"
-        exit 1
-      end
-
-      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
-    end
-
-    def patch url, query
-      begin
-        res = RestClient.patch(url, query, default_headers)
-      rescue => e
-        logger.error "#{e.class}\n#{e.message}"
-        exit 1
-      end
-
-      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
-    end
-
-    def put url, query
-      begin
-        res = RestClient.put(url, query, default_headers)
-      rescue => e
-        logger.error "#{e.class}\n#{e.message}"
-        exit 1
-      end
-
-      JSON.parse(res.body.force_encoding("UTF-8"), symbolize_names: true)
-    end
-
-    def default_headers
-      { content_type: :json, source: 'fir-cli', cli_version: FIR::VERSION }
-    end
-
-    alias_method :☠, :exit
-  end
 end

data/test/build_ipa_test.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+class BuildIpaTest < Minitest::Test
+
+  def test_build_ipa
+    # Only for OSX
+    assert true
+  end
+end

data/test/cases/test_apk_txt

@@ -0,0 +1 @@
+this is a text

data/test/info_test.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+
+class InfoTest < Minitest::Test
+
+  def test_apk_info
+    info = FIR.apk_info(default_apk, true)
+
+    assert_equal 'android',                 info[:type]
+    assert_equal 'com.bughd.myapplication', info[:identifier]
+    assert_equal 'My Application',          info[:name]
+    assert_equal '1',                       info[:build]
+    assert_equal '1.0',                     info[:version]
+
+    assert_equal true, File.exist?(info[:icons].first)
+
+    assert FIR.info(default_apk, {})
+  end
+
+  def test_ipa_info
+    info = FIR.ipa_info(default_ipa, true)
+
+    assert_equal 'ios',              info[:type]
+    assert_equal 'im.fir.build-ipa', info[:identifier]
+    assert_equal 'build_ipa',        info[:name]
+    assert_equal '1',                info[:build]
+    assert_equal '1.0',              info[:version]
+
+    # Only for OSX
+    # assert_equal nil,                       info[:display_name]
+    # assert_equal default_device_udid,       info[:devices].first
+    # 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/login_test.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+class LoginTest < Minitest::Test
+
+  def test_login
+    user_info = FIR.fetch_user_info(default_token)
+
+    assert_equal default_email, user_info.fetch(:email, '')
+
+    assert FIR.login(default_token)
+  end
+end

data/test/mapping_test.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+class MappingTest < Minitest::Test
+
+  def test_mapping
+    options = {
+      token:   default_token,
+      version: '1.1',
+      build:   '1'
+    }
+
+    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))
+  end
+end

data/test/me_test.rb

@@ -0,0 +1,17 @@
+# encoding: utf-8
+
+class MeTest < Minitest::Test
+
+  def test_me
+    user_info = FIR.fetch_user_info(default_token)
+
+    FIR.write_config(email: user_info.fetch(:email, ''), token: default_token)
+    FIR.reload_config
+
+    me_info = FIR.fetch_user_info(FIR.current_token)
+
+    assert_equal default_email, me_info.fetch(:email, '')
+
+    assert FIR.me
+  end
+end

data/test/publish_test.rb

@@ -0,0 +1,14 @@
+# encoding: utf-8
+
+class PublishTest < Minitest::Test
+
+  def test_publish
+    options = {
+      token: default_token,
+      changelog: "test from fir-cli #{Time.now.to_i}"
+    }
+
+    assert FIR.publish(default_ipa, options)
+    assert FIR.publish(default_apk, options)
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+require 'minitest/autorun'
+require 'fir'
+
+FIR.logger = Logger.new(STDOUT)
+
+class Minitest::Test
+
+  def default_token
+    '2dd8a99ef9d19c540bb583624b939960'
+  end
+
+  def default_email
+    'fir-cli_test@fir.im'
+  end
+
+  def default_apk
+    File.expand_path('../cases', __FILE__) + '/test_apk.apk'
+  end
+
+  def default_ipa
+    File.expand_path('../cases', __FILE__) + '/test_ipa.ipa'
+  end
+
+  def default_bughd_project_ios_id
+    '55bb2839692d647a46000004'
+  end
+
+  def default_bughd_project_android_id
+    '55be454a692d351278000002'
+  end
+
+  def default_dsym_mapping
+    File.expand_path('../cases', __FILE__) + '/test_ipa_dsym'
+  end
+
+  def default_txt_mapping
+    File.expand_path('../cases', __FILE__) + '/test_apk_txt'
+  end
+
+  def default_device_udid
+    "cf8b87e3f469d7b185fd64c057778aecbc2017a6"
+  end
+
+  def default_distribution_name
+    'iOSTeam Provisioning Profile: im.fir.* - Fly It Remotely LLC.'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.7'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -117,6 +131,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG
@@ -131,21 +146,32 @@ files:
 - lib/fir/api.yml
 - lib/fir/cli.rb
 - lib/fir/patches.rb
-- lib/fir/patches/bin/pngcrush
+- lib/fir/patches/concern.rb
 - lib/fir/patches/native_patch.rb
 - lib/fir/patches/os_patch.rb
-- lib/fir/patches/parser_patch.rb
 - lib/fir/util.rb
 - lib/fir/util/build.rb
+- lib/fir/util/config.rb
+- lib/fir/util/http.rb
 - lib/fir/util/info.rb
 - lib/fir/util/login.rb
+- lib/fir/util/mapping.rb
 - lib/fir/util/me.rb
+- lib/fir/util/parser.rb
 - lib/fir/util/publish.rb
 - lib/fir/version.rb
 - lib/fir_cli.rb
+- test/build_ipa_test.rb
 - test/cases/test_apk.apk
+- test/cases/test_apk_txt
 - test/cases/test_ipa.ipa
-- test/fir_cli_test.rb
+- test/cases/test_ipa_dsym
+- test/info_test.rb
+- test/login_test.rb
+- test/mapping_test.rb
+- test/me_test.rb
+- test/publish_test.rb
+- test/test_helper.rb
 homepage: http://blog.fir.im/fir_cli
 licenses:
 - MIT
@@ -153,9 +179,14 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.1.5\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
-  Token 查看地址: `http://fir.im/user/info`\n  - 增加 `fir me` 指令查看当前登录用户\n  - 增加团队成员直接上传
-  app\n  - https://github.com/FIRHQ/fir-cli\n  "
+  \ ## 更新记录\n  ### FIR-CLI 1.1.7\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 的时候自动上传:
+  `fir b <project dir> -P <bughd project id> -M -p -T <your api token>`\n  - https://github.com/FIRHQ/fir-cli\n
+  \ "
 rdoc_options: []
 require_paths:
 - lib
@@ -176,6 +207,14 @@ signing_key:
 specification_version: 4
 summary: FIR.im command tool
 test_files:
+- test/build_ipa_test.rb
 - test/cases/test_apk.apk
+- test/cases/test_apk_txt
 - test/cases/test_ipa.ipa
-- test/fir_cli_test.rb
+- test/cases/test_ipa_dsym
+- test/info_test.rb
+- test/login_test.rb
+- test/mapping_test.rb
+- test/me_test.rb
+- test/publish_test.rb
+- test/test_helper.rb