fir-cli 1.6.6 → 1.6.7.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7220dc42dd55229fc0ef694f0ca08c7e38caab37
-  data.tar.gz: dab71b82677c1b051787545af88ae18c6eef4278
+  metadata.gz: 78a3f802006cf3e7ccf72d080a108aa17a524a4c
+  data.tar.gz: a5d40dbd014932de0c4a9a37f301fc51579ffdc9
 SHA512:
-  metadata.gz: cde221ffcf1ae609ad181e3d9240546c8e7e1bc14b39a95e710a6d40d9eaa851235caece707f243b9aa4fd7855b754a4f9f99459fdbdeedbfa4587ccbed4855e
-  data.tar.gz: ca40d85cf3389e9bfa488508f4be3a094c6b9c2d60ee6b658dc240399aa40d6aa8d6df4d058e67ca1884d0d0ed2cac60d450e84a6c90f3fa9270f09d3195eb54
+  metadata.gz: 7ae80450e1bd35fa41ce788cc6273c26d2e7780eb3effe15d2e9ef16ea27371063290436e68dbb628f212e78ba4b3178df4fad89a53b28ec1dbc84d7f7003c3a
+  data.tar.gz: ed977bcd3b135e730a43c0328a31eeb3c2ad180f47c9a976f707d9c977047e5d6713df405b8c8900870807be15d7e6695eded300cd2637022e8d78c00256f61e

data/.travis.yml

@@ -1,20 +1,13 @@
 rvm:
-- 1.9.2
-- 1.9.3
-- 2.0.0
 - 2.1
 - 2.2
 - 2.3
+- 2.4
+- 2.4
 - ruby-head
-- rbx-2
-- jruby
-- jruby-head
 matrix:
   allow_failures:
   - rvm: ruby-head
-  - rvm: jruby
-  - rvm: jruby-head
-  - rvm: rbx-2
 env:
   matrix:
   - USE_OFFICIAL_GEM_SOURCE=true
@@ -22,7 +15,7 @@ env:
     secure: XiWKHPcQNB/mGv8Q5VuBqETS1bmYZ3t5xJkR/JFHrhWi30O+QWulMM5YjzkVawPjpUS/rtefDEASc4bN+a1iRVi6kf8fxjeKNFAzNc/hEKiPgANELf1JJgGAcz4oygzrH94Vqj90fuf6DoUh9r+IO+Z0PF39GL9GCnUjJeg+zao=
 notifications:
   recipients:
-  - hxy@fir.im
+  - jc@fir.im
 branches:
   only:
   - master

data/Gemfile

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

data/lib/fir/api.yml

@@ -4,8 +4,4 @@ fir:
   user_url:  'http://api.fir.im/user'
   app_url:   'http://api.fir.im/apps'
   udids_url: 'http://api.fir.im/devices/multi_udid'
-bughd:
-  domain:           'http://bughd.com'
-  base_url:         'http://api.bughd.com'
-  project_url:      'http://api.bughd.com/projects'
-  full_version_url: 'http://api.bughd.com/full_versions'
+  

data/lib/fir/util/publish.rb

@@ -1,15 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FIR
   module Publish
-
     def publish(*args, options)
       initialize_publish_options(args, options)
       check_supported_file_and_token
 
       logger_info_publishing_message
 
-      @app_info       = send("#{@file_type}_info", @file_path, full_info: true)
+      @app_info = send("#{@file_type}_info", @file_path, full_info: true)
+      @user_info      = fetch_user_info(@token)
       @uploading_info = fetch_uploading_info
       @app_id         = @uploading_info[:id]
 
@@ -20,9 +20,7 @@ module FIR
 
       upload_mapping_file_with_publish(options)
       if options[:show_release_id]
-        sleep 2
-        release_info = fetch_release_id
-        logger.info "release id = #{release_info[:id]}"
+        logger.info "release id = #{answer[:release_id]}"
       end
       logger_info_blank_line
     end
