lizarb 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebe2ac1c0a6d2e86f70577662d985ea755707a6855e67bcc0fc1e3d8f89ac563
-  data.tar.gz: 47544f75a230d272e38bd50adacd388d4cb8a8710da689ae24ca0fe187e7d3f6
+  metadata.gz: d65d5afa1b18cd8fa2dee6e92af9e1dff3f29d17c34ccc1d76f5ac5137d4b4d8
+  data.tar.gz: 5c38cb0eaa603cba1050fa4ecc38ecf2004a5155ba47a68e65af24a199d7005c
 SHA512:
-  metadata.gz: 8427b2e5710ccff4f9031adc64b9ad9e3fcdc4dea4565f933dc34b91f72378230b7946e020074832c8e7f44c7c5085bc0c3dc503b98d9852a2fb207b685f41b1
-  data.tar.gz: a8fa9c03c1cfa03947e3be6a35b610192cb2a50f5111f175b3211ee1ca35fcafbc371583c53e3b006735873fd5c07897c8dd3edcf6fb0235fac49353e19a460d
+  metadata.gz: fe4544def7e3a7a085427efb77707d78071e50848fdf8941ab9490fb8a131cf60594439ce5c46f556c0ae2b20ecaa5dadadd81a224bb98e082513355e25ef1ed
+  data.tar.gz: 50e1451cfcd9f5b6981b343a1e400fdb77c1db761c1581e1ad0c49e062225a8e45a82229ae55dbca7b69f8bb50e6791f0f5e10d4147d69aaee543253e1e08179

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lizarb (1.0.2)
+    lizarb (1.0.4)
       colorize (~> 0.8)
       dotenv (~> 2.8)
       zeitwerk (~> 2.6)
@@ -11,30 +11,29 @@ GEM
   specs:
     coderay (1.1.3)
     colorize (0.8.1)
-    connection_pool (2.3.0)
+    connection_pool (2.4.0)
     dotenv (2.8.1)
     htmlbeautifier (1.4.2)
     method_source (1.0.0)
-    mini_portile2 (2.8.1)
-    nio4r (2.5.8)
-    pry (0.14.1)
+    nio4r (2.5.9)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     puma (5.6.5)
       nio4r (~> 2.0)
-    rack (3.0.0)
-    rackup (0.2.2)
+    rack (3.0.7)
+    rackup (0.2.3)
       rack (>= 3.0.0.beta1)
       webrick
     rake (13.0.6)
-    redis (5.0.5)
+    redis (5.0.6)
       redis-client (>= 0.9.0)
-    redis-client (0.10.0)
+    redis-client (0.14.1)
       connection_pool
-    sqlite3 (1.5.4)
-      mini_portile2 (~> 2.8.0)
-    webrick (1.7.0)
-    zeitwerk (2.6.7)
+    sqlite3 (1.6.3-arm64-darwin)
+    sqlite3 (1.6.3-x86_64-linux)
+    webrick (1.8.1)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-21

data/Rakefile

@@ -1,6 +1,44 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+
+# Replaced tasks
+
 task default: %i[] do
   system "lizarb test"
 end
+
+# Custom tasks
+
+
+
+# Custom prerequisite tasks
+
+task :custom_gemfiles do
+  puts "... Bundling app_global.gemfile.rb"
+  system "VERBOSE=1 BUNDLE_GEMFILE=app_global.gemfile.rb bundle update"
+
+  puts "... Bundling Gemfile"
+  system "VERBOSE=1 BUNDLE_GEMFILE=Gemfile bundle"
+
+  puts "... Installing lizarb"
+end
+
+# Custom post-requisite tasks
+
+task :custom_post_task do
+  puts "! Done"
+  # Add your custom behavior here
+end
+
+# Enhance
+
+# Enhance the existing `build` task with the prerequisite
+
+Rake::Task["build"].enhance [:custom_gemfiles]
+
+# Enhance the existing `install` task with the post-requisite
+
+Rake::Task["install"].enhance do
+  Rake.application.invoke_task :custom_post_task
+end

data/app/dev_box.rb

@@ -1,13 +1,35 @@
 class DevBox < Liza::DevBox
 
-  commands do
-    # Set up your command panel per the DSL in http://guides.lizarb.com/panels/command.html
+  # Configure your bench panel per the DSL in http://guides.lizarb.org/panels/bench.html
+  configure :bench do
+    # set :log_level, ENV["dev.bench.log_level"]
+  end
+
+  # Configure your command panel per the DSL in http://guides.lizarb.org/panels/command.html
+  configure :command do
+    # set :log_level, ENV["dev.command.log_level"]
+    set :log_details, false
+  end
 
