squared 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bdb83cec13d6b8da3e9aecb19b2b13f7c3482ce7500f399e2663ef436c46d1
-  data.tar.gz: b12b93015ce27785b1903674af314582348537ca3cc5ac2de00188c072677e50
+  metadata.gz: 2452b04f29a57fd7e41177ca45d0699c6cbfcbac259f6cd5d34c7b884e525fa3
+  data.tar.gz: 795dbe474a4ad6e72af653fcd0bf8c80929edaa1749c7a7f0343b60e851cd954
 SHA512:
-  metadata.gz: ede0371288478d0cdfdfc3a282d82b3d46e2dd5f32186df6d9125f781eeaa604f75e808490fc8cdfde32a77ed7b24d392407d5c907bb31384cfa4f19276a6623
-  data.tar.gz: 822a6b29c9047a8708240f25443ce6158092a04001302b14981d3466d9473a24db2c6ce8b5a31011f0104848943e241ed9eaf975b0b6bcc598abea22b571e0a3
+  metadata.gz: be07f3621680097432f4a5f56c825af6e47603c1fbdbaaf37a12c0fbec377fa231ad9d2551ee5a6d2fe1565115dc8e8398cca35cac7f858874a178f920683879
+  data.tar.gz: 1743bc51b54ceb5c21a1328bc83b8cb2c2e098378964e1f6bfc623984e551be215c73ef3b16b21e9258d257ba29d950b385364e874a8a6b5485bab24f3c1953c

data/CHANGELOG.md

@@ -1,5 +1,90 @@
 # Changelog
 
+## [0.8.0] - 2026-06-16
+
+### Added
+
+- Application method join for group task invoke was created.
+- Ruby command gem action push can use wildcard paths.
+- Ruby command gem action build can use wildcard paths.
+- Docker command container action attach was implemented.
+- Application method join can be run in parallel.
+- Project base method semver supports bumping prerelease.
+- Node command bump supports incrementing a private workspace.
+- Project base class implemented Enumerable each method.
+- Ruby command gem action outdated can be pinned by semver.
+- Node command publish action stage was implemented.
+- Git command remote was implemented.
+
+### Changed
+
+- Node task outdated does not modify without a full semver range.
+- OptionPartition static methods do not support unknown arguments.
+- Readline/Reline is no longer loaded into global namespace.
+- JRuby/TruffleRuby are no longer given any special treatment.
+- Common shell lib does not include PATH when used as module function.
+- Override methods using suffix "!" were renamed to "\_".
+- Common method as_a checks for to_ary after to_a.
+- Node command bump was condensed into one subtask.
+- Git event name revbuild was separated into git:revbuild:[before|after].
+- Git command stash action [branch|clear|list|all|staged|worktree] were grouped.
+- Project methods with prefix parameter were converted into keyword.
+- Project base method accept_b parameters were converted into keyword.
+- Class methods with a ref parameter were converted into keyword.
+
+### Removed
+
+- Common format method raise_error was removed.
+
+## [0.7.7] - 2026-06-15
+
+### Added
+
+- Ruby program commands can be run through bundle exec.
+- Node command package action [approve|deny] was implemented.
+- NPM command options were updated to 11.16.
+
+### Fixed
+
+- Project method format_banner modified reference to run command.
+- Project subtasks did not use exception? wrapper method.
+
+## [0.6.14] - 2026-06-14
+
+### Added
+
+- Node task depend can run approve-scripts with NPM_APPROVE_SCRIPTS.
+
+### Fixed
+
+- Docker command bake action build did not append context directory.
+
+## [0.5.24]
+
+### Fixed
+
+- See `0.4.38`.
+
+## [0.4.38]
+
+### Added
+
+- Application project commands can be defined without a reference.
+- Git command branch action all was implemented.
+
+### Changed
+
+- Override alias methods were created for suffix "!" to "\_".
+- Project banners do not display boolean attributes.
+- OptionPartition method append strips single quotes when quoting strings.
+
+### Fixed
+
+- Application methods log and exclude were non-functional.
+- Docker command bake action build does not support changing context.
+- Project base method semver did not include prerelease delimiter.
+- Project session cleanup did not compare by reference.
+
 ## [0.7.6] - 2026-05-04
 
 ### Added
@@ -194,6 +279,7 @@
 - Application class supports extensions used during build finalization.
 - Docker command bake action compose to build with defaults was implemented.
 - Program asdf legacy global installations using ASDF_DIR is supported.
+- Docker command compose action publish was implemented.
 
 ### Changed
 
@@ -221,7 +307,6 @@
 - Application project classes can only be injected using static methods.
 - Tasks can only be excluded through Appliction build instance method.
 - Project base utility methods were relocated to Support namespace.
-- Ruby class private method run_rb was removed.
 - Application attribute exception accept Logger levels to route errors.
 - Ruby command irb always includes local development require paths.
 - Bundler tasks are hidden when package is not installed.
@@ -229,7 +314,10 @@
 - Application method with renamed pass to hide due to conflict with Project.
 - Node task depend using Yarn no longer sets option ignore-engines by default.
 - Project base private instance variable events was relocated.
-- Docker command compose action publish was implemented.
+
+### Removed
+
+- Ruby class private method run_rb was removed.
 
 ### Fixed
 
@@ -604,7 +692,6 @@
 
 - Git method source will raise error when checking exit status.
 - Date gem is no longer globally required.
-- Global task git:all was removed.
 - Common base method as_a was relocated to Utils.
 - Python command build and publish detects only one backend.
 - Docker command compose action ps was renamed service.
@@ -612,14 +699,12 @@
 - Project base method success? conditionally calls print_success method.
 - Error classes were not specified for invalid operation.
 - Common format methods stripstyle and stripext are String instance methods.
-- Common format method alias puts_oe was removed.
 - Git commands without a valid action will exit with error status.
 - Errno exceptions are used in place of SystemCallError.
 - Common format method raise_error defaults to RuntimeError.
 - OptionPartition delegator method delete_at was renamed remove_at.
 - Node event name "publish" was renamed to "npm:publish".
 - Project task run with a Method passes self as first argument.
-- Ruby command check was removed.
 - Ruby method gem! was renamed gem.
 - Ruby methods ruby and irb first argument was converted into kwargs.
 - Ruby method rake executes all tasks in one run command.
@@ -635,12 +720,18 @@
 - Project base method run_s uses last argument for ENV hash.
 - Project base method inject does not exit program when raised.
 - Reline gem is installed only when using at least Ruby 3.0.
-- Python method install arguments strategy and user were removed.
 - Project command outdated does not support threading when interactive.
 - Project base accessor global was converted into a reader and setter.
 - Repo build can simultaneously use script and run through REPO_BUILD.
 - Repo static method read_manifest was made an instance method named repo_manifest.
 
+### Removed
+
+- Global task git:all was removed.
+- Common format method alias puts_oe was removed.
+- Ruby command check was removed.
+- Python method install arguments strategy and user were removed.
+
 ### Fixed
 
 - Node task update did not check equivalent ENV install options.
@@ -1237,6 +1328,10 @@
 
 ## [0.3.10]
 
+### Removed
+
+- Git command files action ignored could not be used alone.
+
 ### Fixed
 
 - Git command reset action commit used invalid delimeter.
@@ -1244,10 +1339,6 @@
 - Project script task did not fire first and last callbacks.
 - Git checkout action commit did not include options.
 
-### Removed
-
-- Git command files action ignored could not be used alone.
-
 ## [0.2.10]
 
 ### Fixed
@@ -1829,6 +1920,8 @@
 
 - Changelog was created.
 
+[0.8.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.0
+[0.7.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.7
 [0.7.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.6
 [0.7.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.5
 [0.7.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.4
@@ -1836,6 +1929,7 @@
 [0.7.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.2
 [0.7.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.1
 [0.7.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.0
+[0.6.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.14
 [0.6.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.13
 [0.6.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.12
 [0.6.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.11
@@ -1850,6 +1944,7 @@
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.24
 [0.5.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.23
 [0.5.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.22
 [0.5.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.21
@@ -1874,6 +1969,7 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.38]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.38
 [0.4.37]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.37
 [0.4.36]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.36
 [0.4.35]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.35

data/README.md

@@ -1,4 +1,4 @@
-# squared 0.7
+# squared 0.8
 
 * [source](https://github.com/anpham6/squared-ruby)
 * [docs](https://squared.readthedocs.io)
@@ -11,11 +11,12 @@
 | 2025-01-07 |   0.2.0 |        |  3.4.0 |     |
 | 2025-02-07 |   0.3.0 |        |  3.4.1 |     |
 | 2025-03-06 |   0.4.0 |        |  3.4.2 |  *  |
-| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.4 |  *  |
+| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.4 |     |
 | ---------- |   ----- |  ----- |  ----- | --- |
 | 2025-08-23 |   0.5.5 |        |  3.4.5 |     |
 | 2025-10-31 |   0.6.0 |        |  3.4.7 |  *  |
 | 2026-01-07 |   0.7.0 |  2.5.0 |  4.0.0 |  *  |
+| 2026-06-16 |   0.8.0 |        |  4.0.5 |  *  |
 
 The range chart indicates the *latest* Ruby tested against at the time of release.
 
@@ -47,7 +48,6 @@ require "squared/app"                       # All workspace related modules
 # log       = /workspaces/logger
 # emc       = /workspaces/e-mc
 # pir       = /workspaces/pi-r
-# pir2      = /workspaces/pi-r2
 # squared   = /workspaces/squared
 # cli       = /workspaces/squared/publish/sqd-cli
 # sqd-serve = /workspaces/squared/publish/sqd-serve
@@ -74,7 +74,6 @@ Workspace::Application
   end
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
-  .add("pi-r2", "pir2", copy: { from: :npm, also: %i[squared express], files: ["LICENSE", ["README.md.ruby", "README.md"]] }) # Uses dist files from NPM package spec
   .add("squared", init: "pnpm", script: ["build:stage1", "build:stage2"], group: "app") do # Use pnpm/yarn/berry for depend + Copy target (main)
     # Repo (global)
     as(:run, "build:dev", "dev")                                             # npm run build:dev -> npm run dev
@@ -179,6 +178,12 @@ Workspace::Application
         pip("wheel", with: "build:dev")                                      # pip wheel -r "/chrome-docs/requirements.txt" --no-deps
       }
     end
+
+    join("venv", invoke: "venv:remove", args: ["create"])                    # rake venv:python => rake android:venv:remove[create] => chrome:venv:remove[create]
+    join("venv", "venv:remove", "create", sync: false)                       # PYTHON_ARGS=depend,dry-run rake venv:python => rake android:venv:remove[depend,dry-run] | chrome:venv:remove[depend,dry-run]
+    join("pwd") do                                                           # rake pwd:python => "/workspaces/android-docs" => "/workspaces/chrome-docs"
+      puts self.path
+    end
   end
   .style("inline", "bold")
   .stage("init:project") { puts self.path }                                  # modify attributes before building tasks (init | begin | project:begin/end | populate | extensions | series | finalize | end)
@@ -211,7 +216,6 @@ Workspace::Application
     })
   end
   .add("squared", release: "https://github.com/anpham6/squared/archive/refs/tags/??") # squared:unpack:zip[v5.4.0,/tmp/squared]
-end
 ```
 
 ### Clone
@@ -285,9 +289,6 @@ Workspace::Application
     add("pi-r", "pir") do
       chain "all", "build", after: "emc:build"                             # step: 3
     end
-    add("pi-r2", "pir2") do
-      chain "all", "build", before: "squared"                              # step: 3
-    end
     add("squared-express", "express") do
       chain "all", "clean", with: "emc"                                    # step: 1
       chain "all", "build", with: "pir"                                    # step: 3
@@ -366,7 +367,7 @@ Workspace::Application
       first("git:ls-files", override: true) { puts "2" }                       # puts "2"
       last("git:ls-files") { puts workspace.root }                             # puts "/workspaces" (does not run when error is raised)
       error("git:ls-files") { |err| err.is_a?(TypeError) }                     # return true to suppress error
-end
+    end
   end
   .with(:ruby) do
     run("gem build")                                                           # gem build
@@ -548,6 +549,7 @@ Most project classes will inherit from `Git` which enables these tasks:
 | pull            | pull             | origin remote all                                         |
 | range-diff      | range-diff       | view between contain                                      |
 | rebase          | rebase           | branch onto send                                          |
+| remote          | remote           | add select                                                |
 | refs            | ls-remote --refs | heads tags remote                                         |
 | reset           | reset            | commit index patch mode undo                              |
 | restore         | restore          | source staged worktree                                    |
@@ -698,6 +700,7 @@ GIT_COUNT=50                 # list display limit
 | checkout   | *                 | F|FORCE MERGE                                                       |
 | clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s REVISION=s BARE=1 LOCAL=0,1               |
 |            |                   | SINGLE_BRANCH=0,1 NO_CHECKOUT=1 NO_TAGS=1 QUIET=1                   |
+| commit     | amend             | F|FORCE                                                             |
 | commit     | *                 | UPSTREAM=s DRY_RUN EDIT=0 M|MESSAGE=s                               |
 | diff       | head branch       | INDEX=n                                                             |
 | diff       | *                 | PATHSPEC=s                                                          |
@@ -868,43 +871,44 @@ Features can be enabled through ENV when calling global tasks such as through *C
 
 * Prefix: BUNDLE/GEM/RBS
 
-| Command    | Flag      | ENV                                                       |
-| :--------- | :-------- | :-------------------------------------------------------- |
-| depend     | -         | BINSTUBS=s JOBS=n                                         |
-| depend     | update    | VERSION=major|minor|patch STRICT CONSERVATIVE             |
-| outdated   | -         | U|UPDATE=major|minor|patch ONLY_EXPLICIT DRY_RUN          |
-| gem        | outdated  | DOCUMENT=0,1 USER_INSTALL=0,1                             |
-| rbs        | prototype | Y=0,1                                                     |
+| Command    | Flag      | ENV                                                         |
+| :--------- | :-------- | :---------------------------------------------------------- |
+| depend     | -         | BINSTUBS=s JOBS=n                                           |
+| depend     | update    | VERSION=major|minor|patch STRICT CONSERVATIVE               |
+| outdated   | -         | U|UPDATE=major|minor|patch ONLY_EXPLICIT DRY_RUN            |
+| gem        | outdated  | DOCUMENT=0,1 USER_INSTALL=0,1                               |
+| rbs        | prototype | Y=0,1                                                       |
 
 #### Node
 
 * Prefix: NPM/PNPM/YARN
 
-| Command        | Flag           | ENV                                              |
-| :------------- | :------------- | :----------------------------------------------- |
-| depend         | -              | FORCE CI IGNORE_SCRIPTS                          |
-| outdated       | -              | U|UPDATE=major|minor|patch DIFF DRY_RUN          |
-| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y               |
-| depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y          |
-| npm pnpm       | depend package | CPU=s OS=s LIBC=s                                |
-| npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS             |
-| pnpm           | depend         | PUBLIC_HOIST_PATTERN=s APPROVE_BUILDS            |
-| pnpm           | depend:add     | ALLOW_BUILD=s                                    |
-| yarn           | depend package | IGNORE_ENGINES                                   |
-| yarn           | depend:add     | W|IGNORE_WORKSPACE_ROOT_CHECK=0                  |
+| Command        | Flag           | ENV                                                |
+| :------------- | :------------- | :------------------------------------------------- |
+| depend         | -              | FORCE CI IGNORE_SCRIPTS                            |
+| outdated       | -              | U|UPDATE=major|minor|patch SAVE_EXACT DIFF DRY_RUN |
+| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y                 |
+| depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y            |
+| npm            | depend         | APPROVE_SCRIPTS=s                                  |
+| npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS               |
+| pnpm           | depend         | PUBLIC_HOIST_PATTERN=s APPROVE_BUILDS              |
+| pnpm           | depend:add     | ALLOW_BUILD=s                                      |
+| yarn           | depend package | IGNORE_ENGINES                                     |
+| yarn           | depend:add     | W|IGNORE_WORKSPACE_ROOT_CHECK=0                    |
+| npm pnpm       | depend package | CPU=s OS=s LIBC=s                                  |
 
 #### Python
 
 * Prefix: PIP/POETRY
 
-| Command    | Flag      | ENV                                                       |
-| :--------- | :-------- | :-------------------------------------------------------- |
-| global     | *         | CACHE_DIR=0,s PROXY=s PYTHON=s COLOR=0                    |
-| depend     | -         | E|EDITABLE=0,s BUILD_ISOLATION=0                          |
-| outdated   | -         | U|UPDATE=major|minor|patch NOT_REQUIRED=0 L|LOCAL DRY_RUN |
-| venv       | exec      | INTERACTIVE=0                                             |
-| poetry     | *         | PROJECT=s                                                 |
-| poetry     | depend    | NO_ROOT                                                   |
+| Command    | Flag      | ENV                                                         |
+| :--------- | :-------- | :---------------------------------------------------------- |
+| global     | *         | CACHE_DIR=0,s PROXY=s PYTHON=s COLOR=0                      |
+| depend     | -         | E|EDITABLE=0,s BUILD_ISOLATION=0                            |
+| outdated   | -         | U|UPDATE=major|minor|patch NOT_REQUIRED=0 L|LOCAL DRY_RUN   |
+| venv       | exec      | INTERACTIVE=0                                               |
+| poetry     | *         | PROJECT=s                                                   |
+| poetry     | depend    | NO_ROOT                                                     |
 
 ## LICENSE
 

data/lib/squared/common/base.rb

@@ -18,7 +18,6 @@ module Squared
       GRAPH: %w[| - | \\ -].freeze,
       BORDER: %w[| - - - - - | | - -].freeze,
       VIEW: 'view',
-      BACKTRACE: $DEBUG || !$VERBOSE.nil?,
       LEVEL: ENV.fetch('LOG_LEVEL', 0).to_i,
       COLOR: ENV.fetch('NO_COLOR', '').empty?
     }

data/lib/squared/common/format.rb

@@ -41,7 +41,7 @@ module Squared
 
       String.define_method(:stripstyle) { gsub(/\x1B\[(?:\d+;?)+m/, '') }
       String.define_method(:stripext) { File.basename(self, '.*') }
-      String.define_method(:subhint) { |s| s.nil? || (s.is_a?(::String) && s.empty?) ? self : "#{self} (#{s})" }
+      String.define_method(:subhint) { |s| s.nil? || (s.respond_to?(:empty?) && s.empty?) ? self : "#{self} (#{s})" }
 
       def enable_aixterm
         unless (colors = __get__(:colors)).frozen?
@@ -62,9 +62,9 @@ module Squared
         return val unless ARG[:COLOR]
 
         ret = if pat && index != 0
-                return val unless (data = pat.match(val))
+                return val unless (md = pat.match(val))
 
-                index == -1 ? data.to_a.drop(1) : data[index]
+                index == -1 ? md.to_a.drop(1) : md[index]
               else
                 index = 0
                 val
@@ -110,10 +110,10 @@ module Squared
         return ret.join if index == -1
 
         ret = wrap.call(ret, code) unless code.empty?
-        return ret unless data
+        return ret unless md
 
         out = +''
-        data.to_a.each_with_index do |group, i|
+        md.to_a.each_with_index do |group, i|
           next if i == 0
 
           if i == index
@@ -319,15 +319,6 @@ module Squared
           err ? warn(out) : puts(out)
         end
       end
-
-      def raise_error(*args, hint: nil, kind: RuntimeError, start: 0)
-        kind = args.shift if args.first.is_a?(::Class) && args.first < ::Exception
-        raise kind, message(*args, hint: hint, empty: true), if ARG[:BACKTRACE]
-                                                               caller(start.succ)
-                                                             else
-                                                               caller_locations(start.succ, 1).first&.base_label
-                                                             end
-      end
     end
   end
 end

data/lib/squared/common/prompt.rb

@@ -1,28 +1,29 @@
 # frozen_string_literal: true
 
-unless defined?(Readline)
-  if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.7'
-    require 'readline'
-  else
-    begin
-      require 'reline'
-      Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
-      Readline = Reline
-    rescue LoadError
-      require 'readline' rescue LoadError
-    end
-  end
-end
-
 module Squared
   module Common
     module Prompt
+      def self.reline
+        if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.7'
+          require 'readline'
+          Readline
+        else
+          begin
+            require 'reline'
+            Reline
+          rescue LoadError
+            require 'readline'
+            Readline
+          end
+        end
+      end
+
       module_function
 
-      def confirm(msg, default = nil, agree: 'Y', cancel: 'N', force: false, attempts: 3, timeout: 60)
+      def confirm(msg, accept = nil, agree: 'Y', cancel: 'N', force: false, attempts: 3, timeout: 60)
         require 'timeout'
-        if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(?:Yn|nY|Y/n|y/N)\]})
-          case default
+        if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(Yn|nY|Y/n|y/N)\]})
+          case accept
           when 'Y'
             msg = "#{msg} [Y/n] "
           when 'N'
@@ -32,9 +33,9 @@ module Squared
         agree = /^#{Regexp.escape(agree)}$/i if agree.is_a?(::String)
         cancel = /^#{Regexp.escape(cancel)}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
-          while (ch = Readline.readline(msg))
+          while (ch = Prompt.reline.readline(msg))
             ch = ch.chomp
-            case (ch.empty? ? default : ch)
+            case (ch.empty? ? accept : ch)
             when agree
               return true
             when cancel
@@ -82,7 +83,7 @@ module Squared
         end
         between = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
-          while (ch = Readline.readline(msg))
+          while (ch = Prompt.reline.readline(msg))
             ch.strip!
             unless ch.empty?
               if multiple
@@ -128,14 +129,14 @@ module Squared
       end
 
       def readline(msg, history = false, force: nil, multiline: nil, &blk)
-        multiline = nil unless Readline.respond_to?(:readmultiline)
+        multiline = nil unless Prompt.reline.respond_to?(:readmultiline)
         read = lambda do
           if !multiline
-            Readline.readline(msg, history)
+            Prompt.reline.readline(msg, history)
           elsif block_given?
-            Readline.readmultiline(msg, history, &blk)
+            Prompt.reline.readmultiline(msg, history, &blk)
           else
-            Readline.readmultiline(msg, history) do |line|
+            Prompt.reline.readmultiline(msg, history) do |line|
               next if line.strip.empty?
 
               Array(multiline).any? { |val| line.split.last.end_with?(val.to_s) }

data/lib/squared/common/shell.rb

@@ -18,14 +18,14 @@ module Squared
 
       def shell_escape(val, quote: false, option: false, force: false, double: false, override: false)
         val = val.to_s
-        if (r = /\A(--?)([^=\s]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val))
-          if (data = r[2].match(QUOTE_VALUE))
-            double = data[1] == '"'
+        if (md = /\A(--?)([^=\s]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val))
+          if (q = md[2].match(QUOTE_VALUE))
+            double = q[1] == '"'
             override = true
-          elsif !r[3] || r[6]
+          elsif !md[3] || md[6]
             return val
           end
-          ch = r[7]
+          ch = md[7]
           opt = if ch.start_with?('"', "'")
                   "#{ch}#{ch[0]}"
                 elsif ch.end_with?('"', "'")
@@ -35,7 +35,7 @@ module Squared
 
                   ch
                 end
-          r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, force: force, double: double, override: override)
+          md[1] + (q ? q[2] : md[2]) + md[4] + shell_quote(opt, force: force, double: double, override: override)
         elsif option && val =~ /\A(-{0,2}[^=\s-][^=\s]*)=(.+)\z/m
           return val if $2.match?(QUOTE_VALUE)
 
@@ -56,15 +56,22 @@ module Squared
       def shell_quote(val, option: true, force: true, double: false, preserve: true, pass: false, override: false)
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.empty?
+        return val if option && val.match?(/\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m)
 
-        if option
-          pat = /\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
-          return val if val.match?(pat)
-        end
         if val =~ QUOTE_VALUE
-          return val if pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o))
-
-          base = $2 unless preserve
+          if pass == '"' || pass == "'"
+            return val if pass == $1
+          elsif pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/([#{File::SEPARATOR} ]|\\")/o))
+            return val
+          end
+          case preserve
+          when false
+            base = $2
+          when '"'
+            base = $2 if $1 == "'"
+          when "'"
+            base = $2 if $1 == '"'
+          end
         end
         q = -> { (base || val).gsub("'\\\\''", "'") }
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
@@ -155,11 +162,11 @@ module Squared
       end
 
       def shell_bin(name, env: true)
-        require_relative 'base'
+        path = defined?(PATH) ? PATH : {}
         key = name.to_s.upcase
         key = File.basename(key, '.*') if Rake::Win32.windows?
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || PATH[key = key.downcase] ||
-                    PATH[key.to_sym] || name, option: false, force: false, double: true)
+        shell_quote((env && ENV["PATH_#{key}"]) || path[key] || path[key.to_sym] || path[key = key.downcase] ||
+                    path[key.to_sym] || name, option: false, force: false, double: true)
       end
 
       def line_width(lines)
@@ -168,7 +175,7 @@ module Squared
 
       def fill_option(val, **kwargs)
         return val unless val.is_a?(::String)
-        return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
+        return "-#{val}" if val.match?(/\A([a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)
       end