lizarb 1.0.1 → 1.0.3

data/lib/app.rb

@@ -11,6 +11,10 @@ module App
     puts s.bold
   end
 
+  def logv s
+    log s if $VERBOSE
+  end
+
   # called from "#{APP_DIR}/app"
   def call argv, &block
     instance_exec &block
@@ -23,7 +27,7 @@ module App
     check_mode!
 
     puts
-    ::DevBox.commands.call argv
+    DevBox[:command].call argv
     puts
   end
 
@@ -48,8 +52,8 @@ module App
     loader.tag = Liza.to_s
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-    loader.collapse "#{fname_for Liza}/**/*"
-    loader.push_dir "#{fname_for Liza}", namespace: Liza
+    loader.collapse "#{Liza.source_location_radical}/**/*"
+    loader.push_dir "#{Liza.source_location_radical}", namespace: Liza
 
     loader.enable_reloading
     loader.setup
@@ -69,8 +73,8 @@ module App
 
     @systems.each do |k, klass|
       # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-      loader.collapse "#{fname_for klass}/**/*"
-      loader.push_dir "#{fname_for klass}", namespace: klass
+      loader.collapse "#{klass.source_location_radical}/**/*"
+      loader.push_dir "#{klass.source_location_radical}", namespace: klass
     end
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
@@ -83,6 +87,8 @@ module App
     @systems.each do |k, klass|
       connect_system k, klass
     end
+
+    @systems.freeze
   end
 
   # loaders
@@ -133,7 +139,10 @@ module App
   end
 
   def self.require_system key
+    t = Time.now
+    logv "App.system :#{key}"
     require key
+    logv "App.system :#{key} takes #{t.diff}s"
   rescue LoadError => e
     def e.backtrace; []; end
     raise SystemNotFound, "FILE #{key}.rb not found on $LOAD_PATH", []
@@ -142,6 +151,10 @@ module App
   # parts
 
   def connect_part part_klass, key, system
+    t = Time.now
+    string = "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
+    logv string
+
     klass = if system.nil?
               Liza.const "#{key}_part"
             else
@@ -149,8 +162,6 @@ module App
                   .const "#{key}_part"
             end
 
-    log "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}" if $VERBOSE
-
     if klass.insertion
       part_klass.class_exec &klass.insertion
     end
@@ -159,6 +170,7 @@ module App
       klass.const_set :Extension, Class.new(Liza::PartExtension)
       klass::Extension.class_exec &klass.extension
     end
+    logv "#{string} takes #{t.diff}s"
   end
 
   # systems
@@ -189,12 +201,4 @@ module App
     log "CONNECTING SYSTEM - #{t.diff}s for #{color_system_klass} to connect to #{registrar_index} system parts"
   end
 
-  #
-
-  def fname_for klass
-    # /path/to/liza.rb
-    # /path/to/liza
-    Object.const_source_location(klass.name)[0][0..-4]
-  end
-
 end

data/lib/dev_system/dev/controllers/bench/not_found_bench.rb

@@ -0,0 +1,27 @@
+class DevSystem::NotFoundBench < DevSystem::Bench
+
+  def self.call args
+    # 1. LOG
+
+    log :higher, "Called #{self}.#{__method__} with args #{args}"
+    puts
+
+    # 2. FIND generators
+
+    App.eager_load_all
+    benches = Liza::Bench.descendants
+
+    log "Liza comes with #{benches.count} benches you can use."
+    puts
+
+    log "Here they are:"
+    puts
+
+    # 3. LIST benches
+
+    keys = benches.map { |k| k.last_namespace.snakecase[0..-7] }.sort
+    keys.reject! { |s| s == "not_found" }
+    keys.each { |s| log "liza bench #{s}" }
+  end
+
+end

data/lib/dev_system/dev/controllers/{command/dev_command_test.rb → bench/not_found_bench_test.rb}

@@ -1,8 +1,7 @@
-class DevSystem
-  class DevCommandTest < CommandTest
+class DevSystem::NotFoundBenchTest < DevSystem::BenchTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::DevCommand
+  test :subject_class do
+      assert subject_class == DevSystem::NotFoundBench
     end
 
     test :settings do
@@ -10,5 +9,4 @@ class DevSystem
       assert subject_class.log_color == :green
     end
 
-  end
 end

data/lib/dev_system/dev/controllers/bench.rb

