lhj-tools 0.1.43 → 0.1.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0aa070fc969536b21400e317179f065d532cf30053fe7b7df257b7424b917cd
-  data.tar.gz: 79175f251cfed95f6ec032e5ec9a895c6eccc166bf78fc7c23a525ce1506bb25
+  metadata.gz: 3a3d83868ea1e59da60c81e44b61120054d3896c805f438a9cc72c3a9e70621b
+  data.tar.gz: e394c3618917bbd9e0e543bd00fefa181c49f91ebd7d08f0cd7e19ef34e2b9f1
 SHA512:
-  metadata.gz: 20fb81d28088d33bafba4b3157c8425fabea9ff13f1a7d882e47159a269be27965a6d9d9bc9270e5f1daf47237c07ba390e4353ffea2aa290bbb809d6047a45c
-  data.tar.gz: 7dc681dc1c0cf85e9c376459f0dae3a0c3fcd94274cb2bc031d4f167d18fa5ef54bb20c7eaee4a524de702e39c76e39e8746408ef5dc10b9a725d4425336ae99
+  metadata.gz: c70d7668d27d807eecfbd30c99ac00d0c5da06b3d6695b4e200b848eaaa0a5b85d26598afbc65f1cd0299f6de4dbe70ed29c06c97226f6ab5c6911bbcbebd9cc
+  data.tar.gz: 8dc428ed99bc90d6da940fd4bdaa9e130f0e37e4c6ae64e1636612f4651692a671bcfd32ca6660a47788cbb45cdd7f2397c2f7f97d0d214aa521b44841b9fca9

data/lib/lhj/helper/log_helper.rb

@@ -52,6 +52,7 @@ module Lhj
         message = message.gsub('seconds ', '秒')
         message = message.gsub('minutes ', '分钟')
         message = message.gsub('hours ', '小时')
+        message = message.gsub('weeks ', '周')
         message = message.gsub('days ', '天')
         message = message.gsub('ago ', '前')
         Lhj::TeamMemberConfig.config.each do |key, value|

data/lib/lhj/helper/pgyer_config.rb

@@ -42,6 +42,19 @@ module Lhj
       end
     end
 
+    def self.shortcut_url(env = :uat)
+      case env
+      when :release
+        config['release_shortcut_url']
+      when :gray
+        config['gray_shortcut_url']
+      when :uat
+        config['uat_shortcut_url']
+      else
+        config['shortcut_url']
+      end
+    end
+
     def self.password(env = :uat)
       config['password']
     end

data/lib/lhj/helper/pgyer_helper.rb

@@ -57,9 +57,9 @@ module Lhj
         'installType' => 2,
         'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
       }
-      upload_with_type(path, file) unless path.empty?
       begin
         puts 'begin upload...'
+        upload_with_type(path, file) unless path.empty?
         response = http_client.post API_HOST, params
         @result = response.body
         puts @result
@@ -82,7 +82,8 @@ module Lhj
       rand_key = rand(100) % 3
       zipped_path = "Life_i_#{rand_key}.zip"
       zipped_path = "Life_a_#{rand_key}.zip" unless file.end_with?('.ipa')
-      Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/*), log: false)
+      Actions.sh(%(cd "#{folder_path_dir}" && zip -r "#{zipped_path}" "#{folder_path_dir}"/* -x="#{folder_path_dir}"/Code/MacauLife.ipa), log: false)
+
       # step 2
       oss_key = "code/#{zipped_path}"
       oss_file = File.join(folder_path_dir, zipped_path)

data/lib/lhj/helper/pgyer_shortcut_helper.rb

@@ -0,0 +1,42 @@
+
+# frozen_string_literal: true
+require "uri"
+require "net/http"
+require 'lhj/helper/pgyer_config'
+
+module Lhj
+  # pgyer upload
+  class PgyerShortcut
+    API_SHORTCUT_HOST = 'https://www.pgyer.com/apiv2/app/getByShortcut'
+
+    attr_reader :api_key, :user_key, :password, :shortcut_url
+
+    def initialize(env = :uat)
+      @api_key = Lhj::PgyerConfig.api_key(env)
+      @user_key = Lhj::PgyerConfig.user_key(env)
+      @shortcut_url = Lhj::PgyerConfig.shortcut_url(env)
+    end
+
+    def request_shortcut_body
+      url = URI(API_SHORTCUT_HOST)
+
+      https = Net::HTTP.new(url.host, url.port)
+      https.use_ssl = true
+
+      request = Net::HTTP::Post.new(url)
+      request['Content-Type'] = 'application/x-www-form-urlencoded'
+      request.body = "_api_key=#{@api_key}&buildShortcutUrl=#{@shortcut_url}"
+
+      response = https.request(request)
+      response.read_body
+    end
+
+    def build_version
+      body = request_shortcut_body
+      res_json = JSON.parse(body)
+      res = ''
+      res = res_json['data']['buildBuildVersion'] if res_json['code'].to_i.zero?
+      res
+    end
+  end
+end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.43"
+    VERSION = "0.1.47"
   end
 end

data/lib/lhj/tools.rb

@@ -14,6 +14,7 @@ module Lhj
   require 'lhj/helper/pod_repo_config'
   require 'lhj/helper/git_branch_feature_config'
   require 'lhj/helper/pgyer_helper'
+  require 'lhj/helper/pgyer_shortcut_helper'
   require 'lhj/helper/dingtalk_helper'
   require 'lhj/helper/tb_helper'
   require 'lhj/action/sh_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.43
+  version: 0.1.47
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-02 00:00:00.000000000 Z
+date: 2022-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -344,6 +344,7 @@ files:
 - lib/lhj/helper/oss_helper.rb
 - lib/lhj/helper/pgyer_config.rb
 - lib/lhj/helper/pgyer_helper.rb
+- lib/lhj/helper/pgyer_shortcut_helper.rb
 - lib/lhj/helper/pod_repo_config.rb
 - lib/lhj/helper/tb_config.rb
 - lib/lhj/helper/tb_helper.rb