squared 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 037121270d4c460552bc1b0c24580e95dc6d70c678ab2d82f3339567ab652c84
-  data.tar.gz: 7d7bdbb4164fe03ddfdc64ae0d5b0640cd6d688fa8660f0193399d816f418de1
+  metadata.gz: 8864164b082f5ec20e4e23ec0cea81a0d2ad0cde6977a0d484b113e72058421a
+  data.tar.gz: 2b46eca82d45c97c5a5e3ee5881e40429967916e2d569a6cf16271a0d0851a94
 SHA512:
-  metadata.gz: f96c91ee8cc22e2b81159529e6037b72c07047d7b5fe86834f7fbcf4e89ad884141002d2e47bc121f04c1041a3eb8abc10514f79509e4ee83a1d561dad6d5155
-  data.tar.gz: 5984989ccad4013691a522196eaee92d047a1a2ab0636731952143fde8ac20b96ae9789fcde670586f46c474217443840bee1e22b54b8b49991cd3032717ef0d
+  metadata.gz: 0d03eca41b747dc5fe16d9767870b83733cf475e60df90358631aed94fe4fa1dbc07b00fe6bfea7e845d9b6cf361e028504c3e6302e17564fcbad5e5c3ea7a80
+  data.tar.gz: 20e7c2931780199d66ac670a4fa5b74e6a3a2b71215b1edb32cd48d0c1ca0c0622ee7bdabca21291d10add12231540092936f1e9aa3ffd8f065170ad3c65630f

data/CHANGELOG.md

@@ -1,5 +1,68 @@
 # Changelog
 
+## [0.8.4] - 2026-09-04
+
+### Added
+
+- Common module Host for capabilities was created.
+- OptionPartition can parse option values with a Regexp.
+- OptionPartition can parse option values with a set group.
+- Docker property registry was converted into an accessor.
+- Docker banner arguments [context|registry|tag] were implemented.
+- OptionPartition can parse single flags with a quoted merged value.
+- Docker command image action push is interactive.
+- Docker accessor tag can be initialized through ENV with TAG_${NAME}.
+- OptionPartition can parse option values with an explicit boolean.
+
+### Changed
+
+- Git command log action view with interactive supports exclusions.
+- OptionPartition static method union returns a copy of original target.
+
+## [0.7.11]
+
+### Added
+
+- Node command package action [approve|deny] is interactive.
+
+### Fixed
+
+- Docker container commands [run|exec] did not sanitize input prompt.
+
+## [0.6.18]
+
+### Added
+
+- Docker command bake action buildx with first arg "-" inherits base args.
+
+### Fixed
+
+- Git action grep did not recognize format and max-count.
+- Node command nvm did not quote executable path.
+
+## [0.5.26]
+
+### Fixed
+
+- Node command nvm did not quote executable path.
+
+## [0.4.41]
+
+### Added
+
+- Common base argument SUCCESS for command confirmation was created.
+
+### Changed
+
+- Program options prefer using quotes instead of escape.
+- Docker container run arguments with a leading dash are concatenated.
+
+### Fixed
+
+- Common prompt method choice did not grep list items.
+- OptionPartition static method strip did not parse flags with dashes.
+- Project base method choice_index did not support multiple selections.
+
 ## [0.8.3] - 2026-08-18
 
 ### Added
@@ -28,10 +91,6 @@
 
 ## [0.6.17]
 
-### Added
-
-- NPM command install can bypass engines with ENV and engine-strict=false.
-
 ### Fixed
 
 - Ruby command gem action push interactive file selector did nothing.
@@ -2028,10 +2087,12 @@
 
 - Changelog was created.
 
