squared 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c53d370d6535fd30824fafd72a2f68fd7db161600d2740fd643f270d68d6f6
-  data.tar.gz: 26b8eb9e45b508923bacce4bc06502d3031fc7a8b9c844dfd02775a86191ec3c
+  metadata.gz: 7ffee6667b4033ad1987ad90e83c912134bfbc449efbbe1d6c90e3370fd568d1
+  data.tar.gz: 5ded113c3c6058688db13120068f35983decfcf772af8f67318a073bf65c7e9a
 SHA512:
-  metadata.gz: f32e8ae4585c328c298791628eca4e18e00ac2818bee7aa9c5e1f1f680fd6b60f0a59cc1fd1b4313794d1d7d926dfc195762cf9912e83034d553d248f90f8743
-  data.tar.gz: '091805806ce97b61bf45f6df58bf5232ce75f65e0d1bcbcdffb0aed949e3e38200b5ea8d9bd600e9c2150e24296af2faf2ac3a99312ec290112bf55770ea38a7'
+  metadata.gz: ddbfe113d51f8f89fbc20c950b6de97a9800a8c76dffb04a1ba8e56708a7c3142b1007e1678368df662e9b340ff567d93aeb781656e92a262fa1a417f05f7bb7
+  data.tar.gz: ee09e3e0766d396c644ee7be9ef0e88461fec646e57e4e5c58949042d3a87697215f8069781ef1116d12cf0cdda10b62ab609ded409da954f28a85d6489c12f6

data/CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## [0.3.0] - 2025-02-07
+
+### Added
+
+- NPM command publish was implemented.
+- Globally created tasks can be excluded.
+- Application method pass for project references was created.
+- Gem command push was implemented.
+- Gem command build was implemented.
+- Gem command exec was implemented.
+- Gem command check was implemented.
+- NPM command install was implemented.
+- NPM command dedupe was implemented.
+- NPM command update was implemented.
+- Double quotes can be used for shell option values.
+- Global build commands can be aliased to alternate commands.
+- Graph can be run with certain projects excluded.
+- Workspace home folder can be set through ENV.
+- Global task command lint was created.
+- NPM command pack was implemented.
+- Git command checkout and reset action commit was implemented.
+- Application method script with pass-through args was created.
+- Project build options can be overwritten with ENV build types.
+- Pip install action editable was implemented.
+- Git command log was implemented.
+- Node package managers can update as depend with NODE_UPDATE.
+- NPM install commands were grouped under package namespace.
+- Node global task command update was created.
+
+### Changed
+
+- Global project command options use a private namespace hash.
+- Global git command options use a private namespace hash.
+- Base command options can be constructed from a hash.
+- Git refs and files with complete options were implemented.
+- Git tag action list with complete options was implemented.
+- Git stash per action with complete options was implemented.
+- Git diff with complete options was implemented.
+- Git checkout action path with complete options was implemented.
+- Git reset with complete options was implemented.
+- Git restore with complete options was implemented.
+- Git show with complete options was implemented.
+- Git rev-parse with complete options was implemented.
+- Git rebase with complete options was implemented.
+- Ruby class kwargs opts was converted to optional parameter.
+- Git methods use second parameter for command line options.
+- Project base methods can run multiple commands per task.
+- Project base methods except clean use same run wrapper.
+- Bundle install uses a separate isolated method.
+- Git branch action set negate symbol was inconsistent.
+- Workspace applications have name suffixed ENV settings.
+
+### Fixed
+
+- ENV command options did not take precedence to inline options.
+
+## [0.2.3] - 2025-02-05
+
+### Fixed
+
+ - Project hash options duplicated dash prefix.
+ - Pip upgrade did not append package names.
+
 ## [0.2.2] - 2025-01-19
 
 ### Fixed
@@ -55,7 +118,7 @@
 - Gem install and update non-deprecated options are fully complete.
 - Pip install options are fully complete.
 - Node command bump action version was implemented.
