lhj-tools 0.2.34 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cc00706a73b9e787e9d9336da8f7c8e5e787ff6e6192dff2383e65792561ec0
-  data.tar.gz: 83c616ccc6b192910102979f6c091d9e48b36938588391b963a659362dd0604a
+  metadata.gz: b9a0b24ce8dd1eeb13324c7f45ef7f2a550fe5708dee25de1ec359c5b14814c8
+  data.tar.gz: 77f5d7b3ce5ca29e820d487bba15a2766d4f06b6f38014e0e84c239e1a7002e7
 SHA512:
-  metadata.gz: e1062fd7c95362b9c0cac73359276d929fe49b30643522f8fb11f4ef8f311fcc505974d934f703bacf29a16d29213906d80a97d96bacad99a467d9ead2c98943
-  data.tar.gz: 158f1213427ce173a39537f0b8187c7ad3de2992d4b7bdcf643e46a1d0ab04e478ae0aae25c2b0603e49d328522eaa19ef45ef4303e4ccc0e9592a51d57a7276
+  metadata.gz: e65b3ee57d4050d77cc34faf7ca36be07f7783f1824a073b324215a0ea1e38cf6816a7b6c83ae8db01cd453f92ee4e70035d7865f43263383b80649adca8baad
+  data.tar.gz: 9257435334260aa8ee1f4ce3a9ce8bc2b88ad7e07231ad355fea41de7a278770c8e21a104b53ea305627b132718174bb068b6f73cad998e7c6d5195b476d24c1

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

@@ -20,7 +20,7 @@ module Lhj
 
         def handle
           objects = Lhj::OSS::Helper.instance.list
-          obj_keys = objects.map(&:key)
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b }
           obj_keys.each_with_index { |k, i| puts "#{i}.#{k}".yellow }
           idx = @cli.ask('请选择删除的key: '.green)
           idx_arr = idx.split(',').map(&:strip).filter { |v| v.length.positive? }

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

@@ -63,7 +63,7 @@ module Lhj
 
         def request_oss_keys
           objects = Lhj::OSS::Helper.instance.list
-          obj_keys = objects.map(&:key)
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b }
           obj_keys.each_with_index { |k, i| puts "#{i}.#{k}".yellow }
         end
 

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

@@ -46,7 +46,7 @@ module Lhj
           list_opts[:marker] = @marker if @marker
           list_opts[:delimiter] = '/' if @all_folder
           objects = Lhj::OSS::Helper.instance.list(list_opts)
-          obj_keys = objects.map(&:key) unless @all_folder
+          obj_keys = objects.map(&:key).sort { |a, b| a <=> b } unless @all_folder
           obj_keys = objects.filter { |o| o.is_a?(String) } if @all_folder
           save(obj_keys) if @save
           print(obj_keys) unless @clear

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

@@ -29,6 +29,7 @@ module Lhj
           puts "update: #{bucket['name']} -- #{bucket['location']}"
           Lhj::OSSConfig.oss_endpoint = "#{bucket['location']}.aliyuncs.com"
           Lhj::OSSConfig.oss_bucket = bucket['name']
+          Lhj::OSSConfig.oss_domain = bucket['domain']
           Lhj::OSSConfig.save
         end
       end

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

@@ -39,7 +39,7 @@ module Lhj
 
         def handle
           file_list = []
-          Dir.glob("#{@current_path}/*").each_with_index do |f, i|
+          Dir.glob("#{@current_path}/*").sort { |a, b| File.basename(a) <=> File.basename(b) }.each_with_index do |f, i|
             file_list << f
             puts "#{i}.#{File.basename(f)}".yellow
           end

data/lib/lhj/helper/oss_config.rb

@@ -37,6 +37,14 @@ module Lhj
       config['oss_bucket'] = bucket
     end
 
+    def self.oss_domain
+      config['oss_domain']
+    end
+
+    def self.oss_domain=(domain)
+      config['oss_domain'] = domain
+    end
+
     def self.oss_bucket_list
       config['oss_bucket_list']
     end

data/lib/lhj/helper/oss_helper.rb

@@ -16,7 +16,7 @@ module Lhj
       end
 
       def url_path
-        "http://#{Lhj::OSSConfig.oss_bucket}.#{Lhj::OSSConfig.oss_endpoint}"
+        Lhj::OSSConfig.oss_domain || "http://#{Lhj::OSSConfig.oss_bucket}.#{Lhj::OSSConfig.oss_endpoint}"
       end
 
       def upload(key, file)

data/lib/lhj/helper/pgyer_helper.rb

@@ -60,7 +60,7 @@ module Lhj
         response = http_client.post API_HOST, params
         @result = response.body
         puts @result
-        Actions.sh('git restore ./', log: false)
+        Actions.sh('git restore ./', log: false) if File.exist?(File.expand_path('./.git'))
         puts 'upload success'
         # if @result['data'] && @result['data']['appUpdateDescription'] && @env == :uat
         #   str = Lhj::TbHelper.trans_tb(@result['data']['appUpdateDescription'])

data/lib/lhj/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  VERSION = '0.2.34'
+  VERSION = '0.2.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.34
+  version: 0.2.36
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj