squared 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a3b6e4109938a7ee4ddc9d778c798ad412cd2941a6b887cc62f9bd39779b4ad
-  data.tar.gz: 6912a295b0e64223d3130d8793bce44e954c0903fd74b65eb0f420726a41f82d
+  metadata.gz: c638ae780897008e5115630f70db5a8ce7e1930fd31e7d1984b16d775218e16b
+  data.tar.gz: 231f5fc087b0b3dfcff0289f5601b0c70f0a9e6db63ff7309b7c86d96ae0a1ef
 SHA512:
-  metadata.gz: 137851028240806e553b125ec638df63cb20c25b6f73328a1c08f7af7603d666a1b61ff04dde1da27995a13d0bf2a6c28e644d20b6e8beb6e26fba061191d908
-  data.tar.gz: 21c7fce48d7638aa90b9c0ef40282b30557205065f6117e0602248771cee9e628910f90125295dac4a831615adda43296112809b437f31b4db0aa9d3f03de437
+  metadata.gz: 175e72f4f5821922928b2b95a7f831dc42e91bbc41f093686cd253a68794b4b34db8af2bb9d103871cd19dfdf4d21ddd1d2bf30efdd8a8b4f5a7475be77b9988
+  data.tar.gz: 7c619485cf6d8046ba0e2acd99afcb698137e6342fd68b454c1195f9f32517d133aada79783813c15978eb1af132113aa94c422d425ae76b36a033345c81a4e3

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Changelog
 
+## [0.6.2] - 2025-11-08
+
+### Added
+
+- JoinSet methods [add|merge] were aliased to [push|concat].
+- JoinSet supports values that can be used multiple times.
+
+### Changed
+
+- Ruby command rake can multiple indexed tasks with separate options.
+
+### Fixed
+
+- Session global program options were untested and worthless upon draft.
+
+## [0.5.15] - 2025-11-08
+
+### Fixed
+
+- See `0.4.29`.
+
+## [0.4.29] - 2025-11-08
+
+### Fixed
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
+## [0.5.14] - 2025-11-08
+
+### Fixed
+
+- See `0.4.28`.
+
+## [0.4.28] - 2025-11-08
+
+### Fixed
+
+- Project base method build as arrays parsed unrelated arguments.
+- OptionPartition method arg? does not check after "--" delimiter.
+- OptionPartition did not support duplicate values after "--" delimiter.
+- OptionPartition method opt? did not type check for String.
+
 ## [0.6.1] - 2025-11-05
 
 ### Added
@@ -12,6 +54,7 @@
 
 - Project base method run argument series was backwards.
 - Project base choice range did not detect empty list result.
+- Project base method build as arrays parsed unrelated arguments.
 
 ## [0.5.13] - 2025-11-05
 
@@ -1308,8 +1351,11 @@
 
 - Changelog was created.
 
