lhj-tools 0.1.98 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2687cb0ea3db9db8cdf54d080b9b75a642bde044762994af8ee68b4b9117bd6
-  data.tar.gz: f6720ad9be8a1cf1406f8940d2a95a718490e84692a048f798b04690edc32a26
+  metadata.gz: bffa0e0d28d2e9c7aa78faecb8d43c884f85ed22da0b852394950f9c8293f996
+  data.tar.gz: 356b8db34ea4892193716b8373d782949efd63c9c67728ee3d35ca4328cbdfe7
 SHA512:
-  metadata.gz: 50666013e9f5d2565f28cb05c040a3b1bf62e838ee5aa5744c275e3ff088e093df15c3b93f75f841adf43821a9410cb7dfd9b0c8b82a19c737e42fc79b0a1e16
-  data.tar.gz: 0cfaa91c509467b565af33b0d81b9401f6119c9e2babc17b4f8f993c53899a3bbc363b6f4851d744db2a00c607ecba6832a401800c446748d3b3645346843167
+  metadata.gz: 88c98dd157029e0b81860405d834111bfc53b15205d1658740d5ae539ae677f87d0915f0e4e1e0d76888808785a10295dbe451394d45c0322475539c3bf3eb44
+  data.tar.gz: d9d846644b97ea113f8dab060db53f566cab4de1e033a44a406cfa7f35f05a2ad95c3ff803f766ca254aa0e3213b537a9f8524f4d6963b14060bafed7b6fdb80

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

@@ -14,11 +14,8 @@ 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
-          end
+          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 = []
@@ -28,9 +25,7 @@ module Lhj
             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
+          oss_keys.each { |k| puts "删除的key为:#{k}".red }
           Lhj::OSS::Helper.instance.batch_delete(oss_keys) if oss_keys.length > 0
         end
 

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

@@ -8,19 +8,36 @@ 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
+        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 = []
@@ -29,9 +46,13 @@ module Lhj
             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
+          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)

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

@@ -7,7 +7,25 @@ module Lhj
       class Info < OSS
 
         def handle
-          Lhj::OSS::Helper.instance.info
+          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

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

@@ -8,19 +8,27 @@ module Lhj
 
         def self.options
           [
-            %w[--save 保存文件]
+            %w[--save 保存文件],
+            %w[--clear 清空控制台输出],
+            %w[--prefix 前缀过滤],
+            %w[--marker key之后的列表数据]
           ]
         end
 
         def initialize(argv)
           @save = argv.flag?('save', false)
           @clear = argv.flag?('clear', false)
+          @prefix = argv.option('prefix')
+          @marker = argv.option('marker')
           @current_path = argv.shift_argument || Dir.pwd
           super
         end
 
         def handle
-          objects = Lhj::OSS::Helper.instance.list
+          list_opts = {}
+          list_opts[:prefix] = @prefix if @prefix
+          list_opts[:marker] = @marker if @marker
+          objects = Lhj::OSS::Helper.instance.list(list_opts)
           obj_keys = objects.map(&:key)
           save(obj_keys) if @save
           print(obj_keys) unless @clear

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

@@ -15,13 +15,15 @@ module Lhj
 
         def self.options
           [
-            %w[--tag 标签]
+            %w[--tag 标签],
+            %w[--oss_key 指定oss_key的名称]
           ]
         end
 
         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
@@ -51,6 +53,7 @@ module Lhj
 
         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)

data/lib/lhj/command.rb

@@ -19,6 +19,7 @@ module Lhj
     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/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
@@ -29,8 +33,18 @@ module Lhj
       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

@@ -41,8 +41,11 @@ module Lhj
         @bucket.object_url(key, false)
       end
 
-      def list
-        @bucket.list_objects
+      # @bucket.list_objects({ prefix: 'tool/config' }) 前缀过滤
+      # @bucket.list_objects({ marker: 'code/README.md' }) 当前key之前后
+      # @bucket.list_objects({ delimiter: '/' }).filter { |o| o.is_a?(String) } 分割符, 获取所有目录结构
+      def list(opts = {})
+        @bucket.list_objects(opts)
       end
 
       # {bucket.name} #{bucket.location}
@@ -73,13 +76,28 @@ module Lhj
         @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
+      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

data/lib/lhj/tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.98
+  version: 0.2.0
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -351,6 +351,7 @@ files:
 - 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