lhj-tools 0.1.41 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8fa90967ee885cff64ed4b4d175cf1178919449b42aa8e644ad5fedf17386de
-  data.tar.gz: 750834e640eb75b5653e4f9639dc9b09bf5c320ac34bf721ab637f881729fc08
+  metadata.gz: de320e5c5f781422768e61fec7a22189ad9dc43b308f9cbe7302879bd1f31485
+  data.tar.gz: cbf5518dd14e32f6d3f5ef7d7bea8da1af676b0690c537049227b4ac0ac17843
 SHA512:
-  metadata.gz: b08ab0ab7d6bb7ac5fe0e38bd823032779370b4e6265444db96f691078502d10c199656297b7190f1eaa1be92a76c701f6ec1c467aede28c49464853ccb1add1
-  data.tar.gz: 1a546488cdfca768c14599022da2d80cb5eca23a272d71fbc75b879b74a2f9d99d9574afae62316fad2cd7ebd54010a001396219a5b42eec7f065ba87f09d6cc
+  metadata.gz: 5206f3d577a021d431904d967d1eec6a7ee019902b3e28b69dee5c8ea3169e0acd28a4650421efe2faa0d33ef3dae756d4edac1d391a916bbda1561807af34c8
+  data.tar.gz: 546a93073595d5141f706e106d2c2814399ef8a2d747423f57019b4ed5f998aca6d5e52c716550558ee92986a616af41484b4de6acbd37c425ddb3a7a675b53f

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
 
@@ -39,6 +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,9 +57,9 @@ module Lhj
         'installType' => 2,
         'file' => Faraday::UploadIO.new(file, 'application/octet-stream')
       }
-      upload_code
       begin
         puts 'begin upload...'
+        upload_with_type(path, file) unless path.empty?
         response = http_client.post API_HOST, params
         @result = response.body
         puts @result
@@ -66,13 +74,23 @@ module Lhj
       end
     end
 
-    def upload_code
-      if @env == :release
-        # packing
-        current_dir = File.dirname(__FILE__)
-        puts current_dir
-        # upload to oss
-      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

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.41"
+    VERSION = "0.1.44"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.44
 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