-- Node command add was implemented. 
+- Node command add was implemented.
 - Python command install can use single character options.
 - Gem install and pristine options are fully complete.
 - Gem command outdated was implemented.
@@ -169,6 +232,8 @@
 
 - Changelog was created.
 
+[0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.3]: https://github.com/anpham6/squared/releases/tag/v0.2.3-ruby
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby

data/README.ruby.md

@@ -1,4 +1,4 @@
-# squared 0.2
+# squared 0.3
 
 * [source](https://github.com/anpham6/squared)
 * [manifest](https://github.com/anpham6/squared-repo)
@@ -6,10 +6,11 @@
 
 ## Version Compatibility
 
-| Date       | squared |    Min |    Max |
-| :--------: | ------: | -----: | -----: |
-| 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |
-| 2025-01-07 |   0.2.0 |  2.4.0 |  3.4.0 |
+| Date       | squared |    Min |    Max |    Git |
+| :--------: | ------: | -----: | -----: | -----: |
+| 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 |
 
 The range chart indicates the latest Ruby tested against at the time of release.
 
@@ -84,6 +85,10 @@ Workspace::Application
   .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("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", "build:prod": "prod" })
+
     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])
@@ -97,8 +102,9 @@ Workspace::Application
     variable_set :depend, false
     variable_set :clean, ["build/sqd/"]
   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:/]) do |workspace|
+  .build(default: "build", parallel: ["pull", "fetch", "rebase", "copy", "clean", /^outdated:/], pass: ['publish']) do |workspace|
     workspace
       .enable_aixterm
       .style({
@@ -143,41 +149,41 @@ The task is only active when the project directory is empty or does not exist.
 Workspace::Application
   .new(main: "squared")
   .git(
-    "emc": "https://github.com/anpham6/e-mc",                    # rake emc:clone
-    "pir": {                                                     # rake pir:clone
-      uri: "https://github.com/anpham6/pi-r",                    #
-      options: {                                                 #
-        "origin": "github",                                      # --origin='github'
-        "recurse-submodules": false,                             # --no-recurse-submodules
-        "shallow-exclude": ["v0.0.1", "v0.0.2"]                  # --shallow-exclude='v0.0.1' --shallow-exclude='v0.0.2'
+    "emc": "https://github.com/anpham6/e-mc",                   # rake emc:clone
+    "pir": {                                                    # rake pir:clone
+      uri: "https://github.com/anpham6/pi-r",                   #
+      options: {                                                #
+        "origin": "github",                                     # --origin='github'
+        "recurse-submodules": false,                            # --no-recurse-submodules
+        "shallow-exclude": ["v0.0.1", "v0.0.2"]                 # --shallow-exclude='v0.0.1' --shallow-exclude='v0.0.2'
       }
     }
   )
-  .git("squared", "/path/to/squared", options: { local: true })  # Relative paths resolve from workspace root
+  .git("squared", "/path/to/squared", options: { local: true }) # Relative paths resolve from workspace root
   .git(
     {
-      emc: { uri: "e-mc", options: { "depth": 2 } },             # https://github.com/anpham6/e-mc
-      pir: "pi-r"                                                # Maps task alias to repository folder
+      emc: { uri: "e-mc", options: { "depth": 2 } },            # https://github.com/anpham6/e-mc
+      pir: "pi-r"                                               # Maps task alias to repository folder
     },
-    base: "https://github.com/anpham6",                          # Required
-    repo: ["squared", "android-docs", "chrome-docs"],            # https://github.com/anpham6/squared
-    options: {                                                   # Only "repo"
+    base: "https://github.com/anpham6",                         # Required
+    repo: ["squared", "android-docs", "chrome-docs"],           # https://github.com/anpham6/squared
+    options: {                                                  # Only "repo"
       "depth": 1,
       "quiet": true
     }
   )
-  .with(:node) do                                                # rake clone:node
-    add("e-mc", "emc")                                           # https://github.com/anpham6/e-mc
-    add("pi-r", "pir")                                           # https://github.com/anpham6/pi-r
-    add("squared")                                               # https://github.com/anpham6/squared
+  .with(:node) do                                               # rake clone:node
+    add("e-mc", "emc")                                          # https://github.com/anpham6/e-mc
+    add("pi-r", "pir")                                          # https://github.com/anpham6/pi-r
+    add("squared")                                              # https://github.com/anpham6/squared
   end
-  .with(:python) do                                              # rake clone:python
+  .with(:python) do                                             # rake clone:python
     add("android-docs")
     add("chrome-docs")
   end
-  .git("https://github.com/anpham6")                             # Uses already defined root projects
-  .git("https://github.com/anpham6", ["emc", "pir"])             # Targets any defined project
-  .build(parallel: ["clone"])                                    # rake clone + rake clone:sync
+  .git("https://github.com/anpham6")                            # Uses already defined root projects
+  .git("https://github.com/anpham6", ["emc", "pir"])            # Targets any defined project
+  .build(parallel: ["clone"])                                   # rake clone + rake clone:sync
 ```
 
 ### Graph
@@ -191,17 +197,21 @@ 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
+    # OR
+    run([nil, "build:dev", { "PATH" => "~/.bin" }, "--workspace", "--silent"])   # PATH="~/.bin" npm run build:dev --workspace -- --silent
+
     add("e-mc", "emc") do
-      first("build", "emc:clean", "emc:depend")                  # rake emc:clean; rake emc:depend; rake emc:build; puts "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
@@ -210,11 +220,22 @@ Workspace::Application
     end
   end
   .with(:ruby) do
-    add("pathname")
+    run("gem build")                                                             # gem build
+    # OR
+    run(["gem build", "--force", { "RUBY_VERSION" => "3.4.0" }])                 # RUBY_VERSION="3.4.0" gem build --force
+    # OR
+    run(["gem pristine", ["gem build", "gem cleanup"], nil, "--debug"])          # gem pristine --debug && gem build --debug && gem cleanup --debug
+    # 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
+    ])
+
+    add("pathname", test: ["rake test", { jobs: ENV["RAKE_JOBS"] }])             # rake test --jobs 4
     add("fileutils", graph: "pathname")
-    add("optparse")
+    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
 ```
@@ -229,6 +250,9 @@ rake graph:node     # same
 rake rake:graph     # pathname + fileutils + optparse + rake
 rake graph:ruby     # same
 rake graph          # graph:node + graph:ruby
+
+rake squared:graph:run[express,pir]  # emc + pir + express + squared
+rake squared:graph:run[node,-emc]    # pir + express + squared
 ```
 
 ### Batch
@@ -288,10 +312,12 @@ rake squared:outdated:workspace  # cli + sqd-serve + sqd-admin
 Task:
 
 * run
+* script
 * depend
 * graph
-* test
 * doc
+* lint
+* test
 * clean
 
 Non-task:
@@ -332,51 +358,107 @@ Common::PATH.merge!({
 ### Build
 
 ```ruby
-# :env                                         :run           :opts
-# LD_LIBRARY_PATH="path/to/lib" CFLAGS="-Wall" gcc a.c -o a.o -c
-BUILD_${NAME}      # gcc a.c -o a.o
-BUILD_OPTS_${NAME} # -c
-BUILD_ENV_${NAME}  # {"LD_LIBRARY_PATH":"path/to/lib","CFLAGS":"-Wall"} (hash/json)
-
-# :env                                       :opts                               :script
-# NODE_ENV="production" NO_COLOR="1" npm run --loglevel=error --workspaces=false build:dev
-BUILD_${NAME}      # build:dev
-BUILD_OPTS_${NAME} # --loglevel=error --workspaces=false
-BUILD_ENV_${NAME}  # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
-BUILD_DEV_${NAME}  # pattern,0,1 (:dev)
-BUILD_PROD_${NAME} # pattern,0,1 (:prod)
-
-BUILD_${NAME}=0    # skip project
+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
 ```
 
-These options also support the project specific suffix `${NAME}`. (e.g. LOG_FILE_SQUARED)
+### Graph
+
+```ruby
+GRAPH_${NAME}       # depend,build => squared:depend + squared:build
+GRAPH_${NAME}_PASS  # -emc,pir,express => pir + express
+```
 
 ### Logger
 
+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
 
+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)
+```
+
+## Git
+
+Most project classes will inherit from `Git` which enables these tasks:
+
+| Task       | Git              |  Command                                      |
+| :--------- | :--------------- | :-------------------------------------------- |
+| branch     | branch           | create set delete move copy list edit current |
+| checkout   | checkout         | commit branch track detach path               |
+| 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 ignored        |
+| 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                      |
+| tag        | tag              | add delete list                               |
+
+You can disable all of them at once using the `exclude` property.
+
 ```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)
+Workspace::Application
+  .new
+  .add("squared", exclude: :git)
+```
+
+You can disable one or more of them using the `pass` property as a *string*.
+
+```ruby
+Workspace::Application
+  .new
+  .add("squared", pass: ["pull"], ref: :node)
+  .pass("pull", ref: :node) { read_packagemanager(:private) }
 ```
 
 ## LICENSE

data/lib/squared/common/base.rb

@@ -6,10 +6,12 @@ module Squared
     ARG = {
       PIPE: 1,
       OUT: nil,
-      VERBOSE: nil,
       FAIL: false,
+      HOME: nil,
       COMMON: true,
+      VERBOSE: nil,
       BANNER: true,
+      QUOTE: "'",
       SPACE: ' => ',
       GRAPH: ['│', '─', '├', '└', '┬'],
       VIEW: 'view',

data/lib/squared/common/class.rb

@@ -9,7 +9,7 @@ module Squared
       extend Forwardable
 
       def self.to_s
-        super.match(/[^:]+\z/)[0]
+        super[/[^:]+\z/, 0]
       end
 
       def_delegators :@data, :+, :each, :each_with_index, :entries, :to_a, :include?
@@ -31,7 +31,7 @@ module Squared
 
     class JoinSet < Set
       def self.to_s
-        super.match(/[^:]+\z/)[0]
+        super[/[^:]+\z/, 0]
       end
 
       attr_reader :delim
@@ -41,8 +41,33 @@ module Squared
         @delim = delim
       end
 
+      def last(val, pat)
+        (@last ||= []).push([val, pat, $1]) if val =~ pat
+        self << val
+      end
+
       def pass(&blk)
         ret = to_a.map!(&:to_s).reject(&:empty?)
+        @last&.each do |val, pat, key|
+          i = []
+          j = nil
+          ret.each_with_index do |opt, index|
+            if opt == val
+              j = index
+            elsif j && opt =~ pat && $1 == key
+              i << index
+            end
+          end
+          next unless j && !i.empty?
+
+          val = ret[j]
+          cur = j
+          i.each do |k|
+            ret[cur] = ret[k]
+            cur = k
+          end
+          ret[i.last] = val
+        end
         block_given? ? ret.reject(&blk) : ret
       end
 

data/lib/squared/common/format.rb

@@ -66,7 +66,7 @@ module Squared
             f, b = type.to_s.split('.')
             s = wrap.(s, ['38', '5', f]) if f[0] != '-' && f.to_i <= 255
             if b
-              b = b[0..2]
+              b = b[0, 3]
               s = wrap.(s, ['48', '5', b]) unless b.to_i > 255
             end
           else
@@ -117,7 +117,7 @@ module Squared
           elsif val >= 0 && val <= 256
             ret << val
           elsif val < 0 && (b = val.to_s.split('.')[1])
-            b = b[0..2]
+            b = b[0, 3]
             ret << "-0.#{b}".to_f unless b.to_i > 255
           end
         end
@@ -189,7 +189,7 @@ module Squared
           begin
             File.open(pipe, 'a') do |f|
               br = File::SEPARATOR == '\\' ? "\r\n" : "\n"
-              args.flatten.each { |val| f.write("#{strip_style(val.chomp)}#{br}") }
+              args.flatten.each { |val| f.write(strip_style(val.chomp) + br) }
             end
             return
           rescue StandardError

data/lib/squared/common/shell.rb

@@ -16,7 +16,7 @@ module Squared
           if data[4] == data[6]
             data[4] ? val : join.(data[5])
           else
-            join.("#{data[4]}#{data[5]}#{data[6]}")
+            join.(data[4] + data[5] + data[6])
           end
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, force: force) : val
@@ -29,7 +29,7 @@ module Squared
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m)
 
-        Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
+        Rake::Win32.windows? || ARG[:QUOTE] == '"' ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
       def shell_split(val, quote: false, join: nil)
@@ -39,13 +39,18 @@ module Squared
         val.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true)
-        a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
+      def shell_option(flag, val = nil, escape: true, quote: true, force: true)
+        flag = flag.to_s
+        if flag[0] == '-'
+          b = flag[1] == '-' ? '=' : ' '
+        else
+          a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
+        end
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote)
                                else
-                                 quote ? shell_quote(val) : val
+                                 quote ? shell_quote(val, force: force) : val
                                end}"
                       end}"
       end
