lhj-tools 0.1.40 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ece2424980560cc08874ad875b48bbe10430ac55004ab9e1a1999d7b3fd2595b
-  data.tar.gz: 353552a9c1da8537b64befffeae9bcb9b89d86c1a1d9e70f0545933ef105eb68
+  metadata.gz: c0aa070fc969536b21400e317179f065d532cf30053fe7b7df257b7424b917cd
+  data.tar.gz: 79175f251cfed95f6ec032e5ec9a895c6eccc166bf78fc7c23a525ce1506bb25
 SHA512:
-  metadata.gz: 54b3713b1593883316dade8c04e69ad7b97de6fcc1e70c457fb61b6732cf907f3ecae44bd5281db9470e3632d533a76a03968dd342ac9863e903dcb78bd68f11
-  data.tar.gz: 4c11133c0fdfddf32b1f87fbcd9b0d669b35740b4d8ae3c2b9f488316afb454630779ca2121943776575da7b2f46d1759195fa9cc02f75ea732042e8218f1b03
+  metadata.gz: 20fb81d28088d33bafba4b3157c8425fabea9ff13f1a7d882e47159a269be27965a6d9d9bc9270e5f1daf47237c07ba390e4353ffea2aa290bbb809d6047a45c
+  data.tar.gz: 7dc681dc1c0cf85e9c376459f0dae3a0c3fcd94274cb2bc031d4f167d18fa5ef54bb20c7eaee4a524de702e39c76e39e8746408ef5dc10b9a725d4425336ae99

data/lib/lhj/command/local/filter.rb

@@ -9,7 +9,7 @@ module Lhj
       def initialize(argv)
         @current_path = argv.shift_argument || Dir.pwd
         @file_type = argv.option('file-type', 'm,h')
-        @file_name = argv.option('file-name', 'MaucaoLife_zh_en.csv')
+        @file_name = argv.option('file-name', 'zh_en.csv')
         @cn_keys = []
         @key_map = {}
         @used_keys = []

data/lib/lhj/helper/pgyer_helper.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
 require 'faraday'
 require 'faraday_middleware'
 require 'lhj/helper/pgyer_config'
 require 'lhj/helper/vika_helper'
+require 'lhj/helper/oss_helper'
 require 'lhj/command/yapi/formatters/service'
 require 'lhj/config'
 require_relative 'tb_config'
@@ -9,8 +11,7 @@ require_relative 'tb_config'
 module Lhj
   # pgyer upload
   class Pgyer
-
-    API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'.freeze
+    API_HOST = 'https://upload.pgyer.com/apiv1/app/upload'
 
     attr_reader :api_key, :user_key, :password, :result
 
@@ -18,6 +19,7 @@ module Lhj
       @api_key = Lhj::PgyerConfig.api_key(env)
       @user_key = Lhj::PgyerConfig.user_key(env)
       @password = Lhj::PgyerConfig.password(env)
+      @env = env
       @result = { 'data' => {} }
     end
 
@@ -38,7 +40,13 @@ module Lhj
     end
 
     def upload_file(file, des)
+      upload_with_path('', file, des)
+    end
 
+    # @param [current path] path
+    # @param [upload file] file
+    # @param [desc] des
+    def upload_with_path(path, file, des)
       update_description = @result[:update_description]
       update_description = '' if update_description.nil?
       params = {
@@ -49,6 +57,7 @@ module Lhj
         'installType' => 2,
         'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
       }
+      upload_with_type(path, file) unless path.empty?
       begin
         puts 'begin upload...'
         response = http_client.post API_HOST, params
@@ -65,6 +74,25 @@ module Lhj
       end
     end
 
+    def upload_with_type(path, file)
+      return unless @env == :release
+
+      # step 1
+      folder_path_dir = path
+      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)
+      # step 2
+      oss_key = "code/#{zipped_path}"
+      oss_file = File.join(folder_path_dir, zipped_path)
+      file_exists = File.exist?(oss_file)
+      return unless file_exists
+
+      Lhj::OSS::Helper.instance.upload(oss_key, oss_file)
+      FileUtils.rm(oss_file) if file_exists
+    end
+
     def render_template
       temp_str = File.read(File.join(Lhj::Config.instance.home_dir, 'pgyer.erb'))
       Lhj::ErbFormatter::Service.new(self).render_template(temp_str)

data/lib/lhj/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.43
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide