lizarb 1.0.5 → 1.0.6

data/lib/dev_system/subsystems/generator/generators/move_generator.rb

@@ -0,0 +1,9 @@
+class DevSystem::MoveGenerator < DevSystem::SimpleGenerator
+  
+  # liza g move
+  
+  def call_default
+    log stick :red, "Not implemented yet"
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/move_generator_test.rb

@@ -0,0 +1,8 @@
+class DevSystem::MoveGeneratorTest < DevSystem::SimpleGeneratorTest
+  
+  test :subject_class, :subject do
+    assert_equality DevSystem::MoveGenerator, subject_class
+    assert_equality DevSystem::MoveGenerator, subject.class
+  end
+  
+end

data/lib/dev_system/subsystems/generator/generators/new_generator.rb

@@ -0,0 +1,162 @@
+class DevSystem::NewGenerator < DevSystem::SimpleGenerator
+  
+  # liza g new name
+  
+  def call_default
+    call_project
+  end
+  
+  # liza g new:project name
+  
+  def call_project
+    log "args = #{args.inspect}"
+    # setup
+
+    name! "project"
+
+    from = "#{Lizarb.liz_dir}/examples/new"
+    log "from: #{from}"
+    to = "#{Dir.pwd}/#{@name}"
+
+    return log "Directory #{stick :light_green, to} already exists." if Dir.exist? to
+
+    log "Liza Application initializing at `#{to}`"
+
+    # app
+
+    FileShell.copy from, to
+
+    # extra
+
+    puts
+
+    FileShell.gitkeep "#{to}/lib"
+    FileShell.gitkeep "#{to}/tmp"
+
+    TextShell.write "#{to}/.gitignore", render(:gitignore, format: :gitignore)
+    # TextShell.write "#{to}/Procfile", render(:Procfile, format: :yml)
+    TextShell.write "#{to}/.tool-versions", render(:toolversions, format: :txt)
+
+    FileShell.copy "#{Lizarb.liz_dir}/README.md", "#{to}/README.md"
+    # FileShell.copy "#{Lizarb.app_dir}/web_files", "#{to}/web_files"
+    
+    puts
+
+    KernelShell.call_system \
+      "liza generate gemfile #{@name}/Gemfile +confirm",
+      log_level: :normal
+
+    KernelShell.call_backticks \
+      "cd #{to}; BUNDLE_GEMFILE=Gemfile bundle install",
+      log_level: :normal
+
+    KernelShell.call_backticks \
+      "cd #{to}; git init -b main; git add .; git commit -m 'lizarb new app_1 (v#{Lizarb::VERSION})'",
+      log_level: :normal
+
+    log "Liza Application initialized at `#{to}`"
+  end
+
+  # liza g new:script name
+
+  def call_script
+    if !App.project? or App.global?
+      call_script_independent
+    else
+      call_script_dependent
+    end
+    
+  end
+
+  # liza g new:script_dependent name
+
+  def call_script_dependent
+    name_with_period! "script"
+
+    @systems = ["dev"]
+
+    create_file "scripts/#{@name}", :script_dependent, :rb
+  end
+
+  # liza g new:script_independent name
+
+  def call_script_independent
+    name_with_period! "script"
+
+    @systems = ["dev"]
+
+    create_file @name, :script_independent, :rb
+  end
+
+  # helper methods
+
+  def name! name
+    @name = command.simple_arg_ask_snakecase 1, "Name your new #{name}:"
+    log "@name = #{@name.inspect}"
+  end
+
+  def name_with_period! name
+    @name = command.simple_arg_ask_snakecase 1, "Name your new #{name}:", regexp: /^[a-zA-Z_\.]*$/
+    log "@name = #{@name.inspect}"
+  end
+
+end
+
+__END__
+
+# view gitignore.gitignore.erb
+# Ignore all files in all subdirectories
+.gitignore
+/.bundle/
+/tmp/
+*.sqlite
+*.rdb
+
+# view toolversions.txt.erb
+ruby <%= RUBY_VERSION %>
+
+# view Procfile.yml.erb
+# HEROKU EXAMPLE
+
+web: MODE=demo bundle exec liza rack h=0.0.0.0 p=$PORT
+
+# view script_dependent.rb.erb
+#!/usr/bin/env ruby
+
+require "lizarb"
+Lizarb.init_script_dependent! :dev, app: "app"
+
+# YOUR CODE HERE
+
+# use Shell instead of DevSystem::Shell
+DevSystem::MainShell.easy!
+
+puts
+puts stick " MainShell ".center(100, "-"), :b, :black, :green
+puts
+
+log "MainShell is a wrapper for main: #{self}"
+
+# DevSystem::DevBox.command ["shell"]
+DevBox.command ["shell"]
+
+# view script_independent.rb.erb
+#!/usr/bin/env ruby
+
+require "lizarb"
+Lizarb.init_script_independent! :dev, pwd: __dir__
+puts "#{$boot_time.diff}s to boot" if $log_boot_high
+
+# YOUR CODE HERE
+
+# use Shell instead of DevSystem::Shell
+DevSystem::MainShell.easy!
+
+puts
+puts stick " MainShell ".center(100, "-"), :b, :black, :green
+puts
+
+log "MainShell is a wrapper for main: #{self}"
+
+# DevSystem::DevBox.command ["shell"]
+DevBox.command ["shell"]

data/lib/dev_system/{sub → subsystems}/generator/generators/new_generator_test.rb

@@ -4,8 +4,4 @@ class DevSystem::NewGeneratorTest < DevSystem::SimpleGeneratorTest
     assert subject_class == DevSystem::NewGenerator
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/dev_system/subsystems/generator/generators/not_found_generator.rb

@@ -0,0 +1,87 @@
+class DevSystem::NotFoundGenerator < DevSystem::SimpleGenerator
+  #
+
+  def before
+    super
+    env[:generator_action] = "default"
+  end
+
+  def call_default
+    is_global = App.global?
+    self.log_level 1 if is_global
+
+    app_shell = AppShell.new
+    app_shell.filter_by_unit Generator
+
+    if is_global
+      app_shell.filter_in_units NewGenerator, NotFoundGenerator
+    else
+      app_shell.filter_out_units BaseGenerator, SimpleGenerator, NewGenerator
+      failed_name = menv[:generator_name_original]
+      app_shell.filter_by_name_including failed_name if failed_name
+    end
+
+    outputs(app_shell, failed_name)
+  end
+
+  section :helpers
+
+  def outputs(app_shell, failed_name)
+    domains = app_shell.get_domains.reject(&:empty?)
+    log "domains: #{domains.count}"
+    puts
+
+    if domains.empty?
+      log stick :black, :green, "No results found for '#{failed_name}'"
+      app_shell.undo_filter!
+      domains = app_shell.get_domains
+      log "domains: #{domains.count}"
+    end
+
+    domains.each do |domain|
+      next if domain.empty?
+
+      if log? :normal
+        puts typo.h1 domain.name.snakecase.upcase, domain.color
+      end
+
+      puts
+      domain.layers.each do |layer|
+        next if layer.objects.empty?
+
+        if log? :normal
+          m = "h#{layer.level}"
+          name = layer.level==1 ? domain.name.snakecase.upcase : layer.name.to_s
+          puts typo.send m, name, layer.color unless layer.level==3
+
+          puts stick layer.color, layer.path
+          puts
+        end
+
+        layer.objects.each { print_class _1 }
+        puts
+      end
+    end
+  end
+
+  def print_class klass, description: nil
+    return if [NotFoundCommand].include? klass
+
+    sidebar_length = Log.panel.sidebar_size
+    klass.get_generator_signatures.each do |signature|
+      signature[:name] =
+        signature[:name].empty? \
+          ? klass.token.to_s
+          : "#{klass.token}:#{signature[:name]}"
+      #
+    end.sort_by { _1[:name] }.map do |signature|
+      puts [
+        "liza generate #{signature[:name]}".ljust(sidebar_length),
+        (description or signature[:description])
+      ].join ""
+    end
+  end
+
+  def typo () = TypographyShell
+
+end

data/lib/dev_system/subsystems/generator/generators/not_found_generator_test.rb

@@ -0,0 +1,18 @@
+class DevSystem::NotFoundGeneratorTest < DevSystem::SimpleGeneratorTest
+
+  test :subject_class, :subject do
+    assert_equality subject_class, DevSystem::NotFoundGenerator
+    assert_equality subject.class, DevSystem::NotFoundGenerator
+  end
+
+  test :call_default do
+    assert_raises NoMethodError do
+      subject.call_default
+    end
+    assert_no_raise do
+      subject.menv = {}
+      subject.call_default
+    end
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/overwrite_generator.rb

@@ -0,0 +1,9 @@
+class DevSystem::OverwriteGenerator < DevSystem::SimpleGenerator
+  
+  # liza g overwrite
+  
+  def call_default
+    log stick :red, "Not implemented yet"
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/overwrite_generator_test.rb

@@ -0,0 +1,8 @@
+class DevSystem::OverwriteGeneratorTest < DevSystem::SimpleGeneratorTest
+
+  test :subject_class do
+    assert_equality DevSystem::OverwriteGenerator, subject_class
+    assert_equality DevSystem::OverwriteGenerator, subject.class
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/remove_generator.rb

@@ -0,0 +1,24 @@
+class DevSystem::RemoveGenerator < DevSystem::SimpleGenerator
+  
+  # liza g remove [controller] [filter]
+  
+  def call_default
+    units = app_shell.sorted_writable_units.select { _1 < Controller and _1.superclass != Controller }
+
+    a_filter = Array command.simple_args[1..2]
+
+    if a_filter[0]
+      c = Liza.const a_filter[0]
+      units = units.select { _1 < c }
+    end
+
+    if a_filter[1]
+      units = units.select { _1.to_s.snakecase.include? a_filter[1] }
+    end
+
+    units = pick_many_units units
+    units = units.map { [_1, _1.test_class] rescue _1 }.flatten
+    remove_units units
+  end
+
+end

data/lib/dev_system/subsystems/generator/generators/remove_generator_test.rb

@@ -0,0 +1,8 @@
+class DevSystem::RemoveGeneratorTest < DevSystem::SimpleGeneratorTest
+  
+  test :subject_class, :subject do
+    assert_equality DevSystem::RemoveGenerator, subject_class
+    assert_equality DevSystem::RemoveGenerator, subject.class
+  end
+  
+end

data/lib/dev_system/subsystems/generator/generators/simple_generator.rb

