fir-cli 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d84cfdd014b5dc65bd4221ba4dce498ef0fbc8a
-  data.tar.gz: db4b492052e92961c291a6242fe90e89c885af62
+  metadata.gz: 983c34c1ff6964b4cff980a06a83900468aa5d56
+  data.tar.gz: 16e5217fd7d08a5aed2dd4451a0e46d19cd9ab63
 SHA512:
-  metadata.gz: 2d6d298a917cddb526f1c88c34ba4f71cbfbab8e77f824ceb7da9a3a2d8a63a3887538755043623cb270ebd3bd78533198f87b457a47a7b2cc539bd755e7b734
-  data.tar.gz: 28e45046935d7d156db8ed108d93f3de3e1c8422e9c14339e481a7f3737a33d0e38dc70e3fedf28c45b7a74c7039075148208fec916ac17d52f4ecf6677a3ed7
+  metadata.gz: da2875e4eea8e5f5b9263462ef7ed27afbe81831fa2614b10a3ef244074e68d79ba65938a28f710a568275e5bc5354d377894d1bf9f74cc287df3861982309f6
+  data.tar.gz: f174fb83ee008253cdb62689c30ca5c0e566de20af1375b13aa41b40cc41dc993ccb45ac99e848120cc4c8cfd15e991b13c7709dc74087ed64d0ee879d80a12f

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3
   - ruby-head
   - rbx-2
   - jruby

data/CHANGELOG

@@ -1,4 +1,4 @@
-## 更新记录
+## 更新记录 
 
 ### fir-cli 1.5.0
 - 取消 --open 默认值

data/Gemfile

@@ -8,4 +8,4 @@ end
 # Specify your gem's dependencies in fir.gemspec
 gemspec
 
-gem 'codeclimate-test-reporter', group: :test, require: nil
+gem 'codeclimate-test-reporter', group: :test, require: nil

data/README.md

@@ -1,5 +1,5 @@
 ✈ 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)
@@ -33,5 +33,3 @@ fir.im-cli 可以通过指令查看, 上传, 编译 iOS/Android 应用.
 如果你觉得 fir-cli 对你有所帮助, 欢迎微信打赏支持作者:smile:
 
 ![](http://7rf35s.com1.z0.glb.clouddn.com/coffee.png)
-
-

data/fir-cli.gemspec

@@ -27,10 +27,8 @@ Gem::Specification.new do |spec|
     /_/   /___/_/ |_|      \____/_____/___/
 
   ## 更新记录
-  ### fir-cli 1.5.0
-  - 修正 build 后直接 -p 发布的权限错误
-  - 增加上传时候设置密码及公开访问权限
-  - 增加 build_ipa 中的 destination 参数
+  ### fir-cli 1.5.1
+  - 修复了在 ruby 2.4.0 中登录出错的bug
   - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG
   - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源
   - 欢迎 fork, issue 和 pull request
@@ -43,7 +41,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'thor',           '~> 0.19'
   spec.add_dependency 'CFPropertyList', '~> 2.3'
-  spec.add_dependency 'rest-client',    '~> 1.7'
+  spec.add_dependency 'rest-client',    '~> 2.0'
   spec.add_dependency 'ruby_android',   '~> 0.7'
   spec.add_dependency 'rqrcode',        '~> 0.7'
 end

data/lib/fir/patches/default_headers.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module RestClient
+  class Request
+    def default_headers
+      { content_type: :json, source: 'fir-cli', version: FIR::VERSION }
+    end
+  end
+end

data/lib/fir/patches.rb

@@ -7,3 +7,4 @@ require_relative './patches/instance_variables'
 require_relative './patches/native_patch'
 require_relative './patches/os_patch'
 require_relative './patches/try'
+require_relative './patches/default_headers'

data/lib/fir/util/http.rb

@@ -2,61 +2,29 @@
 
 module FIR
   module Http
-    DEFAULT_TIMEOUT = 300
+    MAX_RETRIES = 5
 
-    def get(url, params = {})
-      tries = 5
-      begin
-        res = ::RestClient::Request.execute(
-          method:  :get,
-          url:     url,
-          timeout: DEFAULT_TIMEOUT,
-          headers: default_headers.merge(params: params)
-        )
-      rescue => e
-        logger.error e.message.to_s
-        if tries > 0
-          logger.info "Retry in #{tries} times......"
-          tries -= 1
-          retry
-        else
-          exit 1
-        end
-      end
-
-      JSON.parse(res.body.force_encoding('UTF-8'), symbolize_names: true)
-    end
-
-    %w(post patch put).each do |method|
-      define_method method do |url, query|
-        tries = 5
-        begin
-          res = ::RestClient::Request.execute(
-            method:  method.to_sym,
-            url:     url,
-            payload: query,
-            timeout: DEFAULT_TIMEOUT,
-            headers: default_headers
-          )
-        rescue => e
-          logger.error e.message.to_s
-          if tries > 0
-            logger.info "Retry in #{tries} times......"
-            tries -= 1
-            retry
-          else
-            exit 1
+    %w(get post patch put).each do |_m|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def #{_m}(url, params = {})
+          query = :#{_m} == :get ? { params: params } : params
+          begin
+            res = ::RestClient.#{_m}(url, query)
+          rescue => e
+            @retries ||= 0
+            logger.error(e.message.to_s)
+            if @retries < MAX_RETRIES
+              @retries += 1
+              logger.info("Retry \#{@retries} times......")
+              sleep 2
+              retry
+            else
+              exit 1
+            end
           end
+          JSON.parse(res.body.force_encoding('UTF-8'), symbolize_names: true)
         end
-
-        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 }
+      METHOD
     end
   end
 end