@@ -1,11 +1,9 @@
-class DevSystem
-  class Bench < Liza::Controller
+class DevSystem::Bench < Liza::Controller
 
-    # DSLS
-
-    def self.main_dsl
-      part :"bench_dsl_main", system: :dev
-    end
+  # DSLS
 
+  def self.main_dsl
+    part :"bench_dsl_main", system: :dev
   end
+
 end

data/lib/dev_system/dev/controllers/bench_dsl_main_part.rb

@@ -1,60 +1,58 @@
-class DevSystem
-  class BenchDslMainPart < Liza::Part
+class DevSystem::BenchDslMainPart < Liza::Part
 
-    insertion do
+  insertion do
 
-      def self.call args
-        log :higher, "Called #{self}.#{__method__} with args #{args}"
+    def self.call args
+      log :higher, "Called #{self}.#{__method__} with args #{args}"
 
-        # https://rubyapi.org/3.1/o/benchmark
-        require "benchmark"
+      # https://rubyapi.org/3.1/o/benchmark
+      require "benchmark"
 
-        if @setup_bl
-          log "Setting up..."
-          instance_exec &@setup_bl
-          log "Set up"
-        end
+      if @setup_bl
+        log "Setting up..."
+        instance_exec &@setup_bl
+        log "Set up"
+      end
 
-        log "Benchmarking #{marks.count} Ruby Blocks"
-        puts
+      log "Benchmarking #{marks.count} Ruby Blocks"
+      puts
 
-        length = marks.keys.map(&:length).max
+      length = marks.keys.map(&:length).max
 
-        marks.each do |label, bl|
-          log "Benchmarking #{label}"
-          marks[label] = Benchmark.measure label, &bl
-        end
+      marks.each do |label, bl|
+        log "Benchmarking #{label}"
+        marks[label] = Benchmark.measure label, &bl
+      end
 
-        puts
+      puts
 
-        log "#{"Reporting".ljust_blanks(length + 17)} App CPU Time   Kernel CPU Time    Total CPU Time"
-        puts
+      log "#{"Reporting".ljust_blanks(length + 17)} App CPU Time   Kernel CPU Time    Total CPU Time"
+      puts
 
-        sorted = marks.sort_by { |_k, tms| tms.total }.to_h
+      sorted = marks.sort_by { |_k, tms| tms.total }.to_h
 
-        sorted.each.with_index do |(label, tms), i|
-          tms = tms.format "%10.6u     %10.6y         %10.6t"
-          s = "[#{i.next.to_s.rjust_zeroes 2}/#{marks.count.to_s.rjust_zeroes 2}]      #{label.rjust_blanks length}   #{tms}"
+      sorted.each.with_index do |(label, tms), i|
+        tms = tms.format "%10.6u     %10.6y         %10.6t"
+        s = "[#{i.next.to_s.rjust_zeroes 2}/#{marks.count.to_s.rjust_zeroes 2}]      #{label.rjust_blanks length}   #{tms}"
 
-          s = s.green if i == 0
-          s = s.red if i == marks.count-1
-          log s
-        end
-        puts
-        log "Done"
+        s = s.green if i == 0
+        s = s.red if i == marks.count-1
+        log s
       end
+      puts
+      log "Done"
+    end
 
-      #
-
-      def self.marks()= @marks ||= {}
+    #
 
-      def self.mark(label, &block)= marks[label] = block
+    def self.marks()= @marks ||= {}
 
-      def self.setup &block
-        @setup_bl = block if block_given?
-      end
+    def self.mark(label, &block)= marks[label] = block
 
+    def self.setup &block
+      @setup_bl = block if block_given?
     end
 
   end
+
 end

data/lib/dev_system/dev/controllers/bench_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class BenchTest < Liza::ControllerTest
+class DevSystem::BenchTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::Bench
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::Bench
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/controllers/command/bench_command.rb

@@ -1,24 +1,32 @@
-class DevSystem
-  class BenchCommand < Command
+class DevSystem::BenchCommand < DevSystem::Command
 
-    def self.call args
-      # 1. LOG
+  def self.call args
+    # 1. LOG
 
-      log :higher, "args: #{args}"
-      puts
+    log :higher, "args: #{args}"
+    puts
 
-      # 2. FIND bench
+    # 2. FIND bench
 
-      bench = args[0]
+    return call_not_found args if args.none?
 
-      log({bench:})
+    bench = args[0]
 
+    log({bench:})
+
+    begin
       bench_klass = Liza.const "#{bench}_bench"