+  # Configure your generator panel per the DSL in http://guides.lizarb.org/panels/generator.html
+  configure :generator do
+    # set :log_level, ENV["dev.generator.log_level"]
+    set :log_details, false
   end
 
-  logs do
-    # Set up your log panel per the DSL in http://guides.lizarb.com/panels/log.html
+  # Configure your command panel per the DSL in http://guides.lizarb.org/panels/log.html
+  configure :log do
+    # set :log_level, ENV["dev.log.log_level"]
+  end
+
+  # Configure your shell panel per the DSL in http://guides.lizarb.org/panels/shell.html
+  configure :shell do
+    # set :log_level, ENV["dev.shell.log_level"]
+  end
 
+  # Configure your terminal panel per the DSL in http://guides.lizarb.org/panels/terminal.html
+  configure :terminal do
+    # set :log_level, ENV["dev.terminal.log_level"]
   end
 
 end

data/app/happy_box.rb

@@ -1,7 +1,7 @@
 class HappyBox < Liza::HappyBox
 
-  axo do
-    # Set up your axo panel per the DSL in http://guides.lizarb.com/panels/axo.html
+  configure :axo do
+    # Configure your axo panel per the DSL in http://guides.lizarb.com/panels/axo.html
 
   end
 

data/app/net/databases/sqlite_db_test.rb

@@ -2,11 +2,11 @@ class SqliteDbTest < Liza::SqliteDbTest
 
   test :subject_class do
     assert subject_class == SqliteDb
-    assert SqliteDb.current.class == SqliteDb
-    assert Liza::SqliteDb.current.class == SqliteDb
-    assert SqliteDb.current == Liza::SqliteDb.current
-    assert SqliteDb.current.client == Liza::SqliteDb.current.client
-    assert SqliteDb.current.client.conn == Liza::SqliteDb.current.client.conn
+    # assert SqliteDb.current.class == SqliteDb
+    # assert Liza::SqliteDb.current.class == SqliteDb
+    # assert SqliteDb.current == Liza::SqliteDb.current
+    # assert SqliteDb.current.client == Liza::SqliteDb.current.client
+    # assert SqliteDb.current.client.conn == Liza::SqliteDb.current.client.conn
   end
 
 end

data/app/net/records/app_record_test.rb

@@ -2,7 +2,7 @@ class AppRecordTest < Liza::RecordTest
 
   test :subject_class do
     assert subject_class == AppRecord
-    assert subject_class.db == SqliteDb.current
+    assert subject_class.db == SqliteDb
   end
 
 end

data/app/net/records/post_record_test.rb

@@ -2,7 +2,7 @@ class PostRecordTest < Liza::RecordTest
 
   test :subject_class do
     assert subject_class == PostRecord
-    assert subject_class.db == SqliteDb.current
+    assert subject_class.db == SqliteDb
   end
 
 end

data/app/net/records/user_record_test.rb

@@ -2,7 +2,7 @@ class UserRecordTest < Liza::RecordTest
 
   test :subject_class do
     assert subject_class == UserRecord
-    assert subject_class.db == SqliteDb.current
+    assert subject_class.db == SqliteDb
   end
 
 end

data/app/net_box.rb

@@ -1,20 +1,20 @@
 class NetBox < Liza::NetBox
 
-  clients do
-    # Set up your client panel per the DSL in http://guides.lizarb.org/panels/client.html
+  configure :client do
+    # Configure your client panel per the DSL in http://guides.lizarb.org/panels/client.html
 
     set :redis_url, "redis://localhost:6379/15"
-    set :sqlite, "tmp/app.#{Time.now.to_i}.sqlite" if App.mode == :code
-    set :sqlite, "app.#{App.mode}.sqlite"
+    set :sqlite_path, "tmp/app.#{Time.now.to_i}.sqlite" if App.mode == :code
+    set :sqlite_path, "app.#{App.mode}.sqlite"
 
   end
 
-  databases do
-    # Set up your database panel per the DSL in http://guides.lizarb.org/panels/database.html
+  configure :database do
+    # Configure your database panel per the DSL in http://guides.lizarb.org/panels/database.html
 
-    define :redis, RedisDb.current
-    define :sql, SqliteDb.current
-    define :sqlite, SqliteDb.current
+    define :redis, RedisDb
+    define :sql, SqliteDb
+    define :sqlite, SqliteDb
 
   end
 

data/app/web_box.rb

@@ -1,15 +1,15 @@
 class WebBox < Liza::WebBox
 
