lizarb 1.0.4 → 1.0.6

data/{app_new → examples/bench/app}/dev/benches/sorted_bench.rb

@@ -1,25 +1,30 @@
-class SortedBench < Liza::Bench
+class SortedBench < DevSystem::Bench
+  # https://rubyapi.org/3.1/o/benchmark
+  require "benchmark"
+  
+  def self.call env
+    super
+    t = Time.now
 
-  def self.call args
-    log "args = #{args.inspect}"
-
-    # https://rubyapi.org/3.1/o/benchmark
-    require "benchmark"
+    log stick system.color, :b, (" MEASURE, DO NOT GUESS ".center 80, "-")
+    log "repetitions #{repetitions}"
 
     if @setup_bl
       log "Setting up..."
-      instance_exec &@setup_bl
-      log "Set up"
+      @setup_bl.call
     end
 
     log "Benchmarking #{marks.count} Ruby Blocks"
     puts
 
-    length = marks.keys.map(&:length).max
+    length = marks.keys.map(&:length).max || 0
 
     marks.each do |label, bl|
       log "Benchmarking #{label}"
-      marks[label] = Benchmark.measure label, &bl
+      marks[label] = Benchmark.measure label do
+        i = 0
+        bl.call while (i += 1) <= repetitions
+      end
     end
 
     puts
@@ -33,22 +38,35 @@ class SortedBench < Liza::Bench
       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
+      s = (stick s, :light_green).to_s if i == 0
+      s = (stick s, :light_red  ).to_s if i == marks.count-1
       log s
     end
     puts
-    log "Done"
+  ensure
+    log "#{t.diff}s | #{marks.count} marks | #{repetitions} repetitions"
   end
 
   #
 
-  def self.marks()= @marks ||= {}
+  def self.repetitions n = nil
+    if n
+      @repetitions = n
+    else
+      @repetitions ||= 1
+    end
+  end
 
-  def self.mark(label, &block)= marks[label] = block
+  #
 
   def self.setup &block
     @setup_bl = block if block_given?
   end
 
+  #
+
+  def self.marks()= @marks ||= {}
+
+  def self.mark(label, &block)= marks[label] = block
+
 end

data/examples/bench/app/dev/benches/sorted_bench_test.rb

@@ -0,0 +1,7 @@
+class SortedBenchTest < DevSystem::BenchTest
+
+  test :subject_class do
+    assert_equality subject_class, SortedBench
+  end
+
+end

data/{app_new → examples/bench/app}/dev/benches/variables_bench.rb

@@ -1,14 +1,20 @@
 class VariablesBench < SortedBench
 
   setup do
+    log "repetitions: #{repetitions}"
+    
     LETTERS = (Array("a".."z")+Array("A".."Z"))
+
     N = 1_000
     # N = 10_000
     # N = 100_000
-    
-    log "setup N = #{N}"
+    # N = 1_000_000
+    # N = 10_000_000
+    # N = 100_000_000
   end
 
+  #
+
   mark "local variable" do
     i = 0
     a = nil

data/{app_new → examples/bench/app}/dev/benches/variables_bench_test.rb

@@ -4,9 +4,4 @@ class VariablesBenchTest < SortedBenchTest
     assert subject_class == VariablesBench
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
 end

data/examples/client/app/net/clients/news_client.rb

@@ -0,0 +1,42 @@
+class NewsClient < NetSystem::Client
+
+  #
+  
+  def self.ruby_news
+    new.call "https://www.ruby-lang.org/en/feeds/news.rss"
+  end
+
+  def self.ruby_weekly
+    new.call "https://cprss.s3.amazonaws.com/rubyweekly.com.xml"
+  end
+
+  #
+
+  def call url
+    t = Time.now
+    body = http_get url
+    hash = xml_to_hash body
+    log "rss channel title: #{ hash.dig :rss, :channel, :title }"
+    hash
+  ensure
+    log "#{t.diff}s to request #{url}"
+    hash
+  end
+
+  def http_get url
+    require "net/http"
+    request_uri = URI(url)
+    log "GET #{request_uri}"
+    Net::HTTP.get(request_uri)
+  end
+
+  def xml_to_hash string
+    # https://github.com/savonrb/nori
+    gem "nori"
+    gem "rexml"
+    require "nori"
+    require "rexml"
+    Nori.new(:parser => :rexml).parse string
+  end
+  
+end

data/examples/client/app/net/clients/news_client_test.rb