+    rescue Liza::ConstNotFound
+      bench_klass = NotFoundBench
+    end
 
-      # 3. CALL
+    # 3. CALL
 
-      bench_klass.call args[1..-1]
-    end
+    bench_klass.call args[1..-1]
+  end
 
+  def self.call_not_found args
+    Liza::NotFoundBench.call args
   end
+
 end

data/lib/dev_system/dev/controllers/command/bench_command_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class BenchCommandTest < CommandTest
+class DevSystem::BenchCommandTest < DevSystem::CommandTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::BenchCommand
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::BenchCommand
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/controllers/command/echo_command.rb

@@ -1,11 +1,9 @@
-class DevSystem
-  class EchoCommand < Command
+class DevSystem::EchoCommand < DevSystem::Command
 
-    def self.call args
-      log :higher, "Called #{self} with args #{args}"
-
-      raise RuntimeError, args.to_s
-    end
+  def self.call args
+    log :higher, "Called #{self} with args #{args}"
 
+    raise RuntimeError, args.to_s
   end
+
 end

data/lib/dev_system/dev/controllers/command/echo_command_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class EchoCommandTest < CommandTest
+class DevSystem::EchoCommandTest < DevSystem::CommandTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::EchoCommand
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::EchoCommand
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/controllers/command/generate_command.rb

@@ -1,23 +1,33 @@
-class DevSystem
-  class GenerateCommand < Command
+class DevSystem::GenerateCommand < DevSystem::Command
 
-    def self.call args
-      # 1. LOG
+  def self.call args
+    # 1. LOG
 
-      log :higher, "args: #{args}"
-      puts
+    log :higher, "args: #{args}"
+    puts
 
-      # 2. FIND generator
+    # 2. FIND generator
 
-      generator = args[0]
+    return call_not_found args if args.none?
 
-      log({generator:})
+    generator = args[0]
 
-      generator_klass = Liza.const "#{generator}_generator"
+    log({generator:})
 
-      # 3. CALL
+    #
 
-      generator_klass.call args[1..-1]
+    begin
+      generator_class = Liza.const "#{generator}_generator"
+    rescue Liza::ConstNotFound
+      generator_class = NotFoundGenerator
     end
+
+    # 3. CALL
+
+    generator_class.call args[1..-1]
+  end
+
+  def self.call_not_found args
+    Liza::NotFoundGenerator.call args
   end
 end

data/lib/dev_system/dev/controllers/command/generate_command_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class GenerateCommandTest < CommandTest
+class DevSystem::GenerateCommandTest < DevSystem::CommandTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::GenerateCommand
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::GenerateCommand
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/controllers/command/not_found_command.rb

@@ -0,0 +1,27 @@
+class DevSystem::NotFoundCommand < DevSystem::Command
+
+  def self.call args
+    # 1. LOG
+
+    log :higher, "Called #{self}.#{__method__} with args #{args}"
+    puts
+
+    # 2. FIND commands
+
+    App.eager_load_all
+    commands = Liza::Command.descendants
+
+    log "Liza comes with #{commands.count} commands you can use."
+    puts
+
+    log "Here they are:"
+    puts
+
+    # 3. LIST commands
+
+    keys = commands.map { |k| k.last_namespace.snakecase[0..-9] }.sort
+    keys.reject! { |s| s == "not_found" }
+    keys.each { |s| log "liza #{s}" }
+  end
+
+end

data/lib/dev_system/dev/controllers/command/not_found_command_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::NotFoundCommandTest < DevSystem::CommandTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::NotFoundCommand
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/controllers/command/terminal_command.rb

@@ -0,0 +1,22 @@
+class DevSystem::TerminalCommand < DevSystem::Command
+
+  def self.call args
+    # 1. LOG
+
+    log :higher, "args: #{args}"
+    puts
+
+    # 2. FIND terminal
+
+    terminal = args[0] || "irb"
+
+    log({terminal:})
+
+    terminal_klass = Liza.const "#{terminal}_terminal"
+
+    # 3. CALL
+
+    terminal_klass.call Array(args[1..-1])
+  end
+
+end

data/lib/dev_system/dev/controllers/command/terminal_command_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::TerminalCommandTest < DevSystem::CommandTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::TerminalCommand
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/controllers/command/test_command.rb

@@ -1,70 +1,85 @@
-class DevSystem
-  class TestCommand < Command
+class DevSystem::TestCommand < DevSystem::Command
 
