tree_uzuki 0.4.3 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0ce45ffd919661e8515fa2b9486a0566ce304259bf80cb9815a56812723f13f
-  data.tar.gz: 31ee3a043d6d8292b8bf3151778afd92e1762693c3f7f2dbdcda42d28944c634
+  metadata.gz: 2caf22d2ab177a8257ef5a108d54337bc0cbd207d977c9c4f360e447da927050
+  data.tar.gz: ae750495d32cf63b9d2ffcaabb4492d21c71d0ead4e251be4a6d52bc9990d8fc
 SHA512:
-  metadata.gz: b6a505265946015258458883042a60ab572f66a4f1ace1c8aa677dac47ba6a97d5bfe1e55511c3263a21f9ab9fecd749e1f4b849570594f1c1c686faf3637948
-  data.tar.gz: 11b712d4f0d93f850e6745e2db2d85f29816844051fe8fb7f2d9e49154db9cd87f8216659885e58a94058e33e373ef823e9eb818edd58a311b43ca4911ad9102
+  metadata.gz: a562ff1cc7082d2a3afeff097d603e4538516e00ad7323e88c9ec5839dc2de151f9d7f9d8e1dff0014e78d8e77bff652941aa21ee4ea367f0ce9a222eaac5402
+  data.tar.gz: 5cc0ce16318b456252683a351247786cfdae78d8ec467cab13cb06a46324d1865408230aeb5f80ee75629a73729d05382bf0bcb9125de95cce5ccf6973f64f61

data/bin/tree_uzuki

@@ -1,9 +1,27 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
 
+# !/usr/bin/env ruby
 
 require 'tree'
+
 if ARGV.empty?
-  puts Tree.run()
+  tree = Tree.new
+  tree.run
+  path_array, directories, files, tree_data, root = tree.run_results
+  tree_data, root, files, directories = Scanner.new.scan(path_array,
+                                                         directories,
+                                                         files,
+                                                         tree_data,
+                                                         root)
+  TreeRender.new.render(tree_data, root, files, directories)
 else
-puts Tree.run(ARGV[0])
-end
+  tree = Tree.new(ARGV[0])
+  tree.run
+  path_array, directories, files, tree_data, root = tree.run_results
+  tree_data, root, files, directories = Scanner.new.scan(path_array,
+                                                         directories,
+                                                         files,
+                                                         tree_data,
+                                                         root)
+  TreeRender.new.render(tree_data, root, files, directories)
+end

data/lib/tree/scanner.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'pathname'
+
+# Scanner class scan all directories of root array and return all children
+class Scanner
+  def scan(path_array, directories, files, tree_data, root)
+    folders_arr = []
+    path_array.each do |i|
+      if i.file?
+        files += 1
+        next
+      else
+        directories += 1
+        begin
+          i.each_child do |dir|
+            folders_arr << dir
+            tree_data << dir
+            i = dir
+          end
+        rescue Errno::EACCES, Errno::ENOENT, Errno::ENOTDIR
+          next
+        end
+      end
+    end
+    if folders_arr.empty?
+      return [tree_data, root, files, directories]
+    else
+      scan(folders_arr, directories, files, tree_data, root)
+    end
+  end
+end

data/lib/tree/tree_render.rb

@@ -1,42 +1,55 @@
+# frozen_string_literal: true
+
 require 'pathname'
 
-class Tree_render
-  def rendering(tree_data,root)
-    final_hash = {}
-    branch = "├── "
-    pipe = "│   "
-    turn = "└── "
-    space = "    "
+# TreeRender class build directory tree and print it in console
+class TreeRender
+  attr_reader :final_hash
+
+  def render(tree_data, root, files, directories)
+    @final_hash = {}
+    branch = '├── '
+    pipe = '│   '
+    turn = '└── '
+    space = '    '
     tree_data.sort!
     i = tree_data.length
-    loop do i-=1 
+    loop do
+      i -= 1
       break if i == -1
+
       leaf_level = tree_data[i].to_s.count('/') - root.to_s.count('/')
-      final_hash[i] = Array.new
+      @final_hash[i] = []
       if leaf_level == 1
-        final_hash[i] << branch
-        final_hash[i] << File.basename(tree_data[i])
+        @final_hash[i] << branch
+        @final_hash[i] << File.basename(tree_data[i])
       else
-        final_hash[i] << space
-        (leaf_level-2).times {final_hash[i] << space} 
-        final_hash[i] << branch 
-        final_hash[i] << File.basename(tree_data[i])
+        @final_hash[i] << space
+        (leaf_level - 2).times { @final_hash[i] << space }
+        @final_hash[i] << branch
+        @final_hash[i] << File.basename(tree_data[i])
       end
-      for index in (0..final_hash[i].size)
-        next if final_hash[i+1] == nil
-        if final_hash[i][index] == space && (final_hash[i+1][index] == branch || 
-                                          final_hash[i+1][index] == pipe ||
-                                          final_hash[i+1][index] == turn)
-          final_hash[i][index] = pipe 
-        elsif final_hash[i][index] == branch && (final_hash[i+1][index] != branch && 
-                                               final_hash[i+1][index] != pipe &&  
-                                               final_hash[i+1][index] != turn)
-          final_hash[i][index] = turn
+      (0..@final_hash[i].size).each do |index|
+        if @final_hash[i + 1].nil? && @final_hash[i][index] == branch
+          @final_hash[i][index] = turn
+        elsif @final_hash[i + 1].nil?
+          next
+        elsif @final_hash[i][index] == space &&
+              (@final_hash[i + 1][index] == branch ||
+               @final_hash[i + 1][index] == pipe ||
+               @final_hash[i + 1][index] == turn)
+          @final_hash[i][index] = pipe
+        elsif @final_hash[i][index] == branch &&
+              (@final_hash[i + 1][index] != branch &&
+               @final_hash[i + 1][index] != pipe &&
+               @final_hash[i + 1][index] != turn)
+          @final_hash[i][index] = turn
         end
       end
     end
     puts root
-    final_hash = final_hash.each.sort_by{ |k,v| k }
-    final_hash.each { |k,v| puts v.join } 
+    @final_hash = @final_hash.each.sort_by { |k, _| k }
+    @final_hash.each { |_, v| puts v.join }
+    puts "#{files} files, #{directories} directories"
   end
-end
+end

data/lib/tree.rb

@@ -1,22 +1,34 @@
+# frozen_string_literal: true
+
 require 'pathname'
-require 'tree/walker'
-require 'tree/tree_render'
+require_relative 'tree/scanner'
+require_relative 'tree/tree_render'
 
+# Tree class create array of all root directories
 class Tree
-  def self.run(root = Dir.pwd)
-    tree_data = []
-    directories = 0
-    files = 0
-    path_array = []
-    root = Pathname.new(root)
-    root.each_child do |dir| 
-      path_array << dir
-      tree_data << dir
+  attr_reader :root,
+              :directories,
+              :files,
+              :tree_data,
+              :path_array
+
+  def initialize(path = Dir.pwd)
+    @root = path
+    @directories = 0
+    @files = 0
+    @tree_data = []
+    @path_array = []
+  end
+
+  def run
+    @root = Pathname.new(@root)
+    @root.each_child do |dir|
+      @path_array << dir
+      @tree_data << dir
     end
-    tree_data = Walker.new.dir_walk(path_array, directories, files, tree_data)
-    files = tree_data.last
-    tree_data.pop
-    Tree_render.new.rendering(tree_data, root)
-    puts files    
   end
-end
+
+  def run_results
+    [@path_array, @directories, @files, @tree_data, @root]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_uzuki
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.7.2
 platform: ruby
 authors:
 - Sunset Uzuki
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - bin/tree_uzuki
 - lib/tree.rb
+- lib/tree/scanner.rb
 - lib/tree/tree_render.rb
-- lib/tree/walker.rb
 homepage: https://rubygems.org/gems/Tree_uzuki
 licenses:
 - MIT

data/lib/tree/walker.rb

@@ -1,30 +0,0 @@
-require 'pathname'
-
-class Walker
-  def dir_walk (path_array, directories, files, tree_data)
-    folders_arr = []
-    path_array.each do |i|
-      if i.file?
-        files += 1
-        next   
-      else
-        directories += 1  
-        begin  
-          i.each_child do |dir|
-            folders_arr << dir
-            tree_data << dir
-            i = dir 
-          end
-          rescue Errno::EACCES, Errno::ENOENT,Errno::ENOTDIR
-            next
-        end
-      end  
-    end
-    if folders_arr.empty?
-      tree_data << "#{directories} directories, #{files} files"
-      return tree_data
-    else
-      dir_walk(folders_arr, directories, files, tree_data)
-    end
-  end
-end