lhj-tools 0.1.96 → 0.1.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa4d693bb22ce7c5059df391d0596da915785429d480109afc53674710885976
-  data.tar.gz: b431fe5461e189eccc44bae77472c1cbad6bd0f4576675389b8ffba699612782
+  metadata.gz: e2687cb0ea3db9db8cdf54d080b9b75a642bde044762994af8ee68b4b9117bd6
+  data.tar.gz: f6720ad9be8a1cf1406f8940d2a95a718490e84692a048f798b04690edc32a26
 SHA512:
-  metadata.gz: 1118b0ca825f9d8c6dd47a09f26bfab28a2b486e4ecf30893d685de5e21470e00bae8523dfe6c7b8aa8b8ede3a3b8c98fedd028ed4c7e2d60dbdda9f2f090a3b
-  data.tar.gz: 05471f260b844ae9851ebae6dc7763972182000065be1ac0a1c0b65637b1df6c1b8a27f7e425292bbf3b3a07d663128d63f673397671ea39e265d9eea5c5159b
+  metadata.gz: 50666013e9f5d2565f28cb05c040a3b1bf62e838ee5aa5744c275e3ff088e093df15c3b93f75f841adf43821a9410cb7dfd9b0c8b82a19c737e42fc79b0a1e16
+  data.tar.gz: 0cfaa91c509467b565af33b0d81b9401f6119c9e2babc17b4f8f993c53899a3bbc363b6f4851d744db2a00c607ecba6832a401800c446748d3b3645346843167

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

@@ -19,10 +19,19 @@ module Lhj
             obj_keys << o.key
             puts "#{i}.#{o.key}".yellow
           end
-          idx = @cli.ask('请选择删除的key: '.green).strip.to_i
-          oss_key = obj_keys[idx]
-          puts "删除的key为:#{oss_key}".red
-          Lhj::OSS::Helper.instance.delete(oss_key)
+          idx = @cli.ask('请选择删除的key: '.green)
+          idx_arr = idx.split(',').map(&:strip).filter { |v| v.length.positive? }
+          result_keys = []
+          idx_arr.each do |i|
+            ma = /(?<begin>[0-9]*)\D*-\D*(?<end>[0-9]*)/.match(i)
+            result_keys << obj_keys[ma[:begin].to_i..ma[:end].to_i] if ma
+            result_keys << obj_keys[i.to_i] unless ma
+          end
+          oss_keys = result_keys.flatten
+          oss_keys.each do |oss_key|
+            puts "删除的key为:#{oss_key}".red
+          end
+          Lhj::OSS::Helper.instance.batch_delete(oss_keys) if oss_keys.length > 0
         end
 
       end

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

@@ -21,17 +21,28 @@ module Lhj
             obj_keys << o.key
             puts "#{i}.#{o.key}".yellow
           end
-          idx = @cli.ask('请选择下载的序号: '.green).strip.to_i
-          oss_key = obj_keys[idx]
-          puts "下载的key为:#{oss_key}".yellow
+          idx = @cli.ask('请选择下载的序号: '.green)
+          idx_arr = idx.split(',').map(&:strip).filter { |v| v.length.positive? }
+          result_keys = []
+          idx_arr.each do |i|
+            ma = /(?<begin>[0-9]*)\D*-\D*(?<end>[0-9]*)/.match(i)
+            result_keys << obj_keys[ma[:begin].to_i..ma[:end].to_i] if ma
+            result_keys << obj_keys[i.to_i] unless ma
+          end
+          Dir.chdir(@current_path) do
+            result_keys.flatten.each { |k| download_with_key(k) }
+          end
+        end
 
+        def download_with_key(oss_key)
+          puts "下载的key为:#{oss_key}".yellow
           file_key = oss_key.split('/').last
           file = File.join(@current_path, file_key)
+          File.rename(file_key, "#{file_key}.bak") if File.exist?(file_key)
           Lhj::OSS::Helper.instance.down_load(oss_key, file)
           puts "下载文件到目录: #{file}\n".yellow
         end
-
       end
     end
   end
-end
+end

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

@@ -0,0 +1,15 @@
+require 'lhj/helper/oss_helper'
+require 'terminal-table'
+
+module Lhj
+  class Command
+    class OSS < Command
+      class Info < OSS
+
+        def handle
+          Lhj::OSS::Helper.instance.info
+        end
+      end
+    end
+  end
+end

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

@@ -6,11 +6,38 @@ module Lhj
     class OSS < Command
       class List < OSS
 
+        def self.options
+          [
+            %w[--save 保存文件]
+          ]
+        end
+
+        def initialize(argv)
+          @save = argv.flag?('save', false)
+          @clear = argv.flag?('clear', false)
+          @current_path = argv.shift_argument || Dir.pwd
+          super
+        end
+
         def handle
           objects = Lhj::OSS::Helper.instance.list
+          obj_keys = objects.map(&:key)
+          save(obj_keys) if @save
+          print(obj_keys) unless @clear
+        end
+
+        def save(obj_keys)
+          obj_urls = obj_keys.map { |k| "#{Lhj::OSS::Helper.instance.url_path}/#{k}" }
+          FileUtils.chdir(@current_path) do
+            File.write('oss_key.yml', obj_keys.to_yaml)
+            File.write('oss_url.yml', obj_urls.to_yaml)
+          end
+        end
+
+        def print(obj_keys)
           rows = []
-          objects.each_with_index do |o, i|
-            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
+          obj_keys.each_with_index do |k, i|
+            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{k}"
             rows << [path]
           end
           table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows

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

@@ -0,0 +1,21 @@
+require 'lhj/helper/oss_helper'
+
+# lhj oss list-bucket
+module Lhj
+  class Command
+    class OSS < Command
+      class ListBucket < OSS
+        def handle
+          helper = Lhj::OSS::Helper.instance
+          objects = helper.list_bucket
+          bucket_list = []
+          objects.each do |o|
+            bucket_list << { 'name' => o.name, 'location' => o.location, 'creation_time' => o.creation_time }
+          end
+          print_obj = { 'oss_bucket_list' => bucket_list }
+          puts print_obj.to_yaml
+        end
+      end
+    end
+  end
+end

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

@@ -28,27 +28,36 @@ module Lhj
 
         def handle
           file_list = []
-          file_name_list = []
           Dir.glob("#{@current_path}/*").each_with_index do |f, i|
-            file_base_name = File.basename(f)
             file_list << f
-            file_name_list << file_base_name
-            puts "#{i}.#{file_base_name}".yellow
+            puts "#{i}.#{File.basename(f)}".yellow
+          end
+          idx = @cli.ask('请选择上传文件序号: '.green)
+          idx_arr = idx.split(',').map(&:strip).filter { |v| v.length.positive? }
+          results = []
+          idx_arr.each do |i|
+            ma = /(?<begin>[0-9]*)\D*-\D*(?<end>[0-9]*)/.match(i)
+            results << file_list[ma[:begin].to_i..ma[:end].to_i] if ma
+            results << file_list[i.to_i] unless ma
+          end
+          results.flatten.each do |f|
+            file_name = File.basename(f)
+            puts "上传的文件名:#{file_name}".yellow
+            upload(f)
           end
-          idx = @cli.ask('请选择上传文件序号: '.green).strip.to_i
-          puts "上传的文件名:#{file_name_list[idx]}".yellow
-          upload(file_list[idx], file_name_list[idx])
         end
 
         private
 
-        def upload(file, file_name)
+        def upload(file)
+          file_name = File.basename(file)
           oss_key = file_name
           oss_key = "#{@tag}/#{file_name}" if @tag
           Lhj::OSS::Helper.instance.upload(oss_key, file)
           url = Lhj::OSS::Helper.instance.object_url(oss_key)
           puts "云端上传成功：#{url}\n".yellow
         end
+
       end
     end
   end

data/lib/lhj/command/yapi.rb

@@ -148,10 +148,10 @@ module Lhj
       end
 
       def push_to_git
-        Actions.sh('git checkout master')
-        Actions.sh('git add .')
-        Actions.sh("git commit -m 'generate yapi code'")
-        Actions.sh('git push')
+        Actions.sh('git checkout master', log: false)
+        Actions.sh('git add .', log: false)
+        Actions.sh("git commit -m 'generate yapi code'", log: false)
+        Actions.sh('git push', log: false)
       end
 
       def notify_robot(upload_info, interface_info, project_info)
@@ -169,7 +169,10 @@ module Lhj
                                       })
         template = Lhj::ErbTemplateHelper.load('oc_code_notify')
         output = Lhj::ErbTemplateHelper.render(template, temp_vars, '-')
-        Lhj::Dingtalk.post_message_robot(robot_url, 'yapi generate', output)
+        btn_array = [
+          { 'title' => '查看Yapi', 'actionURL' => api_url }
+        ]
+        Lhj::Dingtalk.post_card_message_robot(robot_url, 'yapi generate', output, btn_array)
       end
 
       def interface_url_str

data/lib/lhj/command.rb

@@ -17,6 +17,8 @@ module Lhj
     require 'lhj/command/oss/del'
     require 'lhj/command/oss/upload'
     require 'lhj/command/oss/list'
+    require 'lhj/command/oss/info'
+    require 'lhj/command/oss/list_bucket'
     require 'lhj/command/oss/download'
     require 'lhj/command/code/view'
     require 'lhj/command/code/code_template'

data/lib/lhj/helper/dingtalk_helper.rb

@@ -7,45 +7,39 @@ module Lhj
 
     def self.post_message(title, message)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = http_body_message(title, message)
-      http_post(robot_url, http_body)
-      post_branch_message(http_body)
+      post_message_robot(robot_url, title, message)
     end
 
     def self.post_card_message(title, message, btns)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = action_card_body_message(title, message, btns, :vertical)
-      http_post(robot_url, http_body)
+      post_card_message_robot(robot_url, title, message, btns)
     end
 
     def self.post_single_card_message(title, message, single_title, single_url)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
-      http_body = single_action_card_body_message(title, message, single_title, single_url)
-      http_post(robot_url, http_body)
+      post_single_card_message_robot(robot_url, title, message, single_title, single_url)
     end
 
-    def self.post_branch_message(http_body)
-      branch_name = fetch_branch
-      branch_map = Lhj::DingTalkConfig.git_branch
-      branch_robot_key = branch_map[branch_name] if branch_map && branch_name
-      branch_robot_url = Lhj::DingTalkConfig.config[branch_robot_key] if branch_robot_key
-      http_post(branch_robot_url, http_body) if branch_robot_url
+    def self.post_message_robot(robot_url, title, message)
+      http_body = markdown_body_message(title, message)
+      http_post(robot_url, http_body)
     end
 
-    def self.http_post(robot_url, http_body)
-      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    def self.post_card_message_robot(robot_url, title, message, btns)
+      http_body = action_card_body_message(title, message, btns, :vertical)
+      http_post(robot_url, http_body)
     end
 
-    def self.post_message_robot(robot_url, title, message)
-      http_body = http_body_message(title, message)
-      Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
+    def self.post_single_card_message_robot(robot_url, title, message, single_title, single_url)
+      http_body = single_action_card_body_message(title, message, single_title, single_url)
+      http_post(robot_url, http_body)
     end
 
-    def self.post_action_card_message_robot(robot_url, title, message, btns)
-      http_body = action_card_body_message(title, message, btns, :vertical)
+    def self.http_post(robot_url, http_body)
       Net::HTTP.post(URI(robot_url), http_body, 'Content-Type' => 'application/json')
     end
 
+    # deprecation warnings used: markdown_body_message method
     def self.http_body_message(title, message)
       markdown_body_message(title, message)
     end
@@ -87,10 +81,5 @@ module Lhj
         'feedCard' => links
       }.to_json
     end
-
-    def self.fetch_branch
-      name = Lhj::Actions.git_branch || ''
-      name.split('/').last
-    end
   end
 end

data/lib/lhj/helper/oss_config.rb

@@ -28,5 +28,9 @@ module Lhj
     def self.oss_bucket
       config['oss_bucket']
     end
+
+    def self.oss_bucket_list
+      config['oss_bucket_list']
+    end
   end
 end

data/lib/lhj/helper/oss_helper.rb

@@ -11,6 +11,10 @@ module Lhj
         @bucket = @client.get_bucket(Lhj::OSSConfig.oss_bucket)
       end
 
+      def get_bucket(name)
+        @bucket = @client.get_bucket(name)
+      end
+
       def url_path
         "http://#{Lhj::OSSConfig.oss_bucket}.#{Lhj::OSSConfig.oss_endpoint}"
       end
@@ -41,10 +45,43 @@ module Lhj
         @bucket.list_objects
       end
 
+      # {bucket.name} #{bucket.location}
+      def list_bucket
+        @client.list_buckets
+      end
+
       def delete(key)
         @bucket.delete_object(key)
       end
 
+      def batch_delete(keys)
+        @bucket.batch_delete_objects(keys)
+      end
+
+      def acl=(acl)
+        case acl
+        when :public_read_write
+          @bucket.acl = (Aliyun::OSS::ACL::PUBLIC_READ_WRITE)
+        when :public_read
+          @bucket.acl = (Aliyun::OSS::ACL::PUBLIC_READ)
+        when :private
+          @bucket.acl = (Aliyun::OSS::ACL::PRIVATE)
+        end
+      end
+
+      def set_object_acl(key, acl)
+        @bucket.set_object_acl(key, acl)
+      end
+
+      def info
+        puts @bucket.acl
+        puts @bucket.logging
+        puts @bucket.lifecycle
+        puts @bucket.cors
+        puts @bucket.website
+        puts @bucket.referer
+      end
+
       def self.instance
         @instance ||= new
       end

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.96"
+    VERSION = "0.1.98"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.96
+  version: 0.1.98
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -348,7 +348,9 @@ files:
 - lib/lhj/command/oss.rb
 - lib/lhj/command/oss/del.rb
 - lib/lhj/command/oss/download.rb
+- lib/lhj/command/oss/info.rb
 - lib/lhj/command/oss/list.rb
+- lib/lhj/command/oss/list_bucket.rb
 - lib/lhj/command/oss/upload.rb
 - lib/lhj/command/pgyer_upload.rb
 - lib/lhj/command/refactor_rename.rb