lux-fw 0.5.36 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88cd45d785eba48eb2321f58d7d6c5e8748339a6dffef24181be783724fed5c
-  data.tar.gz: 368139721b7d25d90839e1b9d948130134c9b6f2bed642a10d75a8e81ba1ed1e
+  metadata.gz: 26a5ad14f0ac275820255d8ac96fa2cf583d41bbac8ba84c3d49a6702844591f
+  data.tar.gz: f29c9147d212b63be1d78678f13a7e80988f70af77b7c37b8b6f5d0a9b8b6cb9
 SHA512:
-  metadata.gz: f38a00ea2a8d43814645f05dd4e59d39d81b6bff5ac29542ae1c41dbb7082f04a050e33d667c9d7a3a09dba285bd0786e7784869595f6ab340cb1bbb96558bde
-  data.tar.gz: 381f478c2e06dd5123f04764b8515b4f8f6e4e438a222c7f89e6e8b5e05cb58952424640c19e2b1d14b2570f7fb646646b4820469e845b9631a526b226cc80e0
+  metadata.gz: 684d38dede88154e2c8a553868a3d575406524b61e3d9160821b75c7c07ac54db0665365250f9e000cd3ba81f1bf35028734ca5bc391b32e65e5c71fdcb455d8
+  data.tar.gz: 711b5774c246d76d1d785c0c8da79fda930a68ec9f26989937cbfa26f60d6f320d6acb12f97d798957a294c50fc952c642702cd52a3ed4a4faf94cb0744ef3cd

data/.version

@@ -1 +1 @@
-0.5.36
+0.6.2

data/bin/README.md

@@ -1,14 +1,15 @@
-# Lux command line helper
+## Lux command line helper
 
-If you run command `lux` in your app home folder, you will see something like this.
+You can run command `lux` in your app home folder.
 
-```
-[master] $ lux
-Lux (/Users/dux/dev/apps/my/gems/lux-fw, v0.5.20)
+If you have `capistrano` or `mina` installed, you will see linked tasks here as well.
+
+```bash
+$ lux
 Commands:
   lux config          # Show server config
   lux console         # Start console
-  lux dbconsole       # Get PSQL console for current database
+  lux erb             # Parse and process *.erb templates
   lux evaluate        # Eval ruby string in context of Lux::Application
   lux generate        # Genrate models, cells, ...
   lux get             # Get single page by path "lux get /login"
@@ -18,16 +19,28 @@ Commands:
   lux server          # Start web server
   lux stats           # Print project stats
 
-Or use one of rake tasks
-  rake assets:clear      # Clear all assets
-  rake assets:compile    # Compile assets to public/assets and generate mainifest.json
-  rake assets:install    # Install all needed packages via yarn
-  rake assets:monitor    # Monitor for file changes
-  rake assets:s3_upload  # Upload assets to S3
-  rake assets:show       # Show all files/data in manifest
+Rake tasks:
+  rake assets:compile    # Build and generate manifest
+  rake assets:install    # Install example rollup.config.js, package.json and Procfile
   rake db:am             # Automigrate schema
+  rake db:console        # Run PSQL console
+  rake db:create         # Create database
+  rake db:drop           # Drop database
+  rake db:dump[name]     # Dump database backup
+  rake db:reset          # Reset database (drop, create, auto migrate, seed)
+  rake db:restore[name]  # Restore database backup
+  rake db:seed:gen       # Create seeds from models
+  rake db:seed:load      # Load seeds from db/seeds
+  rake docker:bash       # Get bash to web server while docker-compose up
+  rake docker:build      # Build docker image named stemical
+  rake docker:up         # copose up
   rake exceptions        # Show exceptions
   rake exceptions:clear  # Clear all excpetions
+  rake images:reupload   # Reupload images to S3
+  rake job:process       # Process delayed job que tasks (NSQ, Faktory, ...)
+  rake job:start         # Start delayed job que tasks Server (NSQ, Faktory, ...)
   rake nginx:edit        # Edit nginx config
   rake nginx:generate    # Generate sample config
+  rake start             # Run local dev server
+  rake stat:goaccess     # Goaccess access stat builder
 ```

data/bin/cli/benchmark.rb

@@ -0,0 +1,18 @@
+def draw_load_speed what
+  time = Benchmark.realtime { yield }
+  puts "#{(time * 1000).to_i.to_s.rjust(4) } ms #{what}"
+end
+
+LuxCli.class_eval do
+  desc :benchmark, 'Benchmark app boot time'
+  def benchmark
+    require "benchmark"
+
+    def Kernel.require what
+      draw_load_speed(what) { super }
+    end
+
+    draw_load_speed('./config/env.rb') { require './config/env'; puts '     --'}
+    draw_load_speed('./config/app.rb') { require './config/app' }
+  end
+end

data/bin/cli/cerb.rb

@@ -0,0 +1,90 @@
+class ErbParser
+  def self.parse file
+    new(file).parse_file
+  end
+
+  ###
+
+  def initialize file
+    @file = file
+  end
+
+  def import_css folder
+    Dir.find(folder, ext: [:css, :scss], invert: true) { '@import "%s";' }
+  end
+
+  def import_js folder
+    Dir.find(folder, ext: [:js, :coffee]) { 'import "%s";' }
+  end
+
+  def import_svelte folder:, prefix:
+    out = []
+    out.push ''
+
+    for file in Dir.find(folder, ext: [:svelte])
+      name = file.split('/').last.split('.').first.downcase
+
+      # cant call classify because we can have block in singular and plural
+      # block-post and block-posts and become SvelteBlockPost
+      klass = "Svelte_#{prefix}_#{name}".gsub(/[^\w]/, '_') #.classify
+
+      out.push "import #{klass} from './#{file}';";
+      out.push "Svelte.bind('#{prefix}-#{name.gsub('_', '-')}', #{klass});"
+      out.push ''
+    end
+
+    out.join($/)
+  end
+
+  def import folder
+    @file.include?('.js.') ? import_js(folder) : import_css(folder)
+  end
+
+  def parse_file
+    f = Pathname.new(@file)
+    data = f.read
+    # data = data.gsub(/\n<%/, '<%')
+
+    Dir.chdir f.dirname.to_s do
+      data = ERB.new(data).result(binding).gsub('././', './')
+    end
+
+    data
+  end
+end
+
+###
+
+LuxCli.class_eval do
+  desc :cerb, 'Parse and process *.cerb templates (cli erb)'
+  def cerb file=nil
+    # To create server side template, create file ending in .erb
+
+    require './config/app'
+
+    if file
+      puts ErbParser.parse(file)
+    else
+      commmand = "find . -type file | grep --color=never \\.cerb$"
+      puts commmand.gray
+      files = `#{commmand}`
+        .split($/)
+        .reject { |f| f.include?('/views/') }
+
+      Cli.die 'No erb templates found' unless files.first
+
+      for local in files
+        next if local.include?('/.')
+
+        target = local.sub(/\.cerb$/, '')
+
+        out = []
+        out.push "/* Generated from #{local} */"
+        out.push ErbParser.parse(local)
+        File.write(target, out.join("\n\n"))
+
+        puts 'Assets compile: %s -> %s (%s)' % [local.green, target, File.size(target).to_filesize]
+      end
+    end
+  end
+end

data/bin/cli/config.rb

@@ -2,12 +2,8 @@ LuxCli.class_eval do
   desc :config, 'Show server config'
   method_option :mode,  aliases: '-m', default: 'production', desc: 'One of the server modes(dev, log, production)'
   def config
-    ENV['LUX_MODE'] = options[:mode]
+    require './config/app.rb'
 
-    require './config/application.rb'
-
-    puts 'LUX_MODE=%s (-m flag)' % ENV['LUX_MODE'].green
-    puts
     puts 'config:'
     Lux.config.sort.each do |key , value|
       value = case value
@@ -20,25 +16,22 @@ LuxCli.class_eval do
       when Proc
         'proc { ... }'
       else
-        value
+        value.inspect
       end
 
-      name = '  Lux.config.%s' % key.white
+      name = '  Lux.config.%s' % key.to_s.white
       print name.ljust(47)
       puts '= %s' % value
     end
 
     puts
     puts 'servers:'
-    puts '  Lux.delay.server                  = %s' % Lux.delay.server
-    puts '  Lux.cache.server                  = %s' % Lux.cache.server
+    puts '  Lux.cache.server = %s' % Lux.cache.server
 
     puts
     puts 'plugins:'
     Lux.plugin.keys.each do |key|
       puts '  Lux.plugin.%s - %s' % [key.ljust(22).white, Lux.plugin.get(key).folder]
     end
-
-    Object.class_callback :info, Lux::Application
   end
 end

data/bin/cli/console.rb

