lhj-tools 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae59197a9dbd9ce3ed7de0da5c26ce2cc91c8b97f7049b08981134c293e67b1a
-  data.tar.gz: 9b553856214eab3372e2c528707eae16dbbf59068109ac1042256cb32ffedaa0
+  metadata.gz: 2d7427bf47063e690b70a09d1bf6987c387d7289ec0c4206fd7d6182372e463e
+  data.tar.gz: d43905b649b15c84de3120b966c42ebb684bdacfec57af0ac2c622fb57218c79
 SHA512:
-  metadata.gz: 197f2cdaa7e7f8eacbbe3fd28b9f2a6cf4a871d4045134f359cd6ec01f6b79995a8416c5ef4cec2b6b5a21cee238f1a34f2ddb3559fb96e8400c3c878e73f75b
-  data.tar.gz: 990499bcc61e51695cad04f2e5b248056fa236a640cf704e40d2774ddace77df537b4a99429f8c36d168e9344daa2db2763a7bd82eb5086ede790fe7b974912f
+  metadata.gz: 5c3f50b5221b68bdec3d7257c31456a70f9fc04263fd48ce4007157b638ab96613a8077339ae016126c9abf0cb75bc2d35f5bb6ef98f70ca55d3310512e21171
+  data.tar.gz: 0bbff5886d4a5aace7ad8c2143db0fbfe7a7c52cf5809e62a6325a478f7c9c045aede8f74eea640e5a366b38cc6f203e87c372187a257452b65e557d5e87eec3

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

@@ -8,27 +8,40 @@ module Lhj
         self.summary = '删除OSS的key'
 
         self.arguments = [
-          CLAide::Argument.new('--key=XX', true)
+          CLAide::Argument.new('--key=XX', true),
+          CLAide::Argument.new('--type=XX', true)
         ]
 
         def self.options
           [
-            %w[--key OSS对应的key]
+            %w[--key OSS对应的key],
+            %w[--type OSS对应的类型]
           ]
         end
 
         def initialize(argv)
           @key = argv.option('key')
+          @type = argv.option('type')
           super
         end
 
         def validate!
-          help! '请输入key' unless @key
+          help! '请输入key或者类型' unless @key || @type
           super
         end
 
         def run
-          Lhj::OSS::Helper.instance.delete(@key)
+          if @type
+            objects = Lhj::OSS::Helper.instance.list
+            objects.each do |o|
+              if /#{@type}/ =~ o.key
+                puts "成功删除#{o.key}"
+                Lhj::OSS::Helper.instance.delete(o.key)
+              end
+            end
+          else
+            Lhj::OSS::Helper.instance.delete(@key)
+          end
         end
       end
     end

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

@@ -11,13 +11,15 @@ module Lhj
 
         self.arguments = [
           CLAide::Argument.new('type', false),
-          CLAide::Argument.new('name', false)
+          CLAide::Argument.new('name', false),
+          CLAide::Argument.new('tag', false)
         ]
 
         def self.options
           [
             %w[--type 文件类型],
-            %w[--name 文件名]
+            %w[--name 文件名],
+            %w[--tag 标签]
           ]
         end
 
@@ -30,6 +32,7 @@ module Lhj
           @current_path = argv.shift_argument || Dir.pwd
           @type = argv.option('type')
           @name = argv.option('name')
+          @tag = argv.option('tag')
           super
         end
 
@@ -48,6 +51,7 @@ module Lhj
 
         def upload(file, file_name)
           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"

data/lib/lhj/command.rb

@@ -25,11 +25,12 @@ module Lhj
     self.command = 'lhj'
 
     def spinner
-      @spinner ||= TTY::Spinner.new('[:spinner]正在处理...', format: :dots)
+      @spinner ||= TTY::Spinner.new('[:spinner]正在处理...', output: $stdout, format: :dots)
     end
 
     def auto_spin
       spinner.auto_spin
+      puts "\n"
     end
 
     def stop

data/lib/lhj/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Lhj
   module Tools
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - lihaijian