lhj-tools 0.2.60 → 0.2.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a0d582db4ef32f2a5a672b4d00f12f6f22d431dacba91600acc4ff86928bd1b
-  data.tar.gz: 24e872bb4b90c5df2594375a0870a82e3743fdda818663f1ca3d7e5769e9f2ed
+  metadata.gz: b06a7cc355541d7c1a049c137aac1805143560ac8ba051dc4d435303fbbc30d9
+  data.tar.gz: b84e8b7d58daed0b4fafceb4fabbef26a7c8b8ef9f7a06866e2e381818f7143b
 SHA512:
-  metadata.gz: 9eaeb8b7329646a485d38ed3c9cc9a38f02b4797a8adbbf8e9132ef7c767ca8202ccc7a6256397410a41e91408cfbf7fe7f8afb160b506d85d1a1bbd566e5ea2
-  data.tar.gz: f12e98e6d1d9eae53e82847cf90746094dd0a940a3a3954da5279e8256f093950f70983520cbaf4f3a3c09e6f36d67b0416a5d7a6bc4767cedd7604aaa37a088
+  metadata.gz: abc525c352b610813d16ac55437eec92c1e826d0ad5da5e10ae2b59150f25bf864449753a242c46a5364ecd20a44e5124f76f0c47ea789e5df04e8b09329c604
+  data.tar.gz: c6eb6eed5ab5c1a6922e9cdcd0332d44544091af608420ba6fe5f279f8d52ebf45e07ffaffd880e4322f6861f035a5340e7ec4ce115112ec4b0f193ade97f39d

data/lib/lhj/helper/pgyer_helper.rb

@@ -10,7 +10,7 @@ require_relative 'tb_config'
 module Lhj
   # pgyer upload
   class Pgyer
-    API_HOST = 'https://upload.xcxwo.com/apiv1/app/upload'
+    API_HOST = 'https://www.xcxwo.com/apiv2/app'
 
     attr_reader :api_key, :user_key, :password, :result
 
@@ -46,30 +46,74 @@ module Lhj
     # @param [upload file] file
     # @param [desc] des
     def upload_with_path(path, file, des)
-      params = {
+      request_params = {
         '_api_key' => @api_key,
-        'uKey' => @user_key,
-        'password' => @password,
-        'updateDescription' => des,
-        'installType' => 2,
-        'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
+        'buildPassword' => @password,
+        'buildUpdateDescription' => des,
+        'buildType' => 'ios',
+        'buildInstallType' => 2
       }
-      begin
-        puts 'begin upload...'
-        upload_with_type(path, file) unless path.empty?
-        response = http_client.post API_HOST, params
-        @result = response.body
-        puts @result
-        Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
-        puts 'upload success'
-        # if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
-        #   str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])
-        #   str = Lhj::VikaHelper.trans_vika(str)
-        #   @result['data']['appUpdateDescription'] = str
-        # end
-      rescue Faraday::TimeoutError
-        puts 'upload fail'
-        FileUtils.rm_r Dir.glob("#{path}/archive*.zip")
+      conn_options = {
+        request: {
+          timeout: 1000,
+          open_timeout: 300
+        }
+      }
+      pgyer_client = Faraday.new(nil, conn_options) do |builder|
+        builder.request :multipart
+        builder.request :url_encoded
+        builder.response :json, content_type: /\bjson$/
+        builder.adapter :net_http
+      end
+
+      puts 'begin upload...'
+      upload_with_type(path, file) unless path.empty?
+      response = pgyer_client.post "#{API_HOST}/getCOSToken", request_params
+      info = response.body
+
+      if info['code'] != 0
+        UI.user_error!("Get token is failed, info: #{info}")
+      end
+
+      key = info['data']['key']
+      endpoint = info['data']['endpoint']
+      request_params = info['data']['params']
+      if key.nil? || endpoint.nil? || request_params.nil?
+        UI.user_error!('Get token is failed')
+      end
+      request_params['file'] = Faraday::UploadIO.new(file, 'application/octet-stream')
+
+      response = pgyer_client.post endpoint, request_params
+
+      if response.status != 204
+        UI.user_error!("PGYER Plugin Upload Error: #{response.body}")
+      end
+
+      @result = check_publish_status(pgyer_client, API_HOST, @api_key, key)
+
+      puts @result
+      Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
+      puts 'upload success'
+    end
+
+    def check_publish_status(client, api_host, api_key, build_key)
+      url = "#{api_host}/buildInfo"
+      response = client.post url, { :_api_key => api_key, :buildKey => build_key }
+      info = response.body
+      code = info['code']
+      if code.zero?
+        UI.success "Upload success. BuildInfo is #{info['data']}."
+        short_url = info['data']['buildShortcutUrl']
+        if short_url.nil? || short_url == ''
+          short_url = info['data']['buildKey']
+        end
+        info['data']['fastlaneAddedWholeVisitUrl'] = "https://wwww.xcxwo.com/#{short_url}"
+        return info
+      elsif [1246, 1247].include?(code)
+        sleep 3
+        check_publish_status(client, api_host, api_key, build_key)
+      else
+        UI.user_error!("PGYER Plugin Published Error: #{info} buildKey: #{build_key}")
       end
     end
 

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.60'
+  VERSION = '0.2.62'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.60
+  version: 0.2.62
 platform: ruby
 authors:
 - lihaijian