lhj-tools 0.1.99 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c1cb1e36ca0a061c4d3e53f5c0af5c0fb43f5c3dbb044fdd512c44f806a585d
-  data.tar.gz: 1ea501e7dde6f267da843ba2aa0f304e2ec038d0ed16f9a4b7348988d982ffab
+  metadata.gz: 7f059ba0c12401b26f210d4e3d1215168516aeccae1a1b1799b5ce01d1b1846c
+  data.tar.gz: '01386ae62655563b81f2ae08f7a19fa3a3cfa664f7fcc0dab34f5ddeba3c70b2'
 SHA512:
-  metadata.gz: 04faa27361e9e260282b8ed9eaaec6d11336c7f5b4af80c069fc6f37956a485a178880ce6397aca1452d14fad32a47059b699bed3e6a67b75e98a5e57bc0921a
-  data.tar.gz: 6411de6c950b82eafcf5727c57cbd758a6d3350c1682171ba4bc589ad0ddde95b4a53344cf21b03148834af823f35f27bc0ce98585bfb682d744594257aa5ea8
+  metadata.gz: f62dae3e2bf5e873bb778e4a796b60bd9d9569bd8491dd30f4f5c42cba02f8860cfff798d8b578b7c0433684f6256320b2afaa6c5a6461ebd80198981cd458cc
+  data.tar.gz: fbebce23c7af7d7591a2788581d3e9f8df9672fc64b4bd428daf925d8ad883eb5dc658625a8924c2b6885b28ec48d028f3c3be84fbb2fafc932f655ba1739e73

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

@@ -9,20 +9,31 @@ module Lhj
         def self.options
           [
             %w[--save 保存文件],
-            %w[--clear 清空控制台输出]
+            %w[--clear 清空控制台输出],
+            %w[--all_folder 列出所有的子目录],
+            %w[--prefix 前缀过滤],
+            %w[--marker key之后的列表数据]
           ]
         end
 
         def initialize(argv)
           @save = argv.flag?('save', false)
           @clear = argv.flag?('clear', false)
+          @all_folder = argv.flag?('all_folder', 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
-          obj_keys = objects.map(&:key)
+          list_opts = {}
+          list_opts[:prefix] = @prefix if @prefix
+          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.filter { |o| o.is_a?(String) } if @all_folder
           save(obj_keys) if @save
           print(obj_keys) unless @clear
         end
@@ -31,14 +42,15 @@ module Lhj
           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)
+            File.write('oss_url.yml', obj_urls.to_yaml) unless @all_folder
           end
         end
 
         def print(obj_keys)
           rows = []
           obj_keys.each_with_index do |k, i|
-            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{k}"
+            path = "#{i}.#{Lhj::OSS::Helper.instance.url_path}/#{k}" unless @all_folder
+            path = k if @all_folder
             rows << [path]
           end
           table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows

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

@@ -6,8 +6,15 @@ module Lhj
     class OSS < Command
       class UpdateBucket < OSS
 
+        def self.options
+          [
+            %w[--idx 最新bucket序号]
+          ]
+        end
+
         def initialize(argv)
           @cli = HighLine.new
+          @idx = argv.option('idx')
           super
         end
 
@@ -16,8 +23,10 @@ module Lhj
           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
+          idx = @idx.to_i if @idx
+          idx = @cli.ask('更新序号: '.green).strip.to_i unless @idx
           bucket = bucket_list[idx]
+          puts "update: #{bucket['name']} -- #{bucket['location']}"
           Lhj::OSSConfig.oss_endpoint = "#{bucket['location']}.aliyuncs.com"
           Lhj::OSSConfig.oss_bucket = bucket['name']
           Lhj::OSSConfig.save

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

@@ -15,7 +15,8 @@ module Lhj
 
         def self.options
           [
-            %w[--tag 标签]
+            %w[--tag 标签],
+            %w[--oss_key 指定oss_key的名称]
           ]
         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}

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.99"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.99
+  version: 0.2.1
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj