lhj-tools 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffa0e0d28d2e9c7aa78faecb8d43c884f85ed22da0b852394950f9c8293f996
-  data.tar.gz: 356b8db34ea4892193716b8373d782949efd63c9c67728ee3d35ca4328cbdfe7
+  metadata.gz: 4d3988be8542dd54a63ce19437ddeacaadffc6441e0a60dba93ad2c711fc5314
+  data.tar.gz: bf8779a96980fd881fb015d735771c781a97edb79baf2efba6ac08d5f9514cbb
 SHA512:
-  metadata.gz: 88c98dd157029e0b81860405d834111bfc53b15205d1658740d5ae539ae677f87d0915f0e4e1e0d76888808785a10295dbe451394d45c0322475539c3bf3eb44
-  data.tar.gz: d9d846644b97ea113f8dab060db53f566cab4de1e033a44a406cfa7f35f05a2ad95c3ff803f766ca254aa0e3213b537a9f8524f4d6963b14060bafed7b6fdb80
+  metadata.gz: 65430cb4f9e73525b257240a8cabea5da97cd901b752884864789e4ee9b162c7b48b58851c15446ad4b112f8e5384f67c5cf88cf21e33073b70a028654e00077
+  data.tar.gz: a2b69d87c91357ac7a7a7fef44fcb918faaec00a03251de7dd5bbb6fe16b40b587590056b9964cde9ef78849df8cfa20b5194e4af95770e67601440da2668d29

data/bin/lhj

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "lhj/tools"
+require 'lhj/lhj'
 
 Lhj::Command.run(ARGV)

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

@@ -7,6 +7,12 @@ module Lhj
     class OSS < Command
       class Del < OSS
 
+        self.description = <<~DESC
+          OSS删除 \n
+          提示删除的序号以,号分割多项下载项, 传入开始与结束的序号通过-号连接，可删除多项连接序号的文件\n
+          如 1,5,7-10,12-15 那么下载项为 [1,5,7,8,9,10,12,13,14,15]\n
+        DESC
+
         def initialize(argv)
           @cli = HighLine.new
           super

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

@@ -8,6 +8,18 @@ module Lhj
     class OSS < Command
       class Download < OSS
 
+        self.arguments = [
+          CLAide::Argument.new(['--oss_key_file'], false, false)
+        ]
+
+        self.description = <<~DESC
+          OSS下载，下载文件到当前shell的目录\n
+          提示的下载的序号以,号分割多项下载项, 传入开始与结束的序号通过-号连接，可下载多项连接序号的文件\n
+          如 1,5,7-10,12-15 那么下载项为 [1,5,7,8,9,10,12,13,14,15]\n
+          --oss_key_file oss key文件列表, 通过lhj oss list --save之后生成oss_key.yml文件, 保留需要下载的oss key，指定文件名oss_key.yml\n
+          如: --oss_key_file=oss_key.yml
+        DESC
+
         def self.options
           [
             %w[--oss_key_file 本地下载的oss_key文件]

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

@@ -6,6 +6,10 @@ module Lhj
     class OSS < Command
       class Info < OSS
 
+        self.description = <<-DESC
+          查看当前OSS Bucket的信息
+        DESC
+
         def handle
           puts '-------base-----------'
           base_info
@@ -24,6 +28,8 @@ module Lhj
         end
 
         def base_info
+          puts Lhj::OSSConfig.oss_access_key_id
+          puts Lhj::OSSConfig.oss_access_key_secret
           puts Lhj::OSSConfig.oss_endpoint
           puts Lhj::OSSConfig.oss_bucket
         end

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

@@ -6,10 +6,25 @@ module Lhj
     class OSS < Command
       class List < OSS
 
+        self.arguments = [
+          CLAide::Argument.new(%(--save, --clear), false, false),
+          CLAide::Argument.new(%(--all_folder, --prefix, --marker), false, false)
+        ]
+
+        self.description = <<-DESC
+          查看OSS对象列表
+          --save 保存文件oss_key.yml与oss_url.yml到当前目录
+          --clear 清空控制台输出，当oss数量较多时使用，配合save使用
+          --all_folder 则会添加 delimiter='/'，只用于查看oss的目录结构
+          --prefix 添加oss的前缀过滤
+          --marker 会改oss key值，会输出key之后的oss列表
+        DESC
+
         def self.options
           [
             %w[--save 保存文件],
             %w[--clear 清空控制台输出],
+            %w[--all_folder 列出所有的子目录],
             %w[--prefix 前缀过滤],
             %w[--marker key之后的列表数据]
           ]
@@ -18,6 +33,7 @@ module Lhj
         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
@@ -28,8 +44,10 @@ module Lhj
           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)
+          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
@@ -38,14 +56,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

@@ -10,9 +10,18 @@ module Lhj
       class Upload < OSS
 
         self.arguments = [
-          CLAide::Argument.new('tag', false)
+          CLAide::Argument.new('tag', false),
+          CLAide::Argument.new('oss_key', false)
         ]
 
+        self.description = <<~DESC
+          OSS上传，上传当前shell目录到oss服务 \n
+          提示的上传的序号以,号分割多项下载项, 传入开始与结束的序号通过-号连接，可上传多项连接序号的文件\n
+          如 1,5,7-10,12-15 那么下载项为 [1,5,7,8,9,10,12,13,14,15]\n
+          --tag 指定文件的前缀，如--tag=flutter 则文件为flutter/xx
+          --oss_key 指定oss key重命名默认oss key,默认oss key为文件名, 如--oss_key=aa.txt
+        DESC
+
         def self.options
           [
             %w[--tag 标签],

data/lib/lhj/{tools.rb → lhj.rb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_relative "tools/version"
+require_relative "version"
 require 'colored'
 require 'xcodeproj'
 

data/lib/lhj/{tools/version.rb → version.rb}

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
 module Lhj
-  module Tools
-    VERSION = "0.2.0"
-  end
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 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
@@ -390,8 +390,7 @@ files:
 - lib/lhj/jenkins/exceptions.rb
 - lib/lhj/jenkins/job.rb
 - lib/lhj/jenkins/urihelper.rb
-- lib/lhj/tools.rb
-- lib/lhj/tools/version.rb
+- lib/lhj/lhj.rb
 - lib/lhj/tree/directory_renderer.rb
 - lib/lhj/tree/hash_walker.rb
 - lib/lhj/tree/node.rb
@@ -407,6 +406,7 @@ files:
 - lib/lhj/ui/implementations/shell.rb
 - lib/lhj/ui/interface.rb
 - lib/lhj/ui/ui.rb
+- lib/lhj/version.rb
 homepage:
 licenses:
 - MIT