@@ -1,5 +1,3 @@
-require 'pry'
-
 class Object
   def cp data
     data = JSON.pretty_generate(data.to_hash) if data.respond_to?(:to_hash)
@@ -7,32 +5,52 @@ class Object
     'copied'
   end
 
+  # reload code changes
+  def reload!
+    Lux.config.on_reload_code.call :cli
+  end
+
+  # prettify last sql command
+  def sql! sql=nil
+    require 'niceql'
+    puts Niceql::Prettifier.prettify_sql sql || $last_sql_command
+  end
+
+  def c
+    Lux.error.clear_screen
+  end
+
   # show method info
-  # show User, :secure_hash
-  def show klass, m
-    klass = klass.class unless klass.respond_to?(:new)
-    el = klass.instance_method(m)
-    puts el.source_location.or([]).join(':').yellow
-    puts '-'
-    puts el.source
-    nil
+  # m User, :secure_hash
+  def m object, mtd = nil
+    if mtd
+      info = object.method(mtd)
+      puts info.source_location.or([]).join(':').yellow
+      puts '-'
+      puts info.source
+      nil
+    else
+      if object.respond_to?(:superclass)
+        object.methods - object.superclass.methods
+      else
+        object.methods - object.class.superclass.methods
+      end
+    end
   end
 end
 
-
 ARGV[0] = 'console' if ARGV[0] == 'c'
 
 LuxCli.class_eval do
   desc :console, 'Start console'
-  def console
-    $lux_start_time = Time.now
+  def console *args
+    ENV['LUX_ENV'] = 'clre'
 
-    require 'awesome_print'
-    require 'clipboard'
-    require './config/application'
+    require 'amazing_print'
+    require './config/app'
 
-    Lux.config.dump_errors   = true
-    Lux.config.log_to_stdout = true
+    # create mock session
+    Lux::Current.new '/'
 
     if File.exist?('./config/console.rb')
       puts '* loading ./config/console.rb'
@@ -41,21 +59,45 @@ LuxCli.class_eval do
       puts '* ./config/console.rb not found'
     end
 
-    # AwesomePrint.pry!
-    # nice object dump in console
-    Pry.print = proc { |output, data|
-      out = if data.is_a?(Hash)
-        data.class.to_s+"\n"+JSON.pretty_generate(data).gsub(/"(\w+)":/) { '"%s":' % $1.yellow }
+    Pry.pager = false
+
+    Pry.config.print = proc do |output, value|
+      if value.is_a?(Method)
+        output.puts value.inspect
+      elsif value.is_a?(String)
+        output.puts value
       else
-        data.ai
+        ap value
       end
+    end
 
-      output.puts out
-    }
+    if args.first
+      command = args.join(' ')
 
-    # create mock session
-    Lux::Current.new '/'
+      if command.ends_with?('.rb')
+        puts 'Load : %s' % command.light_blue
+        load command
+      else
+        puts 'Command : %s' % command.light_blue
+        data = eval command
+        puts '-'
+        Pry.config.print.call $stdout, data
+      end
+    else
+      # custom history loader
+      history = Pathname.new Lux.root.join('./.pry_history')
+
+      Thread.new do
+        # load in started pry session
+        sleep 0.5
+        if history.exist?
+          lines = history.read.split($/).uniq - ['exit']
+          lines.each {|l| Pry.history.push(l) }
+        end
+      end
+      Pry.start
 
-    Pry.start
+      history.write Pry.history.to_a.uniq.last(100).join($/)
+    end
   end
-end
+end

data/bin/cli/eval.rb

@@ -1,32 +1,10 @@
+ARGV[0] = 'eval' if ARGV[0] == 'e'
+
 LuxCli.class_eval do
   desc :evaluate, 'Eval ruby string in context of Lux::Application'
   def evaluate *args
-    require './config/application'
-
-    Lux.start
-
-    if File.exist?('./config/console.rb')
-      puts '* loading ./config/console.rb'
-      load './config/console.rb'
-    end
-
-    command = ARGV.drop(1).join('; ')
-
-    puts 'Command : %s' % command.light_blue
-
-    data = eval command
-
-    puts '-'
-    puts 'Class   : %s' % data.class
-    puts '-'
-
-    if data.is_a?(String) && data.include?('</body>')
-      require 'nokogiri'
-      puts Nokogiri::XML(data, &:noblanks)
-    else
-      ap data
-    end
-
-    exit
+    require 'amazing_print'
+    require './config/app'
+    console *args
   end
 end

data/bin/cli/generate.rb

