lizarb 1.0.3 → 1.0.4

data/lib/app.rb

@@ -1,102 +1,38 @@
-module App
+class App
   class Error < StandardError; end
-  class ModeNotFound < Error; end
   class SystemNotFound < Error; end
 
   #
 
-  module_function
-
-  def log s
+  def self.log s
     puts s.bold
   end
 
-  def logv s
+  def self.logv s
     log s if $VERBOSE
   end
 
-  # called from "#{APP_DIR}/app"
-  def call argv, &block
-    instance_exec &block
-
-    setup_env
-    setup_bundle
-    setup_liza
-    bundle_systems_app Lizarb::APP_DIR
-
-    check_mode!
-
+  # called from exe/lizarb
+  def self.call argv
     puts
-    DevBox[:command].call argv
+    Liza[:DevBox][:command].call argv
     puts
   end
 
-  def root
+  def self.root
     Pathname Dir.pwd
   end
 
-  def setup_env
-    require "dotenv"
-    Dotenv.load "app.#{mode}.env", "app.env"
-  end
-
-  def setup_bundle
-    require "bundler/setup"
-    Bundler.require :default, *@systems.keys
-  end
-
-  def setup_liza
-    require "liza"
-
-    @loaders << loader = Zeitwerk::Loader.new
-    loader.tag = Liza.to_s
-
-    # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-    loader.collapse "#{Liza.source_location_radical}/**/*"
-    loader.push_dir "#{Liza.source_location_radical}", namespace: Liza
-
-    loader.enable_reloading
-    loader.setup
-  end
-
-  def bundle_systems_app app_dir
-    @systems.keys.each do |k|
-      key = "#{k}_system"
-
-      require_system key
-      klass = Object.const_get key.camelize
-
-      @systems[k] = klass
-    end
-
-    @loaders << loader = Zeitwerk::Loader.new
-
-    @systems.each do |k, klass|
-      # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-      loader.collapse "#{klass.source_location_radical}/**/*"
-      loader.push_dir "#{klass.source_location_radical}", namespace: klass
-    end
-
-    # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-    loader.collapse "#{app_dir}/app/**/*"
-    loader.push_dir "#{app_dir}/app" if Dir.exist? "#{app_dir}/app"
-
-    loader.enable_reloading
-    loader.setup
-
-    @systems.each do |k, klass|
-      connect_system k, klass
-    end
-
-    @systems.freeze
-  end
-
   # loaders
 
   @loaders = []
   @mutex = Mutex.new
 
-  def reload &block
+  def self.loaders
+    @loaders
+  end
+
+  def self.reload &block
     @mutex.synchronize do
       @loaders.map &:reload
       yield if block_given?
@@ -105,36 +41,33 @@ module App
     true
   end
 
-  def eager_load_all
-    Zeitwerk::Loader.eager_load_all
+  def self.load_all
+    Lizarb.load_all
   end
 
-  # mode
+  # modes
 
-  @modes = [:code]
-  ENV["LIZA_MODE"] ||= @modes.first.to_s
-  @mode = ENV["LIZA_MODE"].to_sym
+  @modes = []
 
-  def mode mode = nil
-    return @mode if mode.nil?
+  def self.mode mode = nil
+    return $MODE if mode.nil?
     @modes << mode.to_sym
   end
 
-  def check_mode!
-    return if @modes.include? @mode
-    raise ModeNotFound, "LIZA_MODE `#{@mode}` not found in #{@modes}", []
+  def self.modes
+    @modes
   end
 
   # systems
 
   @systems = {}
 
-  def system key
+  def self.system key
     raise "locked" if @locked
     @systems[key] = nil
   end
 
-  def systems
+  def self.systems
     @systems
   end
 
@@ -150,7 +83,7 @@ module App
 
   # parts
 
-  def connect_part part_klass, key, system
+  def self.connect_part part_klass, key, system
     t = Time.now
     string = "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
     logv string
@@ -163,23 +96,22 @@ module App
             end
 
     if klass.insertion
-      part_klass.class_exec &klass.insertion
+      part_klass.class_exec(&klass.insertion)
     end
 
     if klass.extension
       klass.const_set :Extension, Class.new(Liza::PartExtension)
-      klass::Extension.class_exec &klass.extension
+      klass::Extension.class_exec(&klass.extension)
     end
     logv "#{string} takes #{t.diff}s"
   end
 
   # systems
 
-  def connect_system key, system_klass
+  def self.connect_system key, system_klass
     t = Time.now
 
     color_system_klass = system_klass.to_s.colorize system_klass.log_color
