lizarb 1.0.2 → 1.0.4

data/app_new.rb

@@ -0,0 +1,15 @@
+# This is a LizaRB Application
+# Learn more: http://lizarb.org/
+
+class App
+
+  # Modes help you organize your application's behavior and settings.
+
+  mode :code
+  mode :demo
+
+  # Systems help you organize your application's dependencies and RAM memory usage.
+
+  system :dev
+
+end

data/exe/lizarb

@@ -1,11 +1,19 @@
 #!/usr/bin/env ruby
 
+$APP = ENV["APP"]
+
 $VERBOSE = ENV["VERBOSE"]
 
 $LOAD_PATH.unshift "#{Dir.pwd}/lib"
 
 require_relative "../lib/lizarb.rb"
 
+Lizarb.setup
+
+Lizarb.app
+
 Lizarb.call
 
-exit 0
+App.call ARGV
+
+Lizarb.exit verbose: true

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.commands.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

@@ -1,29 +1,34 @@
-class DevSystem
-  class NotFoundBench < Bench
+class DevSystem::NotFoundBench < DevSystem::Bench
 
-    def self.call args
-      # 1. LOG
+  def self.call args
+    # 1. LOG
 
-      log :higher, "Called #{self}.#{__method__} with args #{args}"
-      puts
+    log "args = #{args.inspect}"
+    puts
 
-      # 2. FIND generators
+    # 2. FIND generators
 
-      App.eager_load_all
-      benches = Liza::Bench.descendants
+    App.load_all
+    benches = Liza::Bench.descendants
+    benches -= ignored_benches
 
-      log "Liza comes with #{benches.count} benches you can use."
-      puts
+    # 3. LIST benches
 
-      log "Here they are:"
-      puts
+    keys = benches.map { _1.last_namespace.snakecase[0..-7] }.uniq.sort
 
-      # 3. LIST benches
+    log "Liza comes with #{keys.count} benches you can use."
+    log "Here they are:"
+    puts
 
-      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
+    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/not_found_bench_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class NotFoundBenchTest < BenchTest
+class DevSystem::NotFoundBenchTest < DevSystem::BenchTest
 
-    test :subject_class do
-        assert subject_class == DevSystem::NotFoundBench
-      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::NotFoundBench
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :green
+    end
 
-  end
 end

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

@@ -1,11 +1,3 @@
-class DevSystem
-  class Bench < Liza::Controller
+class DevSystem::Bench < Liza::Controller
 
-    # DSLS
-
-    def self.main_dsl
-      part :"bench_dsl_main", system: :dev
-    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,34 +1,31 @@
-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 "args = #{args.inspect}"
 
-      # 2. FIND bench
+    # 2. FIND bench
 
-      return call_not_found args if args.none?
+    return call_not_found args if args.none?
 
-      bench = args[0]
+    bench = args[0]
 
-      log({bench:})
+    log({bench:})
 
-      begin
-        bench_klass = Liza.const "#{bench}_bench"
-      rescue Liza::ConstNotFound
-        bench_klass = NotFoundBench
-      end
-
-      # 3. CALL
-
-      bench_klass.call args[1..-1]
+    begin
+      bench_klass = Liza.const "#{bench}_bench"
+    rescue Liza::ConstNotFound
+      bench_klass = NotFoundBench
     end
 
-    def self.call_not_found args
-      Liza::NotFoundBench.call args
-    end
+    # 3. CALL
 
+    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/generate_command.rb

@@ -1,35 +1,9 @@
-class DevSystem
-  class GenerateCommand < Command
+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]
-    end
-
-    def self.call_not_found args
-      Liza::NotFoundGenerator.call args
-    end
+    DevBox[:generator].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/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

@@ -1,29 +1,48 @@
-class DevSystem
-  class NotFoundCommand < Command
+class DevSystem::NotFoundCommand < DevSystem::Command
 
-    def self.call args
-      # 1. LOG
+  def self.call args
+    # 1. LOG
 
-      log :higher, "Called #{self}.#{__method__} with args #{args}"
-      puts
+    log "args = #{args.inspect}"
+    puts
 
-      # 2. FIND commands
+    # 2. FIND commands
 
-      App.eager_load_all
-      commands = Liza::Command.descendants
+    App.load_all
+    commands = Liza::Command.descendants
+    commands -= ignored_commands
 
-      log "Liza comes with #{commands.count} commands you can use."
-      puts
+    # 3. LIST commands
 
-      log "Here they are:"
-      puts
+    keys = commands.map { _1.last_namespace.snakecase[0..-9] }.uniq.sort
 
-      # 3. LIST commands
+    log "Liza comes with #{keys.count} commands you can use."
+    log "Here they are:"
+    puts
 
-      keys = commands.map { |k| k.last_namespace.snakecase[0..-9] }.sort
-      keys.reject! { |s| s == "not_found" }
-      keys.each { |s| log "liza #{s}" }
-    end
+    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/not_found_command_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class NotFoundCommandTest < CommandTest
+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
+  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

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

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

@@ -1,14 +1,12 @@
-class DevSystem
-  class TerminalCommandTest < CommandTest
+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
+  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