lhj-tools 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f8ff17bf0bbd3cbb38c92aa203ecb3983da440b5bb158fa1af980adc9fc452
-  data.tar.gz: c43f7f0ad99e94fd7602e64aaf1246ca1244c588b53794960b937a02ce4e6783
+  metadata.gz: ae59197a9dbd9ce3ed7de0da5c26ce2cc91c8b97f7049b08981134c293e67b1a
+  data.tar.gz: 9b553856214eab3372e2c528707eae16dbbf59068109ac1042256cb32ffedaa0
 SHA512:
-  metadata.gz: b200a275276a8b419427203042365a4641920df44420637d4be89d5f588a173d9a6a944fe65f00d2d956262aae0ebe3bf379dc2ce63afec749401923294f6f3f
-  data.tar.gz: c3bb0f9d4cce6b7f789a00856efe2398274cadb9cbee4b8b5d1b7af6a7c6398f02c33422dff1527f1edeefe3353d65f341d5e637a6a87ead4e283a7e410c4e8c
+  metadata.gz: 197f2cdaa7e7f8eacbbe3fd28b9f2a6cf4a871d4045134f359cd6ec01f6b79995a8416c5ef4cec2b6b5a21cee238f1a34f2ddb3559fb96e8400c3c878e73f75b
+  data.tar.gz: 990499bcc61e51695cad04f2e5b248056fa236a640cf704e40d2774ddace77df537b4a99429f8c36d168e9344daa2db2763a7bd82eb5086ede790fe7b974912f

data/lib/lhj/command/init.rb

@@ -12,8 +12,10 @@ module Lhj
       self.description = '使用工具前先执行`lhj init`'
 
       def run
+        auto_spin
         FileUtils.mkdir_p(target_folder) unless File.exist?(target_folder)
         download_file
+        stop
       end
 
       def down_load_urls
@@ -36,7 +38,7 @@ module Lhj
       end
 
       def file_name_with_url(url)
-        url.scan(%r{(/.[^/]*)}).flatten.last
+        url.scan(%r{/([^/]+)}).flatten.last
       end
 
       def download_file

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

@@ -1,4 +1,5 @@
 require 'lhj/helper/oss_helper'
+require 'terminal-table'
 
 module Lhj
   class Command
@@ -8,10 +9,13 @@ module Lhj
 
         def run
           objects = Lhj::OSS::Helper.instance.list
+          rows = []
           objects.each do |o|
             path = "#{Lhj::OSS::Helper.instance.url_path}/#{o.key}"
-            puts path
+            rows << [path]
           end
+          table = Terminal::Table.new title: 'OSS List', headings: ['URL'], rows: rows
+          puts table
         end
       end
     end

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

@@ -23,7 +23,7 @@ module Lhj
 
         def validate!
           super
-          help! '类型或名字必须输入' unless @name && @type
+          help! '类型或名字必须输入' unless @name || @type
         end
 
         def initialize(argv)
@@ -34,7 +34,7 @@ module Lhj
         end
 
         def run
-          Dir.glob(@current_path).each do |f|
+          Dir.glob("#{@current_path}/*").each do |f|
             file_name = File.basename(f)
             if @name && /#{@name}/ =~ file_name
               upload(f, file_name)

data/lib/lhj/command/refactor_rename.rb

@@ -2,6 +2,7 @@
 
 require 'find'
 require 'fileutils'
+require 'terminal-table'
 
 module Lhj
   class Command
@@ -31,11 +32,13 @@ module Lhj
         @current_path = argv.shift_argument || Dir.pwd
         @key = argv.option('key')
         @other = argv.option('other')
+        @modify_files = []
         super
       end
 
       def run
         update_source_file
+        print_info
       end
 
       def update_source_file
@@ -69,9 +72,22 @@ module Lhj
 
       def format_string(file, line)
         result = line