@@ -42,18 +40,17 @@ module FIR
       @binary_cert = @uploading_info[:cert][:binary]
 
       upload_app_icon unless @app_info[:icons].blank?
-      upload_app_binary
+      answer = upload_app_binary
       upload_device_info
       update_app_info
-
       fetch_app_info
-     
-     
     end
-     
-    %w(binary icon).each do |word|
+
+    %w[binary icon].each do |word|
       define_method("upload_app_#{word}") do
         upload_file(word)
+        storage = ENV['SOTRAGE_NAME'] || 'qiniu'
+        post("#{fir_api[:base_url]}/auth/#{storage}/callback", send("#{word}_information"))
       end
     end
 
@@ -62,29 +59,55 @@ module FIR
       url = @uploading_info[:cert][postfix.to_sym][:upload_url]
       info = send("uploading_#{postfix}_info")
       logger.debug "url = #{url}, info = #{info}"
-      uploaded_info = post(url, info, {
-        params_to_json: false,
-        header: nil
-      })
-
-      return if uploaded_info[:is_completed]
-      
-
+      uploaded_info = post(url, info.merge(manual_callback: true),
+                           params_to_json: false,
+                           header: nil)
+    rescue StandardError
       logger.error "Uploading app #{postfix} failed"
       exit 1
     end
 
     def uploading_icon_info
-      large_icon_path     = @app_info[:icons].max_by { |f| File.size(f) }
-      uncrushed_icon_path = convert_icon(large_icon_path)
+      large_icon_path = @app_info[:icons].max_by { |f| File.size(f) }
+      @uncrushed_icon_path = convert_icon(large_icon_path)
       {
         key:   @icon_cert[:key],
         token: @icon_cert[:token],
-        file:  File.new(uncrushed_icon_path, 'rb'),
+        file:  File.new(@uncrushed_icon_path, 'rb'),
         'x:is_converted' => '1'
       }
     end
 
+    def icon_information
+      {
+        key:   @icon_cert[:key],
+        token: @icon_cert[:token],
+        origin: 'fir-cli',
+        parent_id: @app_id,
+        fsize: File.size(@uncrushed_icon_path),
+        fname: 'blob'
+      }
+    end
+
+    def binary_information
+      {
+        build: @app_info[:build],
+        fname: File.basename(@file_path),
+        key: @binary_cert[:key],
+        name: @app_info[:display_name] || @app_info[:name],
+        origin: 'fir-cli',
+        parent_id: @app_id,
+        release_tag: 'develop',
+        fsize: File.size(@file_path),
+        release_type: @app_info[:release_type],
+        distribution_name: @app_info[:distribution_name],
+        token: @binary_cert[:token],
+        version: @app_info[:version],
+        changelog: @changelog,
+        user_id: @user_info[:id]
+      }.reject { |x| x.nil? || x == '' }
+    end
+
     def uploading_binary_info
       {
         key:   @binary_cert[:key],
@@ -108,14 +131,14 @@ module FIR
       post fir_api[:udids_url], key:       @binary_cert[:key],
                                 udids:     @app_info[:devices].join(','),
                                 api_token: @token
-    end
+      end
 
     def update_app_info
       update_info = { short: @short, passwd: @passwd, is_opened: @is_opened }.compact
 
       return if update_info.blank?
 
-      logger.info "Updating app info......"
+      logger.info 'Updating app info......'
 
       patch fir_api[:app_url] + "/#{@app_id}", update_info.merge(api_token: @token)
     end
@@ -190,7 +213,7 @@ module FIR
       fetch_user_info(@token)
     end
 
-    def convert_icon origin_path
+    def convert_icon(origin_path)
       logger.info "Converting app's icon......"
 
       if @app_info[:type] == 'ios'

data/lib/fir/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module FIR
-  VERSION = '1.6.6'
+  VERSION = '1.6.7.alpha'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fir-cli
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7.alpha
 platform: ruby
 authors:
 - NaixSpirit
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,9 +262,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14