squared 0.7.6 → 0.8.0

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

@@ -105,7 +105,7 @@ module Squared
           end
 
           def bannerargs
-            %i[version dependfile venv].freeze
+            %i[version dependfile venv editable].freeze
           end
 
           def venv?
@@ -201,7 +201,7 @@ module Squared
                               end
                               found |= 1
                               run(script, from: :run)
-                            elsif exception
+                            elsif exception?
                               indexerror n, list
                             else
                               found |= 2
@@ -216,7 +216,7 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise "script: #{val}" if exception
+                              raise message('script', val) if exception?
 
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
@@ -265,10 +265,10 @@ module Squared
 
                           format_desc action, flag, 'c/reate?,d/epend?,opts*'
                           task flag do |_, args|
-                            args = args.to_a
-                            rm_rf(venv, verbose: true)
-                            venv_init if has_value!(args, 'c', 'create')
-                            depend :force, args if has_value!(args, 'd', 'depend')
+                            opts = args.to_a
+                            rm_rf(venv, verbose: !silent?)
+                            venv_init if has_value!(opts, 'c', 'create')
+                            depend :force, opts if has_value!(opts, 'd', 'depend')
                           end
                         when :exec
                           format_desc action, flag, 'command,args*'
@@ -391,7 +391,7 @@ module Squared
                                                                 else 'outdir?,srcdir?'
                                                                 end)
                       task flag do |_, args|
-                        build! flag, args.to_a
+                        build_ flag, args.to_a
                       end
                       break if be
                     when 'publish'
@@ -438,9 +438,9 @@ module Squared
               if flag
                 cmd << case flag
                        when :requirement, :target
-                         quote_option(flag, basepath(target))
+                         quote_option flag, basepath(target)
                        else
-                         shell_option(flag)
+                         shell_option flag
                        end
                 op = append_pip flag, opts, pipopts(:install)
                 op.clear
@@ -614,7 +614,8 @@ module Squared
             op.clear
           when :user, :upgrade
             op.concat(packages)
-            raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
+            raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
+
             op << "--#{flag}"
             op.append
             python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
@@ -622,7 +623,7 @@ module Squared
           run(banner: banner, from: :install)
         end
 
-        def build!(flag, opts = [], outdir: nil, srcdir: nil)
+        def build_(flag, opts = [], outdir: nil, srcdir: nil)
           list = case flag
                  when :poetry
                    cmd = poetry_session 'build'
@@ -705,12 +706,9 @@ module Squared
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
+            raise message('no source to publish', hint: dir) if dir.exist?
 
-            if dir.exist?
-              raise_error 'no source to publish', hint: dir
-            else
-              raise_error Errno::ENOENT, dir, hint: 'publish'
-            end
+            raise Errno::ENOENT, message(dir, hint: 'publish')
           end
           if test
             if op.arg?('r', flag == :hatch ? 'repo' : 'repository')
@@ -771,7 +769,7 @@ module Squared
               when :install, :uninstall
                 op << '.' if installable? && !op.arg?('r', 'requirement')
               else
-                raise_error ArgumentError, 'no packages listed', hint: flag
+                raise ArgumentError, message('no packages listed', hint: flag)
               end
             elsif flag == :install
               op.append_any
@@ -794,7 +792,8 @@ module Squared
               .clear
           when :cache
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
+            raise message('no subcommand', hint: flag) if op.empty?
+
             op << (action = op.shift)
             case action
             when 'dir', 'info', 'purge'
@@ -802,13 +801,15 @@ module Squared
             when 'list', 'remove'
               op.add_first(quote: true)
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :config
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
-            op << (action = op.shift)
+            raise message('no subcommand', hint: flag) if op.empty?
+
+            action = op.shift
+            op << action
             case action
             when 'list', 'edit', 'debug'
               nil
@@ -816,7 +817,7 @@ module Squared
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :hash
@@ -853,7 +854,7 @@ module Squared
         def variable_set(key, *args, **, &blk)
           if block_given?
             case key
-            when :dependfile, :editable, :venv
+            when :dependfile, :venv
               args = block_args args, &blk
             end
           end
@@ -870,8 +871,6 @@ module Squared
                 log.warn "variable_set: @dependfile=#{val}".subhint('not supported')
               end
             end
-          when :editable
-            editable_set args.first
           when :venv
             @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
@@ -1025,7 +1024,7 @@ module Squared
 
               if found
                 line.chomp!($1) if line =~ /(?<=[\d"'{}\[\]]|true|false)(\s*#.*)$/
-                break if line.match?(/^\s*\[(?:[\w.\-"' ]+|".+"|'.+')\]\s*$/)
+                break if line.match?(/^\s*\[([\w.\-"' ]+|".+"|'.+')\]\s*$/)
 
                 if ch
                   val = line.rstrip
@@ -1129,7 +1128,7 @@ module Squared
         end
 
         def variables
-          (super + %i[venv editable]).freeze
+          (super + %i[venv]).freeze
         end
 
         def runenv

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

@@ -8,7 +8,7 @@ module Squared
         GEMNAME = /\A[A-Za-z\d][A-Za-z\d_.-]*\z/.freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[0=im? a c C=pm e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose
+          ruby: %w[a c l n p s S w 0=im? C=pm e=q E=bm F=qm i=bm? I=pm r=bm W=bm? x=pm? d|debug jit rjit verbose
                    y|yydebug backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
                    internal-encoding=b parser=b].freeze,
           rake: %w[A|all B|build-all comments n|dry-run m|multitask P|prereqs q|quiet X|no-deprecation-warnings
@@ -16,14 +16,14 @@ module Squared
                    D|describe=q? e|execute=q E|execute-continue=q p|execute-print=q f|rakefile=p job-stats=b? j|jobs=i?
                    I|libdir=p R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
                    W|where=q?].freeze,
-          irb: %w[d f U w E=b I=p r=bm W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
+          irb: %w[d f U w E=b I=pm r=bm W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
                   inspect multiline no-pager noautocomplete nocolorize noecho noecho-on-assignment noinspect
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
           rdbg: %w[no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q e=q host=q x|init-script=p
                    O|open=q? port=i port-range=b session-name=q sock-path=q util=q].freeze,
-          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze,
+          rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
           rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
                       display-only-correctable display-only-fail-level-offenses display-only-failed
                       display-only-safe-correctable S|display-style-guide display-time editor-mode enable-pending-cops
@@ -34,8 +34,8 @@ module Squared
                       start-server stderr stop-server C|cache=b cache-root=p config=p exclude-limit=i fail-level=b
                       f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
                       s|stdin=p].freeze,
-          pry: %w[f I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
-                  d|disable-plugin=q e=q gem=b r|require=bm s|select-plugin=q].freeze,
+          pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
+                  d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
             rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
                         offense-counts parallel server].freeze
@@ -69,7 +69,7 @@ module Squared
           plugin: %w[source=q version=q].freeze,
           plugin_uninstall: %w[all].freeze,
           show: %w[paths].freeze,
-          update: %w[all conservativepre ruby strict bundler=b? g|group=q source=q].freeze,
+          update: %w[all conservative pre ruby strict bundler=b? g|group=q source=q].freeze,
           v3: {
             binstubs: %w[all].freeze,
             cache: %w[all frozen no-prune].freeze,
@@ -212,7 +212,8 @@ module Squared
         attr_reader :gemdir
         attr_accessor :autodetect
 
-        def initialize(*, autodetect: false, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby', **kwargs)
+        def initialize(*, autodetect: false, exec: false, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby',
+                       **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -225,6 +226,7 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
+          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
           @steepfile = basepath! steep if steep
           @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
@@ -297,7 +299,7 @@ module Squared
                           queue.call
                           if (item = tasks[n.pred])
                             cmd = [pre, item.first].compact.join(' ')
-                          elsif exception
+                          elsif exception?
                             indexerror n, tasks
                           else
                             log.warn "rake task #{n} of #{tasks.size}".subhint('out of range')
@@ -380,7 +382,7 @@ module Squared
                             if val.include?('*')
                               out.concat(Dir.glob(val, base: path))
                             elsif !(file = basepath!(val))
-                              print_error(val, hint: 'not found')
+                              print_error('file not found', hint: val)
                             elsif file.directory?
                               out.concat(file.glob('**/*.rb'))
                             else
@@ -436,17 +438,18 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated
-                        format_desc action, flag, "semver?=major|minor|patch,#{shortname('i', 's', 'u', 'd')},opts*"
+                        format_desc action, flag, "semver?=(=)major|minor|patch,#{shortname('i', 's', 'u', 'd')},opts*"
                         task flag, [:semver] do |_, args|
-                          opts = case (semver = args.semver)
-                                 when 'major', 'minor', 'patch'
+                          opts = if args.semver =~ /^(=)?(major|minor|patch)$/i
+                                   equals = !$1.nil?
+                                   semver = $2.downcase
                                    args.extras
                                  else
-                                   semver = nil
                                    args.to_a
                                  end
                           gem(flag, opts: opts, banner: true, filter: {
                             semver: semver,
+                            equals: equals,
                             update: has_value!(opts, 'u', 'update'),
                             interactive: has_value!(opts, 'i', 'interactive'),
                             select: has_value!(opts, 's', 'select'),
@@ -560,7 +563,7 @@ module Squared
                                       else
                                         %w[## ;]
                                       end
-                          msg = if Readline.respond_to?(:readmultiline)
+                          msg = if Prompt.reline.respond_to?(:readmultiline)
                                   'ruby>'
                                 else
                                   multiline = Array(multiline)
@@ -603,7 +606,7 @@ module Squared
                           pwd_set do
                             out = []
                             tool = args.name || (s && !SEM_VER.match?(s) ? s : 'ruby')
-                            trim = ->(val) { val[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
+                            trim = ->(val) { val =~ /^\D+\d+\.\d+(?:\.\S+)?/ ? $&.sub(/^([a-z]+)-/i, '\1 ') : val }
                             vm, bin = vmname(bin: true)
                             out << trim.call(case vm
                                              when 'rvm'
@@ -689,9 +692,9 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
-                                                   .yield_self do |data|
-                                                     target = data.find { |line| line.include?(tool) }
-                                                     target ? [target] : data
+                                                   .yield_self do |lines|
+                                                     target = lines.find { |line| line.include?(tool) }
+                                                     target ? [target] : lines
                                                    end
                                                    .join(', ')
                                              end
@@ -725,7 +728,7 @@ module Squared
                             out.map!(&:split)
                             pad = as_a(out, :first, :size).max
                             print_item
-                            puts(out.map { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
+                            puts(out.map { |line| '%*s %s' % [pad, line.first, line.drop(1).join(' ')] })
                           end
                         end
                       when :reshim
@@ -1065,6 +1068,7 @@ module Squared
             buffer = []
             filter = kwargs.fetch(:filter, {})
             semver = filter[:semver]
+            equals = filter[:equals]
             update = if sync && filter[:select]
                        semver ||= 'major'
                        items = []
@@ -1141,6 +1145,8 @@ module Squared
                     when 2
                       case semver
                       when 'major', 'minor'
+                        next if equals && semver == 'major'
+
                         update&.push(a)
                       when 'patch'
                         next
@@ -1154,6 +1160,8 @@ module Squared
                     else
                       case semver
                       when 'major', 'minor', 'patch'
+                        next if equals && semver != 'patch'
+
                         update&.push(a)
                       end
                       unless stdin?
@@ -1252,26 +1260,36 @@ module Squared
           case flag
           when :build
             if op.empty?
-              raise_error Errno::ENOENT, 'gemspec', hint: project unless gemfile
+              raise Errno::ENOENT, message('gemspec', hint: project) unless gemfile
+
               op.add_path(gemfile)
             else
-              op.add_first(path: true)
+              op.add_first(path: !op.first.include?('*'), quote: true)
                 .clear(pass: false)
             end
           when :push
+            target = gemname
             if op.empty? || (n = op.index(':'))
               file = basepath(if !n && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 choice_index 'Select a file', Dir.glob('*.gem', base: path)
                               end)
+              op.add_path(file)
+            elsif (file = op.shift).include?('*')
+              file = '*.gem' if file == '*'
+              target = Dir.glob(file, base: path).join(', ')
+              raise Errno::ENOENT, message(file, hint: flag) if target.empty?
+
+              op.add_quote(file)
             else
-              file = basepath(op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" })
-              raise_error Errno::ENOENT, file, hint: flag unless file.exist?
-              raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
+              file = basepath(file.include?('.') ? file : "#{file}.gem")
+              raise Errno::ENOENT, message(file, hint: flag) unless file.exist?
+              raise ArgumentError, message('unrecognized args', op.join(', '), hint: flag) unless op.empty?
+
+              op.add_path(file)
             end
-            op.add_path(file)
-            return run(from: from, interactive: ['Push', 'N', gemname]) unless with || !banner
+            return run(from: from, interactive: ['Push', 'N', target]) unless with || !banner
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1327,7 +1345,8 @@ module Squared
                 op.unshift(name)
               end
             end
-            raise_error ArgumentError, 'missing gem name', hint: flag if op.empty?
+            raise ArgumentError, message('missing gem name', hint: flag) if op.empty?
+
             if op.arg?('all')
               if flag == :pristine
                 append_repeat 'skip', op.extras
@@ -1367,7 +1386,7 @@ module Squared
                 op << action
                 op.clear
               else
-                raise_error ArgumentError, "unrecognized arg: #{action}", hint: flag
+                raise ArgumentError, message('unrecognized command', action, hint: flag)
               end
             end
           when :open, :owner, :unpack, :yank
@@ -1404,7 +1423,7 @@ module Squared
                    end
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          invalid = ->(a) { raise_error ArgumentError, "unrecognized args: #{a.join(', ')}", hint: flag }
+          invalid = ->(a) { raise ArgumentError, message('unrecognized args', a.join(', '), hint: flag) }
           cmd = bundle_session flag
           case flag
           when :cache, :check, :clean, :init, :install, :lock, :pack, :package, :platform
@@ -1623,8 +1642,8 @@ module Squared
 
         def rubocop(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rubocop], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self, strict: strict?,
-                                                                                 no: OPT_RUBY[:no][:rubocop])
+          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session(*bundle_args('rubocop')),
+                                   project: self, strict: strict?, no: OPT_RUBY[:no][:rubocop])
           if @rubocopfile && !op.arg?('c', 'config') && !rootpath('.rubocop.yml', ascend: true).exist?
             op.add_path(@rubocopfile, option: 'c')
           end
@@ -1659,7 +1678,7 @@ module Squared
         end
 
         def vmname(bin: false)
-          order = { 'rbenv' => -1, 'rvm' => -1, 'chruby' => -1, 'mise' => -1 }
+          order = { 'rbenv' => -1, 'rvm' => -1, 'chruby' => -1, 'asdf' => -1, 'mise' => -1 }
           ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
             order.each_key do |key|
               next unless val.match?(%r{[/.]#{key}/})
@@ -1668,36 +1687,40 @@ module Squared
               break
             end
           end
+          items = [
+            "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
+            '$HOME/.rvm/bin/rvm',
+            '$HOME/.local/bin/mise',
+            '/usr/bin/rbenv',
+            '/usr/bin/mise',
+            '/usr/local/rvm/bin/rvm',
+            '/usr/share/rvm/bin/rvm',
+            '/usr/local/share/chruby/chruby.sh'
+          ]
           if @asdf
-            [File.join(ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf'), "installs/#{@asdf.first}")]
-          else
-            [
-              "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
-              '$HOME/.rvm/bin/rvm',
-              '$HOME/.local/bin/mise',
-              '/usr/bin/rbenv',
-              '/usr/bin/mise',
-              '/usr/local/rvm/bin/rvm',
-              '/usr/share/rvm/bin/rvm',
-              '/usr/local/share/chruby/chruby.sh'
-            ]
-            .sort do |a, b|
-              c = -1
-              d = -1
-              order.each do |key, val|
-                pat = %r{/\.?#{key}}
-                c = val if a.match?(pat)
-                d = val if b.match?(pat)
-              end
-              if c == d
-                0
-              elsif c == -1
-                1
-              elsif d == -1
-                -1
-              else
-                c < d ? -1 : 1
-              end
+            dir = File.join(ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf'), "installs/#{@asdf.first}")
+            if @@asdf.version == 16
+              items = [dir]
+            else
+              items << dir
+            end
+          end
+          items.sort do |a, b|
+            c = -1
+            d = -1
+            order.each do |key, val|
+              pat = %r{/\.?#{key}}
+              c = val if a.match?(pat)
+              d = val if b.match?(pat)
+            end
+            if c == d
+              0
+            elsif c == -1
+              1
+            elsif d == -1
+              -1
+            else
+              c < d ? -1 : 1
             end
           end
           .each do |val|
@@ -1725,7 +1748,7 @@ module Squared
         def project
           return @project unless @project.frozen?
 
-          @project = ((spec = gemspec) ? spec.name : @project).dup
+          @project = (gemspec&.name || @project).dup
         end
 
         def depend?
@@ -1820,8 +1843,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, strict: strict?,
-                                                                        first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)), project: self, strict: strict?,
+                                                                                      first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1848,14 +1871,15 @@ module Squared
         end
 
         def rake_session(*cmd, **kwargs)
-          session('rake', *preopts, *cmd, **kwargs)
+          session(*bundle_args('rake'), *preopts, *cmd, **kwargs)
         end
 
         def rbs_session(*cmd, opts: nil)
-          return session('rbs', *cmd) unless opts
+          args = bundle_args 'rbs'
+          return session(*args, *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
-          [session('rbs', *op.to_a, *cmd), op.extras]
+          [session(*args, *op.to_a, *cmd), op.extras]
         end
 
         def gem_output(*cmd, **kwargs)
@@ -1871,7 +1895,15 @@ module Squared
         end
 
         def rake_output(*cmd, **kwargs)
-          session_output('rake', *cmd, **kwargs)
+          session_output(*bundle_args('rake'), *cmd, **kwargs)
+        end
+
+        def bundle_args(*args)
+          if (val = @bundle[:exec])
+            args.unshift(quote_option('gemfile', val)) unless val == true
+            args.unshift('bundle', 'exec')
+          end
+          args
         end
 
         def bundle_load
@@ -1933,10 +1965,6 @@ module Squared
           verbose? ? ['--verbose'] : []
         end
 
-        def variables
-          (super + %i[autodetect]).freeze
-        end
-
         def rakefile
           if @rakefile.nil?
             file = Rake::Application::DEFAULT_RAKEFILES.find { |val| exist?(val) }

data/lib/squared/workspace/project/support/class.rb

@@ -125,8 +125,8 @@ module Squared
               extras.concat(if n == 0
                               data
                             else
-                              super(data[0, n])
-                              data[n..-1]
+                              super(data.take(n))
+                              data.drop(n)
                             end)
               self
             else

data/lib/squared/workspace/project/support/optionpartition.rb

@@ -20,8 +20,8 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
-                       filter: nil, pass: nil, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, double: false, filter: nil,
+                       pass: nil, **kwargs)
               return if (ret = args.flatten(1)).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -52,7 +52,7 @@ module Squared
                 if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
                 elsif quote || pa
-                  shell_quote(val, force: force, double: double)
+                  shell_quote(val, double: double, **kwargs)
                 else
                   val
                 end
@@ -135,7 +135,7 @@ module Squared
               [name, $3, $2 || (name.size == 1 && $1.empty? ? true : '')]
             end
 
-            def arg?(target, *args, value: false, **)
+            def arg?(target, *args, value: false)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
               a = target.to_a
@@ -315,7 +315,7 @@ module Squared
             end
             numtype = [
               [i, /\A\d+\z/],
-              [f, /\A\d*(?:\.\d+)?\z/],
+              [f, /\A\d*(\.\d+)?\z/],
               [si, /\A-?\d+\z/]
             ].freeze
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && v.match?(pat) } }
@@ -395,10 +395,10 @@ module Squared
             self
           end
 
-          def append(*args, clear: false, **kwargs, &blk)
+          def append(*args, clear: false, preserve: '"', **kwargs, &blk)
             args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
-            OptionPartition.append(target, *args, **kwargs, &blk)
+            OptionPartition.append(target, *args, preserve: preserve, **kwargs, &blk)
             errors.concat(pass)
             self
           end
@@ -609,7 +609,7 @@ module Squared
                 val = OptionPartition.send(:matchopts, val) unless val.is_a?(Regexp)
                 blk = proc { |s| s&.match?(val) }
               else
-                raise TypeError, "unknown: #{val}"
+                raise TypeError, Common::Format.message('unknown', val, hint: target.first)
               end
             end
             ret = find_all(&blk)
@@ -658,10 +658,7 @@ module Squared
 
           def readline(msg, fallback = nil, option: nil, quote: false, force: true, double: false)
             begin
-              require 'readline' unless defined?(Readline)
-              ret = Readline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
-            rescue LoadError
-              raise unless (ret = fallback) || !force
+              ret = Common::Prompt.reline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
             rescue Interrupt
               exit(force ? 1 : 0)
             else