fir-cli 1.0.8 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8a82046548f4b97e81c022420f43c5a289b957d
-  data.tar.gz: ae1f174cf2a3be1d9ff278f4a1cec1eca7c0da69
+  metadata.gz: 1f5d2beedaa3955abe679d71ccdae111fcdbe595
+  data.tar.gz: 86c4a61744d18c11768ea6c23a0b291187752be2
 SHA512:
-  metadata.gz: 6d344431db86ffeaa5e8786780365c3dcb41cf6c120a4b8536177feca7f37aa4cd593d14ec69f1694e684b3d5cb891e072b1893293a70a0f546ba1017d34c6ae
-  data.tar.gz: 15c78f358d096ed436e2fac8d05561476f0c8c597ecb1336b532b6e7e6c14455b4663bd56cb0d752b1463ed83210ceb7619141101ebd0ddba449866bf091de02
+  metadata.gz: 523e663b825492d85a365b092850e1611b9009ee7932785c33e9029f8341a7bb649ee2dcc2cf9b3ff90bb7d989fc4a9638b8a98a42293715266a9bea08f3eb16
+  data.tar.gz: bc436021c8798abd0115c385f8ad87d8093af4e90814954f74bfd940088dab1f925c5052c3d9897276274dfd82d61cfaa379db5307292233fb9b863bc061cdc9

data/CHANGELOG

@@ -1,4 +1,8 @@
 ## 更新记录
+### FIR-CLI 1.1.0
+- 完全兼容新版 API
+- 请使用新版 API Token
+
 ### FIR-CLI 1.0
 - 重大重构
 - 优化启动及运行速度

data/README.md

@@ -1,5 +1,7 @@
 FIR.im CLI
 ---
+
+[![Join the chat at https://gitter.im/FIRHQ/fir-cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/FIRHQ/fir-cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 > FIR.im CLI 可以通过指令查看, 上传, 编译应用
 
 ## 使用入门

data/fir-cli.gemspec

@@ -28,23 +28,10 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### FIR-CLI 1.0
-  - 重大重构
-  - 优化启动及运行速度
-  - 增加各指令的 alias
-  - 增加全局参数, -T, -L, -V, -q, -h, 分别为 token, log, verbose, quite, help 参数
-  - 增加输出 log
-  - 修正部分系统安装失败问题
-  - 修正部分服务器安装出现编码失败问题
-  - 修正 ipa 路径带有空格解析失败的 bug
-  - 重写 ipa 解析器, 去除 `miniz.c`, 增加 pngcrash
-  - 上传 ipa 时, 优先取 `display_name` 作为应用名称
-  - build_ipa 增加默认 build 路径, `fir b` 则默认 build 当前路径
-  - build_ipa 增加输出 dSYM 符号表文件
-  - build_ipa 增加输出指定 ipa 名称
-  - build_ipa 增加输出 xcodebuild 的信息
-  - 去掉输出信息颜色, 方便查看 log
-  - 简化 --verbose 参数, 简化为 `--verbose --no-verbose`, 默认输出为 INFO
+  ### FIR-CLI 1.1.0
+  - 完全兼容新版 API ✔
+  - 请使用新版 API Token
+  - 新版 API Token 查看地址: `http://fir.im/user/info`
   - https://github.com/FIRHQ/fir-cli
   )
 

data/lib/fir/api.yml

@@ -1,5 +1,5 @@
-base_url:           'http://fir.im'
-me_url:             'http://fir.im/api/v2/user/me'
-app_url:            'http://fir.im/api/v2/app'
-uploading_info_url: 'http://fir.im/api/v2/app/info'
-version_url:        'http://fir.im/api/v2/appVersion'
+domain:    'http://fir.im'
+base_url:  'http://api.fir.im'
+user_url:  'http://api.fir.im/user'
+app_url:   'http://api.fir.im/apps'
+udids_url: 'http://api.fir.im/devices/multi_udid'

data/lib/fir/util/info.rb

@@ -27,8 +27,8 @@ module FIR
         identifier:        app.identifier,
         name:              app.name,
         display_name:      app.display_name,
-        version:           app.version,
-        short_version:     app.short_version,
+        build:             app.version,
+        version:           app.short_version,
         devices:           app.devices,
         release_type:      app.release_type || ipa.release_type,
         distribution_name: app.distribution_name
@@ -55,11 +55,11 @@ module FIR
     def apk_info apk_path, is_all
       apk  = Android::Apk.new(apk_path)
       info = {
-        type:          'android',
-        identifier:    apk.manifest.package_name,
-        name:          apk.label,
-        version:       apk.manifest.version_code,
-        short_version: apk.manifest.version_name
+        type:       'android',
+        identifier: apk.manifest.package_name,
+        name:       apk.label,
+        build:      apk.manifest.version_code,
+        version:    apk.manifest.version_name
       }
 
       # apk.icon is a hash, { icon_name: icon_data }
@@ -74,6 +74,5 @@ module FIR
 
       info
     end
-
   end
 end

data/lib/fir/util/login.rb

@@ -9,7 +9,7 @@ module FIR
       user_info = fetch_user_info(token)
 
       logger.info "Login succeed, previous user's email: #{config[:email]}" unless config.blank?
-      write_config(email: user_info.fetch(:email, ''), token: user_info.fetch(:token, ''))
+      write_config(email: user_info.fetch(:email, ''), token: token)
       reload_config
       logger.info "Login succeed, current  user's email: #{config[:email]}"
     end

data/lib/fir/util/publish.rb

@@ -15,88 +15,97 @@ module FIR
       logger.info "Publishing app......."
       logger_info_dividing_line
 
-      file_type      = File.extname(file_path).delete('.')
-      app_info       = send("#{file_type}_info", file_path, true)
-      uploading_info = fetch_uploading_info(app_info, token)
+      file_type = File.extname(file_path).delete(".")
+      @app_info = send("#{file_type}_info", file_path, true)
+
+      uploading_info = fetch_uploading_info(type:      @app_info[:type],
+                                            bundle_id: @app_info[:identifier],
+                                            api_token: token)
 
       app_id      = uploading_info[:id]
-      bundle_app  = uploading_info[:bundle][:pkg]
-      bundle_icon = uploading_info[:bundle][:icon]
+      icon_cert   = uploading_info[:cert][:icon]
+      binary_cert = uploading_info[:cert][:binary]
 
-      unless app_info[:icons].empty?
-        large_icon_path     = app_info[:icons].max_by { |f| File.size(f) }
+      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(bundle_icon, uncrushed_icon_path)
+        upload_app_icon(icon_cert, uncrushed_icon_path)
       end
 
-      uploaded_info = upload_app_file(bundle_app, file_path)
-      version_id    = uploaded_info[:versionOid]
-      short         = options[:short].blank? ? uploading_info[:short] : options[:short]
-
-      update_app_info(app_id, name:   app_info[:display_name] || app_info[:name],
-                              short:  short,
-                              token:  token,
-                              source: 'fir-cli')
-      update_app_version_info(version_id, version:      app_info[:version],
-                                          versionShort: app_info[:short_version],
-                                          devices:      app_info[:devices],
-                                          release_type: app_info[:release_type],
-                                          changelog:    changelog,
-                                          token:        token)
-      published_app_info = fetch_app_info(app_id, token)
+      uploaded_info = upload_app_binary(binary_cert, file_path, changelog)
 
-      logger_info_dividing_line
-      logger.info "Published succeed: #{api[:base_url]}/#{published_app_info[:short]}"
+      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
+
+        unless options[:short].blank?
+          update_app_info(app_id, short: options[:short], api_token: token)
+        end
+
+        published_app_info = fetch_app_info(app_id, api_token: token)
+
+        logger_info_dividing_line
+        logger.info "Published succeed: #{api[:domain]}/#{published_app_info[:short]}"
+      end
     end
 
     private
 
       def convert_icon origin_path
         logger.info "Converting app's icon......"
-        output_path = Tempfile.new('uncrushed_icon.png').path
+        output_path = Tempfile.new("uncrushed_icon.png").path
         Parser.uncrush_icon(origin_path, output_path)
         File.size(output_path) == 0 ? origin_path : output_path
       end
 
-      def upload_app_icon bundle_icon, icon_path
+      def upload_app_icon icon_cert, icon_path
         logger.info "Uploading app's icon......"
         hash = {
-          key:   bundle_icon[:key],
-          token: bundle_icon[:token],
-          file:  File.new(icon_path, 'rb')
+          key:   icon_cert[:key],
+          token: icon_cert[:token],
+          file:  File.new(icon_path, "rb")
         }
-        post bundle_icon[:url], hash, 'multipart/form-data'
+        post icon_cert[:upload_url], hash
       end
 
-      def upload_app_file bundle_app, file_path
+      def upload_app_binary binary_cert, file_path, changelog
         logger.info "Uploading app......"
         hash = {
-          key:   bundle_app[:key],
-          token: bundle_app[: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:release_type" => @app_info[:release_type],
         }
-        post bundle_app[:url], hash, 'multipart/form-data'
+        post binary_cert[:upload_url], hash
+      end
+
+      def upload_device_info hash
+        logger.info "Updating devices info......"
+        post api[:udids_url], hash
       end
 
       def update_app_info id, hash
         logger.info "Updating app info......"
-        put api[:app_url] + "/#{id}?#{URI.encode_www_form hash}", hash
+        patch api[:app_url] + "/#{id}", hash
       end
 
-      def update_app_version_info id, hash
-        logger.info "Updating app's version info......"
-        put api[:version_url] + "/#{id}/complete?#{URI.encode_www_form hash}", hash
-      end
+      def fetch_uploading_info hash
+        logger.info "Fetching #{@app_info[:identifier]}@FIR.im uploading info......"
 
-      def fetch_uploading_info app_info, token
-        logger.info "Fetching #{app_info[:identifier]}@FIR.im uploading info......"
-        get api[:uploading_info_url] + "/#{app_info[:identifier]}", type:  app_info[:type],
-                                                                    token: token
+        post api[:app_url], hash
       end
 
-      def fetch_app_info id, token
+      def fetch_app_info id, hash
         logger.info "Fetch app info from FIR.im"
-        get api[:app_url] + "/#{id}", token: token
+        get api[:app_url] + "/#{id}", hash
       end
   end
 end

data/lib/fir/util.rb

@@ -19,7 +19,7 @@ module FIR
     module ClassMethods
 
       def fetch_user_info token
-        get api[:me_url], token: token
+        get api[:user_url], api_token: token
       end
 
       def check_supported_file path
@@ -40,6 +40,5 @@ module FIR
         logger.info "✈ -------------------------------------------- ✈"
       end
     end
-
   end
 end

data/lib/fir/version.rb

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

data/lib/fir.rb

@@ -54,34 +54,52 @@ module FIR
 
     def get url, params = {}
       begin
-        res = RestClient.get(url, params: params)
-      rescue RestClient::Exception => e
-        logger.error e.response
+        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 post url, query, content_type = :json
+    def patch url, query
       begin
-        res = RestClient.post(url, query, { content_type: content_type })
-      rescue RestClient::Exception => e
-        logger.error e.response
+        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, content_type = :json
+    def put url, query
       begin
-        res = RestClient.put(url, query, { content_type: content_type })
-      rescue RestClient::Exception => e
-        logger.error e.response
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.1.0
 platform: ruby
 authors:
 - FIR.im
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,14 +148,8 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### FIR-CLI 1.0\n  - 重大重构\n  - 优化启动及运行速度\n  - 增加各指令的 alias\n  - 增加全局参数,
-  -T, -L, -V, -q, -h, 分别为 token, log, verbose, quite, help 参数\n  - 增加输出 log\n  - 修正部分系统安装失败问题\n
-  \ - 修正部分服务器安装出现编码失败问题\n  - 修正 ipa 路径带有空格解析失败的 bug\n  - 重写 ipa 解析器, 去除 `miniz.c`,
-  增加 pngcrash\n  - 上传 ipa 时, 优先取 `display_name` 作为应用名称\n  - build_ipa 增加默认 build 路径,
-  `fir b` 则默认 build 当前路径\n  - build_ipa 增加输出 dSYM 符号表文件\n  - build_ipa 增加输出指定 ipa
-  名称\n  - build_ipa 增加输出 xcodebuild 的信息\n  - 去掉输出信息颜色, 方便查看 log\n  - 简化 --verbose
-  参数, 简化为 `--verbose --no-verbose`, 默认输出为 INFO\n  - https://github.com/FIRHQ/fir-cli\n
-  \ "
+  \ ## 更新记录\n  ### FIR-CLI 1.1.0\n  - 完全兼容新版 API ✔\n  - 请使用新版 API Token\n  - 新版 API
+  Token 查看地址: `http://fir.im/user/info`\n  - https://github.com/FIRHQ/fir-cli\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -171,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: FIR.im command tool
 test_files: []
-has_rdoc: