squared 0.3.10 → 0.4.0

data/README.ruby.md

@@ -1,4 +1,4 @@
-# squared 0.3
+# squared 0.4
 
 * [source](https://github.com/anpham6/squared)
 * [manifest](https://github.com/anpham6/squared-repo)
@@ -11,6 +11,7 @@
 | 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |   2.39 |
 | 2025-01-07 |   0.2.0 |  2.4.0 |  3.4.0 |   2.39 |
 | 2025-02-07 |   0.3.0 |  2.4.0 |  3.4.1 |   2.39 |
+| 2025-03-06 |   0.4.0 |  2.4.0 |  3.4.2 |   2.39 |
 
 The range chart indicates the latest Ruby tested against at the time of release.
 
@@ -45,18 +46,19 @@ require "squared/workspace/repo"                     # Optional
 require "squared/workspace/project/node"             #
 require "squared/workspace/project/python"           #
 require "squared/workspace/project/ruby"             #
+require "squared/workspace/project/docker"           #
 # OR
 require "squared/app"                                # All workspace related modules
 
 # NODE_ENV  = production
 
-# REPO_ROOT = /workspaces                            #
-# REPO_HOME = /workspaces/squared                    # Dir.pwd
-# rake      = /workspaces/squared/Rakefile           # main?
+# REPO_ROOT = /workspaces                            |
+# REPO_HOME = /workspaces/squared                    | Dir.pwd
+# rake      = /workspaces/squared/Rakefile           | main?
 # OR
-# REPO_ROOT = /workspaces                            # Dir.pwd
-# rake      = /workspaces/Rakefile                   #
-# REPO_HOME = /workspaces/squared                    # main: "squared"
+# REPO_ROOT = /workspaces                            | Dir.pwd
+# rake      = /workspaces/Rakefile                   |
+# REPO_HOME = /workspaces/squared                    | main: "squared"
 
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
@@ -86,25 +88,34 @@ Workspace::Application
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("squared", script: ["build:stage1", "build:stage2"], group: "app") do # Copy target (main)
     # Repo (global)
-    as(:run, "build:dev", "dev")                           # npm run build:dev -> npm run dev
+    as(:run, "build:dev", "dev")                                             # npm run build:dev -> npm run dev
     as(:run, { "build:dev": "dev", "build:prod": "prod" })
 
-    add("publish/sqd-cli", "cli", exclude: [:git]) # rake cli:build
-    add("publish/sqd-serve")                       # rake sqd-serve:build
+    add("publish/sqd-cli", "cli", exclude: [:git])                           # rake cli:build
+    add("publish/sqd-serve")                                                 # rake sqd-serve:build
     add("publish/sqd-admin", group: "sqd", exclude: [:base])
     # OR
-    with(exclude: [:base]) { add("publish/*", "packages") } # rake packages:sqd-serve:build
+    with(exclude: [:base]) { add("publish/*", "packages") }                  # rake packages:sqd-serve:build
     # OR
-    add(["publish/sqd-cli", "publish/sqd-serve", "publish/sqd-admin"], true, exclude: [:base]) # rake squared:sqd-serve:build
+    add(["publish/sqd-cli", "publish/sqd-serve"], true, exclude: [:base])    # rake squared:sqd-serve:build
   end
-  .add("squared/sqd", exclude: :git, pass: [:node, 'checkout', 'bump']) do # Skip initialize(:node) + squared:checkout:* + squared:bump:*
-    variable_set :script, "build:sqd"   # Override detection
+  .add("squared/sqd", exclude: :git, pass: [:node, "checkout", "bump"]) do # Skip initialize(:node) + squared:checkout:* + squared:bump:*
+    variable_set :script, "build:sqd"                                      # Override detection
     variable_set :depend, false
     variable_set :clean, ["build/sqd/"]
   end
+  .with(:docker, pass: ["unpack"]) do
+    .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", args: "--ssh=default", secrets: ["id=github,env=GITHUB_TOKEN"]) do # Docker
+      series(:clean) do                                                                                                                           # run | depend | doc | lint | test | copy | clean
+        File.read(basepath("docker-bake.hcl"))
+            .scan(/\btags\s+=\s+\["([^"]+)"\]/)
+            .each { |val| image(:rm, tag: val.first) }
+      end
+    end
+  end
   .pass("pull", group: "default") { test? || doc? } # pathname:pull | optparse:pull
   .style("banner", 255.255) # 256 colors (fg | fg.bg | -0.bg)
-  .build(default: "build", parallel: ["pull", "fetch", "rebase", "copy", "clean", /^outdated:/], pass: ['publish']) do |workspace|
+  .build(default: "build", parallel: ["pull", "fetch", "rebase", "archive", "copy", "clean", /^outdated:/], pass: ["publish"]) do |workspace|
     workspace
       .enable_aixterm
       .style({
@@ -121,19 +132,19 @@ Workspace::Application
 # chrome    = /workspaces/chrome-docs
 
 Workspace::Application
-  .new(ENV["SQUARED_HOME"], prefix: "rb", common: false)        # Local styles
+  .new(ENV["SQUARED_HOME"], prefix: "rb", common: false) # Local styles
   .group("ruby", "default", run: "rake build", copy: "rake install", clean: "rake clean", ref: :ruby, override: {
     pathname: {
-      run: "rake compile"                                       # rake rb:pathname:build
+      run: "rake compile"                                # rake rb:pathname:build
     }
   })
-  .with(:python) do                                             # ref=Symbol | group=String
-    banner([:name, ": ", :version], "path")                     # chrome-docs: 0.1.0 | /workspaces/chrome-docs
-    doc("make html")                                            # rake rb:doc:python
-    run(false)                                                  # rake rb:build:python (disabled)
-    exclude(%i[base git])                                       # Project::Git.ref (superclass)
-    add("android-docs", "android")                              # rake rb:android:doc
-    add("chrome-docs", "chrome")                                # rake rb:chrome:doc
+  .with(:python) do                                      # ref=Symbol | group=String
+    banner([:name, ": ", :version], "path")              # chrome-docs: 0.1.0 | /workspaces/chrome-docs
+    doc("make html")                                     # rake rb:doc:python
+    run(false)                                           # rake rb:build:python (disabled)
+    exclude(%i[base git])                                # Project::Git.ref (superclass)
+    add("android-docs", "android")                       # rake rb:android:doc
+    add("chrome-docs", "chrome")                         # rake rb:chrome:doc
   end
   .style("inline", "bold")
   .build
@@ -141,6 +152,33 @@ Workspace::Application
 
 **NOTE**: The use of "**ref**" (class name) is only necessary when initializing an empty directory (e.g. *rake repo:init*).
 
+## Archive
+
+```ruby
+# HEADERS={"Authorization":"Bearer RANDOM-TOKEN"} (hash/json)
+# ZIP_DEPTH=0               | default=1
+# TAR_DEPTH=0               | TAR_DEPTH_SQUARED
+# UNPACK_FORCE=1            | Remove target directory
+
+Workspace::Application
+  .new(main: "squared")
+  .with(:python) do
+    add("android-docs", "android", archive: "https://github.com/anpham6/android-docs/archive/refs/tags/v0.3.0.zip")
+    add("chrome-docs", "chrome", archive: {
+      uri: "https://github.com/anpham6/chrome-docs/archive/refs/tags/v0.5.0.tar.gz",  # URI.open (required)
+      digest: "e3d55d2004d4770dd663254c9272dc3baad0d57a5bd14ca767de6546cdf14680",     # SHA1 | SHA256 | SHA384 | SHA512 | MD5
+      digest: "rmd160:47b7790a511eed675fec1a3e742845fef058799b",                      # RMD160
+      ext: "tar.gz",                                                                  # zip | tar | tar.gz | tgz | tar.xz | txz
+      depth: 1,                                                                       # nested directories (e.g. --strip-components)
+      headers: {                                                                      # URI.open
+        "Authorization" => "Bearer RANDOM-TOKEN"
+      }
+    })
+  end
+  .add("squared", release: "https://github.com/anpham6/squared/archive/refs/tags/??") # squared:unpack:zip[v5.4.0,/tmp/squared]
+end
+```
+
 ### Clone
 
 The task is only active when the project directory is empty or does not exist.
@@ -179,10 +217,14 @@ Workspace::Application
   end
   .with(:python) do                                             # rake clone:python
     add("android-docs")
-    add("chrome-docs")
+    add("chrome-docs") do
+      revbuild(include: "source/", exclude: ["source/conf.py"]) # Limit files being watched
+    end
   end
-  .git("https://github.com/anpham6")                            # Uses already defined root projects
   .git("https://github.com/anpham6", ["emc", "pir"])            # Targets any defined project
+  .git("https://github.com/anpham6", cache: true)               # Uses already defined root projects + revbuild
+  .revbuild                                                     # Enables task revbuild (squared.revb)
+  .revbuild(file: "../build.json")                              # $ROOT/build.json
   .build(parallel: ["clone"])                                   # rake clone + rake clone:sync
 ```
 
@@ -197,45 +239,75 @@ Workspace::Application
     add("chrome-docs", "chrome", graph: "android")
   end
   .with(:node) do
-    graph(["build", "copy"], on: {                                               # Overrides "git"
+    graph(["build", "copy"], on: {                                             # Overrides "git"
       first: proc { puts "1" },
       last: proc { puts "2" }
     })
-    script("build:dev")                                                          # npm run build:dev
+    script("build:dev")                                                        # npm run build:dev
     # OR
-    run([nil, "build:dev", { "PATH" => "~/.bin" }, "--workspace", "--silent"])   # PATH="~/.bin" npm run build:dev --workspace -- --silent
+    run([nil, "build:dev", { "PATH" => "~/.bin" }, "--workspace", "--silent"]) # PATH="~/.bin" npm run build:dev --workspace -- --silent
+    # OR
+    run({                                                                      # Same
+      script: "build:dev",                                                     #
+      env: { "PATH" => "~/.bin" },                                             #
+      opts: "--workspace",                                                     #
+      args: "--silent"                                                         #
+    })
 
     add("e-mc", "emc") do
-      first("build", "emc:clean", "emc:depend")                                  # rake emc:clean && rake emc:depend && rake emc:build && echo "123"
-      last("build", out: "123") { |out: nil| puts out }                          #
-      error("build") { |err: nil| log.debug err }                                #
+      first("build", "emc:clean", "emc:depend")                                # rake emc:clean && rake emc:depend && rake emc:build && echo "123"
+      last("build", out: "123") { |out: nil| puts out }                        #
+      error("build") { |err: nil| log.debug err }                              #
     end
     add("pi-r", "pir", graph: "emc", first: {
-      build: proc { puts self.name }                                             # puts "pir"
+      build: proc { puts self.name }                                           # puts "pir"
     })
     add("squared-express", "express", graph: "pir")
     add("squared", graph: ["chrome", "express"]) do
-      first("git:ls-files") { puts path }
-      last("git:ls-files") { puts workspace.root }
+      first("git:ls-files") { puts "1" }                                       # skipped
+      first("git:ls-files", override: true) { puts "2" }                       # puts "2"
+      last("git:ls-files") { puts workspace.root }                             # puts "/workspaces"
     end
   end
   .with(:ruby) do
-    run("gem build")                                                             # gem build
+    run("gem build")                                                           # gem build
     # OR
-    run(["gem build", "--force", { "RUBY_VERSION" => "3.4.0" }])                 # RUBY_VERSION="3.4.0" gem build --force
+    run(["gem build", "--force", { "RUBY_VERSION" => "3.4.0" }])               # RUBY_VERSION="3.4.0" gem build --force
+    # OR
+    run({                                                                      #
+      command: "gem build",                                                    # RUBY_VERSION="3.4.0" gem build --silent --force
+      opts: "--force",                                                         # composable
+      env: { "PATH" => "~/.bin" },                                             #
+      args: { silent: true }                                                   #
+    })
     # OR
-    run(["gem pristine", ["gem build", "gem cleanup"], nil, "--debug"])          # gem pristine --debug && gem build --debug && gem cleanup --debug
+    run(["gem pristine", ["gem build", "gem cleanup"], nil, "--debug"])        # gem pristine --debug && gem build --debug && gem cleanup --debug
+    #
+    # All commands are either Array or Hash
+    #
+    run([                                                                      # PATH="~/.bin" GEM_HOME="~/.gems/ruby-3.4.0" (merged)
+      ["gem pristine", "--all", { "PATH" => "~/.bin" }, "--silent"],           # gem pristine --silent --all
+      ["gem build", { strict: true }, { "GEM_HOME" => "~/.gems/ruby-3.4.0" }]  # gem build --strict
+    ])                                                                         #
     # OR
-    run([                                                                        # PATH="~/.bin" GEM_HOME="~/.gems/ruby-3.4.0" (merged)
-      ["gem pristine", "--all", { "PATH" => "~/.bin" }, "--silent"],             # gem pristine --silent --all
-      ["gem build", { strict: true }, { "GEM_HOME" => "~/.gems/ruby-3.4.0" }]    # gem build --strict
+    run([                                                                      # Same
+      {                                                                        #
+        env: { "PATH" => "~/.bin" },                                           #
+        command: "gem pristine",                                               #
+        opts: "--all", args: "--silent"                                        #
+      },                                                                       #
+      {                                                                        #
+        env: { "GEM_HOME" => "~/.gems/ruby-3.4.0" },                           #
+        command: "gem build",                                                  #
+        opts: { strict: true }                                                 #
+      }                                                                        #
     ])
 
-    add("pathname", test: ["rake test", { jobs: ENV["RAKE_JOBS"] }])             # rake test --jobs 4
+    add("pathname", test: ["rake test", { jobs: ENV["RAKE_JOBS"] }])           # rake test --jobs 4
     add("fileutils", graph: "pathname")
-    add("optparse", run: "gem build", env: { "PATH" => "~/.bin" }, opts: "-v")   # PATH="~/.bin" gem build -v
+    add("optparse", run: "gem build", env: { "PATH" => "~/.bin" }, opts: "-v") # PATH="~/.bin" gem build -v
     add("rake", graph: ["fileutils", "optparse"])
-    banner(command: false)                                                       # Always hide banner
+    banner(command: false)                                                     # Always hide banner
   end
   .build
 ```
@@ -314,6 +386,7 @@ Task:
 * run
 * script
 * depend
+* archive
 * graph
 * doc
 * lint
@@ -332,7 +405,10 @@ Non-task:
 * header
 * active
 * inline
+* subject
+* caution
 * current
+* extra
 * major
 * red
 * yellow
@@ -346,12 +422,14 @@ All project executable programs can have their binary path set to a non-global a
 
 ```ruby
 Common::PATH.merge!({
-  GIT: '/usr/bin/git',
-  GEM: '~/.rvm/rubies/ruby-3.4.0/bin/gem',
-  BUNDLE: '~/.rvm/gems/ruby-3.4.0/bin/bundle',
-  RAKE: '~/.rvm/gems/ruby-3.4.0/bin/rake',
-  NPM: '/opt/node/v22.0.0/bin/npm',
-  PYTHON: "#{ENV['PYTHONPATH']}/bin/python"
+  GIT: "/usr/bin/git",
+  TAR: "/opt/archivers/tar",
+  UNZIP: "/opt/archivers/unzip",
+  GEM: "~/.rvm/gems/ruby-3.4.0/bin/gem",
+  BUNDLE: "~/.rvm/gems/ruby-3.4.0/bin/bundle",
+  RAKE: "~/.rvm/gems/ruby-3.4.0/bin/rake",
+  NPM: "/opt/node/v22.0.0/bin/npm",
+  PYTHON: "#{ENV["PYTHONPATH"]}/bin/python"
 })
 ```
 
@@ -362,32 +440,32 @@ Workspace::Application
   .new
   .add("squared", run: "gcc a.c -o a.o", opts: { __debug__: { g: true, O2: true, c: nil }, c: true, j: 4 }) # gcc a.c -o a.o -c -j4
 
-BUILD_TYPE          # global
-
-# :env                                         :run           :opts :type
-# LD_LIBRARY_PATH="path/to/lib" CFLAGS="-Wall" gcc a.c -o a.o -g    -O2
-BUILD_${NAME}       # gcc a.c -o a.o
-BUILD_${NAME}_OPTS  # -g
-BUILD_${NAME}_ENV   # {"LD_LIBRARY_PATH":"path/to/lib","CFLAGS":"-Wall"} (hash/json)
-BUILD_${NAME}_TYPE  # debug
-
-# :env                                       :opts                               :script      :args
-# NODE_ENV="production" NO_COLOR="1" npm run --loglevel=error --workspaces=false build:dev -- --quiet
-BUILD_${NAME}       # build:dev
-BUILD_${NAME}_OPTS  # --loglevel=error --workspaces=false
-BUILD_${NAME}_ENV   # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
-BUILD_${NAME}_DEV   # pattern,0,1 (:dev)
-BUILD_${NAME}_PROD  # pattern,0,1 (:prod)
-SCRIPT_${NAME}_OPTS # --quiet
-
-BUILD_${NAME}=0     # skip project
+BUILD_TYPE           # global
+
+# :env                                         :run           :args :opts :type
+# LD_LIBRARY_PATH="path/to/lib" CFLAGS="-Wall" gcc a.c -o a.o       -g    -O2
+BUILD_${NAME}        # gcc a.c -o a.o
+BUILD_${NAME}_OPTS   # -g
+BUILD_${NAME}_ENV    # {"LD_LIBRARY_PATH":"path/to/lib","CFLAGS":"-Wall"} (hash/json)
+BUILD_${NAME}_TYPE   # debug
+
+# :env                                       :script   :opts                                  :args
+# NODE_ENV="production" NO_COLOR="1" npm run build:dev --loglevel=error --workspaces=false -- --quiet
+BUILD_${NAME}        # build:dev
+BUILD_${NAME}_OPTS   # --loglevel=error --workspaces=false
+BUILD_${NAME}_ENV    # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
+BUILD_${NAME}_DEV    # pattern,0,1 (:dev)
+BUILD_${NAME}_PROD   # pattern,0,1 (:prod)
+${REF}_${NAME}_OPTS  # --quiet (e.g. NODE_SQUARED_OPTS)
+
+BUILD_${NAME}=0      # skip project
 ```
 
 ### Graph
 
 ```ruby
-GRAPH_${NAME}       # depend,build => squared:depend + squared:build
-GRAPH_${NAME}_PASS  # -emc,pir,express => pir + express
+GRAPH_${NAME}        # depend,build => squared:depend + squared:build
+GRAPH_${NAME}_PASS   # -emc,pir,express => pir + express
 ```
 
 ### Logger
@@ -395,13 +473,13 @@ GRAPH_${NAME}_PASS  # -emc,pir,express => pir + express
 These global options also can target the project suffix `${NAME}`. (e.g. LOG_FILE_EMC)
 
 ```ruby
-LOG_FILE            # %Y-%m-%d.log
+LOG_FILE             # %Y-%m-%d.log
 # OR
-LOG_AUTO            # year,y,month,m,day,d,1
+LOG_AUTO             # year,y,month,m,day,d,1
 # Optional
-LOG_DIR             # exist?
-LOG_LEVEL           # See gem "logger"
-LOG_COLUMNS         # terminal width (default: 80)
+LOG_DIR              # exist?
+LOG_LEVEL            # See gem "logger"
+LOG_COLUMNS          # terminal width (default: 80)
 ```
 
 ### Repo
@@ -409,17 +487,18 @@ LOG_COLUMNS         # terminal width (default: 80)
 These global options also can target the application main suffix `${NAME}`. (e.g. REPO_ROOT_SQUARED)
 
 ```ruby
-REPO_ROOT           # parent dir
-REPO_HOME           # project dir (main)
-REPO_BUILD          # run,script
-REPO_GROUP          # string
-REPO_REF            # e.g. ruby,node
-REPO_DEV            # pattern,0,1
-REPO_PROD           # pattern,0,1
-REPO_WARN           # 0,1
-REPO_SYNC           # 0,1
-REPO_MANIFEST       # e.g. latest,nightly,prod
-REPO_TIMEOUT        # confirm dialog (seconds)
+REPO_ROOT            # parent dir
+REPO_HOME            # project dir (main)
+REPO_BUILD           # run,script
+REPO_GROUP           # string
+REPO_REF             # e.g. ruby,node
+REPO_DEV             # pattern,0,1
+REPO_PROD            # pattern,0,1
+REPO_WARN            # 0,1
+REPO_SYNC            # 0,1
+REPO_MANIFEST        # e.g. latest,nightly,prod
+REPO_DRYRUN          # 0,1,2
+REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
 ## Git
@@ -433,12 +512,13 @@ Most project classes will inherit from `Git` which enables these tasks:
 | commit     | commit           | add all amend amend-orig                      |
 | diff       | diff             | head cached branch files between contain      |
 | fetch      | fetch            | origin remote                                 |
-| files      | ls-files         | cached modified deleted others                |
+| files      | ls-files         | cached modified deleted others ignored        |
+| git        |                  | clean mv restore rm                           |
+| merge      | merge            | commit no-commit send                         |
 | pull       | pull             | origin remote                                 |
 | rebase     | rebase           | branch onto send                              |
 | refs       | ls-remote --refs | heads tags remote                             |
 | reset      | reset            | commit index patch mode                       |
-| restore    | restore          | source worktree staged overlay                |
 | rev        | rev              | commit branch output parseopt                 |
 | show       | show             | format oneline                                |
 | stash      | stash            | push pop apply drop list                      |

data/lib/squared/app.rb

@@ -5,4 +5,5 @@ require_relative 'workspace/repo'
 require_relative 'workspace/project/node'
 require_relative 'workspace/project/python'
 require_relative 'workspace/project/ruby'
+require_relative 'workspace/project/docker'
 require_relative 'config'

data/lib/squared/common/base.rb

@@ -13,8 +13,10 @@ module Squared
       BANNER: true,
       QUOTE: "'",
       SPACE: ' => ',
-      GRAPH: ['│', '─', '├', '└', '┬'],
+      GRAPH: ['|', '-', '|', '\\', '-'].freeze,
+      BORDER: ['|', '-', '-', '-', '-', '-', '|', '|', '-', '-'].freeze,
       VIEW: 'view',
+      LEVEL: ENV.fetch('LOG_LEVEL', 0).to_i,
       COLOR: ENV.fetch('NO_COLOR', '').empty?
     }
     VAR = {
@@ -42,7 +44,10 @@ module Squared
           header: [:bold],
           active: [:bold],
           inline: [:bold],
+          subject: [:bold],
+          caution: [:red],
           current: nil,
+          extra: nil,
           major: [:bold]
         },
         project: {},

data/lib/squared/common/class.rb

@@ -54,7 +54,7 @@ module Squared
           ret.each_with_index do |opt, index|
             if opt == val
               j = index
-            elsif j && opt =~ pat && $1 == key
+            elsif j && opt[pat, 1] == key
               i << index
             end
           end

data/lib/squared/common/format.rb

@@ -28,12 +28,16 @@ module Squared
         bright_cyan!: '106',
         bright_white!: '107'
       }.freeze
+      AIX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
+      AIX_BORDER = ['│', '─', '╭', '╮', '╯', '╰', '├', '┤', '┬', '┴'].freeze
       TEXT_STYLE = [:bold, :dim, :italic, :underline, :blinking, nil, :inverse, :hidden, :strikethrough].freeze
-      private_constant :AIX_TERM, :TEXT_STYLE
+      private_constant :AIX_TERM, :AIX_GRAPH, :AIX_BORDER, :TEXT_STYLE
 
       def enable_aixterm
         unless (colors = __get__(:colors)).frozen?
           colors.merge!(AIX_TERM)
+          ARG[:GRAPH] = AIX_GRAPH
+          ARG[:BORDER] = AIX_BORDER
         end
         block_given? ? yield(self) : self
       end
@@ -53,7 +57,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
+        args.concat(as_a(styles)).each_with_index do |type, i|
           next unless type
 
           if index == -1
@@ -114,7 +118,7 @@ module Squared
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
-          elsif val.between?(0, 256)
+          elsif val >= 0 && val <= 256
             ret << val
           elsif val < 0 && (b = val.to_s.split('.')[1])
             b = b[0, 3]
@@ -166,21 +170,29 @@ module Squared
         color ? sub_style(ret, *styles) : ret
       end
 
-      def log_message(level, *args, subject: nil, hint: nil, color: ARG[:COLOR])
+      def log_message(level, *args, subject: nil, hint: nil, color: ARG[:COLOR], pass: false)
+        return false if !pass && level.is_a?(::Numeric) && level < ARG[:LEVEL]
+
         args = args.map(&:to_s)
-        if args.size > 1
+        if args.size > 1 && !hint
           title = log_title(level, color: false)
           sub = { pat: /^(#{title})(.+)$/, styles: __get__(:theme)[:logger][log_sym(level)] } if color
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]
-          msg << (color ? sub_style(subject, :underline) : subject) if subject
-          msg << args.shift if msg.size == 1
+          if subject
+            msg << (color ? sub_style(subject, styles: (@theme && @theme[:subject]) || :bold) : subject)
+          else
+            msg += args
+            args.clear
+          end
           message(msg.join(' '), *args, hint: hint)
         end
       end
 
       def puts_oe(*args, pipe: 1)
+        return if args.first == false && args.size == 1
+
         if pipe.is_a?(Pathname)
           begin
             File.open(pipe, 'a') do |f|
@@ -222,27 +234,31 @@ module Squared
           require 'io/console'
           (n = [n, $stdout.winsize[1] - 4].min) rescue nil
         end
+        b0, b1, b2, b3, b4, b5, b6, b7 = ARG[:BORDER]
         out = []
-        bord = '-' * (n + 4)
-        bord = sub_style(bord, styles: border) if border
+        draw = lambda do |a, b|
+          ret = a + (b1 * (n + 2)) + b
+          ret = sub_style(ret, styles: border) if border
+          ret
+        end
         sub = as_a(sub)
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| s = sub_style(s, **h) }
-          s = "| #{s} |"
+          s = "#{b0} #{s} #{b0}"
           if border
-            s = sub_style(s, pat: /\A(\|)(.+)\z/m, styles: border)
-            s = sub_style(s, pat: /\A(.+)(\|)\z/m, styles: border, index: 2)
+            s = sub_style(s, pat: /\A(#{Regexp.escape(b0)})(.+)\z/m, styles: border)
+            s = sub_style(s, pat: /\A(.+)(#{Regexp.escape(b0)})\z/m, styles: border, index: 2)
           end
           s
         end
-        out << bord
+        out << draw.(b2, b3)
         if title
           out += title.map { |t| pr.(t) }
-          out << bord
+          out << draw.(b6, b7)
         end
         lines.each { |line| out << pr.(line) }
-        out << bord
+        out << draw.(b5, b4)
         if footer
           unless sub.empty? && !right
             footer.map! do |s|
@@ -274,10 +290,6 @@ module Squared
         val.gsub(/\x1B\[(\d+;?)+m/, '')
       end
 
-      def stripext(val)
-        File.basename(val, File.extname(val))
-      end
-
       def raise_error(*args, hint: nil, kind: ArgumentError)
         raise kind, message(*args, hint: hint, empty: true), caller_locations(1).map(&:to_s)
       end

data/lib/squared/common/prompt.rb

@@ -8,8 +8,8 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 15)
         require 'readline'
         require 'timeout'
-        agree = /\A#{agree}\z/i if agree.is_a?(::String)
-        cancel = /\A#{cancel}\z/i if cancel.is_a?(::String)
+        agree = /^#{agree}$/i if agree.is_a?(::String)
+        cancel = /^#{cancel}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
           begin
             while (ch = Readline.readline(msg, true))
@@ -21,7 +21,7 @@ module Squared
                 return false
               end
               attempts -= 1
-              exit 1 unless attempts > 0
+              exit 1 unless attempts >= 0
             end
           rescue Interrupt
             puts