lhj-tools 0.1.97 → 0.1.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3141a25ce2e0c2b88124dd148417f856317982f1f4da81b9bd43c90ee858b820
-  data.tar.gz: 70f7ffc027cbcb03cb1c4b613a2e132cd46e57dbd2833d36ff88aacc395ed636
+  metadata.gz: 9c1cb1e36ca0a061c4d3e53f5c0af5c0fb43f5c3dbb044fdd512c44f806a585d
+  data.tar.gz: 1ea501e7dde6f267da843ba2aa0f304e2ec038d0ed16f9a4b7348988d982ffab
 SHA512:
-  metadata.gz: ab33b726b8306c881f3ecbced49a801d1d217cb7a340d88b759e82a4d283f2c18f0db89584296edb8e00ca9abb3c8d212ea82d1ee3cf423b56637b507fa9ba14
-  data.tar.gz: b172f1fbe29b4475b777a30dd646d0e01bf83015406cfeb22a161010edb2f62a299cee0db36a7a3a2ee9e4ab40b3583f2a5317da749ef0d1b96bc826b837ff4b
+  metadata.gz: 04faa27361e9e260282b8ed9eaaec6d11336c7f5b4af80c069fc6f37956a485a178880ce6397aca1452d14fad32a47059b699bed3e6a67b75e98a5e57bc0921a
+  data.tar.gz: 6411de6c950b82eafcf5727c57cbd758a6d3350c1682171ba4bc589ad0ddde95b4a53344cf21b03148834af823f35f27bc0ce98585bfb682d744594257aa5ea8

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

@@ -14,15 +14,19 @@ module Lhj
 
         def handle
           objects = Lhj::OSS::Helper.instance.list
-          obj_keys = []
-          objects.each_with_index do |o, i|
-            obj_keys << o.key
-            puts "#{i}.#{o.key}".yellow
+          obj_keys = objects.map(&:key)
+          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? }
+          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
-          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)
+          oss_keys = result_keys.flatten
+          oss_keys.each { |k| puts "删除的key为:#{k}".red }
+          Lhj::OSS::Helper.instance.batch_delete(oss_keys) if oss_keys.length > 0
         end
 
       end

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

@@ -8,30 +8,62 @@ module Lhj
     class OSS < Command
       class Download < OSS
 
+        def self.options
+          [
+            %w[--oss_key_file 本地下载的oss_key文件]
+          ]
+        end
+
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @cli = HighLine.new
+          @oss_key_file = argv.option('oss_key_file')
           super
         end
 
         def handle
-          objects = Lhj::OSS::Helper.instance.list
-          obj_keys = []
-          objects.each_with_index do |o, i|
-            obj_keys << o.key
-            puts "#{i}.#{o.key}".yellow
+          oss_keys = local_oss_keys if @oss_key_file
+          oss_keys ||= remote_oss_keys
+          Dir.chdir(@current_path) do
+            oss_keys.each { |k| download_with_key(k) }
           end
-          idx = @cli.ask('请选择下载的序号: '.green).strip.to_i
-          oss_key = obj_keys[idx]
-          puts "下载的key为:#{oss_key}".yellow
+        end
+
+        def local_oss_keys
+          key_file = File.join(@current_path, @oss_key_file)
+          oss_keys = []
+          oss_keys = YAML.load_file(key_file) if File.exist?(key_file)
+          oss_keys
+        end
 
+        def remote_oss_keys
+          obj_keys = request_oss_keys
+          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
+          result_keys.flatten
+        end
+
+        def request_oss_keys
+          objects = Lhj::OSS::Helper.instance.list
+          obj_keys = objects.map(&:key)
+          obj_keys.each_with_index { |k, i| puts "#{i}.#{k}".yellow }
+        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,33 @@
+require 'lhj/helper/oss_helper'
+require 'terminal-table'
+
+module Lhj
+  class Command
+    class OSS < Command
+      class Info < OSS
+
+        def handle
+          puts '-------base-----------'
+          base_info
+          puts '-------alc-----------'
+          puts Lhj::OSS::Helper.instance.alc
+          puts '-------logging-----------'
+          puts Lhj::OSS::Helper.instance.logging
+          puts '-------lifecycle----------'
+          puts Lhj::OSS::Helper.instance.lifecycle
+          puts '-------cors-----------'
+          puts Lhj::OSS::Helper.instance.cors
+          puts '--------website----------'
+          puts Lhj::OSS::Helper.instance.website
+          puts '--------referer----------'
+          puts Lhj::OSS::Helper.instance.referer
+        end
+
+        def base_info
+          puts Lhj::OSSConfig.oss_endpoint
+          puts Lhj::OSSConfig.oss_bucket
+        end
+      end
+    end
+  end
+end

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