-    color_key = key.to_s.colorize system_klass.log_color
 
     registrar_index = 0
     system_klass.registrar.each do |string, target_block|
@@ -190,7 +122,7 @@ module App
       target_klass = Liza.const reg_target
 
       if reg_type == "insertion"
-        target_klass.class_exec &target_block
+        target_klass.class_exec(&target_block)
       else
         raise "TODO: decide and implement system extension"
       end

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

@@ -3,25 +3,32 @@ class DevSystem::NotFoundBench < DevSystem::Bench
   def self.call args
     # 1. LOG
 
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
+    log "args = #{args.inspect}"
     puts
 
     # 2. FIND generators
 
-    App.eager_load_all
+    App.load_all
     benches = Liza::Bench.descendants
+    benches -= ignored_benches
 
-    log "Liza comes with #{benches.count} benches you can use."
-    puts
+    # 3. LIST benches
 
+    keys = benches.map { _1.last_namespace.snakecase[0..-7] }.uniq.sort
+
+    log "Liza comes with #{keys.count} benches you can use."
     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
 
+  def self.ignored_benches
+    [
+      self,
+      DevSystem::NotFoundBench,
+      (DevSystem::SortedBench if defined? SortedBench),
+    ].uniq.compact
+  end
+
 end

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

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

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

@@ -3,8 +3,7 @@ class DevSystem::BenchCommand < DevSystem::Command
   def self.call args
     # 1. LOG
 
-    log :higher, "args: #{args}"
-    puts
+    log "args = #{args.inspect}"
 
     # 2. FIND bench
 

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

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

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

@@ -0,0 +1,9 @@
+class DevSystem::NewCommand < DevSystem::Command
+
+  def call args
+    log "args = #{args.inspect}"
+
+    Liza[:GenerateCommand].call ["new", *args]
+  end
+
+end

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

@@ -0,0 +1,7 @@
+class DevSystem::NewCommandTest < DevSystem::CommandTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::NewCommand
+  end
+
+end

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

@@ -3,25 +3,46 @@ class DevSystem::NotFoundCommand < DevSystem::Command
   def self.call args
     # 1. LOG
 
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
+    log "args = #{args.inspect}"
     puts
 
     # 2. FIND commands
 
-    App.eager_load_all
+    App.load_all
     commands = Liza::Command.descendants
+    commands -= ignored_commands
 
-    log "Liza comes with #{commands.count} commands you can use."
-    puts
+    # 3. LIST commands
+
+    keys = commands.map { _1.last_namespace.snakecase[0..-9] }.uniq.sort
 
+    log "Liza comes with #{keys.count} commands you can use."
     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
 
+  def self.ignored_commands
+    [
+      self,
+      DevSystem::NotFoundCommand,
+      DevSystem::NewCommand,
+      DevSystem::TerminalCommand,
+      (DevSystem::NarrativeMethodCommand if defined? NarrativeMethodCommand),
+    ].uniq.compact
+  end
+
+  if $APP == "app_global"
+    def self.ignored_commands
+      [
+        self,
+        DevSystem::NotFoundCommand,
+        DevSystem::BenchCommand,
+        DevSystem::GenerateCommand,
+        DevSystem::TestCommand,
+      ].uniq.compact
+    end
+  end
+
 end

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

@@ -1,9 +1,9 @@
 class DevSystem::TerminalCommand < DevSystem::Command
 
-  def self.call args
+  def call args
     # 1. LOG
 
-    log :higher, "args: #{args}"
+    log "args = #{args.inspect}"
     puts
 
     # 2. FIND terminal

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

@@ -1,9 +1,9 @@
 class DevSystem::TestCommand < DevSystem::Command
 
   def self.call args
-    log :higher, "Called #{self} with args #{args}"
+    log "args = #{args.inspect}"
 
-    App.eager_load_all
+    App.load_all
 
     now = Time.now
     test_classes = Liza::Test.descendants
@@ -44,11 +44,11 @@ class DevSystem::TestCommand < DevSystem::Command
     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! &:source_location
     tc_liza.sort_by! &:source_location

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

@@ -1,17 +1,13 @@
 class DevSystem::Command < Liza::Controller
 
-  # def self.call args
-  #   new.call args
-  # end
-
-  # def initialize args
-  #   @args = args
-  # end
-
-  # attr_reader :args
-
-  # def call args
-  #
-  # end
+  def self.call args
+    log "args = #{args}"
+    new.call args
+  end
+
+  def call args
+    log "args = #{args}"
+    raise NotImplementedError
+  end
 
 end

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

@@ -3,7 +3,7 @@ class DevSystem::GeneratorDslMainPart < Liza::Part
   insertion do
 
     def self.call args