@@ -0,0 +1,24 @@
+class NewsClientTest < NetSystem::ClientTest
+  
+  # 
+
+  test :subject_class, :subject do
+    assert_equality NewsClient, subject_class
+    assert_equality NewsClient, subject.class
+  end
+
+  test :subject_class, :ruby_news do
+    hash = subject_class.ruby_news
+    a = hash.dig("rss", "channel", "title")
+    b = "Ruby News"
+    assert_equality a, b
+  end
+
+  test :subject_class, :ruby_weekly do
+    hash = subject_class.ruby_weekly
+    a = hash.dig("rss", "channel", "title")
+    b = "Ruby Weekly"
+    assert_equality a, b
+  end
+
+end

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

@@ -10,11 +10,11 @@ class CalculatorCommand < NarrativeMethodCommand
 
   def validate
     log "Called #{self}.#{__method__}"
-    raise Invalid, "liza calculator 0 + 0" if @args.size != 3
+    raise Invalid, "liza calculator 0 + 0" if args.size != 3
 
-    @a  = @args[0].to_f
-    @op = @args[1].to_sym
-    @b  = @args[2].to_f
+    @a  = args[0].to_f
+    @op = args[1].to_sym
+    @b  = args[2].to_f
 
     log "@a  = #{@a}"
     log "@op = #{@op}"
@@ -33,7 +33,7 @@ class CalculatorCommand < NarrativeMethodCommand
       when :/ then self.class.div(@a, @b)
       end
     log "RESULT: #{@result}"
-    log render "success.txt"
+    log render(:success, format: :txt)
   end
 
 end

data/{app_new → examples/command/app}/dev/commands/calculator_command_test.rb

@@ -4,11 +4,6 @@ class CalculatorCommandTest < NarrativeMethodCommandTest
     assert subject_class == CalculatorCommand
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
   test :subject_class, :sum do
     assert subject_class.sum(1, 2) == 3
   end

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

@@ -17,11 +17,11 @@ class CircleCommand < NarrativeMethodCommand
 
   def validate
     log "Called #{self}.#{__method__}"
-    raise Invalid, "liza circle <formula> <radius>" if @args.size != 2
-    raise Invalid, "liza circle <formula> <radius>" if @args[0] != "area" && @args[0] != "circumference"
+    raise Invalid, "liza circle <formula> <radius>" if args.size != 2
+    raise Invalid, "liza circle <formula> <radius>" if args[0] != "area" && args[0] != "circumference"
 
-    @formula = @args[0].to_sym
-    @radius = @args[1].to_f
+    @formula = args[0].to_sym
+    @radius = args[1].to_f
 
     log "@formula = #{@formula}"
     log "@radius  = #{@radius}"
@@ -38,7 +38,7 @@ class CircleCommand < NarrativeMethodCommand
       when :circumference then self.class.circumference(@radius)
       end
     log "RESULT: #{@result}"
-    log render "success.txt"
+    log render(:success, format: :txt)
   end
 
 end

data/{app_new → examples/command/app}/dev/commands/circle_command_test.rb

@@ -4,11 +4,6 @@ class CircleCommandTest < NarrativeMethodCommandTest
     assert subject_class == CircleCommand
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
   test :subject_class, :area do
     assert subject_class.area(1) == 3.141592653589793
   end

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

@@ -1,17 +1,8 @@
-class NarrativeMethodCommand < Liza::Command
+class NarrativeMethodCommand < DevSystem::SimpleCommand
   class Error < StandardError; end
   class Invalid < Error; end
 
-  def self.call(args)
-    log "args = #{args.inspect}"
-    new.call(args)
-  end
-
-  # instance methods
-
-  def call(args)
-    @args = args
-    log "@args = #{args.inspect}"
+  def call_default
     return help if args.empty?
 
     validate
@@ -32,11 +23,11 @@ class NarrativeMethodCommand < Liza::Command
   end
 
   def handle
-    log render "error.txt"
+    log render(:error, format: :txt)
   end
 
   def help
-    log render "help.txt"
+    log render(:help, format: :txt)
   end
 end
 

data/{app_new → examples/command/app}/dev/commands/narrative_method_command_test.rb

@@ -1,14 +1,9 @@
-class NarrativeMethodCommandTest < Liza::CommandTest
+class NarrativeMethodCommandTest < DevSystem::SimpleCommandTest
 
   test :subject_class do
     assert subject_class == NarrativeMethodCommand
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
   test :validate, :not_implemented do
     subject = subject_class.new
     begin

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

@@ -17,11 +17,11 @@ class QuadraticCommand < NarrativeMethodCommand
 
   def validate
     log "Called #{self}.#{__method__}"
-    raise Invalid, "liza quadratic 0 0 0" if @args.size != 3
+    raise Invalid, "liza quadratic 0 0 0" if args.size != 3
 
