command_tree 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 176b3e5d77f912e73b5c72557c96fbb1582eed07f3c533ee6837770fbc6de53f
-  data.tar.gz: eab685983241b03ef1f6e49b034a98ec9aa70c57c62c8d5235002d448bc9f254
+  metadata.gz: 05ab09a1469a4d3a4ffc2df192457f327cca0a2e3e984bcd554dae62b9e81019
+  data.tar.gz: 760f177dcc67462b17931ff4617142165d35539a82a15f5aeecc772824adb073
 SHA512:
-  metadata.gz: 637cfb3d7ee3570fb0f39ef9f447f4880729bb3053c9816c3e4514c4e6df8000f14179688ff4a44f3a6c72c5ca9ea23b722fbaecec9a097e2f9bf769e0b50d8c
-  data.tar.gz: cf69dbace893ff6d3537e26cc681df533260d6473aca76817a1ddbd8d3b444bbf1cbfb370db4863d6ea9e38b94a7d13d3622717157b7c938f1499d1701ee9684
+  metadata.gz: 5d6b22a9224d94d7756ac716c3b24e1ca6954ea3d7d2db003658429858d0c5f20034803754c609abd14013bd85924fb5c5ba09609961c40a32a1027aa1842675
+  data.tar.gz: '058775d799989ee2d609791937770105569891f979811e2b678f87fd70cdbdfea6f55394e699ebdd911baa9126337cf387739bb54a0995315ec545a4d237698c'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    command_tree (0.1.2)
+    command_tree (0.1.3)
       colorize (~> 0.8)
 
 GEM

data/lib/command_tree/command.rb

@@ -0,0 +1,33 @@
+module CommandTree
+  # A command class
+  class Command
+    attr_reader :name, :desc, :prefix, :block
+
+    def initialize(prefix, name, options = {}, &block)
+      @prefix = prefix
+      @name = name
+      @desc = options[:desc]
+      @block = block
+    end
+
+    def execute
+      print_banner
+      block.call
+    end
+
+    private
+
+    def print_banner
+      puts pretty_name if name
+      puts pretty_description if desc
+    end
+
+    def pretty_name
+      name.light_magenta.bold if name
+    end
+
+    def pretty_description
+      desc.to_s.light_black if desc
+    end
+  end
+end

data/lib/command_tree/group.rb

@@ -0,0 +1,31 @@
+module CommandTree
+  # A group of commands
+  class Group
+    attr_reader :name, :desc, :prefix
+
+    def initialize(prefix, name, options = {})
+      @prefix = prefix
+      @name = name
+      @desc = options[:desc]
+    end
+
+    def execute
+      print_banner
+    end
+
+    private
+
+    def print_banner
+      puts pretty_name if name
+      puts pretty_description if desc
+    end
+
+    def pretty_name
+      name.light_magenta.bold if name
+    end
+
+    def pretty_description
+      desc.to_s.light_black if desc
+    end
+  end
+end

data/lib/command_tree/text_menu.rb

@@ -0,0 +1,53 @@
+require 'colorize'
+require 'colorized_string'
+
+module CommandTree
+  # responsible for showing the menu in terminal
+  class TextMenu
+    def initialize(item_width)
+      @item_width = item_width
+      @items = []
+    end
+
+    def render
+      _, screen_width = IO.console.winsize
+      items_per_row = screen_width / item_width
+
+      names = items.dup.map! { |item| item_name(item) }
+      descs = items.dup.map! { |item| item_desc(item) }
+
+      until names.empty?
+        puts names.shift(items_per_row).join
+        puts descs.shift(items_per_row).join
+      end
+    end
+
+    def add(item)
+      items << item
+    end
+
+    private
+
+    attr_reader :items, :item_width
+
+    def  item_name(item)
+      prefix = item.prefix
+      arrow = ' → '
+
+      name_width = item_width - prefix.length - arrow.length
+      name =  (item.is_a?(Group) ? '+' : '') + item.name
+      name = name.ljust(name_width)
+
+      colored_name = item.is_a?(Group) ? name.light_magenta.bold : name.cyan
+
+      (prefix.green + arrow.light_black + colored_name)
+    end
+
+    def item_desc(item)
+      desc = item.desc.to_s
+
+      return (desc[0...item_width - 3] + '...').light_black if desc.length >= item_width
+      return desc.ljust(item_width).light_black
+    end
+  end
+end

data/lib/command_tree/tree.rb

@@ -1,12 +1,14 @@
 require 'io/console'
-require 'colorize'
-require 'colorized_string'
+
+require_relative 'group'
+require_relative 'command'
+require_relative 'text_menu'
 
 module CommandTree
   # A tree of commands and associated keys for every node
   class Tree
     def initialize
-      @calls = { '' => {} }
+      @calls = { '' => nil }
     end
 
     # register a `path` to a `name` with a block of code if
@@ -14,10 +16,14 @@ module CommandTree
     # supported:
     # desc: a description of the item, as a help text for the user
     def register(path, name, options = {}, &block)
+      path = path.to_s
+      name = name.to_s
+      prefix = path[-1]
+
       insure_path(path, name, options)
       return unless block_given?
 
-      calls[path] = { name: name, options: options, block: block }
+      calls[path] = Command.new(prefix, name, options, &block)
     end
 
     # define a group of commands (subtree)
@@ -41,7 +47,7 @@ module CommandTree
     def merge(subtree, prefix, name, options = {})
       register(prefix, name, options)
       subtree.calls.each do |key, command|
-        next if key.empty?
+        next unless command
 
         calls["#{prefix}#{key}"] = command
       end
@@ -57,25 +63,16 @@ module CommandTree
       return if path.empty?
 
       insure_path(path[0...-1], name, options)
-      calls[path] = { name: name, options: options } unless calls[path]
+      calls[path] = Group.new(path[-1], name, options) unless calls[path]
     end
 
     def execute_path(path)
       return puts "#{path} couldn't be found..." unless calls.key?(path)
 
       node = calls[path]
-      children = calls.keys.select do |key|
-        key.start_with?(path) && key.length == (path.length + 1)
-      end
-      children.sort!
-
-      puts "#{node[:name]}:".light_magenta.bold if node.key?(:name)
-
-      description = node.dig(:options, :desc)
-      puts description.to_s.light_black if description
-
-      node[:block].call if node.key?(:block)
+      node.execute if node
 
+      children = get_children(path)
       return if children.empty?
 
       print_children(children)
@@ -83,34 +80,21 @@ module CommandTree
       execute_path(path + choice)
     end
 
+    def get_children(path)
+      calls.keys.select do |key|
+        key.start_with?(path) && key.length == (path.length + 1)
+      end.sort
+    end
+
     def print_children(children)
-      table_content = []
+      menu = TextMenu.new(40)
 
       children.each do |child|
-        child_node = calls[child]
-
-        output = child[-1].green
-        output << ' → '.light_black
-
-        output << if child_node.key?(:block)
-                    " #{child_node[:name].ljust(40)}".cyan
-                  else
-                    "+#{child_node[:name].ljust(40)}".light_magenta.bold
-                  end
-
-        table_content << output
+        menu.add calls[child]
       end
 
-      table(table_content, 40)
+      menu.render
       print "\n"
     end
-
-    def table(items, item_width)
-      _, screen_width = IO.console.winsize
-      items_per_row = screen_width / item_width
-      items_dup = items.dup
-
-      puts items_dup.shift(items_per_row).join until items_dup.empty?
-    end
   end
 end

data/lib/command_tree/version.rb

@@ -1,3 +1,3 @@
 module CommandTree
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: command_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Emad Elsaid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -86,6 +86,9 @@ files:
 - bin/setup
 - command_tree.gemspec
 - lib/command_tree.rb
+- lib/command_tree/command.rb
+- lib/command_tree/group.rb
+- lib/command_tree/text_menu.rb
 - lib/command_tree/tree.rb
 - lib/command_tree/version.rb
 homepage: https://www.github.com/emad-elsaid/command_tree