-    def self.call args
-      log :higher, "Called #{self} with args #{args}"
+  def self.call args
+    log :higher, "Called #{self} with args #{args}"
 
-      App.eager_load_all
+    App.eager_load_all
 
-      now = Time.now
-      test_classes = Liza::Test.descendants
+    now = Time.now
+    test_classes = Liza::Test.descendants
 
-      test_classes = _call_sort test_classes
+    _call_silence_base_units
+    
+    if Lizarb::IS_APP_DIR
+      test_classes = test_classes.select { |tc| tc.source_location[0].include? Lizarb::APP_DIR }
+    end
+
+    test_classes = _call_sort test_classes
+
+    log "Testing #{test_classes}"
+    _call_testing test_classes
+    log "Done Testing (#{now.diff}s)"
 
-      log "Testing #{test_classes}"
-      _call_testing test_classes
-      log "Done Testing (#{now.diff}s)"
+    puts
 
-      puts
+    log "Counting #{test_classes.count} Test Classes"
+    _call_counting test_classes
+    log "Done Counting (#{now.diff}s)"
+  end
 
-      log "Counting #{test_classes.count} Test Classes"
-      _call_counting test_classes
-      log "Done Counting (#{now.diff}s)"
+  def self._call_silence_base_units
+    [
+      Liza::Box,
+      Liza::Panel,
+      Liza::Controller,
+    ].each do |x|
+      def x.log(...) end
+      def x.puts(...) end
     end
+  end
 
-    def self._call_sort test_classes
-      test_classes.sort_by! &:name
+  def self._call_sort test_classes
+    test_classes.sort_by! &:name
 
-      proc_namespaced = proc { |tc| tc.name.include? "::" }
-      proc_liza = proc { |tc| tc.name[0..3] == "Liza" }
+    proc_namespaced = proc { |tc| tc.name.include? "::" }
+    proc_liza = proc { |tc| tc.name[0..3] == "Liza" }
 
-      tc_app        = test_classes.reject &proc_namespaced
-      tc_namespaced = test_classes.select &proc_namespaced
+    tc_app        = test_classes.reject &proc_namespaced
+    tc_namespaced = test_classes.select &proc_namespaced
 
-      tc_liza   = tc_namespaced.select &proc_liza
-      tc_system = tc_namespaced.reject &proc_liza
+    tc_liza   = tc_namespaced.select &proc_liza
+    tc_system = tc_namespaced.reject &proc_liza
 
-      tc_app.sort_by! { |tc| Object.const_source_location(tc.name)[0] }
-      tc_liza.sort_by! { |tc| Object.const_source_location(tc.name)[0] }
+    tc_app.sort_by! &:source_location
+    tc_liza.sort_by! &:source_location
 
-      [tc_liza, tc_system, tc_app].flatten
-    end
+    [tc_liza, tc_system, tc_app].flatten
+  end
 
-    def self._call_testing test_classes
-      i, count = 0, test_classes.count
-      for test_class in test_classes
-        test_class.call i+=1, count
-      end
+  def self._call_testing test_classes
+    i, count = 0, test_classes.count
+    for test_class in test_classes
+      test_class.call i+=1, count
     end
+  end
 
-    def self._call_counting test_classes
-      puts
-      totals = Hash.new { 0 }
-      last_namespace = nil
-      test_classes.each do |test_class|
-        namespace = test_class.first_namespace
-        puts if last_namespace != namespace
-        last_namespace = namespace
-
-        test_class.totals.each do |k, v|
-          totals[k] += v.size
-        end
-        Liza.log "  #{"#{test_class}.totals".ljust 60} #{test_class.totals.map { |k, v| [k, v.size] }.to_h}"
+  def self._call_counting test_classes
+    puts
+    totals = Hash.new { 0 }
+    last_namespace = nil
+    test_classes.each do |test_class|
+      namespace = test_class.first_namespace
+      puts if last_namespace != namespace
+      last_namespace = namespace
+
+      test_class.totals.each do |k, v|
+        totals[k] += v.size
       end
-      puts
-      Liza.log "  #{"Total".ljust 60} #{totals}"
-      puts
+      Liza.log "  #{"#{test_class}.totals".ljust 60} #{test_class.totals.map { |k, v| [k, v.size] }.to_h}"
     end
-
+    puts
+    Liza.log "  #{"Total".ljust 60} #{totals}"
+    puts
   end
+
 end