+[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.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
+[0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
 [0.5.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.13
 [0.5.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.12
 [0.5.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.11
@@ -1324,6 +1370,8 @@
 [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.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
+[0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28
 [0.4.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.27
 [0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26
 [0.4.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25

data/lib/squared/common/format.rb

@@ -266,8 +266,8 @@ module Squared
           sub.each { |h| s = sub_style(s, **h) }
           s = "#{b0} #{s} #{b0}"
           if border
-            s = sub_style(s, **opt_style(border, /\A(#{Regexp.escape(b0)})(.+)\z/m))
-            s = sub_style(s, **opt_style(border, /\A(.+)(#{Regexp.escape(b0)})\z/m, 2))
+            s = sub_style(s, **opt_style(border, /\A(#{Regexp.escape(b0)})(.+)\z/om))
+            s = sub_style(s, **opt_style(border, /\A(.+)(#{Regexp.escape(b0)})\z/om, 2))
           end
           s
         end

data/lib/squared/common/shell.rb

@@ -156,6 +156,7 @@ module Squared
       end
 
       def fill_option(val, **kwargs)
+        return val unless val.is_a?(::String)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)

data/lib/squared/config.rb

@@ -271,7 +271,7 @@ module Squared
               end
             end
           rescue StandardError
-            log&.warn "#{Viewer}(#{type}) => #{file && "#{file} "}{#{key}: undefined}"
+            log&.warn "#{Viewer}(#{type}) => #{"#{file} " if file}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"

data/lib/squared/version.rb

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

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

@@ -553,31 +553,31 @@ module Squared
             cmd = cmd.join(' && ')
           else
             cmd, opts, var, flags, extra = args
-          end
-          if cmd
-            return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
-
-            cmd = as_get cmd, from
-            opts = compose(opts, script: false) if opts && respond_to?(:compose)
-            flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
-            case opts
-            when Hash
-              cmd = Array(cmd).push(flags)
-                              .concat(append_hash(opts, target: [], build: true))
-                              .compact
-                              .join(' ')
-            when Enumerable
-              cmd = Array(cmd).concat(opts.to_a)
-              cmd.map! { |val| "#{val} #{flags}" } if flags
-              cmd = cmd.join(' && ')
+            if cmd
+              return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
+
+              cmd = as_get cmd, from
+              opts = compose(opts, script: false) if opts && respond_to?(:compose)
+              flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
+              cmd = case opts
+                    when Hash
+                      Array(cmd).push(flags)
+                                .concat(append_hash(opts, target: [], build: true))
+                                .compact
+                                .join(' ')
+                    when Enumerable
+                      cmd = Array(cmd).concat(opts.to_a)
+                      cmd.map! { |val| "#{val} #{flags}" } if flags
+                      cmd.join(' && ')
+                    else
+                      [cmd, flags, opts].compact.join(' ')
+                    end
             else
-              cmd = [cmd, flags, opts].compact.join(' ') if opts || flags
-            end
-          else
-            return unless (opts || extra) && respond_to?(:compose)
+              return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
-            from = :script if from == :run && script?
+              cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
+              from = :script if from == :run && script?
+            end
           end
           run(cmd, var, sync: sync, banner: banner, from: from)
         end
@@ -596,12 +596,12 @@ module Squared
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
-                    next
                   rescue StandardError => e
                     on_error(e, :prereqs, exception: true)
                   end
+                else
+                  print_error(name, "method: #{meth}", subject: 'prereqs', hint: 'undefined')
                 end
-                print_error(name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -1023,6 +1023,8 @@ module Squared
         end
 
         def exist?(*args)
+          return false if (args = args.compact).empty?
+
           basepath(*args).exist?
         end
 
@@ -1359,10 +1361,10 @@ module Squared
           ret = JoinSet.new(cmd.flatten(1))
           if options
             env("#{prefix.upcase}_OPTIONS") do |val|
-              if val.start_with('-')
-                ret.concat(shell_parse(val))
+              if val.start_with?('-')
+                ret.merge(shell_parse(val))
               else
-                split_escape(val) { |opt| ret.last(fill_option(opt), /\A(--?[^= ]+)[= ].+\z/m) }
+                split_escape(val) { |opt| ret.last(fill_option(opt), /\A(--?[^\[\]=\s-][^\[\]=\s]*)[=\s].+\z/m) }
               end
             end
           end
@@ -1699,11 +1701,12 @@ module Squared
                           **kwargs)
           return if list.empty?
 
+          kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
           [].tap do |ret|
             list.flatten.each do |flag|
               next unless (val = option(flag, target: target, **kwargs))
 
-              if val == '0' && no
+              if no && val == '0'
                 flag = "no-#{flag}"
                 val = nil
               end
@@ -1804,6 +1807,12 @@ module Squared
           print_error(e, subject: name)
         end
 
+        def parse_env(key)
+          env(key) do |val|
+            val.start_with?('-') ? shell_parse(val) : split_escape(val).map! { |opt| fill_option(opt) }
+          end || []
+        end
+
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -1841,7 +1850,7 @@ module Squared
                          force: true, **kwargs)
           puts unless series || printfirst?
           ret = choice(msg, list, multiple: multiple, force: force, **kwargs).tap do |val|
-            next unless val.empty?
+            next unless !val || val.empty?
 
             exit 1 if force
             return nil
@@ -2012,7 +2021,7 @@ module Squared
         end
 
         def indexerror(val, list = nil)
-          raise_error IndexError, "requested index #{val}", hint: list && "of #{list.size}"
+          raise_error IndexError, "requested index #{val}", hint: ("of #{list.size}" if list)
         end
 
         def indexchar
@@ -2333,15 +2342,33 @@ module Squared
         end
 
         def has_value?(target, *args)
+          return false unless target.is_a?(Enumerable)
+
           args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
           case target
           when Hash
             args.is_a?(Enumerable) ? args.any? { |obj| target.value?(obj) } : target.value?(args)
-          when Enumerable
-            args.is_a?(Enumerable) ? args.any? { |obj| target.include?(obj) } : target.include?(args)
           else
-            false
+            args.is_a?(Enumerable) ? args.any? { |obj| target.include?(obj) } : target.include?(args)
+          end
+        end
+
+        def has_value!(target, *args, first: false)
+          return unless target.is_a?(Enumerable)
+
+          args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
+          found = false
+          args.each do |val|
+            if target.respond_to?(:delete?)
+              found = true if target.delete?(val)
+            elsif target.respond_to?(:delete)
+              found = true if target.delete(val)
+            elsif target.include?(val)
+              found = true
+            end
+            break if found && first
           end
+          target if found
         end
 
         def variables

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

@@ -154,12 +154,8 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    a = args.delete('a') || args.delete('all')
                     ls = case command
-                         when 'network'
-                           a = nil
-                           'ls'
-                         when 'image', 'container'
+                         when 'image', 'container', 'network'
                            'ls'
                          when 'compose'
                            'ps'
@@ -167,7 +163,7 @@ module Squared
                            raise_error ArgumentError, 'unrecognized command', hint: command
                          end
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    if args.delete('s') || args.delete('standard')
+                    if has_value!(args, 's', 'standard')
                       cols = data.first(data.index('CreatedAt'))
                     else
                       cols = []
@@ -184,7 +180,8 @@ module Squared
                         cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
                       end
                     end
-                    cmd = docker_output(command, ls, a && '-a')
+                    cmd = docker_output command, ls
+                    cmd << '-a' unless command == 'network' || !has_value!(args, 'a', 'all')
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -949,8 +946,7 @@ module Squared
         end
 
         def tagjoin(*args, char: '/')
-          args.compact!
-          args.join(char) unless args.empty?
+          args.join(char) unless (args = args.compact).empty?
         end
 
         def tagname(val)

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

@@ -31,7 +31,7 @@ module Squared
           return self
         end
         if base
-          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : @root + base
+          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : rootpath(base)
           repo.each do |target|
             if target.is_a?(Project::Git)
               data[target.localname] = target.project
@@ -50,7 +50,7 @@ module Squared
                 end
           unless uri.match?(GIT_PROTO) || Pathname.new(uri).absolute?
             if uri.start_with?('.')
-              uri = @root + uri
+              uri = rootpath uri
             elsif base
               uri = base + uri
             else
@@ -154,9 +154,9 @@ module Squared
                      namespace=p].freeze,
           add: %w[A e|edit f|force ignore-errors ignore-missing i|interactive n|dry-run p|patch pathspec-file-nul
                   refresh renormalize sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose abbrev=i color=b column=b
-                     contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b sort=q
-                     t|track=b].freeze,
+          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
+                     column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
+                     sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
                        pathspec-file-nul q|quiet ours theirs conflict=b orphan=b pathspec-from-file=p t|track=b].freeze,
           diff: {
@@ -183,9 +183,9 @@ module Squared
                      A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=i
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
-            revert: %w[e S=bm? abort continue n|no-commit quit reference skip cleanup=b gpg-sign=b? m|mainline=i
-                       s|signoff strategy=b X|strategy-option=b].freeze,
-            rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse v|verbose
+            revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
+                       X|strategy-option=b].freeze,
+            rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse
                    pathspec-from-file=p].freeze
           }.freeze,
           log: {
@@ -245,7 +245,7 @@ module Squared
             pop: %w[index].freeze,
             apply: %w[index].freeze
           }.freeze,
-          status: %w[z u=bm? b|branch long s|short show-stash v|verbose column=b find-renames=i? ignore-submodules=b?
+          status: %w[z u=bm? b|branch long s|short show-stash v|verbose=+ column=b find-renames=i? ignore-submodules=b?
                      ignored=b? porcelain=b? untracked-files=b?].freeze,
           submodule: {
             status: %w[cached recursive].freeze,
@@ -296,7 +296,8 @@ module Squared
             send: %w[continue skip abort quit].freeze,
             value: %w[true false merges interactive].freeze
           }.freeze,
-          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze
+          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
+          revbuild: %w[untracked-files ignore-submodules ignored].freeze
         }.freeze
         private_constant :OPT_GIT, :VAL_GIT
 
@@ -1151,7 +1152,7 @@ module Squared
             append_option(OptionPartition.select(OPT_GIT[:stash][:push], no: false), no: true, ignore: false)
             append_message
           end
-          source(banner: !quiet?, sync: sync, **threadargs)
+          source(sync: sync, banner: !quiet?, **threadargs)
         end
 
         def status(flag = nil, opts = [])
@@ -1217,22 +1218,22 @@ module Squared
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
           case flag
           when :build
-            op = OptionPartition.new(opts, %w[ignore-submodules=b? ignored=b? untracked-files=b?], project: self)
+            op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
             op.clear(append: true)
             args = op.to_a
           else
-            args = [
-              option('untracked-files', prefix: 'git') { |val| basic_option('untracked-files', val) },
-              option('ignore-submodules', prefix: 'git') { |val| basic_option('ignore-submodules', val) },
-              option('ignored', prefix: 'git') { |val| basic_option('ignored', val) }
-            ].compact
+            args = parse_env('GIT_OPTIONS')
+                   .grep(/\A--#{Regexp.union(*VAL_GIT[:revbuild])}/)
+                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option(key, val) } })
+                   .compact
+            OptionPartition.uniq!(args)
           end
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               workspace.rev_timeutc(name, 'build') unless (since = workspace.rev_timesince(name, 'build'))
               if stdout?
-                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: since && "#{since} ago")
+                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: ("#{since} ago" if since))
               end
               return
             end
@@ -1754,7 +1755,12 @@ module Squared
         def git(flag, opts = [])
           cmd, opts = git_session(flag, opts: opts)
           list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
-          list.concat(OPT_GIT[:log][:diff_context]) if flag == :add
+          case flag
+          when :add
+            list.concat(OPT_GIT[:log][:diff_context])
+          when :revert
+            list.concat(VAL_GIT[:rebase][:send])
+          end
           op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GIT[:no][flag], single: /\A\d+\z/,
                                                     first: case flag
                                                            when :blame, :revert then nil
@@ -1766,7 +1772,7 @@ module Squared
             op.append(basepath(op.remove_at(n)), delim: true)
               .clear
           when :revert
-            if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
+            if op.arg?(*VAL_GIT[:rebase][:send])
               op.clear
             elsif op.empty?
               raise_error 'no commit target'

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

@@ -302,22 +302,21 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,d/ry-run?,p/ublic|r/estricted?',
-                                  before: ('tag' if flag == :tag))
+                      format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?', before: ('tag' if flag == :tag))
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('d')
-                        access = if args.delete('public') || args.delete('p')
-                                   'public'
-                                 elsif args.delete('restricted') || args.delete('r')
+                        access = if has_value!(args, 'r', 'restricted')
                                    'restricted'
+                                 elsif has_value!(args, 'p', 'public')
+                                   'public'
                                  end
+                        dryrun = has_value!(args, 'd', 'dry-run')
                         if flag == :latest
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
                         end
-                        publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
+                        publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                       end
                     when 'tsc'
                       break unless @tsfile
@@ -325,15 +324,11 @@ module Squared
                       format_desc(action, flag, 'opts*', "#{flag == :project ? 'before' : 'after'}": 'config?')
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :project
-                          project = if !args.empty? && exist?(args.first)
-                                      args.shift
-                                    else
-                                      @tsfile
-                                    end
-                        end
-                        watch = !(args.delete('watch') || args.delete('w')).nil?
-                        tsc(*args, banner: true, project: project, build: flag == :build, watch: watch)
+                        tsc(*args, banner: true, "#{flag}": if flag == :build
+                                                              true
+                                                            else
+                                                              exist?(args.first) ? args.shift : @tsfile
+                                                            end, watch: has_value!(args, 'w', 'watch'))
                       end
                     end
                   end
@@ -345,6 +340,8 @@ module Squared
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -361,8 +358,6 @@ module Squared
             create = @copy[:create] if @copy.key?(:create)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-          elsif @copy == false
-            return
           end
           items = []
           if build? && path != @workspace.home && @workspace.home?
@@ -381,7 +376,7 @@ module Squared
               dest = dir
               @workspace.rev_clear(dest, sync: sync)
             when String
-              dest = @workspace.root + dir
+              dest = @workspace.rootpath(dir)
               @workspace.rev_clear(dest, sync: sync)
             when Symbol
               dest = if (proj = @workspace.find(name: dir))
@@ -918,12 +913,9 @@ module Squared
         end
 
         def bump(flag, val = nil)
-          if flag != :version
-            val = sembump version, flag
-            return if val == version
-          elsif !val
-            return
-          end
+          val = sembump version, flag unless flag == :version
+          return unless val
+
           doc = dependfile.read
           if doc.sub!(/"version"\s*:\s*"#{version}"/, "\"version\": \"#{val}\"")
             unless dryrun?

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

@@ -7,16 +7,16 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          common: %w[b=+ B d E h i I O P q=+ s S u v=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
                     o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
                    prompt=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input q|quiet require-virtualenv
-                     v|verbose cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p proxy=q
-                     python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input require-virtualenv
+                     q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p
+                     proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
                      use-feature=b].freeze,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
@@ -43,21 +43,21 @@ module Squared
           wheel: %w[no-verify w|wheel-dir=p].freeze
         }.freeze
         OPT_POETRY = {
-          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
+          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet=+ v|verbose=+ P|project=p].freeze,
           build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
           publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=q
                       u|username=b].freeze
         }.freeze
         OPT_PDM = {
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
-                    k|skip=b].freeze,
-          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+                    p|project=p k|skip=b].freeze,
+          publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
-                     q|quiet v|verbose].freeze,
+                     q|quiet=+ v|verbose=+].freeze,
           build: %w[clean-hooks-after ext hooks-only no-hooks c|clean t|target=b].freeze,
           publish: %w[initialize-auth n|no-prompt y|yes a|auth=q ca-cert=p client-cert=p client-key=p o|option=q
                       p|publisher=b r|repo=q u|user=q].freeze
@@ -923,6 +923,8 @@ module Squared
           case flag
           when :python
             /\A(?:v+|q+|b+)\z/
+          when :pdm
+            /\Av+\z/
           when :twine
             nil
           else

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

@@ -217,33 +217,41 @@ module Squared
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, "task+|#{indexchar}index+,opts*|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
                       format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile, &:join)
                     else
-                      items, opts = args.to_a.partition { |val| indexitem(val) }
-                      if items.empty?
-                        rake(banner: true, opts: opts)
-                      else
-                        tasks = raketasks
-                        while (n, pre = indexitem(items.shift))
+                      tasks = raketasks
+                      cmd = nil
+                      opts = []
+                      queue = lambda do
+                        if cmd
+                          cmd += "[#{opts.join(',')}]" unless opts.empty?
+                          rake(cmd, banner: true)
+                          cmd = nil
+                        elsif !opts.empty?
+                          rake(banner: true, opts: opts)
+                        end
+                        opts.clear
+                      end
+                      args.to_a.each do |item|
+                        if (n, pre = indexitem(item))
+                          queue.call
                           if (item = tasks[n.pred])
-                            cmd = pre ? "#{pre} #{item.first}" : item.first
+                            cmd = [pre, item.first].compact.join(' ')
                           elsif exception
                             indexerror n, tasks
                           else
                             log.warn "rake task #{n} of #{tasks.size} (out of range)"
-                            next
-                          end
-                          if opts.empty?
-                            rake(cmd, banner: true)
-                          else
-                            rake(cmd + "[#{opts.join(',')}]", banner: true)
                             opts.clear
+                            next
                           end
+                        else
+                          opts << item
                         end
                       end
+                      queue.call
                     end
                   end
                 when 'irb'
@@ -344,9 +352,9 @@ module Squared
                                  end
                           gem(flag, opts: opts, banner: true, filter: {
                             semver: semver,
-                            update: opts.delete('u') || opts.delete('update'),
-                            interactive: opts.delete('i') || opts.delete('interactive'),
-                            select: opts.delete('s') || opts.delete('select')
+                            update: has_value!(opts, 'u', 'update'),
+                            interactive: has_value!(opts, 'i', 'interactive'),
+                            select: has_value!(opts, 's', 'select')
                           })
                         end
                       when :build, :push, :exec, :update
@@ -390,7 +398,7 @@ module Squared
                         format_desc action, flag, 'f/orce?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'redownload' if opts.delete('f') || opts.delete('force')
+                          opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath('Gemfile.lock')).exist?
                             config = basepath '.bundle', 'config'
                             if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
@@ -476,17 +484,17 @@ module Squared
         end
 
         def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
             return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
+            into = @copy[:into] if @copy.key?(:into)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-            into = @copy[:into] if @copy.key?(:into)
-          elsif @copy == false
-            return
           end
           return unless into
 
@@ -509,8 +517,8 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = (opts.delete('s') || opts.delete('select')) && !stdin?
-            up = opts.delete('u') || opts.delete('update')
+            se = has_value!(opts, 's', 'select') && !stdin?
+            up = has_value!(opts, 'u', 'update')
             cmd << "--#{flag}"
             OptionPartition.new(opts, bundleopts(:outdated), cmd, project: self)
                            .clear
@@ -743,6 +751,7 @@ module Squared
               end
               out.map!(&:split)
               pad = out.map(&:first).map!(&:size).max
+              print_item
               puts(out.map! { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
             end
             return
@@ -1134,9 +1143,7 @@ module Squared
               output = val.match?(/(?:un)?set/)
             else
               a = op.dup
-              b = op.shift
-              c = op.shift
-              d = op.shift
+              b, c, d = op.slice!(0, 3)
               e = op.arg?('global', 'local')
               op << b
               getname = -> { op << (c || readline('Enter name', force: true)) }

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

@@ -11,7 +11,7 @@ module Squared
           extend Forwardable
 
           OPT_NAME = /\A(?:(--)|-)((?(1)[^\[\]=\s-][^\[\]=\s]*|[^\[\]=\s-]))\z/
-          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:\s*=\s*|\s+)(.+)\z/
+          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:=|\s+)(\S.*)\z/
           OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
@@ -27,9 +27,9 @@ module Squared
               target << '--' if delim && !target.include?('--')
               if strip
                 pat, s = Array(strip)
-                ret.map! { |val| val.gsub(pat, s || '') }
+                ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
-              ret, err = ret.partition { |val| filter.match?(val) } if filter
+              ret, err = ret.partition { |val| filter.match?(val.to_s) } if filter
               if block_given?
                 out = []
                 err ||= []
@@ -119,11 +119,16 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
-              s = target.to_a.compact
-              r.any? { |pat| s.any?(pat) }
+              a = target.to_a
+              if (n = a.index('--'))
+                a = a[0..n]
+              end
+              r.any? { |pat| a.any?(pat) }
             end
 
             def opt?(val)
+              return false unless val.is_a?(String)
+
               val.start_with?('-') && (OPT_NAME.match?(val) || OPT_VALUE.match?(val) || OPT_SINGLE.match?(val))
             end
 
@@ -146,13 +151,13 @@ module Squared
             end
 
             def shortopt(*group)
-              group.map! { |s| s.delete_prefix('-') }
-              "-(?:#{Regexp.escape(group.join('|'))})(?:\\z|[^ =]| +[^ -])"
+              group.map! { |s| Regexp.escape(s.delete_prefix('-')) }
+              "-(?:#{group.join('|')})(?:\\z|[^ =]| +[^ -])"
             end
 
             def longopt(*group, value)
-              group.map! { |s| s.delete_prefix('--') }
-              "--(?:#{Regexp.escape(group.join('|'))})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
+              group.map! { |s| Regexp.escape(s.delete_prefix('--')) }
+              "--(?:#{group.join('|')})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
             end
           end
 
@@ -161,7 +166,8 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :shift, :unshift,
-                         :pop, :push, :concat, :index, :join, :map, :map!, :detect, :select, :select!, :reject, :size
+                         :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select, :select!, :slice, :slice!,
+                         :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -193,6 +199,7 @@ module Squared
             f = []
             si = []
             bl = []
+            ml = []
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -229,6 +236,9 @@ module Squared
                   @values << Regexp.escape(flag)
                 when '!'
                   bl << flag
+                when '+'
+                  ml << flag
+                  bare << flag
                 else
                   next
                 end
@@ -254,8 +264,10 @@ module Squared
               f.concat(tr.call(f))
               si.concat(tr.call(si))
               bl.concat(tr.call(bl))
+              ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
+            target.multiple.concat(ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }) if target.is_a?(JoinSet)
             numtype = [
               [i, /\A\d+\z/],
               [f, /\A\d*(?:\.\d+)?\z/],
@@ -458,8 +470,8 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            args.compact!
-            merge(args.map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
+            merge(args.compact
+                      .map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
           end
 
@@ -628,11 +640,22 @@ module Squared
             super[/[^:]+\z/, 0]
           end
 
-          attr_reader :delim
+          alias to_ary to_a
 
-          def initialize(data = [], delim: ' ')
-            super(data.compact)
+          attr_reader :delim, :extras
+          attr_accessor :multiple
+
+          def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^\[\]=\s-]/, multiple: [])
             @delim = delim
+            @partition = partition
+            @uniq = uniq
+            @multiple = multiple
+            @extras = []
+            super(data.compact)
+          end
+
+          def insert(*args)
+            replace Set.new(to_ary.reject { |val| val.nil? || (val.is_a?(String) && val.empty?) }.insert(*args))
           end
 
           def last(val, pat)
@@ -641,7 +664,7 @@ module Squared
           end
 
           def pass(&blk)
-            ret = to_a.map!(&:to_s).reject(&:empty?)
+            ret = to_ary.map!(&:to_s).reject(&:empty?)
             @last&.each do |val, pat, key|
               items = []
               index = nil
@@ -662,6 +685,7 @@ module Squared
               end
               ret[items.last] = val
             end
+            ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
             return ret unless block_given?
 
             ret.reject(&blk)
@@ -683,18 +707,82 @@ module Squared
 
           def temp(*args, &blk)
             args.compact!
-            ret = pass(&blk)
-            ret = Set.new(ret.concat(args)).to_a unless args.empty?
-            ret.join(@delim)
+            pass(&blk)
+              .concat(args)
+              .join(@delim)
           end
 
           def done
             to_s.tap { clear }
           end
 
+          def merge(enum)
+            if !extras.empty?
+              extras.concat(enum.to_a)
+              self
+            elsif (n = enum.find_index { |val| extras?(val) })
+              data = enum.to_a
+              @extras = if n == 0
+                          data
+                        else
+                          super(data[0...n])
+                          data[n..-1]
+                        end
+              self
+            else
+              super
+            end
+          end
+
+          def <<(obj)
+            extras!(obj) || super
+          end
+
+          def add(obj)
+            extras!(obj) || super
+          end
+
+          def add?(obj)
+            extras!(obj) || super
+          end
+
+          def to_a
+            pass
+          end
+
           def to_s
             pass.join(@delim)
           end
+
+          def to_enum(*args)
+            pass.to_enum(*args)
+          end
+
+          def to_json(*args)
+            pass.to_json(*args)
+          end
+
+          def to_yaml(*args)
+            pass.to_yaml(*args)
+          end
+
+          alias push :<<
+          alias concat merge
+
+          private
+
+          def extras!(obj)
+            return if extras.empty? && !extras?(obj)
+
+            unless !extras.include?(@partition) && include?(obj) && @uniq.match?(s = obj.to_s) && !multiple.include?(s)
+              extras << obj
+            end
+            self
+          end
+
+          def extras?(obj)
+            obj == @partition || (include?(obj) && (!@uniq.match?(s = obj.to_s) || multiple.include?(s)))
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []