squared 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d49aff6b1cd9bedf0f0057bd7f9afe30cee588a2d86224f59585f53f16003ac6
-  data.tar.gz: 445bcbd6ae09304dc4797404de44819600abae31b5f41f8bc61ce1951428a25c
+  metadata.gz: 671df38fde0cf8e19a5edf52d76aedba0d3eb294e7eaeed1bc32e63ca50b5e37
+  data.tar.gz: 1f87dfbe1fb9881d0d5a2ae023a4e4f14e353bd30368afcc0b45e6cd7e5c3beb
 SHA512:
-  metadata.gz: 66c420cde0388bbb2c284fc83b365014bdd770cf30d9edb4a5c5b903b9c95752a87a3c8d951acd1c9b73473d2ce5b1167c6bff63fa582d75f79418ed80e468a5
-  data.tar.gz: 0b89a2327e97e8f26e077134dfa228bfb1234a09cc6e499a96cd042d23d9e004aea623c63f8b34e3251b198b9f9806b6d191db9978f251c0d52608d1b4e452dd
+  metadata.gz: ea1eda6ca2addd9593a414c453eaa7450e31309f91ce56077732e0bc24297d23901a177ec8fd3740ccbdf92e19ec0c4473720e344508ba365fb44a745deda65f
+  data.tar.gz: bf9ac431a644fa2fd532bf33aff3bba1a1b9a52a0e8e2ec7b724df2bcfec41760aa00378034a099e0da60a47b21778581bae5a31700c9a5c9d7e0a816d715a6d

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # Changelog
 
+## [0.8.7] - 2026-10-22
+
+### 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.8.6] - 2026-10-01
 
 ### Added
@@ -18,7 +46,7 @@
 
 - OptionPartition did not parse quoted option values.
 
-## [0.6.20] - 2026-09-25
+## [0.6.20]
 
 ### Added
 
@@ -2153,6 +2181,7 @@
 
 - Changelog was created.
 
+[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
@@ -2160,6 +2189,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
@@ -2174,6 +2204,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/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -645,16 +645,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

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

@@ -1911,7 +1911,7 @@ module Squared
                     out << ''
                   end
                   if from
-                    out << from
+                    out << (from = from.to_s)
                     /\A(#{Regexp.escape(from)})(.*)\z/
                   end
                 else

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

@@ -181,7 +181,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

@@ -1106,7 +1106,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)

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

@@ -69,7 +69,7 @@ module Squared
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
                       mode=b].freeze,
           add: %w[cached D|dev json O|optional P|peer prefer-dev].freeze,
-          add_a: %w[C|caret E|exact F|fixed interactive T|tilde mode=b].freeze,
+          add_a: %w[C|caret E|exact F|fixed i|interactive no-time-gate T|tilde mode=b].freeze,
           update: %w[R|recursive].freeze,
           dedupe: %w[check json mode=b strategy=b].freeze,
           run: %w[B|binaries-only inspect inspect-brk T|top-level require=q].freeze,
@@ -305,13 +305,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*'
@@ -662,7 +660,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci') || (ci? && exist?('yarn.lock'))
+                elsif option('ci') || (ci? && exist?(yarnlock))
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -698,13 +696,13 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci') || (ci? && exist?('pnpm-lock.yaml'))
+                     elsif option('ci') || (ci? && exist?(pnpmlock))
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              ci = option('ci', prefix: 'npm') || (ci? && exist?('package-lock.json'))
+              ci = option('ci', prefix: 'npm') || (ci? && exist?(npmlock))
               cmd = session('npm', ci ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
@@ -758,7 +756,7 @@ module Squared
                   append_platform
                 end
               end
-              cmd << '--package-lock=false' << 'save=false' if nolockfile?(prefix: 'npm')
+              cmd << '--package-lock=false' << '--save=false' if nolockfile?(prefix: 'npm')
               cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
@@ -771,7 +769,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          cmd = session(pnpm? && exist?('pnpm-lock.yaml') ? 'pnpm' : 'npm', 'outdated')
+          cmd = session(pnpm? && exist?(pnpmlock) ? 'pnpm' : 'npm', 'outdated')
           dryrun = has_value?(opts, 'd', 'dry-run') || dryrun?
           unless dryrun
             log.info cmd.to_s
@@ -1452,7 +1450,7 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependroot).exist?
+          (@pm[:yarn] ||= if rootpath(yarnlock, ascend: dependroot).exist?
                             yarntype
                           elsif (ver = read_package || read_install)
                             if ver =~ /^yarn(?:@(\d)|$)/
@@ -1473,7 +1471,7 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependroot).exist?
+          (@pm[:pnpm] ||= if rootpath(pnpmlock, ascend: dependroot).exist?
                             pnpmtype
                           elsif (ver = read_package || read_install)
                             ver.start_with?('pnpm') ? pnpmtype : 0
@@ -1582,7 +1580,7 @@ module Squared
             require 'yaml'
             doc = YAML.load_file(rc)
             doc.nodeLinker == 'node-modules' ? 2 : 3
-          elsif exist && !exist?('yarn.lock')
+          elsif exist && !exist?(yarnlock)
             0
           else
             1
@@ -1594,6 +1592,10 @@ module Squared
           3
         end
 
+        def yarnlock
+          'yarn.lock'
+        end
+
         def pnpmtype(exist: false)
           require 'yaml'
           doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependroot))
@@ -1608,13 +1610,21 @@ module Squared
           end
         rescue => e
           if exist
-            %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
+            %W[#{pnpmlock} pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
           else
             log.debug e
             4
           end
         end
 
+        def pnpmlock
+          'pnpm-lock.yaml'
+        end
+
+        def pnpmopts(*args)
+          OPT_PNPM[:common] + args.flat_map { |name| OPT_PNPM.fetch(name, []) }
+        end
+
         def remove_modules(prefix: dependbin)
           modules = basepath!('node_modules', type: 'd')
           return false unless modules && confirm_basic('Remove?', modules, prefix: prefix)
@@ -1696,16 +1706,16 @@ module Squared
           ].concat(args)
         end
 
-        def npmopts(*args)
-          OPT_NPM[:common] + args.flat_map { |name| OPT_NPM.fetch(name, []) }
+        def npmlock
+          'package-lock.json'
         end
 
-        def pnpmopts(*args)
-          OPT_PNPM[:common] + args.flat_map { |name| OPT_PNPM.fetch(name, []) }
+        def npmopts(*args)
+          OPT_NPM[:common] + args.flat_map { |name| OPT_NPM.fetch(name, []) }
         end
 
         def lockfile(delete = false)
-          ret = basepath(yarn? ? 'yarn.lock' : pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json')
+          ret = basepath(yarn? ? yarnlock : pnpm? ? pnpmlock : npmlock)
           if ret.exist?
             if delete
               ret.delete

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

@@ -7,16 +7,18 @@ module Squared
         DEP_PYTHON = %w[poetry.lock 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
@@ -77,15 +79,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,
@@ -276,7 +283,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 +353,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.yield_self 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|
@@ -735,7 +742,7 @@ module Squared
           op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
                                    session('python', path: !venv?),
                                    project: self, strict: strict?, multiple: [/^-c/], single: singleopt(:python),
-                                   args: true, stdin: true)
+                                   sep: ' ', args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
             op.exist?(add: true)
@@ -936,7 +943,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
 
@@ -1197,6 +1205,7 @@ module Squared
                    status = true
                    :virtualenv
                  else
+                   status = !banner
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
@@ -1204,32 +1213,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'
-              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
@@ -1583,7 +1583,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')
@@ -1866,7 +1866,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)
@@ -1884,11 +1884,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)
@@ -1896,7 +1895,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)
@@ -1909,7 +1908,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/optionpartition.rb

@@ -247,7 +247,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 = []
@@ -264,8 +264,6 @@ module Squared
             bl = []
             ex = []
             ml = []
-            re = {}
-            ar = {}
             sw = {}
             se = {}
             list.flat_map do |val|
@@ -287,10 +285,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
@@ -325,14 +323,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)..-1].chomp!('}')&.split(',')
                   if group
-                    mod.each { |key| ar[key] = group }
+                    mod.each { |key| enum[key] = group }
                   else
                     warn "#{self.class}: invalid group (#{val})"
                   end
@@ -439,8 +437,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
@@ -448,10 +446,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.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - An Pham
@@ -126,7 +126,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: []