-    @a = @args[0].to_f
-    @b = @args[1].to_f
-    @c = @args[2].to_f
+    @a = args[0].to_f
+    @b = args[1].to_f
+    @c = args[2].to_f
 
     log "@a = #{@a}"
     log "@b = #{@b}"
@@ -35,7 +35,7 @@ class QuadraticCommand < NarrativeMethodCommand
 
     @result = self.class.quadratic(@a, @b, @c)
     log "RESULT: #{@result}"
-    log render "success.txt"
+    log render(:success, format: :txt)
   end
 
 end

data/{app_new → examples/command/app}/dev/commands/quadratic_command_test.rb

@@ -4,11 +4,6 @@ class QuadraticCommandTest < NarrativeMethodCommandTest
     assert subject_class == QuadraticCommand
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
   test :subject_class, :quadratic do
     assert subject_class.quadratic(1, -11, 30) == [5, 6]
     assert subject_class.quadratic(1, +11, 30) == [-6, -5]

data/examples/command/app/dev_box.rb

@@ -0,0 +1,3 @@
+class DevBox < Liza::DevBox
+
+end

data/examples/log/app/dev/handler_logs/logger_handler_log.rb

@@ -0,0 +1,9 @@
+class LoggerHandlerLog < DevSystem::HandlerLog
+
+  # TODO: https://rubyapi.org/3.1/o/logger
+  def self.call(env)
+    super
+    #
+  end
+  
+end

data/examples/log/app/dev/handler_logs/logger_handler_log_test.rb

@@ -0,0 +1,15 @@
+class LoggerHandlerLogTest < DevSystem::HandlerLogTest
+
+  test :subject_class do
+    assert subject_class == LoggerHandlerLog
+  end
+  
+  test_sections(
+    :default=>{
+      :constants=>[],
+      :class_methods=>[:call],
+      :instance_methods=>[]
+    }
+  )
+
+end

data/examples/new/app/dev_box.rb

@@ -0,0 +1,45 @@
+class DevBox < DevSystem::DevBox
+
+  configure :command do
+    # CommandPanel.instance gives you read-access to this instance
+    shortcut :b, :bench
+    shortcut :g, :generate
+    shortcut :i, :irb
+    shortcut :l, :log
+    shortcut :p, :pry
+    shortcut :s, :shell
+    shortcut :t, :test
+  end
+
+  configure :generator do
+    # GeneratorPanel.instance gives you read-access to this instance
+    shortcut :c, :command
+    shortcut :s, :shell
+  end
+
+  configure :log do
+    # LogPanel.instance gives you read-access to this instance
+    sidebar_size 40
+
+    # handlers
+    handler :output   if not $coding
+    handler :color_output if $coding
+  end
+
+  configure :shell do
+    # ShellPanel.instance gives you read-access to this instance
+    # converters
+    converter :html, :md
+    converter :html, :haml
+    converter :js,   :coffee
+    converter :css,  :scss
+    
+    # formatters
+    formatter :html
+    formatter :html, :xml
+
+    # renderers
+    renderer :erb
+  end
+
+end

data/examples/new/app.rb

@@ -0,0 +1,37 @@
+# This is a LizaRB Application
+# Learn more: https://lizarb.org/
+
+class App
+
+  # Choose your Name
+
+  name "project_1"
+
+  # Choose your Gemfile
+
+  gemfile "Gemfile"
+
+  # Choose your Application Directory
+
+  directory "app"
+
+  # Choose your Log Transparency
+  #
+  #    1       2     3     4      5      6        7
+  # :lowest :lower :low :normal :high :higher :highest
+  #
+  # log_boot  4
+  # log_level 4
+
+  # Choose your Mode and sources of Environment Variables
+
+  # mode :code # default
+  # mode :demo
+
+  # env_vars ".env", ":directory.env", ":directory.:mode.env", mandatory: false
+
+  # Systems help you organize your application's dependencies and RAM memory usage.
+
+  system :dev # default
+
+end

data/examples/shell/app/dev/shells/bash_adapter_shell.rb

@@ -0,0 +1,25 @@
+class BashAdapterShell < DevSystem::Shell
+  # class Error < Liza::Error; end
+  # class CustomError < Error; end
+
+  def self.query_something(args)
+    log "args = #{args.inspect}"
+    output = nil
+
+    output = KernelShell.call_backticks("echo '#{args.size}'")
+    log "output = #{output.inspect}"
+    
+    output
+  end
+
+  def self.execute_something(args)
+    log "args = #{args.inspect}"
+    it_worked = nil
+
+    it_worked = KernelShell.call_system("echo '#{args.size}'")
+    log "it_worked = #{it_worked.inspect}"
+    
+    it_worked
+  end
+
+end

data/examples/shell/app/dev/shells/bash_adapter_shell_test.rb

@@ -0,0 +1,19 @@
+class BashAdapterShellTest < DevSystem::ShellTest
+
+  test :subject_class do
+    assert_equality subject_class, BashAdapterShell
+  end
+
+  test :query_something do
+    a = subject_class.query_something "some args"
+    b = "9\n"
+    assert_equality a, b
+  end
+
+  test :execute_something do
+    a = subject_class.execute_something "same args"
+    b = true
+    assert_equality a, b
+  end
+
+end

data/examples/shell/app/dev/shells/business_logic_shell.rb

@@ -0,0 +1,42 @@
+class BusinessLogicShell < DevSystem::Shell
+  # class Error < Liza::Error; end
+  # class CustomError < Error; end
+
+  # BusinessLogicShell.metric_bmi 70, 180
+
+  def self.metric_bmi(kilograms, centimenters)
+    log "kilograms = #{kilograms.inspect}"
+    log "centimenters = #{centimenters.inspect}"
+    bmi = nil
+
+    bmi = kilograms / ((centimenters / 100.0) ** 2)
+    log "bmi = #{bmi.inspect}"
+    
+    bmi
+  end
+
+  # BusinessLogicShell.imperial_bmi 154, 70
+
+  def self.imperial_bmi(pounds, inches)
+    log "pounds = #{pounds.inspect}"
+    log "inches = #{inches.inspect}"
+
+    kilograms = pounds_to_kilograms pounds
+    centimenters = inches_to_centimeters inches
+
+    metric_bmi kilograms, centimenters
+  end
+
+  # BusinessLogicShell.pounds_to_kilograms 154
+
+  def self.pounds_to_kilograms(pounds)
+    pounds * 0.45
+  end
+
+  # BusinessLogicShell.inches_to_centimeters 70
+
+  def self.inches_to_centimeters(inches)
+    inches * 2.54
+  end
+  
+end

data/examples/shell/app/dev/shells/business_logic_shell_test.rb

@@ -0,0 +1,35 @@
+class BusinessLogicShellTest < DevSystem::ShellTest
+
+  test :subject_class do
+    assert_equality subject_class, BusinessLogicShell
+  end
+
+  #
+
+  test :metric_bmi do
+    a = subject_class.metric_bmi 100, 193
+    b = 26.85
+    assert_equality a.round(2), b
+  end
+
+  test :imperial_bmi do
+    a = subject_class.imperial_bmi 222, 76
+    b = 26.81
+    assert_equality a.round(2), b
+  end
+
+  #
+
+  test :pounds_to_kilograms do
+    a = subject_class.pounds_to_kilograms 222
+    b = 100
+    assert_equality a.round(0), b
+  end
+
+  test :inches_to_centimeters do
+    a = subject_class.inches_to_centimeters 76
+    b = 193
+    assert_equality a.round(0), b
+  end
+
+end

data/examples/shell/app/dev/shells/gem_adapter_shell.rb

@@ -0,0 +1,33 @@
+class GemAdapterShell < DevSystem::Shell
+  # class Error < Liza::Error; end
+  # class CustomError < Error; end
+
+  # GemAdapterShell.do_something "some args"
+
+  def self.do_something(args)
+    log "args = #{args.inspect}"
+    result = nil
+
+    # require "some_gem"
+    # result = SomeGem.do_something args
+    result = [:some, :result]
+    log "result = #{result.inspect}"
+    
+    result
+  end
+
+  # GemAdapterShell.do_something_else "some args"
+
+  def self.do_something_else(args)
+    log "args = #{args.inspect}"
+    result = nil
+
+    # require "some_gem"
+    # result = SomeGem.do_something_else args
+    result = {:some=>{:other=>:result}}
+    log "result = #{result.inspect}"
+    
+    result
+  end
+
+end

data/examples/shell/app/dev/shells/gem_adapter_shell_test.rb

@@ -0,0 +1,19 @@
+class GemAdapterShellTest < DevSystem::ShellTest
+
+  test :subject_class do
+    assert_equality subject_class, GemAdapterShell
+  end
+
+  test :do_something do
+    a = subject_class.do_something "some args"
+    b = [:some, :result]
+    assert_equality a, b
+  end
+
+  test :do_something_else do
+    a = subject_class.do_something_else "same args"
+    b = {some: {other: :result}}
+    assert_equality a, b
+  end
+
+end

data/exe/liza

@@ -1,3 +1,6 @@
 #!/usr/bin/env ruby
 
-load "#{__dir__}/lizarb"
+# global executable liza forwards to local executable when in a mother project directory
+path = "#{Dir.pwd}/exe/lizarb"
+path = "#{__dir__}/lizarb" unless File.exist? path
+Kernel.load path