data/lib/fir/util/publish.rb

@@ -43,15 +43,18 @@ module FIR
       fetch_app_info
     end
 
-    def upload_app_icon
-      logger.info 'Uploading app icon......'
+    %w(icon binary).each do |postfix|
+      class_eval <<-METHOD, __FILE__, __LINE__ + 1
+        def upload_app_#{postfix}
+          logger.info "Uploading app #{postfix}......"
+          uploaded_info = post(@#{postfix}_cert[:upload_url], uploading_#{postfix}_info)
 
-      uploaded_info = post(@icon_cert[:upload_url], uploading_icon_info)
+          return if uploaded_info[:is_completed]
 
-      return if uploaded_info[:is_completed]
-
-      logger.error 'Upload app icon failed'
-      exit 1
+          logger.error "Uploading app #{postfix} failed"
+          exit 1
+        end
+      METHOD
     end
 
     def uploading_icon_info
@@ -66,17 +69,6 @@ module FIR
       }
     end
 
-    def upload_app_binary
-      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
-
     def uploading_binary_info
       {
         key:   @binary_cert[:key],

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 end

data/test/test_helper.rb

@@ -1,7 +1,10 @@
 # encoding: utf-8
 
+# CodeClimate::TestReporter.start
 require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
+
 
 require 'minitest/autorun'
 require 'ostruct'
@@ -71,4 +74,25 @@ class Minitest::Test
   def default_distribution_name
     'iOSTeam Provisioning Profile: im.fir.* - Fly It Remotely LLC.'
   end
+
+end
+
+
+# 跑完测试之后再发结果到Codelimate
+# 测试CODECLIMATE_REPO_TOKEN: c454b9a54151b3ed3e18949279aec49d6a25bf507706815f99a919f1c01679ed
+Minitest.after_run do  
+  COVERAGE_FILE = "coverage/.resultset.json".freeze
+  if (repo_token = ENV["CODECLIMATE_REPO_TOKEN"]) && !repo_token.empty?
+    if File.exist?(COVERAGE_FILE)
+      begin
+        results = JSON.parse(File.read(COVERAGE_FILE))
+      rescue JSON::ParserError => e
+        $stderr.puts "Error encountered while parsing #{COVERAGE_FILE}: #{e}"
+      end
+
+      CodeClimate::TestReporter.run(results)
+    else
+      $stderr.puts "Coverage results not found"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - NaixSpirit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: ruby_android
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - lib/fir/patches.rb
 - lib/fir/patches/blank.rb
 - lib/fir/patches/concern.rb
+- lib/fir/patches/default_headers.rb
 - lib/fir/patches/hash.rb
 - lib/fir/patches/instance_variables.rb
 - lib/fir/patches/native_patch.rb
@@ -215,10 +216,9 @@ metadata: {}
 post_install_message: "\n        ______________        ________    ____\n       /
   ____/  _/ __ \\      / ____/ /   /  _/\n      / /_   / // /_/ /_____/ /   / /    /
   /\n     / __/ _/ // _, _/_____/ /___/ /____/ /\n    /_/   /___/_/ |_|      \\____/_____/___/\n\n
-  \ ## 更新记录\n  ### fir-cli 1.5.0\n  - 修正 build 后直接 -p 发布的权限错误\n  - 增加上传时候设置密码及公开访问权限\n
-  \ - 增加 build_ipa 中的 destination 参数\n  - 详细更新记录, 请查看: https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n
-  \ - [fir-cli](https://github.com/FIRHQ/fir-cli) 已经开源\n  - 欢迎 fork, issue 和 pull
-  request\n  "
+  \ ## 更新记录\n  ### fir-cli 1.5.1\n  - 修复了在 ruby 2.4.0 中登录出错的bug\n  - 详细更新记录, 请查看:
+  https://github.com/FIRHQ/fir-cli/blob/master/CHANGELOG\n  - [fir-cli](https://github.com/FIRHQ/fir-cli)
+  已经开源\n  - 欢迎 fork, issue 和 pull request\n  "
 rdoc_options: []
 require_paths:
 - lib
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: fir.im command tool