-        result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3") if /(\W)(#{@key})(\W)/ =~ line
+        if /(\W)(#{@key})(\W)/ =~ line
+          result = result.gsub(/(\W)(#{@key})(\W)/, "\\1#{@other}\\3")
+          @modify_files << file unless @modify_files.include?(file)
+        end
         result
       end
+
+      def print_info
+        rows = []
+        @modify_files.each do |file|
+          rows << [File.basename(file), File.absolute_path(file)]
+        end
+        title = "修改了#{rows.count}个文件"
+        table = Terminal::Table.new title: title, headings: %w[文件 路径], rows: rows
+        puts table
+      end
     end
   end
 end

data/lib/lhj/command.rb

@@ -1,4 +1,5 @@
 require 'claide'
+require "tty-spinner"
 
 module Lhj
   # command plugin
@@ -22,5 +23,18 @@ module Lhj
 
     self.abstract_command = true
     self.command = 'lhj'
+
+    def spinner
+      @spinner ||= TTY::Spinner.new('[:spinner]正在处理...', format: :dots)
+    end
+
+    def auto_spin
+      spinner.auto_spin
+    end
+
+    def stop
+      spinner.stop('Done!')
+    end
+
   end
 end

data/lib/lhj/tools/version.rb

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

data/lib/lhj/tree/directory_renderer.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Lhj
+  class Tree
+    # Render nodes as files paths explorer
+    class DirectoryRenderer
+      MARKERS = {
+        unicode: {
+          branch: '├──',
+          leaf: '└──',
+          pipe: '│'
+        },
+        ansi: {
+          branch: '|--',
+          leaf: '`--',
+          pipe: '|'
+        }
+      }.freeze
+
+      def initialize(nodes, options = {})
+        @nodes  = nodes
+        @indent = options.fetch(:indent, 4)
+        @pipe_mark  = MARKERS[:unicode][:pipe] + ' ' * [@indent - 1, 0].max
+        @space_mark = ' ' * @indent
+      end
+
+      def render
+        @nodes.reduce([]) do |acc, node|
+          render_node(acc, node, @pipe_mark, @space_mark)
+        end.join('')
+      end
+
+      private
+
+      def render_node(acc, node, pipe_mark, space_mark)
+        acc << node.prefix.gsub(/:pipe/, pipe_mark).gsub(/:space/, space_mark)
+        unless node.root?
+          acc << MARKERS[:unicode][node.leaf? ? :leaf : :branch]
+          acc << ' '
+        end
+        acc << node.name.to_s + "\n"
+      end
+    end
+  end
+end

data/lib/lhj/tree/hash_walker.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+require 'lhj/tree/node'
+
+module Lhj
+  class Tree
+    # Walk and collect nodes from hash data strcture.
+    #
+    # @api public
+    class HashWalker
+      attr_reader :nodes
+
+      attr_reader :files_count
+
+      attr_reader :dirs_count
+
+      def initialize(options = {})
+        @nodes       = []
+        @files_count = 0
+        @dirs_count  = 0
+        @level       = options.fetch(:level) { -1 }
+        @file_limit  = options.fetch(:file_limit) { - 1 }
+      end
+
+      def traverse(data)
+        walk(data, Pathname.new(''), '', 0, false)
+      end
+
+      def walk(data, parent_path, prefix, level, is_last)
+        node = is_last ? LeafNode : Node
+
+        case data
+        when Hash
+          return if @level != -1 && level + 1 > @level
+
+          data.each do |dir, item|
+            dir_node = node.new(dir.to_s, parent_path, prefix, level)
+            @nodes << dir_node
+            @dirs_count += 1 unless dir_node.root?
+
+            if level > 0
+              postfix = ':pipe'
+              postfix = ':space' if is_last
+            else
+              postfix = ''
+            end
+
+            walk(item, parent_path + dir.to_s,
+                 prefix + postfix, level + 1, false)
+          end
+        when Array
+          return if @file_limit != -1 && data.size > @file_limit
+
+          last_data_index = data.size - 1
+
+          data.each_with_index do |item, i|
+            last = (last_data_index == i)
+
+            walk(item, parent_path, prefix, level, last)
+          end
+        else
+          @nodes << node.new(data.to_s, parent_path, prefix, level)
+          @files_count += 1
+        end
+      end
+    end
+  end
+end

data/lib/lhj/tree/node.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require 'forwardable'
+require 'pathname'
+
+module Lhj
+  class Tree
+    # A representation of tree node
+    #
+    # @api private
+    class Node
+      extend Forwardable
+
+      # The base name for the directory or file
+      attr_reader :name
+
+      # The parent directory path
+      attr_reader :parent
+
+      # The require path prefix
+      attr_reader :prefix
+
+      # The directory depth
+      attr_reader :level
+
+      # The file stat
+      attr_reader :stat
+
+      # The current path
+      attr_reader :path
+
+      def_delegators :@path, :directory?, :executable?, :file?,
+                     :symlink?, :socket?, :pipe?
+
+      def initialize(path, parent, prefix, level)
+        if path.is_a? String
+          # strip null bytes from the string to avoid throwing errors
+          path = path.delete("\0")
+        end
+
+        @path = Pathname.new(path)
+        @name   = @path.basename
+        @parent = Pathname.new(parent)
+        @prefix = prefix
+        @level  = level
+      end
+
+      def full_path
+        return parent if name.to_s.empty?
+
+        parent.join(name)
+      end
+
+      def root?
+        parent.to_s.empty?
+      end
+
+      def hidden?
+        name.to_s.start_with?('.')
+      end
+
+      def leaf?
+        false
+      end
+
+      def to_s
+        @name
+      end
+
+      def ==(other)
+        other.is_a?(self.class) && other.state_attrs == state_attrs
+      end
+      alias eql? ==
+
+      protected
+
+      def state_attrs
+        [@name, @path, @parent, @prefix, @level]
+      end
+
+      ROOT = Node.new('', Pathname.new(''), '', 0).freeze
+    end # Node
+
+    class LeafNode < Node
+      def leaf?
+        true
+      end
+    end
+  end
+end

data/lib/lhj/tree/number_renderer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Lhj
+  class Tree
+    # Render nodes as numbered list
+    class NumberRenderer
+      def initialize(nodes, options = {})
+        @indent = options.fetch(:indent, 4)
+        @nodes = nodes
+        @mark = ' ' * @indent
+      end
+
+      def render
+        @nodes.each_with_index.reduce([]) do |acc, (node, i)|
+          render_node(acc, node, i, @mark)
+        end.join
+      end
+
+      private
+
+      def render_node(acc, node, i, mark)
+        acc << node.prefix.gsub(/:pipe|:space/, mark)
+        unless node.root?
+          acc << "#{node.level}.#{i} "
+        end
+        acc << node.name.to_s + "\n"
+      end
+    end
+  end
+end

data/lib/lhj/tree/path_walker.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+require 'lhj/tree/node'
+
+module Lhj
+  class Tree
+    # Walk and collect nodes from directory.
+    #
+    # @api public
+    class PathWalker
+      attr_reader :nodes
+
+      attr_reader :files_count
+
+      attr_reader :dirs_count
+
+      # Create a PathWalker
+      #
+      # @api public
+      def initialize(options = {})
+        @files_count = 0
+        @dirs_count  = 0
+        @nodes       = []
+        @filters     = []
+        @level       = options.fetch(:level) { -1 }
+        @file_limit  = options.fetch(:file_limit) { - 1 }
+
+        unless options[:show_hidden]
+          add_filter(-> (p) { !p.basename.to_s.start_with?('.') })
+        end
+
+        if options[:only_dirs]
+          add_filter(-> (p) { p.directory? })
+        end
+      end
+
+      def add_filter(filter)
+        @filters << filter
+      end
+
+      # Traverse given path recursively
+      #
+      # @param [String] path
+      #   the path to traverse
+      #
+      # @api public
+      def traverse(path)
+        root_path  = Pathname.new(path)
+        empty_path = Pathname.new('')
+
+        unless root_path.directory?
+          raise ArgumentError, "#{root_path} is not a directory path"
+        end
+
+        @nodes << Node.new(root_path, empty_path, '', 0)
+
+        walk(root_path, root_path.children, '', 1)
+      end
+
+      private
+
+      # Filter entries
+      #
+      # @api private
+      def filter_entries(entries, filters)
+        return entries if filters.nil? || filters.empty?
+        filter = filters[0]
+        filter_entries(entries.select(&filter), filters[1..-1])
+      end
+
+      # Walk paths recursively
+      #
+      # @api private
+      def walk(parent_path, entries, prefix, level)
+        if entries.empty? || (@level != -1 && @level < level)
+          return
+        else
+          return if @file_limit != -1 && entries.size > @file_limit
+          processed_paths = filter_entries(entries, @filters).sort
+          last_path_index = processed_paths.size - 1
+
+          processed_paths.each_with_index do |path, i|
+            sub_path = path.relative_path_from(parent_path)
+
+            node = last_path_index == i ? LeafNode : Node
+
+            if path.directory?
+              next if @level != -1 && level + 1 > @level
+
+              @nodes << node.new(sub_path, parent_path, prefix, level)
+              @dirs_count += 1
+
+              postfix = ':pipe'
+              postfix = ':space' if i == last_path_index
+
+              walk(path, path.children, prefix + postfix, level + 1)
+            elsif path.file?
+              @nodes << node.new(path, parent_path, prefix, level)
+              @files_count += 1
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lhj/tree/tree.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+require 'lhj/tree/node'
+require 'lhj/tree/directory_renderer'
+require 'lhj/tree/number_renderer'
+require 'lhj/tree/hash_walker'
+require 'lhj/tree/path_walker'
+
+module Lhj
+  class Tree
+    # @api public
+    def self.[](data)
+      new(data)
+    end
+
+    # The list of nodes in this tree.
+    attr_reader :nodes
+
+    # Create a Tree
+    #
+    # @param [String,Dir,Hash] data
+    #
+    # @api public
+    def initialize(data = nil, options = {}, &block)
+      @data   = data ? data.dup.freeze : nil
+      @walker = select_walker.new(options)
+      @nodes  = []
+
+      if @data
+        @walker.traverse(data)
+        @nodes = @walker.nodes
+      end
+
+      @nodes_stack = []
+
+      instance_eval(&block) if block_given?
+
+      freeze
+    end
+
+    # Add node to this tree.
+    #
+    # @param [Symbol,String] name
+    #   the name for the node
+    #
+    # @param [Node, LeafNode] type
+    #   the type of node to add
+    #
+    # @example
+    #   TTY::Tree.new do
+    #     node '...' do
+    #       node '...'
+    #     end
+    #   end
+    #
+    # @api public
+    def node(name, type = Node, &block)
+      parent = @nodes_stack.empty? ? Node::ROOT : @nodes_stack.last
+      level = [0, @nodes_stack.size - 1].max
+      prefix = ':pipe' * level
+      if parent.class == LeafNode
+        prefix = ':space' * level
+      end
+      node = type.new(name, parent.full_path, prefix, @nodes_stack.size)
+      @nodes << node
+
+      return unless block_given?
+
+      @nodes_stack << node
+      if block.arity.zero?
+        instance_eval(&block)
+      else
+        instance_eval(&(->(*_args) { block[node] }))
+      end
+      @nodes_stack.pop
+    end
+
+    # Add leaf node
+    #
+    # @api public
+    def leaf(name, &block)
+      node(name, LeafNode, &block)
+    end
+
+    # @api public
+    def render(options = {})
+      as = options.delete(:as) || :dir
+      renderer = select_renderer(as).new(nodes, options)
+      renderer.render
+    end
+
+    private
+
+    # @api private
+    def select_walker
+      if @data.is_a?(Hash) || @data.nil?
+        HashWalker
+      else
+        @data ||= Dir.pwd
+        PathWalker
+      end
+    end
+
+    def select_renderer(as)
+      case as
+      when :dir, :directory then DirectoryRenderer
+      when :num, :number then NumberRenderer
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhj-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - lihaijian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -118,6 +118,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: faraday-cookie_jar
   requirement: !ruby/object:Gem::Requirement
@@ -244,6 +264,12 @@ files:
 - lib/lhj/helper/trans_helper.rb
 - lib/lhj/tools.rb
 - lib/lhj/tools/version.rb
+- lib/lhj/tree/directory_renderer.rb
+- lib/lhj/tree/hash_walker.rb
+- lib/lhj/tree/node.rb
+- lib/lhj/tree/number_renderer.rb
+- lib/lhj/tree/path_walker.rb
+- lib/lhj/tree/tree.rb
 homepage:
 licenses:
 - MIT