tree_uzuki 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f34dc7c852bdd77dbae1793a240ba435eda065fef72bc03e806ef156700c94
-  data.tar.gz: a19fdd49773ea201e5bcf6d86d0990e685351a0881edbd1aa97472328ccfdac6
+  metadata.gz: e479ff9ef2011dbdbd9e32af736ff736d56659e6f8dc4904be6aa90bd1462954
+  data.tar.gz: 3a11a45e98d716e693b0206ad26a9cd160c55bf50739686683d8f25804c66277
 SHA512:
-  metadata.gz: 540eba3c0a706d2e9d6741cb9c3a31c0680920330962d0e0c6c7d9ac691dde7d9369c1f05a3321b538918ea55fa6a69ffe9aa89309ff1c2275a3f36df50db3e6
-  data.tar.gz: 4a8c10267da3170738c6d14dc39244f8ea0250c1dc3e2528dca529fed14119f3425b6dd9fd3df0e1402f5cf206a6c2a96507d9b58fd70fe77247defdaa2c211c
+  metadata.gz: eb1d4de9ad758955c5f44852054c93f36b119fc8ccc69529d53933dc903b23a67261cd9107942b4f4cd08b2feb1c694640e77f5127a5773317586dd4fdb6f7ae
+  data.tar.gz: f5d9f38dbe226f551173799c7c6350db9d0b46c6f7d2974549b28f12aebcc1cb0e518a49187513394469d8224a01cb46de5d81bc94d47aa4f97b2d70a180625d

data/bin/tree_uzuki

@@ -3,7 +3,7 @@
 
 require 'tree'
 if ARGV.empty?
-  puts Tree.runner()
+  puts Tree.run()
 else
-puts Tree.runner(ARGV[0])
+puts Tree.run(ARGV[0])
 end

data/lib/tree/tree_render.rb

@@ -1,39 +1,35 @@
 require 'pathname'
 
-
 class Tree_render
-  def render(tree_data,root)
+  def rendering(tree_data,root)
     final_hash = {}
     branch = "├── "
     pipe = "│   "
     turn = "└── "
     space = "    "
-
     tree_data.sort!
-    i = tree_data.length
-    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
+    tree_data.reverse_each do |i|
+      leaf_level = i.to_s.count('/') - root.to_s.count('/')
+      final_hash[tree_data.index(i)] = Array.new
       if leaf_level == 1
-        final_hash[i] << branch
-        final_hash[i] << File.basename(tree_data[i])
+        final_hash[tree_data.index(i)] << branch
+        final_hash[tree_data.index(i)] << File.basename(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[tree_data.index(i)] << space
+        (leaf_level-2).times {final_hash[tree_data.index(i)] << space} 
+        final_hash[tree_data.index(i)] << branch 
+        final_hash[tree_data.index(i)] << File.basename(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
+      final_hash.each_with_index do |obj ,index|
+        next if final_hash[tree_data.index(i)+1] == nil
+        if final_hash[tree_data.index(i)][index] == space && (final_hash[tree_data.index(i)+1][index] == branch || 
+                                                              final_hash[tree_data.index(i)+1][index] == pipe ||
+                                                              final_hash[tree_data.index(i)+1][index] == turn)
+          final_hash[tree_data.index(i)][index] = pipe 
+        elsif final_hash[tree_data.index(i)][index] == branch && (final_hash[tree_data.index(i)+1][index] != branch && 
+                                                                  final_hash[tree_data.index(i)+1][index] != pipe &&  
+                                                                  final_hash[tree_data.index(i)+1][index] != turn)
+          final_hash[tree_data.index(i)][index] = turn
         end
       end
     end

data/lib/tree/walker.rb

@@ -1,29 +1,26 @@
 require 'pathname'
 
-
 class Walker
-  def dir_walker (path_array, directories, files, level, tree_data)
-    level += 1
+  def dir_walk (path_array, directories, files, tree_data)
     folders_arr = []
-    for i in (0..path_array.length-1) 
-      if path_array[i].file?
+    path_array.each do |i|
+      if i.file?
         files += 1
         next   
       else
-        directories += 1     
-        path_array[i].each_child do |dir|
+        directories += 1  
+        i.each_child do |dir|
           folders_arr << dir
           tree_data << dir
-          path_array[i] = dir  
-        end        
-      end
+          i = dir 
+        end
+      end  
     end
     if folders_arr.empty?
       tree_data << "#{directories} directories, #{files} files"
       return tree_data
-        
     else
-      dir_walker(folders_arr, directories, files, level, tree_data)
+      dir_walk(folders_arr, directories, files, tree_data)
     end
   end
 end

data/lib/tree.rb

@@ -3,8 +3,7 @@ require 'tree/walker'
 require 'tree/tree_render'
 
 class Tree
-  def self.runner(root = Dir.pwd)
-    level = 0
+  def self.run(root = Dir.pwd)
     tree_data = []
     directories = 0
     files = 0
@@ -14,10 +13,10 @@ class Tree
       path_array << dir
       tree_data << dir
     end
-    tree_data = Walker.new.dir_walker(path_array, directories, files, level, tree_data)
+    tree_data = Walker.new.dir_walk(path_array, directories, files, tree_data)
     files = tree_data.last
     tree_data.pop
-    Tree_render.new.render(tree_data, root)
+    Tree_render.new.rendering(tree_data, root)
     puts files    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tree_uzuki
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sunset Uzuki