@@ -6,11 +6,39 @@ module Lhj
     class OSS < Command
       class List < OSS
 
+        def self.options
+          [
+            %w[--save 保存文件],
+            %w[--clear 清空控制台输出]
+          ]
+        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/update_bucket.rb

@@ -0,0 +1,28 @@
+require 'lhj/helper/oss_helper'
+
+# lhj oss update-bucket
+module Lhj
+  class Command
+    class OSS < Command
+      class UpdateBucket < OSS
+
+        def initialize(argv)
+          @cli = HighLine.new
+          super
+        end
+
+        def handle
+          bucket_list = Lhj::OSSConfig.oss_bucket_list
+          return unless bucket_list.length.positive?
+
+          bucket_list.each_with_index { |k, i| puts "#{i}.#{k['name']}----#{k['location']}".yellow }
+          idx = @cli.ask('更新序号: '.green).strip.to_i
+          bucket = bucket_list[idx]
+          Lhj::OSSConfig.oss_endpoint = "#{bucket['location']}.aliyuncs.com"
+          Lhj::OSSConfig.oss_bucket = bucket['name']
+          Lhj::OSSConfig.save
+        end
+      end
+    end
+  end
+end

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

@@ -22,33 +22,44 @@ module Lhj
         def initialize(argv)
           @current_path = argv.shift_argument || Dir.pwd
           @tag = argv.option('tag')
+          @oss_key = argv.option('oss_key')
           @cli = HighLine.new
           super
         end
 
         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)
+          file_name = @oss_key if @oss_key
           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.rb

@@ -17,6 +17,9 @@ 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/update_bucket'
     require 'lhj/command/oss/download'
     require 'lhj/command/code/view'
     require 'lhj/command/code/code_template'

data/lib/lhj/helper/dingtalk_helper.rb

@@ -10,26 +10,26 @@ module Lhj
       post_message_robot(robot_url, title, message)
     end
 
-    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.post_card_message(title, message, btns)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
       post_card_message_robot(robot_url, title, message, btns)
     end
 
-    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_single_card_message(title, message, single_title, single_url)
       robot_url = Lhj::DingTalkConfig.dingtalk_robot
       post_single_card_message_robot(robot_url, title, message, single_title, single_url)
     end
 
+    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.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_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)

data/lib/lhj/helper/oss_config.rb

@@ -17,6 +17,10 @@ module Lhj
       config['oss_endpoint']
     end
 
+    def self.oss_endpoint=(endpoint)
+      config['oss_endpoint'] = endpoint
+    end
+
     def self.oss_access_key_id
       config['oss_access_key_id']
     end
@@ -28,5 +32,19 @@ module Lhj
     def self.oss_bucket
       config['oss_bucket']
     end
+
+    def self.oss_bucket=(bucket)
+      config['oss_bucket'] = bucket
+    end
+
+    def self.oss_bucket_list
+      config['oss_bucket_list']
+    end
+
+    def self.save
+      file_to_save = File.open(config_file, 'w+')
+      YAML.dump(config, file_to_save)
+      file_to_save.close
+    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,58 @@ 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 alc
+        @bucket.acl
+      end
+
+      def logging
+        @bucket.logging
+      end
+
+      def lifecycle
+        @bucket.lifecycle
+      end
+
+      def cors
+        @bucket.cors
+      end
+
+      def website
+        @bucket.website
+      end
+
+      def referer
+        @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.97"
+    VERSION = "0.1.99"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.97
+  version: 0.1.99
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-15 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -348,7 +348,10 @@ 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/update_bucket.rb
 - lib/lhj/command/oss/upload.rb
 - lib/lhj/command/pgyer_upload.rb
 - lib/lhj/command/refactor_rename.rb