@@ -61,7 +66,7 @@ module Squared
       end
 
       def basic_option(flag, val)
-        shell_option(flag, val, escape: false, quote: false)
+        shell_option(flag, val, escape: false, force: false)
       end
 
       def single_quote(val)

data/lib/squared/common/utils.rb

@@ -35,33 +35,44 @@ module Squared
         end
       end
 
-      def env(key, default = nil, suffix: @envname, equals: nil, ignore: nil)
-        ret = env_value(key, suffix: suffix)
+      def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
+        ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?
 
         ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
       end
 
-      def env_value(key, default = '', suffix: nil)
-        suffix && (ret = ENV["#{key}_#{suffix}"]) ? ret : ENV.fetch(key, default)
+      def env_value(key, default = '', suffix: nil, strict: false)
+        if suffix
+          if (ret = ENV["#{key}#{@envname ? "_#{@envname}" : ''}_#{suffix}"])
+            return ret
+          elsif strict
+            return default
+          end
+        end
+        if @envname
+          return ret if (ret = ENV["#{key}_#{@envname}"])
+          return default if strict
+        end
+        ENV.fetch(key, default)
       end
 
-      def env_bool(key, default = false, suffix: nil)
+      def env_bool(key, default = false, suffix: nil, strict: false, index: false)
         if key.is_a?(::String)
-          case env_value(key, suffix: suffix)
+          case (val = env_value(key, suffix: suffix, strict: strict))
           when ''
             default
           when '0', 'false'
             false
           else
-            true
+            index && val.to_i > 0 ? val.to_i : true
           end
         else
           key.nil? ? default : key
         end
       end
 
-      def env_pipe(key, default = 1, suffix: nil, root: nil)
+      def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
         if default.is_a?(::String)
           begin
             default = (root ? root.join(default) : Pathname.new(default)).realdirpath
@@ -72,7 +83,7 @@ module Squared
         end
         case key
         when ::String
-          case (ret = env_value(key, suffix: suffix))
+          case (ret = env_value(key, suffix: suffix, strict: strict))
           when '0', '1', '2'
             return ret.to_i
           end
@@ -82,8 +93,8 @@ module Squared
         default
       end
 
-      def env_match(key, default = nil, suffix: nil, options: 0, timeout: nil)
-        case (ret = env_value(key, suffix: suffix))
+      def env_match(key, default = nil, suffix: nil, strict: false, options: 0, timeout: nil)
+        case (val = env_value(key, suffix: suffix, strict: strict))
         when ''
           default
         when '0'
@@ -91,7 +102,7 @@ module Squared
         when '1'
           true
         else
-          Regexp.new(ret, options, timeout: timeout)
+          Regexp.new(val, options, timeout: timeout)
         end
       end
     end