+[0.8.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.4
 [0.8.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.3
 [0.8.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.2
 [0.8.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.1
 [0.8.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.0
+[0.7.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.11
 [0.7.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.10
 [0.7.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.9
 [0.7.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.8
@@ -2043,6 +2104,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.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.18
 [0.6.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.17
 [0.6.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.16
 [0.6.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.15
@@ -2061,6 +2123,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.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.26
 [0.5.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.25
 [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
@@ -2087,6 +2150,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.41]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.41
 [0.4.40]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.40
 [0.4.39]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.39
 [0.4.38]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.38

data/README.md

@@ -693,11 +693,9 @@ GIT_COUNT=50                 # list display limit
 | :--------- | :---------------- | :------------------------------------------------------------------ |
 | branch     | create            | TRACK=0,1,s F|FORCE                                                 |
 | branch     | move copy         | F|FORCE                                                             |
-| branch     | delete            | COUNT=n                                                             |
 | branch     | global            | SYNC                                                                |
-| checkout   | branch            | DETACH TRACK=s COUNT=n                                              |
+| checkout   | branch            | D|DETACH TRACK=s                                                    |
 | checkout   | detach            | REFLOG=1                                                            |
-| checkout   | track             | COUNT=n                                                             |
 | checkout   | global path       | HEAD=s PATHSPEC=s                                                   |
 | checkout   | *                 | F|FORCE MERGE                                                       |
 | clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s REVISION=s BARE=1 LOCAL=0,1               |
@@ -721,10 +719,10 @@ GIT_COUNT=50                 # list display limit
 | rebase     | onto              | INTERACTIVE I HEAD=s                                                |
 | reset      | mode (mixed)      | N REFRESH=0                                                         |
 | reset      | index             | PATHSPEC=s                                                          |
-| reset      | commit            | COUNT=n REFLOG=1                                                    |
+| reset      | commit            | REFLOG=1                                                            |
 | reset      | -commit           | HEAD=s                                                              |
 | restore    | *                 | PATHSPEC=s                                                          |
-| revbuild   | global            | UNTRACKED_FILES=s IGNORE_SUBMODULES=s IGNORED=s (status)            |
+| revbuild   | global (status)   | UNTRACKED_FILES=s IGNORE_SUBMODULES=s IGNORED=s                     |
 | stash      | push              | PATHSPEC=s                                                          |
 | stash      | global            | ALL=0,1 KEEP_INDEX=0,1 INCLUDE_UNTRACKED=0,1 STAGED=0,1 M|MESSAGE=s |
 | status     | global            | BRANCH LONG IGNORE_SUBMODULES=s,0-3 PATHSPEC=s                      |
@@ -732,9 +730,7 @@ GIT_COUNT=50                 # list display limit
 | switch     | detach            | REFLOG=1                                                            |
 | switch     | -detach           | HEAD=s                                                              |
 | switch     | *                 | F|FORCE                                                             |
-| tag        | add               | SIGN FORCE HEAD=s M|MESSAGE=s TRAILER=s                             |
-| tag        | sign              | F|FORCE HEAD=s M|MESSAGE=s TRAILER=s                                |
-| tag        | delete            | COUNT=n                                                             |
+| tag        | add sign          | F|FORCE HEAD=s M|MESSAGE=s TRAILER=s                                |
 | rev        | commit branch     | HEAD=s                                                              |
 
 ### Docker
@@ -749,6 +745,8 @@ DOCKER_TAG_${NAME}=v0.1.0                # project only (override)
 DOCKER_ALL=1                             # list every image/container
 DOCKER_Y=1                               # confirm all
 
+TAG_${NAME}=1.0.0                        # initialize
+
 BUILD_SQUARED_OPTS="NODE_TAG=24 RUBY_VERSION=4.0.0" DOCKER_SQUARED_OPTS="--no-cache --label=v1" rake squared:build
 docker build --no-cache --label=v1 --build-arg="NODE_TAG=24" --build-arg="RUBY_VERSION=4.0.0" .
 ```

data/lib/squared/common/base.rb

@@ -15,6 +15,7 @@ module Squared
       CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
+      SUCCESS: 'Success',
       GRAPH: %w[| - | \\ -].freeze,
       BORDER: %w[| - - - - - | | - -].freeze,
       VIEW: 'view',

data/lib/squared/common/format.rb

@@ -89,7 +89,8 @@ module Squared
             end
           else
             t = type.to_sym
-            if (c = __get__(:colors)[t] || __get__(:colors)[t.to_s.sub('bright_', '').to_sym])
+            c = __get__(:colors)[t] || __get__(:colors)[t.to_s.sub('bright_', '').to_sym]
+            if c
               if index == -1
                 s = wrap.call(s, [c])
               else

data/lib/squared/common/host.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rake'
+
+module Squared
+  module Common
+    module Host
+      module_function
+
+      def windows?
+        !!Rake::Win32.windows?
+      end
+
+      def mri?
+        RUBY_ENGINE == 'ruby'
+      end
+
+      def docker?
+        !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
+      end
+
+      def powershell?
+        return true if ENV['SHELL']&.end_with?(File.join('', 'pwsh'))
+        return false unless windows?
+
+        case ENV['TERM_PROGRAM']
+        when 'powershell.exe', 'vscode'
+          true
+        else
+          ENV.fetch('PSModulePath', '').split(';', 2).size > 1
+        end
+      end
+    end
+  end
+end

data/lib/squared/common/prompt.rb

@@ -57,6 +57,7 @@ module Squared
       def choice(msg, list = nil, min: 1, max: 1, multiple: false, index: false, grep: nil, border: nil, auto: true,
                  force: true, attempts: 3, timeout: 0, empty: nil)
         require 'timeout'
+        multiple = Array(multiple) if multiple.is_a?(::Numeric)
         if list
           grep &&= Array(grep).map { |val| Regexp.new(val) }
           items = list.each_with_object([]) do |val, out|
@@ -81,7 +82,7 @@ module Squared
               puts print_footer(border: border)
             end
             msg = "#{msg + (force ? ':' : '?')} [#{min}-#{max}#{if (n = multiple)
-                                                                  "|,#{n.is_a?(::Numeric) ? "{#{n}}" : '*'}"
+                                                                  "|,#{n.is_a?(::Array) ? "{#{n.join(',')}}" : '*'}"
                                                                 end}] "
           end
         end
@@ -110,7 +111,7 @@ module Squared
                 unless k.include?(nil)
                   k.uniq!
                   k.sort!
-                  unless multiple.is_a?(::Numeric) && multiple != k.size
+                  unless multiple.is_a?(::Array) && !multiple.include?(k.size)
                     return index || !items ? k : k.map { |i| items[i.pred] }
                   end
                 end

data/lib/squared/common/shell.rb

@@ -41,12 +41,12 @@ module Squared
 
           "#{$1}=%s" % if $2.include?(' ')
                          shell_quote($2, option: false)
-                       elsif Rake::Win32.windows?
+                       elsif windows?
                          $2
                        else
                          Shellwords.escape($2)
                        end
-        elsif Rake::Win32.windows?
+        elsif windows?
           quote ? shell_quote(val, force: force, double: double) : val
         else
           val.empty? ? '' : Shellwords.escape(val)
@@ -61,7 +61,7 @@ module Squared
         if val =~ QUOTE_VALUE
           if pass == '"' || pass == "'"
             return val if pass == $1
-          elsif pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/([#{File::SEPARATOR} ]|\\")/o))
+          elsif pass || ($1 == '"' && windows? && val.match?(/([#{File::SEPARATOR} ]|\\")/o))
             return val
           end
           case preserve
@@ -74,7 +74,7 @@ module Squared
           end
         end
         q = -> { (base || val).gsub("'\\\\''", "'") }
-        if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
+        if double || windows? || (ARG[:QUOTE] == '"' && !override)
           "\"#{q.call.gsub(/(?<!\\)"/, '\\"')}\""
         else
           "'#{q.call.gsub("'", "'\\\\''")}'"
@@ -82,7 +82,7 @@ module Squared
       end
 
       def shell_option(flag, val = nil, sep: '=', escape: true, quote: true, force: true, double: false, merge: false,
-                       switch: nil, override: false)
+                       switch: nil, explicit: false, override: false)
         flag = flag.to_s
         if flag =~ QUOTE_VALUE
           double = $1 == '"'
@@ -91,18 +91,15 @@ module Squared
           override = true
         end
         sep = unless flag.empty?
+                single = merge ? '' : explicit.is_a?(::String) ? explicit : ' '
                 if flag[0] == '-'
-                  if flag[1] == '-'
-                    sep
-                  else
-                    merge ? '' : ' '
-                  end
+                  flag[1] == '-' ? sep : single
                 elsif switch
                   pre = switch unless flag.start_with?(switch)
                   merge ? '' : sep
                 elsif flag.size == 1
                   pre = '-'
-                  merge ? '' : ' '
+                  single
                 else
                   pre = '--'
                   sep
@@ -164,7 +161,7 @@ module Squared
       def shell_bin(name, env: true)
         path = defined?(PATH) ? PATH : {}
         key = name.to_s.upcase
-        key = File.basename(key, '.*') if Rake::Win32.windows?
+        key = File.basename(key, '.*') if 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)
       end
@@ -187,6 +184,10 @@ module Squared
       def basic_option(flag, val, **kwargs)
         shell_option(flag, val, escape: false, force: false, **kwargs)
       end
+
+      def windows?
+        !!Rake::Win32.windows?
+      end
     end
   end
 end

data/lib/squared/common/utils.rb

@@ -105,18 +105,21 @@ module Squared
           time << "#{d}d"
           epoch -= d * dd
         end
-        if (h = epoch / hh) > 0
+        h = epoch / hh
+        if h > 0
           time << (clock ? h.to_s : "#{h}h")
           epoch -= h * hh
         end
-        if (m = epoch / mm) > 0
+        m = epoch / mm
+        if m > 0
           time << (clock ? m.to_s.rjust(2, '0') : "#{m}m")
           epoch -= m * mm
         elsif clock
           time << '00'
         end
         unless hm
-          if (s = epoch / ss) > 0
+          s = epoch / ss
+          if s > 0
             time << (clock ? s.to_s.rjust(2, '0') : "#{s}s")
             epoch -= s * ss
           elsif clock
@@ -144,7 +147,7 @@ module Squared
       end
 
       def env_key(*val)
-        val.join('_').gsub(/\W+/, '_').upcase
+        val.join('_').sub(/\A\d+\W*/, '__').gsub(/\W+/, '_').upcase
       end
 
       def env_bool(key, default = false, index: false, **kwargs)

data/lib/squared/common.rb

@@ -4,6 +4,7 @@ require 'set'
 
 require_relative 'common/base'
 require_relative 'common/format'
+require_relative 'common/host'
 require_relative 'common/prompt'
 require_relative 'common/shell'
 require_relative 'common/system'

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.8.3'
+  VERSION = '0.8.4'
 end

data/lib/squared/workspace/application.rb

@@ -5,6 +5,7 @@ module Squared
     class Application
       include Enumerable
       include Common::Format
+      include Host
       include Utils
       include Rake::DSL
 
@@ -13,8 +14,8 @@ module Squared
 
       class << self
         def implement(*objs, base: nil)
-          objs.each_with_index do |obj, index|
-            if base && index == 0
+          objs.each_with_index do |obj, i|
+            if base && i == 0
               case base
               when 0, true
                 @kind_extend[0] = obj
@@ -215,7 +216,7 @@ module Squared
             end
             raise 'method not found'
           rescue => e
-            warn log_message(Logger::WARN, e, subject: main, hint: hint || args)
+            warn log_warn(e, subject: main, hint: hint || args)
           end
         end
         @group = nil
@@ -740,30 +741,6 @@ module Squared
         !!find(home)&.enabled?
       end
 
-      def windows?
-        Rake::Win32.windows?
-      end
-
-      def mri?
-        RUBY_ENGINE == 'ruby'
-      end
-
-      def docker?
-        !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
-      end
-
-      def powershell?
-        return true if ENV['SHELL']&.end_with?(File.join('', 'pwsh'))
-        return false unless windows?
-
-        case ENV['TERM_PROGRAM']
-        when 'powershell.exe', 'vscode'
-          true
-        else
-          ENV.fetch('PSModulePath', '').split(';', 2).size > 1
-        end
-      end
-
       def rootpath(*args)
         root.join(*args)
       end
@@ -797,6 +774,7 @@ module Squared
       end
 
       public :task_join
+      public(*Host.private_instance_methods(false))
 
       private
 

data/lib/squared/workspace/project/base.rb

@@ -12,6 +12,7 @@ module Squared
         include Enumerable
         include Comparable
         include Common::Format
+        include Host
         include System
         include Shell
         include Prompt
@@ -338,6 +339,7 @@ module Squared
                         ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                         tag = param_guard(action, flag, args: args, key: :tag)
                         dir = param_guard(action, flag, args: args, key: :dir)
+                        digest = args.digest
                         unless tag.match?(URI_SCHEME)
                           tag = unpack_get tag, ext
                           tag ||= if @release
@@ -346,7 +348,7 @@ module Squared
                                     raise ArgumentError, message('no base uri', tag, hint: ext)
                                   end
                         end
-                        force = case (digest = args.digest)
+                        force = case digest
                                 when 'f', 'force'
                                   digest = nil
                                   true
@@ -362,7 +364,8 @@ module Squared
                       when :set
                         format_desc action, flag, 'version,dir?=u/home|p/arent'
                         task flag, [:version] do |_, args|
-                          args = if (version = args.version)
+                          version = args.version
+                          args = if version
                                    args.extras
                                  else
                                    version, opts = choice_index('Select a version',
@@ -377,7 +380,9 @@ module Squared
                           asdf(flag, args, version: version)
                         end
                       else
-                        format_desc(action, flag, case flag when :exec, :env then 'command' end)
+                        format_desc(action, flag, case flag
+                                                  when :exec, :env then 'command'
+                                                  end)
                         task flag do |_, args|
                           args = args.to_a
                           if args.empty? && (flag == :exec || flag == :env)
@@ -533,7 +538,8 @@ module Squared
           graph_deps.flatten(1).sort.each do |proj|
             next if @@graph[:_].include?(proj)
 
-            if (val = ENV["PREREQS_#{proj.envname_get}"] || ENV["PREREQS_#{proj.ref.upcase}"])
+            val = ENV["PREREQS_#{proj.envname_get}"] || ENV["PREREQS_#{proj.ref.upcase}"]
+            if val
               split_escape(val) do |meth|
                 if proj.has?(meth)
                   begin
@@ -581,7 +587,8 @@ module Squared
           on :first, :clean unless pass
           case @clean
           when Struct
-            if (val = instance_eval(&@clean.block) || @clean.run)
+            val = instance_eval(&@clean.block) || @clean.run
+            if val
               cur = @clean
               @clean = val
               clean(*args, sync: sync, pass: true, **kwargs)
@@ -1366,9 +1373,8 @@ module Squared
         def run_b(obj, **kwargs)
           case obj
           when Struct
-            if (val = instance_eval(&obj.block) || obj.run)
-              run_b(val, **kwargs)
-            end
+            val = instance_eval(&obj.block) || obj.run
+            run_b(val, **kwargs) if val
           when Proc
             instance_eval(&obj)
           when Method
@@ -1726,7 +1732,7 @@ module Squared
         end
 
         def print_success
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -1921,7 +1927,8 @@ module Squared
 
         def append_hash(data, target: @session || [], build: false)
           if build && (type = env('BUILD', suffix: 'TYPE', ignore: false))
-            if (extra = data[type = "__#{type}__"] || data[type.to_sym]).is_a?(Hash)
+            extra = data[type = "__#{type}__"] || data[type.to_sym]
+            if extra.is_a?(Hash)
               data = data.merge(extra)
             else
               extra = nil
@@ -2139,7 +2146,10 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val.to_s, theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
-            ret = Array(ret) if accept.any? { |val| val[1] == true }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
             begin
               item = accept.shift
               c = confirm("#{item[0]}#{" [#{hint}]" if hint}", item[2] ? 'Y' : 'N')
@@ -2152,7 +2162,7 @@ module Squared
             end until accept.empty?
           end
           if values
-            ret = Array(ret)
+            ret = [ret] unless accept && multiple == -1
             Array(values).each do |val|
               if val.is_a?(Array)
                 val, force = val
@@ -2198,7 +2208,7 @@ module Squared
                   cmd.reverse! if File::NULL == 'NUL'
                   cmd.unshift('').join(' ')
                 end
-          if workspace.powershell?
+          if powershell?
             "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
           else
             args.map { |val| "#{val}#{out}" }.join(' && ')
@@ -2335,7 +2345,7 @@ module Squared
         end
 
         def indexchar
-          workspace.windows? ? '=' : '^'
+          windows? ? '=' : '^'
         end
 
         def shortname(*args, suffix: '?', delim: ',', pass: false)
@@ -2432,7 +2442,7 @@ module Squared
           return if from == false
 
           require 'timeout'
-          unless (path.to_s == Dir.pwd || pass) && (workspace.mri? || !workspace.windows?)
+          unless (path.to_s == Dir.pwd || pass) && (mri? || !windows?)
             pwd = Dir.pwd
             Dir.chdir(path)
           end
@@ -2775,6 +2785,20 @@ module Squared
           false
         end
 
+        def choice!(args, char: ':', first: true, empty: false, only: false)
+          return true if (empty && args.empty?) || (only && args.size == 1 && args.first == char)
+
+          if first
+            if args.first == char
+              args.shift
+              return true
+            end
+          elsif args.delete(char)
+            return true
+          end
+          false
+        end
+
         def variables
           VAR_SET
         end