-  rack do
-    # Set up your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
+  configure :rack do
+    # Configure your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
     
     # set :files, App.root.join("web_files")
     # set :host, "localhost"
     # set :port, 3000
   end
 
-  requests do
-    # Set up your request panel per the DSL in http://guides.lizarb.org/panels/request.html
+  configure :request do
+    # Configure your request panel per the DSL in http://guides.lizarb.org/panels/request.html
 
   end
 

data/app.rb

@@ -1,17 +1,16 @@
-App.call ARGV do
+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.
-  # Learn more: http://guides.lizarb.org/systems.html
 
   system :dev
   system :happy
   system :net
   system :web
 
-  # Modes help you organize your application's behavior and settings.
-  # Learn more: http://guides.lizarb.org/modes.html
-
-  mode :code
-  mode :demo
 
 end

data/{exe/Gemfile → app_global.gemfile.rb}

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org"
+
+gem "lizarb", "~> 1.0"

data/app_global.gemfile.rb.lock

@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    colorize (0.8.1)
+    dotenv (2.8.1)
+    lizarb (1.0.4)
+      colorize (~> 0.8)
+      dotenv (~> 2.8)
+      zeitwerk (~> 2.6)
+    zeitwerk (2.6.8)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  lizarb (~> 1.0)
+
+BUNDLED WITH
+   2.4.1

data/app_global.rb

@@ -0,0 +1,4 @@
+class App
+  mode :code
+  system :dev
+end

data/{app → app_new}/dev/benches/loops_bench.rb

@@ -1,5 +1,4 @@
-class LoopsBench < AppBench
-  main_dsl
+class LoopsBench < SortedBench
 
   setup do
     N = 1_000_000
@@ -8,6 +7,8 @@ class LoopsBench < AppBench
     HASH_INT = RANGE.map { |i| [i, i] }.to_h
     HASH_STR = RANGE.map { |i| ["a#{i}", i] }.to_h
     HASH_SYM = RANGE.map { |i| [:"a#{i}", i] }.to_h
+    
+    log "setup N = #{N}"
   end
 
   mark "for i in RANGE" do

data/{app/dev/generators/bench_generator_test.rb → app_new/dev/benches/loops_bench_test.rb}

@@ -1,7 +1,7 @@
-class BenchGeneratorTest < Liza::GeneratorTest
+class LoopsBenchTest < SortedBenchTest
 
   test :subject_class do
-    assert subject_class == BenchGenerator
+    assert subject_class == LoopsBench
   end
 
   test :settings do

data/app_new/dev/benches/objects_bench.rb

@@ -0,0 +1,83 @@
+class ObjectsBench < SortedBench
+
+  setup do
+    N = 1_000_000
+    # N = 10_000_000
+    # N = 100_000_000
+
+    log "setup N = #{N}"
+  end
+
+  mark "BasicObject.new" do
+    i = 0
+
+    while (i += 1) <= N
+      BasicObject.new
+    end
+  end
+
+  mark "Object.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Object.new
+    end
+  end
+
+  mark "String.new" do
+    i = 0
+
+    while (i += 1) <= N
+      String.new
+    end
+  end
+
+  mark "Numeric.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Numeric.new
+    end
+  end
+
+  mark "Time.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Time.new
+    end
+  end
+
+  mark "Proc.new {}" do
+    i = 0
+
+    while (i += 1) <= N
+      Proc.new {}
+    end
+  end
+
+  mark "Set.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Set.new
+    end
+  end
+
+  mark "Array.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Array.new
+    end
+  end
+
+  mark "Hash.new" do
+    i = 0
+
+    while (i += 1) <= N
+      Hash.new
+    end
+  end
+
+end

data/{app/dev/generators/record_generator_test.rb → app_new/dev/benches/objects_bench_test.rb}

@@ -1,7 +1,7 @@
-class RecordGeneratorTest < Liza::GeneratorTest
+class ObjectsBenchTest < SortedBenchTest
 
   test :subject_class do
-    assert subject_class == RecordGenerator
+    assert subject_class == ObjectsBench
   end
 
   test :settings do

data/app_new/dev/benches/sorted_bench.rb

