lizarb 1.0.2 → 1.0.4

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

@@ -1,74 +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 "args = #{args.inspect}"
 
-      App.eager_load_all
+    App.load_all
 
-      now = Time.now
-      test_classes = Liza::Test.descendants
-      
-      if Lizarb::IS_APP_DIR
-        test_classes = test_classes.select { |tc| tc.source_location[0].include? Lizarb::APP_DIR }
-      end
+    now = Time.now
+    test_classes = Liza::Test.descendants
+
+    _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
+    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)"
+    log "Counting #{test_classes.count} Test Classes"
+    _call_counting test_classes
+    log "Done Counting (#{now.diff}s)"
+  end
+
+  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! &:source_location
-      tc_liza.sort_by! &:source_location
+    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

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

@@ -1,14 +1,12 @@
-class DevSystem
-  class TestCommandTest < CommandTest
+class DevSystem::TestCommandTest < DevSystem::CommandTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::TestCommand
-    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::TestCommand
+  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.rb

@@ -1,19 +1,13 @@
-class DevSystem
-  class Command < Liza::Controller
+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/command_test.rb

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

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

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

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

@@ -1,54 +1,50 @@
-class DevSystem
-  class GeneratorDslMainPart < Liza::Part
+class DevSystem::GeneratorDslMainPart < Liza::Part
 
-    insertion do
+  insertion do
 
-      def self.call args
-        log :higher, "Called #{self}.#{__method__} with args #{args}"
+    def self.call args
+      log "args = #{args.inspect}"
 
-        name = args.shift || raise("args[0] should contain NAME")
-        name = name.downcase
+      name = args.shift || raise("args[0] should contain NAME")
+      name = name.downcase
 
-        memo.each do |label, bl|
-          log "Generating #{label}"
-          g = new label, name, args
-          g.instance_exec &bl
-          g.call
-        end
-
-        puts
-        log "done"
+      memo.each do |label, bl|
+        log "Generating #{label}"
+        g = new label, name, args
+        g.instance_exec(&bl)
+        g.call
       end
 
-      def self.memo()= @memo ||= {}
+      puts
+      log "done"
+    end
 
-      def self.generate(label, &block)= memo[label] = block
+    def self.memo()= @memo ||= {}
 
-      attr_reader :label, :name, :args
+    def self.generate(label, &block)= memo[label] = block
 
-      def initialize label, name, args
-        @label, @name, @args = label, name, args
-      end
+    attr_reader :label, :name, :args
 
-      def call
-        TextShell.write "#{folder}/#{filename}", "#{content}\n"
-      end
+    def initialize label, name, args
+      @label, @name, @args = label, name, args
+    end
 
-      %w|folder filename content|.each do |s|
-        class_eval <<-CODE, __FILE__, __LINE__ + 1
-          attr_reader :#{s}
+    def call
+      TextShell.write "#{folder}/#{filename}", "#{content}\n"
+    end
 
-          def #{s} #{s} = nil
-            if #{s}
-              @#{s} = #{s}
-            else
-              @#{s}
-            end
+    %w|folder filename content|.each do |s|
+      class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{s} #{s} = nil
+          if #{s}
+            @#{s} = #{s}
+          else
+            @#{s}
           end
-        CODE
-      end
-
+        end
+      CODE
     end
 
   end
+
 end

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

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

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

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

@@ -0,0 +1,97 @@
+class DevSystem::ControllerGenerator < DevSystem::Generator
+
+  def self.call args
+    log "args = #{args.inspect}"
+    new.generate_app_controller(*args)
+  end
+
+  def generate_app_controller system_name, controller_name, folder, name
+    log "(#{system_name.inspect}, #{controller_name.inspect}, #{folder.inspect}, #{name.inspect})"
+
+    @name = name
+    @panels = []
+
+    filename = "app/#{system_name}/#{folder}/#{name}_#{controller_name}.rb"
+    content = render "controller.rb"
+    TextShell.write filename, content
+
+    filename = "app/#{system_name}/#{folder}/#{name}_#{controller_name}_test.rb"
+    content = render "controller_test.rb"
+    TextShell.write filename, content
+  end
+
+  #
+
+  def self.install args
+    log "args = #{args.inspect}"
+
+    system_name = get(:system).name.snakecase.gsub "_system", ""
+    controller_name = last_namespace.snakecase.gsub "_generator", ""
+
+    new.instance_exec do
+      log "#install_app_panel"
+
+      @filename = "app/#{system_name}_box.rb"
+      @system_name = system_name
+      @controller_name = controller_name
+      @panels = {}
+
+      install_write_box unless FileShell.exist? @filename
+      install_read_box
+      install_insert_panel
+      install_write_box
+    end
+  end
+
+  # helper methods
+
+  def install_write_box
+    @content = render "app_box.rb"
+    TextShell.write @filename, "#{@content.strip}\n"
+  end
+
+  def install_read_box
+    @content ||= TextShell.read @filename
+
+    cursor = nil
+    @content.split("\n").each do |line|
+      md = line.match(/^  configure :(.*) do$/)
+      if md
+        cursor = md[1]
+        @panels[cursor] = {lines: []}
+      elsif line =~ /^  end$/
+        cursor = nil
+      else
+        next unless cursor
+        @panels[cursor][:lines] << line
+      end
+    end
+  end
+
+  def install_insert_panel
+    lines = render("install_insert_panel.rb").split("\n").reject(&:empty?)
+    @panels[@controller_name] = {lines: lines}
+    @panels = @panels.sort_by(&:first)
+  end
+
+end
+
+__END__
+
+# view app_box.rb.erb
+
+class <%= @system_name.camelcase %>Box < Liza::<%= @system_name.camelcase %>Box
+
+<% @panels.each do |key, panel| -%>
+  configure :<%= key %> do
+<% panel[:lines].each do |line| -%>
+<%= line %>
+<%   end -%>
+  end
+
+<% end -%>
+end
+
+# view install_insert_panel.rb.erb
+
+    #

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

@@ -0,0 +1,12 @@
+class DevSystem::ControllerGeneratorTest < DevSystem::GeneratorTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::ControllerGenerator
+  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/generator_generator/template.rb.erb

@@ -4,6 +4,6 @@ end
 
 __END__
 
-# text.txt.erb
+# view text.txt.erb
 Called <%%%= self %>.<%%%= __method__ %>
 @args: <%%%= @args %>