-      log :higher, "Called #{self}.#{__method__} with args #{args}"
+      log "args = #{args.inspect}"
 
       name = args.shift || raise("args[0] should contain NAME")
       name = name.downcase
@@ -11,7 +11,7 @@ class DevSystem::GeneratorDslMainPart < Liza::Part
       memo.each do |label, bl|
         log "Generating #{label}"
         g = new label, name, args
-        g.instance_exec &bl
+        g.instance_exec(&bl)
         g.call
       end
 
@@ -35,8 +35,6 @@ class DevSystem::GeneratorDslMainPart < Liza::Part
 
     %w|folder filename content|.each do |s|
       class_eval <<-CODE, __FILE__, __LINE__ + 1
-        attr_reader :#{s}
-
         def #{s} #{s} = nil
           if #{s}
             @#{s} = #{s}

data/{app/dev/generators/bench_generator/bench.rb.erb → lib/dev_system/dev/controllers/generators/bench_generator/controller.rb.erb}

@@ -1,5 +1,4 @@
-class <%= name.camelize %>Bench < AppBench
-  main_dsl
+class <%= @name.camelize %>Bench < SortedBench
 
   setup do
     N = 1_000_000

data/{app/dev/generators/bench_generator/bench_test.rb.erb → lib/dev_system/dev/controllers/generators/bench_generator/controller_test.rb.erb}

@@ -1,7 +1,7 @@
-class <%= name.camelize %>BenchTest < AppBenchTest
+class <%= @name.camelize %>BenchTest < SortedBenchTest
 
   test :subject_class do
-    assert subject_class == <%= name.camelize %>Bench
+    assert subject_class == <%= @name.camelize %>Bench
   end
 
   test :settings do

data/lib/dev_system/dev/controllers/generators/bench_generator.rb

@@ -0,0 +1,12 @@
+class DevSystem::BenchGenerator < DevSystem::ControllerGenerator
+
+  def self.call args
+    log "args = #{args.inspect}"
+
+    name = args.shift || raise("args[0] should contain NAME")
+    name = name.downcase
+
+    new.generate_app_controller :dev, :bench, :benches, name
+  end
+
+end

data/lib/dev_system/dev/controllers/generators/bench_generator_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::BenchGeneratorTest < DevSystem::ControllerGeneratorTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::BenchGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/controllers/generators/command_generator/controller.rb.erb

@@ -0,0 +1,41 @@
+class <%= @name.camelize %>Command < Liza::Command
+
+  def self.call args
+    log "args = #{args.inspect}"
+    new.call args
+  end
+
+  def call args
+    log "@args = #{args.inspect}"
+    @args = args
+
+    # log "puts render inline.txt"
+    # puts render "inline.txt"
+
+    # log "puts render text.txt"
+    # puts render "text.txt"
+
+    log "Time.now #{Time.now}"
+  end
+
+end
+
+__END__
+
+The default view can be rendered by calling `render "inline.txt`"
+
+Self is the instance of the class that called `render`:
+  self: <%%= self %>
+
+# view text.txt.erb
+
+This named view can be rendered by calling `render "text.txt`"
+
+Instance variables are accessible from the view:
+  @args: <%%= @args %>
+
+Written at <%%= Time.now %>
+
+# view lalala.txt.erb.ignored
+
+This named view will be ignored.

data/{app/dev/generators/command_generator/command_test.rb.erb → lib/dev_system/dev/controllers/generators/command_generator/controller_test.rb.erb}

@@ -1,7 +1,7 @@
-class <%= name.camelize %>CommandTest < AppCommandTest
+class <%= @name.camelize %>CommandTest < Liza::CommandTest
 
   test :subject_class do
-    assert subject_class == <%= name.camelize %>Command
+    assert subject_class == <%= @name.camelize %>Command
   end
 
   test :settings do

data/lib/dev_system/dev/controllers/generators/command_generator.rb

@@ -0,0 +1,19 @@
+class DevSystem::CommandGenerator < DevSystem::ControllerGenerator
+
+  def self.call args
+    log "args = #{args.inspect}"
+
+    name = args.shift || raise("args[0] should contain NAME")
+    name = name.downcase
+
+    new.generate_app_controller :dev, :command, :commands, name
+  end
+
+end
+
+__END__
+
+# view install_insert_panel.rb.erb
+
+    short :b, :bench
+    short :g, :generate

data/lib/dev_system/dev/controllers/generators/command_generator_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::CommandGeneratorTest < DevSystem::ControllerGeneratorTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::CommandGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end