@@ -0,0 +1,54 @@
+class SortedBench < Liza::Bench
+
+  def self.call args
+    log "args = #{args.inspect}"
+
+    # https://rubyapi.org/3.1/o/benchmark
+    require "benchmark"
+
+    if @setup_bl
+      log "Setting up..."
+      instance_exec &@setup_bl
+      log "Set up"
+    end
+
+    log "Benchmarking #{marks.count} Ruby Blocks"
+    puts
+
+    length = marks.keys.map(&:length).max
+
+    marks.each do |label, bl|
+      log "Benchmarking #{label}"
+      marks[label] = Benchmark.measure label, &bl
+    end
+
+    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.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"
+  end
+
+  #
+
+  def self.marks()= @marks ||= {}
+
+  def self.mark(label, &block)= marks[label] = block
+
+  def self.setup &block
+    @setup_bl = block if block_given?
+  end
+
+end

data/app_new/dev/benches/sorted_bench_test.rb

@@ -0,0 +1,12 @@
+class SortedBenchTest < Liza::BenchTest
+
+  test :subject_class do
+    assert_equality subject_class, SortedBench
+  end
+
+  test :settings do
+    assert_equality subject_class.log_level, :normal
+    assert_equality subject_class.log_color, :green
+  end
+
+end

data/app_new/dev/benches/variables_bench.rb

@@ -0,0 +1,55 @@
+class VariablesBench < SortedBench
+
+  setup do
+    LETTERS = (Array("a".."z")+Array("A".."Z"))
+    N = 1_000
+    # N = 10_000
+    # N = 100_000
+    
+    log "setup N = #{N}"
+  end
+
+  mark "local variable" do
+    i = 0
+    a = nil
+
+    while (i += 1) <= N
+      eval "v_#{random_name} = sample"
+    end
+  end
+
+  mark "instance variable" do
+    i = 0
+
+    while (i += 1) <= N
+      eval "@v_#{random_name} = sample"
+    end
+  end
+
+  mark "class variable" do
+    i = 0
+
+    while (i += 1) <= N
+      eval "@@v_#{random_name} = sample"
+    end
+  end
+
+  mark "global variable" do
+    i = 0
+
+    while (i += 1) <= N
+      eval "$v_#{random_name} = sample"
+    end
+  end
+
+  # helper methods
+
+  def self.random_name
+    LETTERS.shuffle.join("")
+  end
+
+  def self.sample
+    LETTERS.sample
+  end
+
+end

data/{app/dev/generators/command_generator_test.rb → app_new/dev/benches/variables_bench_test.rb}

@@ -1,7 +1,7 @@
-class CommandGeneratorTest < Liza::GeneratorTest
+class VariablesBenchTest < SortedBenchTest
 
   test :subject_class do
-    assert subject_class == CommandGenerator
+    assert subject_class == VariablesBench
   end
 
   test :settings do

data/{app → app_new}/dev/commands/calculator_command.rb

@@ -40,7 +40,7 @@ end
 
 __END__
 
-# help.txt.erb
+# view help.txt.erb
 
 NAME:
 

data/{app → app_new}/dev/commands/circle_command.rb

@@ -45,7 +45,7 @@ end
 
 __END__
 
-# help.txt.erb
+# view help.txt.erb
 
 NAME:
 

data/{app → app_new}/dev/commands/narrative_method_command.rb

@@ -3,17 +3,17 @@ class NarrativeMethodCommand < Liza::Command
   class Invalid < Error; end
 
   def self.call(args)
-    log "Called #{self}.#{__method__} with args #{args}"
+    log "args = #{args.inspect}"
     new.call(args)
   end
 
   # instance methods
 
   def call(args)
-    log "Called #{self}.#{__method__} with args #{args}"
+    @args = args
+    log "@args = #{args.inspect}"
     return help if args.empty?
 
-    @args = args
     validate
     perform
   rescue StandardError => error
@@ -32,26 +32,24 @@ class NarrativeMethodCommand < Liza::Command
   end
 
   def handle
-    log "Called #{self}.#{__method__}"
     log render "error.txt"
   end
 
   def help
-    log "Called #{self}.#{__method__}"
     log render "help.txt"
   end
 end
 
 __END__
 
-# success.txt.erb
+# view success.txt.erb
 
 RESULT:
 
 class      <%= @result.class %>
 value      <%= @result %>
 
-# error.txt.erb
+# view error.txt.erb
 
 ERROR:
 

data/{app → app_new}/dev/commands/quadratic_command.rb

@@ -42,7 +42,7 @@ end
 
 __END__
 
-# help.txt.erb
+# view help.txt.erb
 
 NAME:
 

data/app_new/dev_box.rb

@@ -0,0 +1,14 @@
+class DevBox < Liza::DevBox
+
+  configure :bench do
+    #
+  end
+
+  configure :command do
+    set :log_details, false
+    
+    short :b, :bench
+    short :g, :generate
+  end
+
+end