lizarb 1.0.5 → 1.0.6

data/lib/dev_system/subsystems/generator/generators/simple_generator.rb.unit.rb.erb

@@ -0,0 +1,7 @@
+# view unit.rb.erb
+class <%= @class_names[0] %> < <%= @class_names[1] %>
+<% @current_unit.sections.each do |section| %>
+<%= "  section #{section[:name].inspect}" %>
+<%= section[:content] -%>
+<% end %>
+end

data/lib/dev_system/{sub → subsystems}/generator/generators/simple_generator_test.rb

@@ -1,19 +1,20 @@
-class DevSystem::SimpleGeneratorTest < DevSystem::GeneratorTest
+class DevSystem::SimpleGeneratorTest < DevSystem::BaseGeneratorTest
 
   test :subject_class do
     assert subject_class == DevSystem::SimpleGenerator
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
+  test_erbs_defined(
+    "subject.rb.erb",
+    "unit.rb.erb"
+  )
 
   # helper methods
 
-  def call_with(name, coil, placement, superklass, path)
+  def call_with(name, action, placement, superklass, path)
     env = {}
     env[:name] = name.to_s
-    env[:generator_coil] = coil.to_s
+    env[:generator_action] = action.to_s
     env[:placement] = placement
     env[:superclass] = superklass
     env[:path] = path

data/lib/dev_system/subsystems/generator/generators/uninstall_generator.rb

@@ -0,0 +1,9 @@
+class DevSystem::UninstallGenerator < DevSystem::SimpleGenerator
+  
+  # liza g uninstall
+  
+  def call_default
+    log stick :red, "Not implemented yet"
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/uninstall_generator_test.rb

@@ -0,0 +1,8 @@
+class DevSystem::UninstallGeneratorTest < DevSystem::SimpleGeneratorTest
+  
+  test :subject_class, :subject do
+    assert_equality DevSystem::UninstallGenerator, subject_class
+    assert_equality DevSystem::UninstallGenerator, subject.class
+  end
+  
+end

data/lib/dev_system/subsystems/log/commands/log_command.rb

@@ -0,0 +1,52 @@
+class DevSystem::LogCommand < DevSystem::SimpleCommand
+  
+  # liza log
+
+  def call_default
+    print_log_handlers
+    print_log_levels
+  end
+
+  def print_log_handlers
+    puts stick " LOG HANDLERS ".center(80, "-"), :b, system.color
+    puts
+    DevBox[:log].handlers.each do |key, log_class|
+      log "handler :#{key.to_s.ljust_blanks 25} => #{log_class}"
+    end
+    puts
+  end
+
+  def print_log_levels
+    puts stick " LOG LEVELS ".center(80, "-"), :b, system.color
+    puts
+    log :highest, ":highest #{ log_levels[ :highest ] } >= #{ log_level }"
+    log :higher,  ":higher  #{ log_levels[ :higher  ] } >= #{ log_level }"
+    log :high,    ":high    #{ log_levels[ :high    ] } >= #{ log_level }"
+    log :normal,  ":normal  #{ log_levels[ :normal  ] } >= #{ log_level }"
+    log :low,     ":low     #{ log_levels[ :low     ] } >= #{ log_level }"
+    log :lower,   ":lower   #{ log_levels[ :lower   ] } >= #{ log_level }"
+    log :lowest,  ":lowest  #{ log_levels[ :lowest  ] } >= #{ log_level }"
+    puts
+    puts "-".center(80, "-")
+    puts
+    puts ":highest " if log_level? :highest
+    puts ":higher  " if log_level? :higher
+    puts ":high    " if log_level? :high
+    puts ":normal  " if log_level? :normal
+    puts ":low     " if log_level? :low
+    puts ":lower   " if log_level? :lower
+    puts ":lowest  " if log_level? :lowest
+    puts
+    puts "-".center(80, "-")
+    puts
+    puts ":highest " if log? :highest
+    puts ":higher  " if log? :higher
+    puts ":high    " if log? :high
+    puts ":normal  " if log? :normal
+    puts ":low     " if log? :low
+    puts ":lower   " if log? :lower
+    puts ":lowest  " if log? :lowest
+    puts
+  end
+
+end

data/lib/dev_system/{sub → subsystems}/log/commands/log_command_test.rb

@@ -4,8 +4,4 @@ class DevSystem::LogCommandTest < DevSystem::CommandTest
     assert_equality subject_class, DevSystem::LogCommand
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/dev_system/subsystems/log/generators/log_generator.rb

@@ -0,0 +1,52 @@
+class DevSystem::LogGenerator < DevSystem::ControllerGenerator
+  
+  section :actions
+  
+  # liza g log name place=app
+
+  def call_default
+    set_default_super ""
+
+    create_controller do |unit, test|
+      unit.section name: :controller_section_1, skip_section: true
+      test.section name: :controller_test_section_1, skip_section: true
+    end
+  end
+  
+  # liza g log:handler name place=app
+
+  def call_handler
+    set_default_super "handler"
+    append_handler_to_log_panel
+
+    create_controller do |unit, test|
+      unit.section name: :handler_section_1, skip_section: true
+      test.section name: :handler_test_section_1, skip_section: true
+    end
+  end
+
+  def append_handler_to_log_panel
+    path = App.directory.join "dev_box.rb"
+
+    contents = read_file path
+    old_lines = contents.split("\n")
+
+    lines = LineShell.extract_wall_of old_lines, "    handler :"
+    lines << "    handler :#{controller_name}"
+    lines = LineShell.replace_wall_of old_lines, "    handler :", lines
+
+    contents = lines.join("\n")
+    update_file path, contents
+  end
+
+  # liza g log:examples
+
+  def call_examples
+    # This bypasses the name check
+    @controller_name = "logger"
+    append_handler_to_log_panel
+    #
+    copy_examples Log
+  end
+
+end

data/lib/dev_system/subsystems/log/generators/log_generator.rb.controller_section_1.rb.erb

@@ -0,0 +1,7 @@
+# view controller_section_1.rb.erb
+
+  def self.call(env)
+    super
+    env[:object_parsed] = env[:object].to_s
+    true
+  end

data/lib/dev_system/subsystems/log/generators/log_generator.rb.controller_test_section_1.rb.erb

@@ -0,0 +1,6 @@
+# view controller_test_section_1.rb.erb
+
+  test :subject_class, :subject do
+    assert_equality <%= @class_name %>, subject_class
+    assert_equality <%= @class_name %>, subject.class
+  end

data/lib/dev_system/subsystems/log/generators/log_generator.rb.handler_section_1.rb.erb

@@ -0,0 +1,8 @@
+
+# view handler_section_1.rb.erb
+
+  def self.call(env)
+    super
+    Kernel.puts env[:object_parsed]
+    true
+  end

data/lib/dev_system/subsystems/log/generators/log_generator.rb.handler_test_section_1.rb.erb

@@ -0,0 +1,6 @@
+# view handler_test_section_1.rb.erb
+
+  test :subject_class, :subject do
+    assert_equality <%= @class_name %>, subject_class
+    assert_equality <%= @class_name %>, subject.class
+  end

data/lib/dev_system/subsystems/log/generators/log_generator_test.rb

@@ -0,0 +1,17 @@
+class DevSystem::LogGeneratorTest < DevSystem::SimpleGeneratorTest
+
+  #
+  
+  test :subject do
+    assert_equality subject_class, DevSystem::LogGenerator
+    assert_equality subject.class, DevSystem::LogGenerator
+  end
+  
+  test_erbs_defined(
+    "controller_section_1.rb.erb",
+    "controller_test_section_1.rb.erb",
+    "handler_section_1.rb.erb",
+    "handler_test_section_1.rb.erb"
+  )
+  
+end

data/lib/dev_system/{sub/log/logs/output_log.rb → subsystems/log/handler_logs/color_output_handler_log.rb}

@@ -1,29 +1,11 @@
-class DevSystem::OutputLog < DevSystem::Log
-
-  SIDEBAR_LENGTH = 60
-  
-  def self.call(env)
-    env[:sidebar] ||= sidebar_for env
-
-    string = env[:object]
-    string = string.join("") if string.is_a? Array
-
-    unless $coding
-      pid = Process.pid
-      tid = Lizarb.thread_id.to_s.rjust_zeroes 3
-      env[:sidebar] = "#{pid} #{tid} #{env[:sidebar]}"
-    end
-
-    string = "#{env[:sidebar]} #{string}"
-    Kernel.puts string
-  end
+class DevSystem::ColorOutputHandlerLog < DevSystem::OutputHandlerLog
   
   def self.sidebar_for env
     sidebar = ""
 
     source = env[:unit_class]
-    system_color = source.system.color
-    source_color = source.division.system.color
+    system_color = source.system.color || :white
+    source_color = source.color || :white
     size = 0
 
     # TODO: Figure out why RequestPanel is returning false when started from rack command but not from request command
@@ -33,19 +15,17 @@ class DevSystem::OutputLog < DevSystem::Log
     source_is_a_panel = source.to_s.end_with? "Panel"
 
     if source_is_a_panel
-      key = env[:unit].key
-      source = source.box
-
-      namespace, _sep, classname = source.name.rpartition('::')
+      namespace, _sep, classname = env[:unit_class].controller.name.rpartition('::')
       unless namespace.empty?
         sidebar << stick(namespace, system_color, :b).to_s
         sidebar << "::"
         size += namespace.size + 2
       end
-      sidebar << stick(classname, source_color).to_s
-      sidebar << "[:#{key}]."
+      sidebar << stick(classname, source_color, :b).to_s
+      size += classname.size
 
-      size += classname.size + key.size + 4
+      sidebar << ".panel."
+      size += 7
     else
       method_sep = env[:instance] ? "#" : ":"
 
@@ -55,7 +35,7 @@ class DevSystem::OutputLog < DevSystem::Log
         sidebar << "::"
         size += namespace.size + 2
       end
-      sidebar << stick(classname, source_color).to_s
+      sidebar << stick(classname, source_color, :b).to_s
 
       sidebar << method_sep
       size += classname.size + 1
@@ -64,11 +44,14 @@ class DevSystem::OutputLog < DevSystem::Log
     sidebar << env[:method_name]
     size += env[:method_name].size
 
-    size = SIDEBAR_LENGTH - size - 1
+    size = DevBox[:log].sidebar_size - size - 1
     size = 0 if size < 0
     sidebar << " " * size
 
     sidebar
+  rescue => e
+    puts e
+    binding.irb
   end
 
-end
+end

data/lib/dev_system/subsystems/log/handler_logs/color_output_handler_log_test.rb

@@ -0,0 +1,41 @@
+class DevSystem::ColorOutputHandlerLogTest < DevSystem::OutputHandlerLogTest
+  
+  # 
+
+  test :subject_class, :subject do
+    assert_equality DevSystem::ColorOutputHandlerLog, subject_class
+    assert_equality DevSystem::ColorOutputHandlerLog, subject.class
+  end
+  
+  test :sidebar_for do
+    assert_equality "\e[1m\e[38;2;0;204;0mDevSystem\e[0m::\e[1m\e[38;2;0;204;0mCommand\e[0m:call                                    ",
+      sidebar_for(
+        DevSystem::Command,
+        DevSystem::Command,
+        "call"
+      )
+    assert_equality "\e[1m\e[38;2;0;204;0mDevSystem\e[0m::\e[1m\e[38;2;0;204;0mTestCommand\e[0m:call                                ",
+      sidebar_for(
+        DevSystem::TestCommand,
+        DevSystem::TestCommand,
+        "call"
+      )
+    assert_equality "\e[1m\e[38;2;0;204;0mDevSystem\e[0m::\e[1m\e[38;2;0;204;0mCommand\e[0m.panel.call                              ",
+      sidebar_for(
+        DevSystem::CommandPanel,
+        DevSystem::CommandPanel.new(:command),
+        "call"
+      )
+  end
+
+  def sidebar_for unit_class, unit, method_name
+    env = {
+      unit_class: unit_class,
+      unit: unit,
+      method_name: method_name
+    }
+    #
+    subject_class.sidebar_for env
+  end
+
+end

data/lib/dev_system/subsystems/log/handler_logs/handler_log.rb

@@ -0,0 +1,5 @@
+class DevSystem::HandlerLog < DevSystem::Log
+
+  division!
+  
+end

data/lib/dev_system/subsystems/log/handler_logs/handler_log_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::HandlerLogTest < DevSystem::LogTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::HandlerLog
+  end
+
+  test_methods_defined do
+    on_self
+    on_instance
+  end
+
+end

data/lib/dev_system/subsystems/log/handler_logs/none_handler_log.rb

@@ -0,0 +1,8 @@
+class DevSystem::NoneHandlerLog < DevSystem::HandlerLog
+
+  def self.call(env)
+    super
+    # intentionally left blank
+  end
+  
+end

data/lib/dev_system/subsystems/log/handler_logs/none_handler_log_test.rb

@@ -0,0 +1,10 @@
+class DevSystem::NoneHandlerLogTest < DevSystem::HandlerLogTest
+  
+  # 
+
+  test :subject_class, :subject do
+    assert_equality DevSystem::NoneHandlerLog, subject_class
+    assert_equality DevSystem::NoneHandlerLog, subject.class
+  end
+  
+end

data/lib/dev_system/subsystems/log/handler_logs/output_handler_log.rb

@@ -0,0 +1,57 @@
+class DevSystem::OutputHandlerLog < DevSystem::HandlerLog
+
+  def self.call(env)
+    super
+    sidebar = env[:sidebar] || (sidebar_for env)
+
+    unless $coding
+      pid = Process.pid
+      tid = Lizarb.thread_id.to_s.rjust_zeroes 3
+      sidebar = "#{pid} #{tid} #{sidebar}"
+    end
+
+    object_parsed = env[:object_parsed]
+    if object_parsed.is_a? String
+      Kernel.puts "#{sidebar} #{object_parsed}"
+    else
+      object_parsed.each do |s|
+        Kernel.puts "#{sidebar} #{s}"
+      end
+    end
+
+    true
+  end
+  
+  def self.sidebar_for env
+    sidebar = ""
+
+    source = env[:unit_class]
+
+    # TODO: Figure out why RequestPanel is returning false when started from rack command but not from request command
+    # source_is_a_panel = source < Panel
+    # source_is_a_panel = source.ancestors.include? Panel
+    # source_is_a_panel = env[:unit].is_a? Panel
+    source_is_a_panel = source.to_s.end_with? "Panel"
+
+    if source_is_a_panel
+      namespace, _sep, classname = env[:unit_class].controller.name.rpartition('::')
+      sidebar << "#{namespace}::" unless namespace.empty?
+      sidebar << "#{classname}.panel."
+    else
+      method_sep = env[:instance] ? "#" : ":"
+
+      namespace, _sep, classname = env[:unit_class].name.rpartition('::')
+      sidebar << "#{namespace}::" unless namespace.empty?
+      sidebar << "#{classname}#{method_sep}"
+    end
+
+    sidebar << env[:method_name]
+
+    size = DevBox[:log].sidebar_size - sidebar.size - 1
+    size = 0 if size < 0
+    sidebar << " " * size
+
+    sidebar
+  end
+
+end

data/lib/dev_system/{sub/log/logs/output_log_test.rb → subsystems/log/handler_logs/output_handler_log_test.rb}

@@ -1,32 +1,28 @@
-class DevSystem::OutputLogTest < DevSystem::LogTest
+class DevSystem::OutputHandlerLogTest < DevSystem::HandlerLogTest
 
   test :subject_class do
-    assert subject_class == DevSystem::OutputLog
+    assert subject_class == DevSystem::OutputHandlerLog
   end
 
   test_methods_defined do
     on_self :call, :sidebar_for
     on_instance
   end
-
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
   
   test :sidebar_for do
-    assert_equality "\e[1m\e[38;2;0;255;0mDevSystem\e[0m::\e[38;2;0;255;0mCommand\e[0m:call                                    ",
+    assert_equality "DevSystem::Command:call                                    ",
       sidebar_for(
         DevSystem::Command,
         DevSystem::Command,
         "call"
       )
-    assert_equality "\e[1m\e[38;2;0;255;0mDevSystem\e[0m::\e[38;2;0;255;0mTestCommand\e[0m:call                                ",
+    assert_equality "DevSystem::TestCommand:call                                ",
       sidebar_for(
         DevSystem::TestCommand,
         DevSystem::TestCommand,
         "call"
       )
-    assert_equality "\e[1m\e[38;2;0;255;0mDevSystem\e[0m::\e[38;2;0;255;0mDevBox\e[0m[:command].call                           ",
+    assert_equality "DevSystem::Command.panel.call                              ",
       sidebar_for(
         DevSystem::CommandPanel,
         DevSystem::CommandPanel.new(:command),

data/lib/dev_system/subsystems/log/log_panel.rb

@@ -0,0 +1,108 @@
+class DevSystem::LogPanel < Liza::Panel
+
+  def call env
+    env[:instance] ||= env[:unit_class] != env[:unit]
+    env[:method_name] ||= method_name_for env
+    env[:method_name] = env[:method_name].to_s
+
+    # NOTE: this is an intentional redundancy with Unit#log_level?
+    # The unit determines the lowest log level it wants to log
+    # Therefore, a message of higher log level will not be logged
+    return unless env[:message_log_level] <= env[:unit_log_level]
+
+    return if handlers.empty?
+
+    find env
+    parse env
+
+    handlers.values.each do |handler|
+      handler.call env
+    rescue Exception => e
+      log stick :light_yellow, "#{e.class} #{e.message.inspect} on #{e.backtrace[0]}"
+    end
+  end
+
+  def find env
+    env[:object_log] = Liza.const "#{env[:object_class].last_namespace}_log"
+  rescue Liza::ConstNotFound
+    env[:object_log] = StickLogLog
+  end
+
+  def parse env
+    env[:object_log].call env
+  end
+
+  def handler *keys
+    handler_keys.concat keys
+  end
+
+  def handler_keys
+    @handler_keys ||= []
+  end
+
+  def handlers
+    @handlers ||= handler_keys.map do |k|
+      [k, Liza.const("#{k}_handler_log")]
+    end.to_h
+  end
+
+  def sidebar_size sidebar_size = nil
+    if sidebar_size
+      @sidebar_size = sidebar_size
+    else
+      @sidebar_size
+    end
+  end
+
+  # NOTE: improve logs performance and readability
+
+  def method_name_for env
+    env[:caller].each do |s|
+      t = s.match(/`(.*)'/)[1]
+
+      next if t.include? " in <class:"
+      return t.split(" ").last if t.include? " in "
+
+      next if t == "log"
+      next if t == "each"
+      next if t == "map"
+      next if t == "with_index"
+      next if t == "instance_exec"
+      next if t.start_with? "_"
+      return t
+    end
+
+    raise "there's something wrong with kaller"
+  end
+
+  def method_name_for env
+    env[:caller].each do |s|
+      m = s.match(/'(.*)'/)
+      t = m[1]
+
+        # next if t.include? " in <class:"
+        # return t.split(" ").last if t.include? " in "
+      t = t.split(".").last.split("#").last
+
+      next if t == "log"
+      next if t == "each"
+      next if t == "map"
+      next if t == "with_index"
+      next if t == "instance_exec"
+      next if t.start_with? "_"
+
+      return t
+    rescue => e
+      puts e
+      puts
+      puts "  caller:"
+      puts env[:caller]
+      puts
+      puts "  s:"
+      puts s
+    end
+
+    raise "there's something wrong with kaller"
+  end if Lizarb.ruby_version >= "3.4"
+
+end