@@ -0,0 +1,345 @@
+class DevSystem::SimpleGenerator < DevSystem::BaseGenerator
+
+  section :filters
+
+  def self.before_instance_calls()= fetch(:before_instance_calls) { [] }
+
+  def self.before_instance_call(method, *args, &block)
+    log :higher, "before_instance_call save #{method}, #{args}, #{block}"
+    before_instance_calls << [method, args, block]
+  end
+
+  def before
+    super
+
+    before_instance_calls
+  end
+
+  def before_instance_calls
+    self.class.before_instance_calls.each do |method, args, block|
+      log :higher, "before_instance_call send #{method}, #{args}, #{block}"
+      send method, *args, &block
+    end
+  end
+  
+  section :panel
+
+  def inform
+    log :lowest, "informing #{mapper.changes.count} changes"
+
+    mapper.changes.each do |fname, data|
+      mapper.changes.delete fname if data[:before] == data[:after]
+    end
+    
+    mapper.changes.each do |fname, data|
+      puts_line
+      
+      action = "updating"
+      action = "creating" if data[:before] == ""
+      action = "deleting" if data[:after] == ""
+
+      diff = {
+        "+": (data[:after].split("\n") - data[:before].split("\n")).count,
+        "-": (data[:before].split("\n") - data[:after].split("\n")).count,
+      }
+
+      bit = diff.map { "#{_1}#{_2}" }.join(" ")
+      relative = Pathname(fname).relative_path_from(App.root)
+      string = "#{action.ljust 8} | #{"#{bit}".rjust 8} lines | #{relative}"
+      log :lowest, string
+
+      if log_level? :low
+        puts relative
+        LineDiffShell.log_diff(data[:before].split("\n"), data[:after].split("\n")) if diff.values.sum.positive?
+      end
+    end
+  end
+
+  def save
+    puts_line
+    diff = {
+      "+": mapper.changes.map { _2[:after].split("\n").count }.sum,
+      "-": mapper.changes.map { _2[:before].split("\n").count }.sum,
+    }
+    log "saving #{mapper.changes.count} files changed: #{diff[:"+"]} insertions(+), #{diff[:"-"]} deletions(-)"
+
+    choices = mapper.changes.keys.map { [_1, _1] }.to_h
+    if command.simple_boolean :confirm
+      answers = choices.keys
+    else
+      answers = InputShell.multi_select "Approve all changes?", choices
+    end
+
+    #
+    
+    puts_line
+    diff = {
+      "+": mapper.changes.map { _2[:after].split("\n").count }.sum,
+      "-": mapper.changes.map { _2[:before].split("\n").count }.sum,
+    }
+    log "saving #{answers.count} files changed: #{diff[:"+"]} insertions(+), #{diff[:"-"]} deletions(-)"
+
+    answers.each do |fname|
+      answer = mapper.changes[fname]
+      if answer[:after] == ""
+        FileShell.remove fname, log_level: :higher
+      else
+        FileShell.write_text fname, answer[:after], log_level: :higher
+      end
+    end
+  end
+
+  section :mapping
+
+  def generate(*args, &block)
+    args = args.flatten
+    cmd_menv = Command.panel.forge ["generate", *args]
+    cmd_menv[:command] = SimpleCommand.new.tap do |cmd|
+      cmd.instance_variable_set :@menv, cmd_menv
+      cmd.before
+    end
+
+    gen_menv = panel.forge cmd_menv
+    gen_menv[:simple_mapper] = mapper
+    panel.forge_shortcut gen_menv
+    panel.find gen_menv
+    panel.find_shortcut gen_menv
+    panel.forward gen_menv
+  end
+
+  def mapper() = menv[:simple_mapper] ||= Mapper.new(self)
+
+  class Mapper
+    attr_reader :changes
+
+    def log(*args, **kwargs)
+      kwargs[:method_name] = 'map'
+      @gen.log(*args, **kwargs)
+    end
+
+    def initialize(generator)
+      @gen = generator
+      log "#{self.class.last_namespace}.#{__method__}"
+      @changes = {}
+    end
+
+    def get(fname)
+      changes[fname]
+    end
+
+    def read_before(fname)
+      cache fname
+      changes[fname][:before]
+    end
+
+    def read_after(fname)
+      cache fname
+      changes[fname][:after]
+    end
+
+    def write_after(fname, text)
+      log "#{self.class.last_namespace}.#{__method__} #{fname.to_s.sub App.root.to_s, "."}, #{text.size} bytes"
+      cache fname
+      changes[fname][:after] = text
+    end
+
+    def delete_after(fname)
+      log "#{self.class.last_namespace}.#{__method__} #{fname.to_s.sub App.root.to_s, "."}"
+      cache fname
+      changes[fname][:after] = ""
+    end
+
+    private
+
+    def cache(fname)
+      raise "fname must be a Pathname" unless fname.is_a? Pathname
+      return true if changes.key? fname
+      
+      s = ""
+      s = DevSystem::FileShell.read_text(fname) if DevSystem::FileShell.exist? fname
+      changes[fname] = {before: s, after: s}
+
+      true
+    end
+    
+  end
+
+  section :files
+
+  def create_file name, template, format
+    contents = render! template, format: format
+    create_file_contents name, contents
+  end
+
+  def create_file_contents name, contents
+    update_file name, contents
+  end
+
+  def read_file name
+    path = App.root.join name
+    mapper.read_after path
+  end
+
+  def update_file name, contents
+    path = App.root.join name
+    mapper.write_after path, contents
+  end
+
+  def delete_file name
+    path = App.root.join name
+    mapper.delete_after path
+  end
+
+  def copy_examples controller
+    puts
+    log controller.to_s
+    singular = controller.singular
+    sys = controller.system.token
+    
+    [
+      Lizarb.gem_dir,
+      Lizarb.app_dir,
+    ].uniq.each do |dir|
+      FileShell.directory? "#{dir}/examples/#{singular}" or next
+      copy_files "#{dir}/examples/#{singular}/app/#{sys}", "#{App.directory}/#{sys}"
+    end
+  end
+
+  #
+
+  def copy_files from_folder, to_folder
+    from_pattern = "#{from_folder}/**/*"
+    log "from_pattern = #{from_pattern}"
+
+    from_files = Dir[from_pattern]
+    log "from_files"
+    log_array from_files
+    puts
+
+    from_files.each do |source|
+      next if File.directory? source
+
+      target = source.sub(from_folder, to_folder)
+      copy_file source, target
+    end
+  end
+
+  def copy_file source, target
+    path = App.root.join target
+    text = FileShell.read_text source
+    mapper.write_after path, text
+  end
+
+  section :arg_views
+
+  def arg_views_none?() = arg_views == 'none'
+
+  def arg_views_eof?() = arg_views == 'eof'
+
+  def arg_views_adjacent?() = arg_views == 'adjacent'
+
+  def arg_views_nested?() = arg_views == 'nested'
+
+  def self.set_default_views(views) = before_instance_call(:set_default_views, views)
+
+  def set_default_views(views) = command.set_default_string(:views, views)
+    
+  def valid_views() = @valid_views ||=  %w[none eof adjacent nested]
+
+  def arg_views() = @arg_views ||= command.simple_string(:views)
+
+  set_input_string :views do |default|
+    title = "Choose views"
+    valid_views = menv[:generator].valid_views
+    index_base_1 = valid_views.index(default) + 1 rescue 1
+    InputShell.select title, valid_views, default: index_base_1
+  end
+  
+  set_default_views "none"
+  
+  section :unit
+
+  def add_unit(unit, class_names, unit_path)
+    raise "unit_path cannot be empty" if unit_path.nil?
+    @current_unit = unit
+    @class_names = class_names
+    @class_name = class_names[0]
+    unit.sections.each do |section|
+      @current_section = section
+      section[:content] = render! section[:render_key], format: :rb
+    end
+    unit.views.each do |view|
+      view[:content] = render! view[:render_key], format: view[:render_format]
+    end
+
+    new_lines = render! :unit, format: :rb
+    if arg_views_eof? && unit.views.any?
+      new_lines << "\n__END__\n\n"
+      unit.views.each do |view|
+        new_lines << "# view #{view[:name]}.#{view[:format]}.erb\n#{view[:content]}"
+      end
+    end
+    mapper.write_after unit_path, new_lines
+  end
+
+  def add_view(unit, view, view_path)
+    raise "view_path cannot be empty" if view_path.nil?
+    view[:content] = render! view[:render_key], format: view[:render_format]
+
+    new_content = view[:content].dup
+    new_content.prepend "# view #{view[:name]}.#{view[:format]}.erb\n" if arg_views_adjacent?
+    mapper.write_after view_path, new_content
+  end
+
+  class UnitHelper
+    def section section = {}
+      sections << section
+      section[:name] or raise "name is required"
+      section[:render_key] ||= section[:name]
+    end
+
+    def view view = {}
+      views << view
+      view[:render_key] or raise "render_key is required"
+      view[:render_format] ||= view[:format]
+      view[:render_format] or raise "render_format is required"
+    end
+
+    def sections
+      @sections ||= []
+    end
+
+    def views
+      @views ||= []
+    end
+  end
+
+  def remove_units(units)
+    units.each do |unit|
+      unit_path_radical = unit.source_location_radical
+      unit_path = "#{unit_path_radical}.rb"
+
+      mapper.delete_after Pathname unit_path
+      views = Dir["#{unit_path_radical}*/**/*"]
+      views.each do |fname|
+        mapper.delete_after Pathname fname
+      end
+    end
+  end
+
+  def pick_many_units(units)
+    options = units.map do |unit|
+      [
+        "#{TypographyShell.color_class unit}",
+        unit
+      ]
+    end.to_h
+    selected = units.count == 1 ? :all : :none
+    InputShell.multi_select "Pick Multiple Controllers", options, selected: selected
+  end
+
+  def app_shell() = @app_shell ||= AppShell.new
+
+  def puts_line() =  puts "-" * 120
+
+end

data/lib/dev_system/subsystems/generator/generators/simple_generator.rb.subject.rb.erb

@@ -0,0 +1,9 @@
+# view subject.rb.erb
+<%
+string = @class_name.end_with?("Test") ? @class_name[0..-5] : @class_name
+-%>
+
+  test :subject_class, :subject do
+    assert_equality subject_class, <%= string %>
+    assert_equality subject.class, <%= string %>
+  end