@@ -8,19 +8,16 @@ module LuxGenerate
   extend self
 
   def generate object=nil, objects=nil
-    unless object
-      puts "./generate [object singular]".red
-      exit
-    end
+    Cli.die "./generate [object singular]" unless object
 
     template_dir = 'config/templates'
-    exit puts "Lux::View dir #{template_dir} is not accessible" unless Dir.exists?(template_dir)
+    Cli.die "Lux::Template dir #{template_dir} is not accessible" unless Dir.exist?(template_dir)
 
     tpl_desc = {
       p:'api',
       m:'model',
       a:'admin',
-      c:'cell',
+      c:'controller',
       v:'view'
     }
 
@@ -34,6 +31,7 @@ module LuxGenerate
       object  = @object
       objects = @objects
       klass   = @object.classify
+      klasses = klass.pluralize
 
       data.gsub(/\{\{([^\}]+)\}\}/) { eval $1 }
     end
@@ -57,8 +55,8 @@ module LuxGenerate
       templates[type].push [path, data]
     end
 
-    # # puts  "Lux::Views : #{templates.keys.sort.map{ |el| tpl_desc[el.to_sym] ? tpl_desc[el.to_sym].sub(el, el.upcase.yellow) : el.yellow }.join(', ')}"
-    puts  "Lux::Views : #{templates.keys.map{ |el| "#{tpl_desc[el.to_sym]}(#{el.yellow})" }.join(', ')}"
+    # # puts  "Lux::Templates : #{templates.keys.sort.map{ |el| tpl_desc[el.to_sym] ? tpl_desc[el.to_sym].sub(el, el.upcase.yellow) : el.yellow }.join(', ')}"
+    puts  "Templates : #{templates.keys.map{ |el| "#{tpl_desc[el.to_sym]}(#{el.yellow})" }.join(', ')}"
     print "Execute   : "
 
     parse_templates = STDIN.gets.chomp
@@ -67,14 +65,14 @@ module LuxGenerate
       next unless parse_templates.index(type)
       for el in templates[type]
         file, data = *el
-        if File.exists?(file)
+        if File.exist?(file)
           print 'exists'.yellow.rjust(20)
         else
           FileUtils.mkdir_p(file.sub(/\/[^\/]+$/,'')) rescue false
           File.open(file, 'w') { |f| f.write(data) }
           print 'created'.green.rjust(20)
         end
-        puts ": #{file}"
+        puts "  #{file}"
       end
     end
   end
@@ -85,4 +83,4 @@ LuxCli.class_eval do
   def generate object, objects=nil
     LuxGenerate.generate object, objects
   end
-end
+end

data/bin/cli/get.rb

@@ -1,12 +1,20 @@
 LuxCli.class_eval do
   desc :get, 'Get single page by path "lux get /login"'
-  method_option :hide, desc: 'Hide body', type: :boolean, aliases: "-h", default: false
+  method_option :body,   desc: 'Show body',    type: :boolean, aliases: "-b", default: false
+  method_option :info,   desc: 'Show info',    type: :boolean, aliases: "-i", default: false
+  method_option :type,   desc: 'Request type', type: :boolean, aliases: "-i", default: false
   def get path
-    require './config/application'
+    require './config/app'
 
-    data = Lux.app.render(path)
-    data[:body] = 'BODY lenght: %s kB' % (data[:body].length.to_f/1024).round(1) if options[:hide]
-    ap data
-    puts '-h true if you want to hide body' unless options[:hide]
+    Cli.die "Use\n -b to show body\n -i to show info" unless options[:body] || options[:info]
+
+    data = Lux.app.new(path).render
+
+    if options[:body]
+      puts data[:body]
+    elsif options[:info]
+      data[:body] = 'BODY lenght: %s kB' % (data[:body].length.to_f/1024).round(1)
+      ap data.to_h
+    end
   end
 end

data/bin/cli/memory.rb

@@ -0,0 +1,12 @@
+LuxCli.class_eval do
+  desc :memory, 'Show memory usage'
+  def memory
+    require 'memory_profiler'
+
+    report = MemoryProfiler.report do
+      require './config/app'
+    end
+
+    report.pretty_print retained_strings: 5, allocated_strings: 5#(to_file: "profile.txt")
+  end
+end

data/bin/cli/new.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 LuxCli.class_eval do
   desc 'new APP_NAME', 'Creates new lux application'
   def new app_folder

data/bin/cli/secrets.rb

@@ -3,38 +3,10 @@ LuxCli.class_eval do
   def secrets
     require 'lux-fw'
 
-    @secrets = Lux::Config::Secrets.new
-
-    # create secret from template (config/secrets.enc)
-    # or read file (tmp/secrets.yaml) if one exist
-    unless @secrets.read_file.exist?
-      if @secrets.secret_file.exist?
-        @secrets.read_file.write @secrets.encoded_data
-        Cli.info 'CREATED read file %s from secrets file' % @secrets.read_file
-        # encoded = JWT.encode @secrets.read_file.read, @secrets.secret, @secrets.strength
-        # @secrets.secret_file.write encoded
-        # Cli.info 'Written secret file %s' % @secrets.secret_file
-      else
-        data  = "version: 1\n\n"
-        data += %w[shared production development].map{ |it| "%s:\n  key: value" % it }.join("\n\n")
-        @secrets.read_file.write data
-        Cli.info '@Secrets file "%s" created from template.' % @secrets.read_file
-      end
-    end
-
-    # edit ecrets file
-    vim = `which vim`.chomp.or('vi')
-    system '%s %s' % [vim, @secrets.read_file]
-
-    # write secrets file if needed
-    if !@secrets.secret_file.exist? || (@secrets.secret_file.ctime < @secrets.read_file.ctime)
-      @secrets.write
-      Cli.info 'Written secret file %s' % @secrets.secret_file
-    end
-
     # show secret for easier debuging and dump secrets
-    Cli.info 'secret: "%s"' % @secrets.secret
     Cli.info 'dump for ENV %s' % Lux.env
-    puts @secrets.to_h.pretty_generate
+
+    Cli.info 'dump for secrets'
+    puts Lux.secrets.to_h.to_jsonp(true)
   end
 end

data/bin/cli/server.rb

@@ -1,24 +1,43 @@
+# RACK_ENV = test dev/development prod/production
+#   live acts as production. RACK_ENV=live; Lux.env.prod? # true
+# LUX_ENV  = clre - add any for dev env options. Emit all -> production settings
+  # Lux.env.no_cache?    # true
+  # Lux.env.screen_log?  # true
+  # Lux.env.reload_code? # true
+  # Lux.env.reload_code? # true
+
+# no code reload with logging
+# lux s -c
+
 if ARGV[0] == 's'
   ARGV[0] = 'server'
-elsif ARGV[0] == 'ss'
-  # production mode with logging
-  ARGV = %w{server -m log }
+end
+
+# lux ss -> lux -opt le (only log and errors dump, no cacing and code reload)
+if ARGV[0] == 'ss'
+  ARGV[0] = 'server'
+  ARGV[1] = '-o'
+  ARGV[2] = 'le'
 end
 
 LuxCli.class_eval do
   desc :server, 'Start web server'
   method_option :port,  aliases: '-p', default: 3000,  desc: 'Port to run app on', type: :numeric
-  method_option :mode,  aliases: '-m', default: 'dev', desc: 'One of the server modes(dev, log, production)'
-  method_option :env,   aliases: '-e', default: 'd',   desc: 'Environemnt, only first chart counts'
+  method_option :env,   aliases: '-e', desc: 'Environemnt, only first chart counts (%s)'
   method_option :rerun, aliases: '-r', default: false, desc: 'rerun app on every file chenge', type: :boolean
+  method_option :opt,  aliases: '-o', default: 'clre', desc: 'lux options (clre - cache, screen log, code reload, errors)', type: :string
   def server
-    mode  = 'LUX_MODE=%s' % options[:mode]
-    env   = options[:env][0,1] == 'p' ? 'production' : 'development'
+    trap("SIGINT") { Cli.die 'ctrl+c exit' }
+
+    ENV['RACK_ENV'] = options[:env] if options[:env]
+    ENV['LUX_ENV'] = options[:opt]
+
+    command = "RACK_ENV=#{ENV['RACK_ENV']} LUX_ENV=#{ENV['LUX_ENV']} bundle exec puma -p #{options[:port]}"
 
     if options[:rerun]
-      Cli.run "#{mode} rerun -p '**/*.{rb,ru}' -d . -d #{LUX_ROOT} 'lux s -p #{options[:port]}'"
+      Cli.run "find #{LUX_ROOT} . -name *.rb | entr -r #{command}"
     else
-      Cli.run "#{mode} puma -e #{env} -p #{options[:port]}"
+      Cli.run command
     end
   end
 end