squared 0.9.0.pre2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c463103c9731435a61c03a50774d321728675919d1299f92179ee3283c43c570
-  data.tar.gz: 608c26522a45d3a91dad5d3c8f094d9da571f8010a16bccc2bb88dc1a92bd90e
+  metadata.gz: ed5b9e99423ac6374d36ad8dffd6a50f2714cef292d6324e358ae19d6a547ed9
+  data.tar.gz: 1e6358b439d1defc1f6d9601e915c49b619b00614fc104911ac0554dd61ce6cd
 SHA512:
-  metadata.gz: e352c390e9299f58b66066f3bdf28ad24d60496b00155eaf8d1dc26b64311f7fef2203bb861c17a021fecc16f2f09849a40d563179a1591eec8db25f502164d3
-  data.tar.gz: '0598d79fac00ed9a272582db5b655bd5cf75b5597f15d67ec48dd00b6be990e4ef9b171facf19a4c62c54616187f58c46c0f886853dea75ed4a694198640708f'
+  metadata.gz: 0e973fe0eb9137cd8e822b3eb5e28fc8275e69f17414373205944c28350b616cb58dae4fe41eb647ab2a018f5a21a3e7e43854cf0711a4f59c15614948bb328c
+  data.tar.gz: '0293c7c12c7c8d66a7783162a4d1fd5b9a0ae87f3476e0c0dae73f9a3d918fcda4d93a31894b327161a6b571be9c4988bcb0fb2abff0c10995fe4a64af4e93de'

data/CHANGELOG.md

@@ -1,6 +1,42 @@
 # Changelog
 
-## Unreleased
+## [0.9.1] - 2026-10-22
+
+### Added
+
+- sqd: Option --gemfile for rerouting commands through bundle exec.
+- Python install manager for Windows is supported.
+- sqd: Option --sync for running threads in a series was implemented.
+
+## [0.8.7]
+
+### Added
+
+- OptionPartition can be initialized with enum and pattern options.
+
+### Fixed
+
+- Python venv creation did not run post-install for package managers.
+
+## [0.7.14]
+
+### Changed
+
+- Python program meson prefix options use local path resolution.
+- Bundle exec wrapper can be configured per application.
+
+### Fixed
+
+- Bundle exec wrapper did not accept boolean values.
+
+## [0.6.21]
+
+### Fixed
+
+- RuboCop did not resolve config to project directory.
+- Python program did not use correct separator for double dash options.
+
+## [0.9.0] - 2026-10-12
 
 ### Added
 
@@ -36,6 +72,7 @@
 - Ruby command script does not run code until it has passed validation.
 - Ruby gem io-console is used for default console size.
 - Node program tsc boolean options support explicit values.
+- Python program meson prefix options use local path resolution.
 
 ### Removed
 
@@ -2197,6 +2234,9 @@
 
 - Changelog was created.
 
+[0.9.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.9.1
+[0.9.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.9.0
+[0.8.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.7
 [0.8.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.6
 [0.8.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.5
 [0.8.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.4
@@ -2204,6 +2244,7 @@
 [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.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.14
 [0.7.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.13
 [0.7.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.12
 [0.7.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.11
@@ -2218,6 +2259,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.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.21
 [0.6.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.20
 [0.6.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.19
 [0.6.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.18

data/README.md

@@ -43,12 +43,15 @@ Usage: sqd [options] [rake options] [global...] [:targets...] -- [rake targets..
 
     -s, --[no-]strict                Do not run commands with invalid arguments
         --update                     Use update strategy for applicable commands
+    -u, --parallel STR,PAT           Run standard tasks with multi-task threads
+    -U, --sync STR,PAT               Run parallel tasks in a series sequentially
     -F, --force [STR,STR]            Enable force through ENV by application
     -y, --yes [STR,STR]              Enable auto-approve through ENV by application
     -d, --dry-run                    Run commands without any modifying actions
 
     -S, --select PAGE[:CHOICE]       Prompt menu selection pagination display (e.g. 15:75)
 
+    -g, --gemfile                    Execute commands using bundle exec and nearest Gemfile
     -p, --pipe 0|1|2                 Set file descriptor for communication
     -o, --pipe-out FILE              Write command data stream to a file
         --fail 0..4                  Set application exception level
@@ -101,11 +104,11 @@ Workspace::Application
   .clean("rake clean", group: "default")
   .clean(["build/"], group: "app")
   .log({ file: "tmp/%Y-%m-%d.log", level: "debug" }, group: "app")
-  .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", env: { # Ruby (with C extensions)
+  .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", exec: true, group: "default", env: { # Ruby (with C extensions)
     "CFLAGS" => "-fPIC -O1"
   })
-  .add("optparse", doc: "rake rdoc", gemspec: "optparse.gemspec", group: "default") # Uses bundler/gem_tasks (without C extensions)
-  .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "/home/user/.local/gem/ruby/4.0.0/gems/logger-1.7.0" }, clean: ["tmp/"]) do # autodetect: true | "rvm" | "rbenv" | "asdf" | "mise" | bundler"
+  .add("optparse", doc: "rake rdoc", gemspec: "optparse.gemspec", exec: { rake: true, ruby: '../Gemfile', rbs: false }, group: "default") # Uses bundler/gem_tasks (without C extensions)
+  .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "/home/user/.local/gem/ruby/4.0.0/gems/logger-1.7.0" }, clean: ["tmp/"]) do  # autodetect: true | "rvm" | "rbenv" | "asdf" | "mise" | bundler"
     self.gemdir = "/home/user/.local/gem/ruby/4.0.0/gems/logger-1.7.0" # Default for "into"
   end
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node)

data/exe/sqd

@@ -45,6 +45,19 @@ class SqdParser < OptionParser
     end
   end
 
+  def parse_series(list, session:, flag:)
+    pattern, parallel = list.partition do |val|
+      next false if val.match?(%r{^[\w~`!@#%&\-=:;"'<>/]+$})
+
+      Regexp.new(val)
+    rescue RegexpError
+      false
+    end
+    s = flag == :sync ? '!' : ''
+    (session[:APP][:"build_pattern#{s}"] ||= []).concat(pattern.map { |pat| Regexp.new(pat) }) unless pattern.empty?
+    (session[:APP][:"build_parallel#{s}"] ||= []).concat(parallel) unless parallel.empty?
+  end
+
   def banner_set(val, session:)
     session[:BANNER] = val
     ENV['BANNER'] = val ? 'true' : 'false'
@@ -118,6 +131,7 @@ end
 
 SqdParser.new do |sqd|
   session = Squared::Common::ARG
+  argv = ARGV.dup
   sqd.banner = 'Usage: sqd [options] [rake options] [global...] [:targets...] -- [rake targets...]'
   sqd.separator ''
   sqd.on('-R', '--ref STR,STR', Array, 'Run global commands by class reference') do |val|
@@ -144,6 +158,12 @@ SqdParser.new do |sqd|
   sqd.on('--update', 'Use update strategy for applicable commands') do
     ENV['UPDATE'] = 'true'
   end
+  sqd.on('-u', '--parallel STR,PAT', Array, 'Run standard tasks with multi-task threads') do |val|
+    sqd.parse_series(val, session: session, flag: :parallel)
+  end
+  sqd.on('-U', '--sync STR,PAT', Array, 'Run parallel tasks in a series sequentially') do |val|
+    sqd.parse_series(val, session: session, flag: :sync)
+  end
   sqd.on('-F', '--force [STR,STR]', Array, 'Enable force through ENV by application') do |val|
     sqd.parse_common(val, session: session, arg: :FORCE)
   end
@@ -162,6 +182,24 @@ SqdParser.new do |sqd|
     ENV['SELECT'] = "#{page}:#{choice}"
   end
   sqd.separator ''
+  sqd.on('-g', '--gemfile', 'Execute commands using bundle exec and nearest Gemfile') do
+    require 'pathname'
+    next if ENV['RUBYOPT']&.match?(/(^|\b)-r.+#{File::SEPARATOR}bundler#{File::SEPARATOR}setup\b/)
+
+    gemfile = Pathname.pwd.ascend { |path| break path if path.join('Gemfile').file? } || ENV['BUNDLE_GEMFILE']
+    next unless gemfile && (argv.delete('--gemfile') || argv.delete('-g'))
+
+    include Squared::Common
+    include Shell
+
+    argv.unshift('sqd')
+    if gemfile.is_a?(String)
+      argv.unshift("--gemfile=#{shell_escape(Pathname.new(gemfile).relative_path_from(Dir.pwd), quote: true)}")
+      gemfile = Dir.pwd
+    end
+    ENV['BUNDLE_GEMFILE'] = nil
+    exec(shell_bin('bundle'), 'exec', *argv, chdir: gemfile)
+  end
   sqd.on('-p', '--pipe 0|1|2', Integer, 'Set file descriptor for communication') do |val|
     sqd.error_exit('out of range', val) unless val.between?(0, 2)
     session[:PIPE] = val
@@ -211,9 +249,14 @@ SqdParser.new do |sqd|
   end
   sqd.on('--version', 'Print the current version') do
     puts Squared::VERSION
-    exit 0
+    exit
   end
   sqd.on('-h', '--help', 'Print the command line options') do
-    sqd.help_exit
+    if defined?(sqd.help_exit)
+      sqd.help_exit
+    else
+      puts sqd.help
+      exit
+    end
   end
 end.run

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.9.0.pre2'
+  VERSION = '0.9.1'
 end

data/lib/squared/workspace/application.rb

@@ -163,8 +163,14 @@ module Squared
                             end
         @pass.items.concat(kwargs[:pass].map { |val| val.is_a?(Regexp) ? val : val.to_s }) if kwargs[:pass]
         @series = Application.register(self, @base.to_a, exclude: kwargs.fetch(:exclude, []))
-        if (n = ARG[:APP][:series_ref_min])
-          @series.ref_min = n
+        app = ARG[:APP]
+        @series.ref_min = app[:series_ref_min] if app.key?(:series_ref_min)
+        kwargs[:pattern].concat(app[:build_pattern]) if app.key?(:build_pattern)
+        kwargs[:parallel].concat(app[:build_parallel]) if app.key?(:build_parallel)
+        kwargs[:parallel].reject! { |val| app[:build_parallel!].include?(val) } if app.key?(:build_parallel!)
+        app[:build_pattern!]&.each do |pat|
+          kwargs[:pattern].delete(pat)
+          kwargs[:parallel].reject! { |val| pat.match?(val) }
         end
         self.closed = 'begin'
         pb = @stage.key?('project:begin')
@@ -652,16 +658,24 @@ module Squared
         val = val.split(':') if val.is_a?(String)
         if before || after || opts
           pos = []
-          pos << (before.is_a?(Array) ? before.join(',') : before) if before
-          if opts
-            pos << if opts.is_a?(Array)
-                     arg ? "#{arg}=#{opts.join(',')}" : opts.join('|')
+          append = lambda do |data|
+            pos << case data
+                   when Array
+                     data.join(',')
+                   when Hash
+                     data.keys.join('|')
                    else
-                     opts
+                     data
                    end
           end
-          pos << (after.is_a?(Array) ? after.join(',') : after) if after
-          val << "#{val.pop}[#{pos.join(',')}]"
+          append.call(before)
+          pos << if opts.is_a?(Array)
+                   arg ? "#{arg}=#{opts.join(',')}" : opts.join('|')
+                 else
+                   opts
+                 end
+          append.call(after)
+          val << "#{val.pop}[#{pos.compact.join(',')}]"
         end
         out ? message(*val) : task_desc(*val)
       end
@@ -717,12 +731,12 @@ module Squared
         !@extensions.empty? || any? { |proj| proj.enabled?(base: false) }
       end
 
-      def task_base?(key)
-        series.base?(key)
+      def task_base?(...)
+        series.base?(...)
       end
 
-      def task_extend?(obj, key)
-        series.extend?(obj, key)
+      def task_extend?(...)
+        series.extend?(...)
       end
 
       def task_include?(obj, key, ref: nil)
@@ -758,12 +772,12 @@ module Squared
         !!find(home)&.enabled?
       end
 
-      def rootpath(*args)
-        root.join(*args)
+      def rootpath(...)
+        root.join(...)
       end
 
-      def homepath(*args)
-        home.join(*args)
+      def homepath(...)
+        home.join(...)
       end
 
       def pwd

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

@@ -1139,8 +1139,8 @@ module Squared
           @ref.reverse_each(&blk)
         end
 
-        def basepath(*args)
-          path.join(*args)
+        def basepath(...)
+          path.join(...)
         end
 
         def basepath!(*args, type: nil)

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

@@ -182,7 +182,7 @@ module Squared
               if flags.nil?
                 case action
                 when 'ls'
-                  format_desc(action, nil, VAL_DOCKER[:ls].keys, after: 'a/ll?,s/tandard?,range*', arg: nil)
+                  format_desc(action, nil, 'a/ll?,s/tandard?,range*', before: VAL_DOCKER[:ls])
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras

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

@@ -1077,7 +1077,7 @@ module Squared
                         git(:remote, args.extras, extras: [name, url])
                       end
                     else
-                      format_desc action, flag, "#{OPT_GIT[:remote].keys.join('|')},opts*" if TASK_METADATA
+                      format_desc(action, flag, 'opts*', before: OPT_GIT[:remote])
                       task flag, [:command] do |_, args|
                         command = param_guard(action, flag, args: args, key: :command)
                         cmd, opts = git_session('remote', opts: args.extras)
@@ -1840,7 +1840,7 @@ module Squared
             if adding.empty? && !cached.empty? && banner?
               puts(cached.lines(chomp: true).map { |val| "cached #{shell_quote(val)}" })
             end
-            ENV['COMMIT_PUSH'] = git_spawn 'rev-parse --verify HEAD' if source(co) && source(pu) && !dryrun?
+            ENV['COMMIT_PUSH'] = git_value 'rev-parse --verify HEAD' if source(co) && source(pu) && !dryrun?
           else
             if banner?
               puts 'Nothing to commit'

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

@@ -306,13 +306,11 @@ module Squared
                   format_desc action, nil, 'version|pre?{major,minor,patch}|prerelease'
                   task action, [:version] do |_, args|
                     version = param_guard(action, 'to', args: args, key: :version)
-                    if version.match?(/^((pre)?(major|minor|patch))|prerelease$/)
-                      flag = version.to_sym
-                      version = nil
+                    if version.match?(/^(pre)?(major|minor|patch)|prerelease$/)
+                      bump version.to_sym
                     else
-                      flag = :version
+                      bump :version, version
                     end
-                    bump flag, version
                   end
                 when 'pack'
                   format_desc action, nil, 'opts*'

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

@@ -7,16 +7,18 @@ module Squared
         DEP_PYTHON = %w[poetry.lock pdm.lock pylock.toml setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[meson.build README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b=+ B d E h i I O P q=+ s S u v=+ 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=+ V=+ x c=q m=b W=b X=q
+                     check-hash-based-pycs={always,default,never}].freeze,
           build: %w[C=bm n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel config-json=q 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,
           virtualenv: %w[always-copy clear copies download never-download no-download no-periodic-update no-pip no-seed
-                         no-setuptools no-vcs-ignore q|quiet read-only-app-data reset-app-data symlink-app-data symlinks
-                         system-site-packages with-traceback without-pip upgrade-embed-wheels v|verbose=+ activators=q
-                         app-data=p creator=b discovery=b extra-search-dir=p pip=b prompt=q p|python=q seeder=b
-                         setuptools=b try-first-with=q].freeze
+                         no-setuptools no-vcs-ignore no-venv-redirect q|quiet read-only-app-data reset-app-data
+                         symlink-app-data symlinks system-site-packages with-traceback without-pip upgrade-embed-wheels
+                         venv-redirect v|verbose=+ activators={bash,batch,cshell,fish,nushell,powershell,python,xonsh}
+                         app-data=p creator=b discovery={builtin} extra-search-dir=p pip=b prompt=q p|python=q
+                         seeder={app-data,pip} setuptools=b try-first-with=q].freeze
         }.freeze
         OPT_PIP = {
           common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-proxy-env
@@ -49,27 +51,34 @@ module Squared
           uninstall: %w[break-system-packages y|yes r|requirement=p root-user-action=b].freeze,
           wheel: %w[no-verify w|wheel-dir=p].freeze
         }.freeze
+        OPT_PY = {
+          common: %w[q|quiet=+ v|verbose=+ y|yes config=p].freeze,
+          exec: %w[3=/^\.\d+(\.\d+)?$/m? V=/^:./m?].freeze,
+          install: %w[by-id configure dry-run f|force refresh u|update d|download=p s|source=q t|target=p].freeze,
+          list: %w[1|one online only-managed format={table,json,jsonl,csv,exe,prefix,url,formats} s|source=q].freeze,
+          uninstall: %w[by-id cleanup purge].freeze
+        }.freeze
         OPT_POETRY = {
           common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose=+ P|project=p].freeze,
           install: %w[all-extras all-groups compile dry-run no-directory no-root only-root E|extras=q only=q with=q
                       without=q].freeze,
-          build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
+          build: %w[clean c|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=q r|repository=q
                       u|username=qq].freeze
         }.freeze
         OPT_PDM = {
-          common: %w[c|config I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=qq 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=qq].freeze
+          common: %w[c|config I|ignore-python no-cache n|non-interactive q|quiet v|verbose=+ p|project=p
+                     k|skip=b].freeze,
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel config-setting=qq d|dest=p].freeze,
+          publish: %w[no-build no-verify-ssl no-very-ssl S|sign skip-existing ca-certs=p c|comment=q d|dest=p
+                      i|identity=b P|password=q r|repository=q u|username=qq].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,
-          build: %w[clean-hooks-after ext hooks-only no-hooks c|clean t|target=b].freeze,
+          build: %w[a|all 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
+                      p|publisher=b r|repo=q u|user=qq].freeze
         }.freeze
         OPT_TWINE = {
           publish: %w[attestations disable-progress-bar non-interactive s|sign skip-existing verbose cert=p
@@ -77,15 +86,20 @@ module Squared
                       sign-with=b u|username=qq].freeze
         }.freeze
         OPT_MESON = {
-          build: %w[D=q clearcache debug errorlogs fatal-meson-warnings pkgconfig.relocatable prefer-static
-                    python.allow-limited-api reconfigure stdsplit strip vsenv werror wipe auto-features=b backend=b
-                    bindir=p build.cmake-prefix-path=p build.pkg-config-path=p buildtype=b cmake-prefix-path=p
-                    cross-file=p datadir=p default-library=b default-both-libraries=b force-fallback-for=q genvslite=b
-                    includedir=p infodir=p install-umask=b layout=b libdir=p libexecdir=p licensedir=p localedir=p
-                    localstatedir=p mandir=p native-file=p optimization=b pkg-config-path=p prefix=p
-                    python.bytecompile=i python.platlibdir=p python.purelibdir=p python.install-env=b sbindir=p
-                    sharedstatedir=p sysconfdir=p unity=b unity-size=i warnlevel=b wrap-mode=b].freeze,
-          compile: %w[clean v|verbose j|jobs=i l|load-average=b ninja-args=q vs-args=q xcode-args=q].freeze
+          build: %w[D=q clearcache debug errorlogs fatal-meson-warnings os2-emxomf pkgconfig.relocatable prefer-static
+                    python.allow-limited-api reconfigure stdsplit strip vsenv werror wipe auto-features=b
+                    backend={ninja,vs,vs2010,vs2012,vs2013,vs2015,vs2017,vs2019,vs2022,vs2026,xcode,none}
+                    bindir=q build.cmake-prefix-path=p build.pkg-config-path=p
+                    buildtype={plain,debug,debugoptimized,release,minsize,custom} cmake-prefix-path=p cross-file=p
+                    datadir=q default-library={shared,static,both} default-both-libraries={shared,static,auto}
+                    force-fallback-for=q genvslite={vs2022,vs2026} includedir=q infodir=q install-umask=b
+                    layout={mirror,flat} libdir=q libexecdir=q licensedir=q localedir=q localstatedir=q mandir=q
+                    namingscheme={platform,classic} native-file=p optimization={plain,0,g,1,2,3,s} pkg-config-path=p
+                    prefix=p python.build-config=p python.bytecompile=b python.platlibdir=p python.purelibdir=p
+                    python.install-env={auto,prefix,system,venv} sbindir=q sharedstatedir=q sysconfdir=q
+                    unity={on,off,subprojects} unity-size=i warnlevel={0,1,2,3,everything}
+                    wrap-mode={default,nofallback,nodownload,forcefallback,nopromote}].freeze,
+          compile: %w[C=p clean v|verbose j|jobs=i l|load-average=b ninja-args=q vs-args=q xcode-args=q].freeze
         }.freeze
         PASS_PYTHON = {
           python: %w[c v V].freeze,
@@ -94,7 +108,8 @@ module Squared
             install: %w[C config-settings c constraint extra-index-url no-binary only-binary platform
                         r requirement].freeze,
             list: %w[exclude extra-index-url no-binary only-binary].freeze
-          }.freeze
+          }.freeze,
+          py: %w[q v quiet verbose].freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE,
                          :PASS_PYTHON
@@ -144,6 +159,7 @@ module Squared
           'outdated' => %i[major minor patch].freeze,
           'build' => %i[poetry pdm hatch meson python].freeze,
           'publish' => %i[twine poetry pdm hatch].freeze,
+          'py' => %i[exec install list uninstall].freeze,
           'run' => nil,
           'exec' => nil
         })
@@ -276,7 +292,7 @@ module Squared
                             args = args.to_a
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
-                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: ref)
+                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: 'python')
                               args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
@@ -346,18 +362,18 @@ module Squared
                       case flag
                       when :upgrade
                         task flag, [:strategy] do |_, args|
-                          install flag, (case args.strategy
-                                         when 'eager'
-                                           'eager'
-                                         when /^only-if|needed$/
-                                           'only-if-needed'
-                                         end.then do |val|
-                                           if val
-                                             args.extras << "upgrade-strategy=#{val}"
-                                           else
-                                             args.to_a
-                                           end
-                                         end)
+                          val = case args.strategy
+                                when 'eager'
+                                  'eager'
+                                when /^only-if/, /needed$/
+                                  'only-if-needed'
+                                end
+                          args = if val
+                                   args.extras << "upgrade-strategy=#{val}"
+                                 else
+                                   args.to_a
+                                 end
+                          install flag, args
                         end
                       when :requirement, :target
                         task flag, [:path] do |_, args|
@@ -414,6 +430,26 @@ module Squared
                                                   end)
                       end
                       break if be
+                    when 'py'
+                      break unless windows?
+
+                      case flag
+                      when :exec
+                        format_desc action, flag, 'opts*'
+                        task flag do |_, args|
+                          opts = args.to_a
+                          if (n = opts.index { |val| val.start_with?('3.') }) && (opts[n] =~ SEM_VER)
+                            opts[n] = $3.to_i >= 5 ? "3=.#{$3}.#{$5 || '0'}" : '3'
+                          end
+                          command = ENV['PY_EXEC'] || readline('Enter command', force: true)
+                          py(flag, command, opts: opts)
+                        end
+                      else
+                        format_desc(action, flag, 'opts*', after: flag == :list ? 'filter*' : 'tag*')
+                        task flag do |_, args|
+                          py(flag, opts: args.to_a, banner: true)
+                        end
+                      end
                     end
                   end
                 end
@@ -746,10 +782,17 @@ module Squared
           run(from: symjoin(flag, 'publish'), interactive: ['Publish', 'N', project])
         end
 
-        def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], **kwargs)
-          op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
-                                   session('python', path: !venv?),
-                                   project: self, strict: strict?, auto: %w[help V|version],
+        def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], from: :python, **kwargs)
+          py = from == :py && windows?
+          list = OPT_PYTHON[:common]
+          if py
+            list += OPT_PY[:exec]
+            list.delete('V=+')
+            from = :'py:exec'
+          end
+          op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), list,
+                                   py ? session('py', 'exec') : session('python', path: !venv?),
+                                   project: self, strict: strict?, auto: %w[help V|version], sep: ' ',
                                    multiple: [/^-c/], single: singleopt(:python), args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
@@ -763,8 +806,14 @@ module Squared
               op.append(escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
             end
           end
+          var = kwargs[:env]
+          if var == true
+            var = nil
+          elsif py && var.nil?
+            var = false
+          end
           print_run(op, banner, **kwargs) unless op.stdout
-          run(sync: sync, banner: op.style?(banner), exception: exception?(**kwargs), from: :python)
+          run(op, var, sync: sync, banner: op.style?(banner), exception: exception?(**kwargs), from: from)
         end
 
         def pip(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -850,6 +899,28 @@ module Squared
             .then { |val| ret || val }
         end
 
+        def py(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
+          flag = flag.to_sym
+          if flag == :exec
+            pass = PASS_PYTHON[:python] if pass.nil?
+            python(*args, sync: sync, banner: banner, with: with, pass: pass, from: :py, **kwargs)
+          else
+            pass = PASS_PYTHON[:py] if pass.nil?
+            opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+            list = OPT_PY[:common] + OPT_PY[flag]
+            op = OptionPartition.new(opts, list, session('py', flag), project: self, strict: strict?,
+                                                                      single: singleopt(:py))
+            case flag
+            when :install, :uninstall
+              raise ArgumentError, message('no tags listed', hint: flag) if op.empty?
+            end
+            op << '-y' if option('y')
+            op.append
+            print_run(op, banner, **kwargs)
+            run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('py', flag))
+          end
+        end
+
         def serve(root, opts = [], bind: 'localhost', port: nil, **)
           shell(python_session('-m http.server', port, basic_option('b', bind), opts: opts).first.done, chdir: root)
         end
@@ -951,7 +1022,8 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, strict: strict?, single: singleopt(name.to_sym))
+          op = OptionPartition.new(opts, common, project: self, strict: strict?, sep: name == 'python' ? ' ' : '=',
+                                                 single: singleopt(name.to_sym))
           [session(name, *pre, *op.to_a, *cmd, path: !venv?), op.extras]
         end
 
@@ -1126,6 +1198,8 @@ module Squared
           when :pdm, :poetry
             /\Av+\z/
           when :twine, :meson then nil
+          when :py
+            /\A(vv|qq)\z/
           else
             /\A(v+|q+)\z/
           end
@@ -1230,6 +1304,7 @@ module Squared
                    status = true
                    :virtualenv
                  else
+                   status = !banner
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
@@ -1237,34 +1312,31 @@ module Squared
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)
-          ret = run(op, env, exception: true, banner: banner)
-          args = []
-          requires = read_pyproject 'build-system', 'requires'
-          args.concat(requires) if requires.is_a?(Array)
-          if poetry?
-            requires = read_pyproject 'tool.poetry', 'requires-poetry'
-            args << "poetry#{requires}"
-          elsif setuptools? && !virtualenv?
-            args << 'setuptools' << 'wheel'
-          end
-          pip(:install, *args, banner: false) unless args.empty?
-          success?(ret, banner, !status) do |out|
-            if out && dir.directory?
-              if poetry?
-                dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
-                cmd = poetry_session 'env use'
-              elsif pdm?
-                cmd = pdm_session 'use -f'
-              else
-                puts "Success: #{dir}"
-                return
-              end
-              cmd << shell_quote(dir)
-              print_run cmd, silent?
-              run(banner: false)
+          if run(op, env, exception: true, banner: banner) && dir.directory?
+            args = []
+            requires = read_pyproject 'build-system', 'requires'
+            args.concat(requires) if requires.is_a?(Array)
+            if poetry?
+              requires = read_pyproject 'tool.poetry', 'requires-poetry'
+              args << "poetry#{requires}"
+            elsif setuptools? && !virtualenv?
+              args << 'setuptools' << 'wheel'
+            end
+            pip(:install, *args, banner: false) unless args.empty?
+            if poetry?
+              dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
+              poetry_session 'env use'
+            elsif pdm?
+              pdm_session 'use -f'
             else
-              puts 'Failed'
+              puts "Success: #{dir}" unless status
+              return
             end
+            cmd << shell_quote(dir)
+            print_run cmd, silent?
+            run(banner: false)
+          elsif !status
+            puts 'Failed'
           end
         end
 

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

@@ -227,7 +227,7 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : exec }
+          @bundle = { exec: exec }
           @steepfile = basepath! steep if steep
           rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
           @rubocopfile = basepath! rubocop if rubocop
@@ -1601,7 +1601,7 @@ module Squared
 
         def rdbg(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:rdbg], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          cmd = session 'rdbg'
+          cmd = session(*bundle_args('rdbg'))
           args.each_with_index do |val, i|
             break if val == '--'
             next unless exist?(val, type: 'f')
@@ -1881,7 +1881,7 @@ module Squared
         end
 
         def ruby_session(*cmd, **kwargs)
-          session('ruby', *preopts, *cmd, **kwargs)
+          session(*bundle_args('ruby'), *preopts, *cmd, **kwargs)
         end
 
         def gem_session(*cmd, **kwargs)
@@ -1899,11 +1899,10 @@ module Squared
         end
 
         def rbs_session(*cmd, opts: nil)
-          args = bundle_args 'rbs'
-          return session(*args, *cmd) unless opts
+          return session(*bundle_args('rbs'), *cmd) unless opts
 
           op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
-          [session(*args, *op.to_a, *cmd), op.extras]
+          [session(*bundle_args('rbs'), *op.to_a, *cmd), op.extras]
         end
 
         def gem_output(*cmd, **kwargs)
@@ -1911,7 +1910,7 @@ module Squared
         end
 
         def ruby_output(*cmd, **kwargs)
-          session_output('ruby', *cmd, **kwargs)
+          session_output(*bundle_args('ruby'), *cmd, **kwargs)
         end
 
         def bundle_output(*cmd, **kwargs)
@@ -1924,7 +1923,20 @@ module Squared
 
         def bundle_args(*args)
           if (val = @bundle[:exec])
-            args.unshift(quote_option('gemfile', val)) unless val == true
+            app = args.first
+            if val.is_a?(Hash)
+              env = val[app.to_s] || val[app.to_sym]
+              return args unless env
+
+              val = env.is_a?(String) ? basepath!(env) : true
+            elsif app == 'ruby'
+              return args
+            end
+            if val.is_a?(String)
+              return args unless (val = basepath!(val))
+
+              args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}")
+            end
             args.unshift('bundle', 'exec')
           end
           args

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

@@ -37,12 +37,12 @@ module Squared
             end
           end
 
-          def insert(*args)
-            replace Set.new(compact.insert(*args))
+          def insert(...)
+            replace Set.new(compact.insert(...))
           end
 
-          def slice(*args)
-            compact.slice(*args)
+          def slice(...)
+            compact.slice(...)
           end
 
           def slice!(*args)
@@ -168,16 +168,16 @@ module Squared
             to_a.join(@delim)
           end
 
-          def to_enum(*args)
-            to_a.to_enum(*args)
+          def to_enum(...)
+            to_a.to_enum(...)
           end
 
-          def to_json(*args)
-            to_a.to_json(*args)
+          def to_json(...)
+            to_a.to_json(...)
           end
 
-          def to_yaml(*args)
-            to_a.to_yaml(*args)
+          def to_yaml(...)
+            to_a.to_yaml(...)
           end
 
           alias add :<<

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

@@ -248,7 +248,7 @@ module Squared
           end
 
           def parse(list, opts = extras, no: nil, single: nil, args: false, multiple: nil, first: nil, underscore: nil,
-                    explicit: false, bool: %w[true false], auto: [], stdin: false, &blk)
+                    explicit: false, bool: %w[true false], auto: [], regexp: {}, enum: {}, stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
@@ -265,8 +265,6 @@ module Squared
             bl = []
             ex = []
             ml = []
-            re = {}
-            ar = {}
             sw = {}
             se = {}
             list.flat_map do |val|
@@ -288,10 +286,10 @@ module Squared
               end
               if (n = val.index('='))
                 flag = val[0, n]
-                enum = flag.split(':')
-                mod = if enum.size > 1
-                        pre = enum.shift
-                        enum.map { |s| "#{pre}:#{s}" }
+                opt = flag.split(':')
+                mod = if opt.size > 1
+                        pre = opt.shift
+                        opt.map { |s| "#{pre}:#{s}" }
                       else
                         [flag]
                       end
@@ -326,14 +324,14 @@ module Squared
                     pat = eval(val)
                     raise SyntaxError unless pat.is_a?(Regexp)
 
-                    mod.each { |key| re[key] = pat }
+                    mod.each { |key| regexp[key] = pat }
                   rescue SyntaxError
                     warn "#{self.class}: invalid pattern (#{val})"
                   end
                 when '{'
                   group = val[(n + 2)..].chomp!('}')&.split(',')
                   if group
-                    mod.each { |key| ar[key] = group }
+                    mod.each { |key| enum[key] = group }
                   else
                     warn "#{self.class}: invalid group (#{val})"
                   end
@@ -440,8 +438,8 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !ar.empty? && has.call(ar.keys, key)
-                    group = get.call(ar)
+                  elsif !enum.empty? && has.call(enum.keys, key)
+                    group = get.call(enum)
                     if group.include?(val)
                       add shell_option(key, val, force: false, **kwargs)
                     elsif @strict
@@ -449,10 +447,10 @@ module Squared
                     else
                       push opt
                     end
-                  elsif !re.empty? && has.call(re.keys, key)
-                    pat = get.call(re)
+                  elsif !regexp.empty? && has.call(regexp.keys, key)
+                    pat = get.call(regexp)
                     if val.match?(pat)
-                      add quote_option(key, val, **kwargs)
+                      add __send__(kwargs[:merge] ? :basic_option : :quote_option, key, val, **kwargs)
                     elsif @strict
                       clear([opt], hint: "match != /#{pat.source}/")
                     else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre2
+  version: 0.9.1
 platform: ruby
 authors:
 - An Pham
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.20
+rubygems_version: 4.0.23
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []