squared 0.7.12 → 0.7.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1f82d48ab79c1dc869f6c34dbef07e57c7b1bd9cc0ce8b54582d2029d5e9889
-  data.tar.gz: 55526a1592b3b6ef2aec992288fd74b7772837abc733d4eb6dc69f9e7a208cc6
+  metadata.gz: dcfaaa48501a181162e78334bb241561dbe890d64d71495dcfb4a88e9a4a8839
+  data.tar.gz: 192a883f356e0127e0d3ae0549d78745da6c0fe4ac80cf46f31b27b6740712a1
 SHA512:
-  metadata.gz: 4b60c4bd1db9d601b87ae2e686c3d7ec2190cf766307186a682e10f0e200e5e5280196a7eb55d3c9821707189e9953b6ba1a76c2757ad1f10fec3c96e0d88a83
-  data.tar.gz: b4527aff9694bf17460b65f0395d30147faaf5ccaee9042ac47e5d81d5f988470ff8e878e20f6a8dc22c39d7bcc166e15e953443a0785d46a71c5cb2aece8871
+  metadata.gz: 7141897d2f852cbcbad0ab3cd411f256c5111e28ad997c7987bdc2dd2cd9f7b59aff4de3c4ab1977b409fe7cdea56c219359a4d9940a694cabdc984c78b02647
+  data.tar.gz: 287860e11f435050c6bb64da259612977bdfc3c04aeac96bd4e1eb6c9d7432d9daf1e6c3f174c349410a9f2b26aec789e79c9b476aed48fbd4d42a36d6cd5b76

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.7.14] - 2026-10-22
+
+### 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] - 2026-10-22
+
+### Fixed
+
+- RuboCop did not resolve config to project directory.
+- Python program did not use correct separator for double dash options.
+
+## [0.7.13] - 2026-09-25
+
+### Fixed
+
+- OptionPartition did not parse quoted option values.
+
+## [0.6.20] - 2026-09-25
+
+### Added
+
+- Prompt choice optional selection can be bypassed with a single dash.
+
+### Fixed
+
+- Git interactive commit selection did not accept additional values.
+
 ## [0.7.12] - 2026-09-23
 
 ### Fixed
@@ -2018,6 +2052,8 @@
 
 - Changelog was created.
 
+[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
 [0.7.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.10
@@ -2031,6 +2067,8 @@
 [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
 [0.6.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.17

data/lib/squared/common/prompt.rb

@@ -86,7 +86,9 @@ module Squared
           while (ch = Readline.readline(msg))
             ch.strip!
             unless ch.empty?
-              if multiple
+              if ch == '-' && !force
+                break
+              elsif multiple
                 k = if ch == '*'
                       (min..max).to_a
                     else

data/lib/squared/version.rb

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

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

@@ -1166,10 +1166,20 @@ module Squared
           ret = basepath(*args)
           return ret unless ascend && !ret.exist?
 
+          case ascend
+          when String, Pathname
+            root = Pathname.new(ascend).cleanpath
+            root = nil unless root.absolute? && root.directory?
+          end
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+
+            if root
+              break if dir == root
+            elsif workspace.root == dir || parent&.path == dir || (ascend.is_a?(String) && dir.join(ascend).exist?)
+              break
+            end
           end
           ret
         end
@@ -1872,7 +1882,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/git.rb

@@ -1528,7 +1528,7 @@ module Squared
             end
             if (n = op.index('>'))
               patch = op.slice!(n, 2)[1]
-            elsif !op.exist?(op.last)
+            elsif !op.last.include?('*') && !op.exist?(op.last)
               patch ||= op.pop
             end
             append_pathspec op.extras
@@ -2104,7 +2104,7 @@ module Squared
           ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
-            ret.map { |val| val&.stripstyle }
+            ret.map { |val| val.is_a?(Array) ? val.map { |s| s&.stripstyle } : val&.stripstyle }
           when String
             ret.stripstyle
           else

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

@@ -709,7 +709,7 @@ module Squared
                   append_platform
                 end
               end
-              cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
+              cmd << '--package-lock=false' << '--save=false' if nolockfile?('npm')
               cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add

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

@@ -79,12 +79,12 @@ module Squared
         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,
+                    bindir=q build.cmake-prefix-path=p build.pkg-config-path=p buildtype=b cmake-prefix-path=p
+                    cross-file=p datadir=q default-library=b default-both-libraries=b force-fallback-for=q genvslite=b
+                    includedir=q infodir=q install-umask=b layout=b libdir=q libexecdir=q licensedir=q localedir=q
+                    localstatedir=q mandir=q native-file=p optimization=b pkg-config-path=p prefix=p
+                    python.bytecompile=b python.platlibdir=p python.purelibdir=p python.install-env=b sbindir=q
+                    sharedstatedir=q sysconfdir=q 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
         }.freeze
         PASS_PYTHON = {
@@ -276,7 +276,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 +346,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|
@@ -738,7 +738,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)
@@ -937,7 +937,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
 

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

@@ -226,9 +226,10 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
+          @bundle = { exec: exec }
           @steepfile = basepath! steep if steep
-          @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
+          rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
+          @rubocopfile = basepath! rubocop if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !self.autodetect
 
@@ -1563,7 +1564,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, index|
             break if val == '--'
             next unless exist?(val, type: 'f')
@@ -1846,7 +1847,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)
@@ -1864,11 +1865,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)
@@ -1876,7 +1876,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)
@@ -1889,7 +1889,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

@@ -379,7 +379,7 @@ module Squared
                   if has.call(e) || (has.call(bl) && %w[true false].include?(val))
                     add shell_option(key, val, **kwargs)
                   elsif has.call(q)
-                    kwargs[:double] = true if has.call(qq, key)
+                    kwargs[:double] = true if has.call(qq)
                     add quote_option(key, val, **kwargs)
                   elsif has.call(p)
                     if !double.nil?

metadata

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