lhj-tools 0.1.39 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1016401e08b49467fcbd6362af988daaeec6d5f9272b58eaf19ddf0c10d002b
-  data.tar.gz: a4d51e70f9c75217efbb6f94cf84fdaa8a3cfce04ef3cee33c4c205b5895830b
+  metadata.gz: '080d2ba9a8af88c54194f832036407dd590ba281de5196eb4668a1fef19761c3'
+  data.tar.gz: b7e10f83ba5acf3e587af543f3c7bdf67f7778dd3528265e961e9305881d5550
 SHA512:
-  metadata.gz: d7904a6b62c5a5a418a0ee5cc642ebd2dcea0b138aad1f19b2a2f352bee72011b15e3dff0022946cc762a578aefb0c6622001aa451e6a8267d963d8156980bde
-  data.tar.gz: 31a2943539fd9e629a89c3abb3b0e3fe65e5a61b683fdc485c356ed64ba45c895f4df87794aa2d4b29cb2c0f827629ae91a516aa4aa320c8c26faf83f07147fb
+  metadata.gz: 92ddcd3c9912a4d036fa584db8783b330789340ad3b0b5bbd27e74389a5f4997eb929e2a6b2f14722e969d8063b9e2ff276646466735d12154f001745317feff
+  data.tar.gz: 37a3edac304e4006f4cb92889534f7ec66314d96f06619d5ae5aa91e54b67b034984768772a11241625954bc4e6bdaa1d081b8c7c2e99e6887d48ab54a2d314c

data/lib/lhj/command/code/template/dispatch_source.erb

@@ -21,7 +21,7 @@
         dispatch_source_set_timer(self.timer, DISPATCH_TIME_NOW, 1.0 * NSEC_PER_SEC, 0);
         __weak __typeof(self)weakSelf = self;
         dispatch_source_set_event_handler(self.timer, ^{
-            if(weakSelf.leftTime <= 0){ //倒計時結束，關閉
+            if(weakSelf.leftTime <= 0){
                 [[NSNotificationCenter defaultCenter] postNotificationName:kOrderTimerFinishedNotification object:nil];
                 dispatch_source_cancel(weakSelf.timer);
             }else{

data/lib/lhj/command/oss/del.rb

@@ -6,7 +6,6 @@ module Lhj
   class Command
     class OSS < Command
       class Del < OSS
-        self.summary = '删除OSS的key'
 
         def initialize(argv)
           @cli = HighLine.new

data/lib/lhj/command/oss/download.rb

@@ -7,7 +7,6 @@ module Lhj
   class Command
     class OSS < Command
       class Download < OSS
-        self.summary = '下载OSS'
 
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd

data/lib/lhj/command/oss/list.rb

@@ -5,7 +5,6 @@ module Lhj
   class Command
     class OSS < Command
       class List < OSS
-        self.summary = '查看oss列表'
 
         def handle
           objects = Lhj::OSS::Helper.instance.list

data/lib/lhj/command/oss/upload.rb

@@ -8,7 +8,6 @@ module Lhj
     class OSS < Command
       # OSS file upload
       class Upload < OSS
-        self.summary = '上传文件(添加标签 --tag=XX)'
 
         self.arguments = [
           CLAide::Argument.new('tag', false)

data/lib/lhj/command/oss.rb

@@ -3,7 +3,6 @@ module Lhj
   class Command
     # sync config
     class OSS < Command
-      self.summary = 'oss操作'
       self.abstract_command = true
     end
   end

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_file_with_path(path) unless path.empty?
       begin
         puts 'begin upload...'
         response = http_client.post API_HOST, params
@@ -65,6 +74,23 @@ module Lhj
       end
     end
 
+    def upload_file_with_path(path)
+      return unless @env == :release
+
+      # step 1
+      folder_path_dir = path
+      rand_key = rand(100) % 3
+      zipped_path = "Life_#{rand_key}.zip"
+      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)
+      Lhj::OSS::Helper.instance.upload(oss_key, oss_file)
+      # step 3
+      file_exists = File.exist?(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.39"
+    VERSION = "0.1.42"
   end
 end

metadata

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