lhj-tools 0.2.61 → 0.2.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17f381f8a5e810d3d6455d7ffc07c21edb457deca5822d55ec75c49151cf1499
-  data.tar.gz: d12cd89e36ba62322d1f941829fc53ce69c66b3d11e27863a277bf8f767baec4
+  metadata.gz: 77f66fd979d6fe1773bd9c603fda0dd2cbb1b3107267d64ded1360377e573b2f
+  data.tar.gz: 50d1e50e766fe708bde20971ab1235437514a3680abacc286ed2ca91d37eba57
 SHA512:
-  metadata.gz: '091917f41e4d3e47781159cbccc9e9fdec220900a60ca25fc226bdab0c7039dfb7803f113c4d230ef13a85137e895e90b538bc05e8e9d589e51bf5d8153add0b'
-  data.tar.gz: 13394220af4f61305c6e1659cfa040f1129ddb140a9df027750eb17a819aea502b88dfb713b233e86d5a857296e6af398685936f2028c48204694515a8c26fe0
+  metadata.gz: dde586d855c8c511510922f81699041945fcb4efe834d786cbebbd52beee3440236db020568d38c906587eeddb62cf8760a6727c1cfbe2fc878dfa36c89fd88d
+  data.tar.gz: 4de47cd395f046a096215ff2b5fde89761ae19f2e03bc8c57ba5819924ae974e58e80cb22a7bc9d55f747153d88760768ea82b52a6e5f1d9b4224e26312c1f80

data/lib/lhj/helper/app_version_info.rb

@@ -112,7 +112,8 @@ module Lhj
       if @env == :release
         num
       else
-        "#{@env.to_s}_#{num}"
+        # "#{@env.to_s}_#{num}"
+        num
       end
     end
 

data/lib/lhj/helper/pgyer_helper.rb

@@ -71,51 +71,40 @@ module Lhj
       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
+      UI.user_error!("Get token is failed, info: #{info}") if info['code'] != 0
 
       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
+      UI.user_error!('Get token is failed') if key.nil? || endpoint.nil? || request_params.nil?
       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
+      UI.user_error!("Upload Error: #{response.body}") if response.status != 204
 
-      @result = checkPublishStatus(pgyer_client, API_HOST, @api_key, key)
+      @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 checkPublishStatus(client, api_host, api_key, buildKey)
+    def check_publish_status(client, api_host, api_key, build_key)
       url = "#{api_host}/buildInfo"
-      UI.message "checkPublishStatus url: #{url}"
-      response = client.post "#{api_host}/buildInfo", { :_api_key => api_key, :buildKey => buildKey }
+      response = client.post url, { _api_key: api_key, buildKey: build_key }
       info = response.body
       code = info['code']
-      if code == 0
-        UI.success "Upload success. BuildInfo is #{info['data']}."
-        shortUrl = info["data"]["buildShortcutUrl"]
-        if shortUrl.nil? || shortUrl == ""
-          shortUrl = info["data"]["buildKey"]
-        end
-        info["data"]["fastlaneAddedWholeVisitUrl"] = "https://wwww.xcxwo.com/#{shortUrl}"
-        UI.success "Upload success. Visit this URL to see: #{info["data"]["fastlaneAddedWholeVisitUrl"]}"
-        return info["data"]
-      elsif code == 1246 || code == 1247
+      if code.zero?
+        short_url = info['data']['buildShortcutUrl']
+        short_url = info['data']['buildKey'] if short_url.nil? || short_url == ''
+        info['data']['fastlaneAddedWholeVisitUrl'] = "https://wwww.xcxwo.com/#{short_url}"
+        info
+      elsif [1246, 1247].include?(code)
         sleep 3
-        checkPublishStatus(client, api_host, api_key, buildKey)
+        check_publish_status(client, api_host, api_key, build_key)
       else
-        UI.user_error!("PGYER Plugin Published Error: #{info} buildKey: #{buildKey}")
+        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.61'
+  VERSION = '0.2.63'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.61
+  version: 0.2.63
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj