lizarb 1.0.5 → 1.0.7

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

@@ -0,0 +1,345 @@
+class DevSystem::SimpleGenerator < DevSystem::BaseGenerator
+
+  section :filters
+
+  def self.before_instance_calls()= fetch(:before_instance_calls) { [] }
+
+  def self.before_instance_call(method, *args, &block)
+    log :higher, "before_instance_call save #{method}, #{args}, #{block}"
+    before_instance_calls << [method, args, block]
+  end
+
+  def before
+    super
+
+    before_instance_calls
+  end
+
+  def before_instance_calls
+    self.class.before_instance_calls.each do |method, args, block|
+      log :higher, "before_instance_call send #{method}, #{args}, #{block}"
+      send method, *args, &block
+    end
+  end
+  
+  section :panel
+
+  def inform
+    log :lowest, "informing #{mapper.changes.count} changes"
+
+    mapper.changes.each do |fname, data|
+      mapper.changes.delete fname if data[:before] == data[:after]
+    end
+    
+    mapper.changes.each do |fname, data|
+      puts_line
+      
+      action = "updating"
+      action = "creating" if data[:before] == ""
+      action = "deleting" if data[:after] == ""
+
+      diff = {
+        "+": (data[:after].split("\n") - data[:before].split("\n")).count,
+        "-": (data[:before].split("\n") - data[:after].split("\n")).count,
+      }
+
+      bit = diff.map { "#{_1}#{_2}" }.join(" ")
+      relative = Pathname(fname).relative_path_from(App.root)
+      string = "#{action.ljust 8} | #{"#{bit}".rjust 8} lines | #{relative}"
+      log :lowest, string
+
+      if log_level? :low
+        puts relative
+        DifflcsGemShell.log_diff(data[:before].split("\n"), data[:after].split("\n")) if diff.values.sum.positive?
+      end
+    end
+  end
+
+  def save
+    puts_line
+    diff = {
+      "+": mapper.changes.map { _2[:after].split("\n").count }.sum,
+      "-": mapper.changes.map { _2[:before].split("\n").count }.sum,
+    }
+    log "saving #{mapper.changes.count} files changed: #{diff[:"+"]} insertions(+), #{diff[:"-"]} deletions(-)"
+
+    choices = mapper.changes.keys.map { [_1, _1] }.to_h
+    if command.simple_boolean :confirm
+      answers = choices.keys
+    else
+      answers = InputShell.multi_select "Approve all changes?", choices
+    end
+
+    #
+    
+    puts_line
+    diff = {
+      "+": mapper.changes.map { _2[:after].split("\n").count }.sum,
+      "-": mapper.changes.map { _2[:before].split("\n").count }.sum,
+    }
+    log "saving #{answers.count} files changed: #{diff[:"+"]} insertions(+), #{diff[:"-"]} deletions(-)"
+
+    answers.each do |fname|
+      answer = mapper.changes[fname]
+      if answer[:after] == ""
+        FileShell.remove fname, log_level: :higher
+      else
+        FileShell.write_text fname, answer[:after], log_level: :higher
+      end
+    end
+  end
+
+  section :mapping
+
+  def generate(*args, &block)
+    args = args.flatten
+    cmd_menv = Command.panel.forge ["generate", *args]
+    cmd_menv[:command] = SimpleCommand.new.tap do |cmd|
+      cmd.instance_variable_set :@menv, cmd_menv
+      cmd.before
+    end
+
+    gen_menv = panel.forge cmd_menv
+    gen_menv[:simple_mapper] = mapper
+    panel.forge_shortcut gen_menv
+    panel.find gen_menv
+    panel.find_shortcut gen_menv
+    panel.forward gen_menv
+  end
+
+  def mapper() = menv[:simple_mapper] ||= Mapper.new(self)
+
+  class Mapper
+    attr_reader :changes
+
+    def log(*args, **kwargs)
+      kwargs[:method_name] = 'map'
+      @gen.log(*args, **kwargs)
+    end
+
+    def initialize(generator)
+      @gen = generator
+      log "#{self.class.last_namespace}.#{__method__}"
+      @changes = {}
+    end
+
+    def get(fname)
+      changes[fname]
+    end
+
+    def read_before(fname)
+      cache fname
+      changes[fname][:before]
+    end
+
+    def read_after(fname)
+      cache fname
+      changes[fname][:after]
+    end
+
+    def write_after(fname, text)
+      log "#{self.class.last_namespace}.#{__method__} #{fname.to_s.sub App.root.to_s, "."}, #{text.size} bytes"
+      cache fname
+      changes[fname][:after] = text
+    end
+
+    def delete_after(fname)
+      log "#{self.class.last_namespace}.#{__method__} #{fname.to_s.sub App.root.to_s, "."}"
+      cache fname
+      changes[fname][:after] = ""
+    end
+
+    private
+
+    def cache(fname)
+      raise "fname must be a Pathname" unless fname.is_a? Pathname
+      return true if changes.key? fname
+      
+      s = ""
+      s = DevSystem::FileShell.read_text(fname) if DevSystem::FileShell.exist? fname
+      changes[fname] = {before: s, after: s}
+
+      true
+    end
+    
+  end
+
+  section :files
+
+  def create_file name, template, format
+    contents = render! template, format: format
+    create_file_contents name, contents
+  end
+
+  def create_file_contents name, contents
+    update_file name, contents
+  end
+
+  def read_file name
+    path = App.root.join name
+    mapper.read_after path
+  end
+
+  def update_file name, contents
+    path = App.root.join name
+    mapper.write_after path, contents
+  end
+
+  def delete_file name
+    path = App.root.join name
+    mapper.delete_after path
+  end
+
+  def copy_examples controller
+    puts
+    log controller.to_s
+    singular = controller.singular
+    sys = controller.system.token
+    
+    [
+      Lizarb.gem_dir,
+      Lizarb.app_dir,
+    ].uniq.each do |dir|
+      FileShell.directory? "#{dir}/examples/#{singular}" or next
+      copy_files "#{dir}/examples/#{singular}/app/#{sys}", "#{App.directory}/#{sys}"
+    end
+  end
+
+  #
+
+  def copy_files from_folder, to_folder
+    from_pattern = "#{from_folder}/**/*"
+    log "from_pattern = #{from_pattern}"
+
+    from_files = Dir[from_pattern]
+    log "from_files"
+    log_array from_files
+    puts
+
+    from_files.each do |source|
+      next if File.directory? source
+
+      target = source.sub(from_folder, to_folder)
+      copy_file source, target
+    end
+  end
+
+  def copy_file source, target
+    path = App.root.join target
+    text = FileShell.read_text source
+    mapper.write_after path, text
+  end
+
+  section :arg_views
+
+  def arg_views_none?() = arg_views == 'none'
+
+  def arg_views_eof?() = arg_views == 'eof'
+
+  def arg_views_adjacent?() = arg_views == 'adjacent'
+
+  def arg_views_nested?() = arg_views == 'nested'
+
+  def self.set_default_views(views) = before_instance_call(:set_default_views, views)
+
+  def set_default_views(views) = command.set_default_string(:views, views)
+    
+  def valid_views() = @valid_views ||=  %w[none eof adjacent nested]
+
+  def arg_views() = @arg_views ||= command.simple_string(:views)
+
+  set_input_string :views do |default|
+    title = "Choose views"
+    valid_views = menv[:generator].valid_views
+    index_base_1 = valid_views.index(default) + 1 rescue 1
+    InputShell.select title, valid_views, default: index_base_1
+  end
+  
+  set_default_views "none"
+  
+  section :unit
+
+  def add_unit(unit, class_names, unit_path)
+    raise "unit_path cannot be empty" if unit_path.nil?
+    @current_unit = unit
+    @class_names = class_names
+    @class_name = class_names[0]
+    unit.sections.each do |section|
+      @current_section = section
+      section[:content] = render! section[:render_key], format: :rb
+    end
+    unit.views.each do |view|
+      view[:content] = render! view[:render_key], format: view[:render_format]
+    end
+
+    new_lines = render! :unit, format: :rb
+    if arg_views_eof? && unit.views.any?
+      new_lines << "\n__END__\n\n"
+      unit.views.each do |view|
+        new_lines << "# view #{view[:name]}.#{view[:format]}.erb\n#{view[:content]}"
+      end
+    end
+    mapper.write_after unit_path, new_lines
+  end
+
+  def add_view(unit, view, view_path)
+    raise "view_path cannot be empty" if view_path.nil?
+    view[:content] = render! view[:render_key], format: view[:render_format]
+
+    new_content = view[:content].dup
+    new_content.prepend "# view #{view[:name]}.#{view[:format]}.erb\n" if arg_views_adjacent?
+    mapper.write_after view_path, new_content
+  end
+
+  class UnitHelper
+    def section section = {}
+      sections << section
+      section[:name] or raise "name is required"
+      section[:render_key] ||= section[:name]
+    end
+
+    def view view = {}
+      views << view
+      view[:render_key] or raise "render_key is required"
+      view[:render_format] ||= view[:format]
+      view[:render_format] or raise "render_format is required"
+    end
+
+    def sections
+      @sections ||= []
+    end
+
+    def views
+      @views ||= []
+    end
+  end
+
+  def remove_units(units)
+    units.each do |unit|
+      unit_path_radical = unit.source_location_radical
+      unit_path = "#{unit_path_radical}.rb"
+
+      mapper.delete_after Pathname unit_path
+      views = Dir["#{unit_path_radical}*/**/*"]
+      views.each do |fname|
+        mapper.delete_after Pathname fname
+      end
+    end
+  end
+
+  def pick_many_units(units)
+    options = units.map do |unit|
+      [
+        "#{TypographyShell.color_class unit}",
+        unit
+      ]
+    end.to_h
+    selected = units.count == 1 ? :all : :none
+    InputShell.multi_select "Pick Multiple Controllers", options, selected: selected
+  end
+
+  def app_shell() = @app_shell ||= AppShell.new
+
+  def puts_line() =  puts "-" * 120
+
+end

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

@@ -0,0 +1,9 @@
+# view subject.rb.erb
+<%
+string = @class_name.end_with?("Test") ? @class_name[0..-5] : @class_name
+-%>
+
+  test :subject_class, :subject do
+    assert_equality subject_class, <%= string %>
+    assert_equality subject.class, <%= string %>
+  end

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