squared 0.4.32 → 0.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 913d20d3c4a6de7260752fb6603305cee9af765f2885ae74a57d145abe0c2e4e
-  data.tar.gz: 4c07a15fb013d871a8ebf0f93343146b4366a127ca1f1c18467648d9f7c4ca44
+  metadata.gz: 0d59b575971efdb7998b924fa5ca7815c4aeaeeaeecb756197fbc79b11433743
+  data.tar.gz: 9cb428fb205f51803c0b7576b71d78165a8987925f90c04462c266bd03ca48b9
 SHA512:
-  metadata.gz: 13a87e14e520b801a71e00c5012eb06e8a557b1f6c7d14cf30702e0a4b2ed0d87bb5535d8ffc970275da0f7a65958562e4ca586cebca847c886a80a6df438d5b
-  data.tar.gz: 48626887ad8b660747dc389e321c2b179b9855cba8ddc9c98d3e48416b87d3ab5899de9f416db068ce47e983f56ce27174057ebed38b148b5331cc4088e12e9c
+  metadata.gz: 5504784e072989e9e4a25ee08aa2f8bc5b9b73d4476aa9ad5d4633b08b2546847b9945de201f964b04a52124b2e75bc2f9341321348f429e2dc9ea0c4bae3fd8
+  data.tar.gz: 73786a35bd4255024f235090cc8b11883b95efa8903e2034b8f5d13353fb7a7756ed8d8d335f42756232d595a00bf10cdafb099c3065906617575e3cd035bebf

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.4.34] - 2025-12-26
+
+### Added
+
+- Project public base method scope for nested tasks was created.
+- Ruby task copy can autodetect "env" using [GEM_HOME|GEM_ROOT].
+
+### Changed
+
+- Python virtual environment did not install poetry during initialization.
+
+### Fixed
+
+- Workspace global banner never referenced the correct hash key.
+- Python task depend without editable did not append context directory.
+- Docker task build did not parse DOCKER_OPTIONS as command options.
+- Project base method build did not call Method routines.
+- Bundler autodetect did not check for valid gems directory.
+- Ruby copy to version detection did not check for valid gemspec.
+
+## [0.4.33] - 2025-12-07
+
+### Added
+
+- Ruby attribute setter gemdir for copy method was created.
+- Project inline run executables binary path are replaced with global alias.
+
+### Fixed
+
+- Workspace class Series created non-existent keys when queried.
+- Application class did not support changing base Project class.
+- Git command rev action build did not check build? method.
+- Python command build action python did not use outdir option.
+
 ## [0.4.32] - 2025-11-25
 
 ### Fixed
@@ -1130,6 +1164,9 @@
 
 - Changelog was created.
 
+[0.4.34]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.34
+[0.4.33]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.33
+[0.4.32]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.32
 [0.4.31]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.31
 [0.4.30]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.30
 [0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29

data/lib/squared/common/prompt.rb

@@ -60,7 +60,7 @@ module Squared
             while (ch = Readline.readline(msg))
               unless (ch = ch.strip).empty?
                 if multiple
-                  a = ch.split(/\s*,\s*/)
+                  a = ch.split(',').map!(&:strip)
                   b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
                   next unless a.size == b.size
                   return items ? b.map! { |i| items[i - 1] } : b unless multiple.is_a?(::Numeric) && multiple != b.size

data/lib/squared/common/shell.rb

@@ -110,6 +110,7 @@ module Squared
       end
 
       def shell_bin(name, env: true)
+        require_relative 'base'
         key = name.to_s.upcase
         key = File.basename(key, '.*') if Rake::Win32.windows?
         shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -274,9 +274,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group]
+                 @pass[:group][group.to_s]
                elsif ref
-                 @pass[:ref][ref]
+                 @pass[:ref][ref.to_sym]
                else
                  @pass[:global]
                end
@@ -336,9 +336,9 @@ module Squared
         end
         proj = ((if !ref.is_a?(Class)
                    Application.find(ref, path: path)
-                 elsif ref < Project::Base
+                 elsif ref < Application.impl_project
                    ref
-                 end) || @kind[name]&.last || Project::Base).new(self, path, name, **kwargs)
+                 end) || @kind[name]&.last || Application.impl_project).new(self, path, name, **kwargs)
         proj.__send__(:index_set, @project.size)
         @project[name] = proj
         __get__(:project)[name] = proj unless kwargs[:private]
@@ -573,7 +573,7 @@ module Squared
         return ret if group && (ret = @banner[:group][group.to_sym])
 
         ref.reverse_each { |val| return ret if (ret = @banner[:ref][val]) }
-        @banner[:ref][:'']
+        @banner[:ref][:_]
       end
 
       def enabled?

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

@@ -460,8 +460,14 @@ module Squared
             cmd = []
             var = {}
             args.each do |val|
-              next instance_exec(*val[1..-1], &val.first) if val.first.is_a?(Proc)
-
+              case val.first
+              when Proc
+                instance_exec(*val[1..-1], &val.first)
+                next
+              when Method
+                val.first.call(*val[1..-1])
+                next
+              end
               a, b, c, d, e = val
               case b
               when Hash
@@ -471,7 +477,7 @@ module Squared
               end
               d = append_hash(d, target: []).join(' ') if d.is_a?(Hash)
               if a
-                cmd << [a, d, b].compact.join(' ')
+                cmd << [replace_bin(a), d, b].compact.join(' ')
               else
                 next unless respond_to?(:compose)
 
@@ -485,7 +491,7 @@ module Squared
             if cmd
               return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
 
-              cmd = as_get(cmd, from)
+              cmd = replace_bin 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
@@ -859,6 +865,12 @@ module Squared
           end
         end
 
+        def scope(*args, **kwargs, &blk)
+          namespace name do
+            task(*args, **kwargs, &blk)
+          end
+        end
+
         def variable_set(key, *args, **kwargs, &blk)
           if variables.include?(key) || blocks.include?(key)
             val = case args.size
@@ -891,7 +903,8 @@ module Squared
             when :env
               run_set(output[0], *args, **kwargs)
             when :dependfile
-              @dependfile = basepath(*args)
+              @dependindex = nil
+              @dependfile = val.nil? ? nil : basepath(*args)
             else
               if block_given?
                 if blocks.include?(key)
@@ -1595,6 +1608,13 @@ module Squared
           ret
         end
 
+        def replace_bin(val)
+          a, b = val.split(' ', 2)
+          return val if val.start_with?(/["']/) || a.include?(File::Separator)
+
+          [shell_bin(a), b].compact.join(' ')
+        end
+
         def parse_json(val, kind: Hash, hint: nil)
           ret = JSON.parse(val)
           raise_error("invalid JSON #{kind.name}", val, hint: hint) if kind && !ret.is_a?(kind)

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

@@ -13,7 +13,7 @@ module Squared
           buildx: {
             common: %w[builder=b D|debug],
             build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
-                      cgroup-parent=b iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
+                      cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q
                       q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
             bake: %w[print list=q set=q].freeze,
             shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
@@ -41,14 +41,14 @@ module Squared
                        device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q
                        disable-content-trust=b? dns=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq
                        env-file=p expose=q gpus=q group-add=b health-cmd=q health-interval=b health-retries=i
-                       health-start-interval=q health-start-period=q health-timeout=q io-maxbandwidth=b io-maxiops=b
-                       ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b link-local-ip=q
-                       log-driver=b log-opt=q mac-address=q m|memory=b memory-reservation=b memory-swap=n
-                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
-                       platform=b p|publish=q pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
-                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
-                       volume-driver=b volumes-from=b w|workdir=q].freeze,
-            run: %w[d|detach detach-keys=q hostname=q sig-proxy=b?].freeze,
+                       health-start-interval=q health-start-period=q health-timeout=q hostname=q io-maxbandwidth=b
+                       io-maxiops=b ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b
+                       link-local-ip=q log-driver=b log-opt=q mac-address=q m|memory=b memory-reservation=b
+                       memory-swap=n memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b
+                       pid=b pids-limit=n platform=q p|publish=q pull=b restart=b runtime=b security-opt=q shm-size=b
+                       stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b
+                       v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+            run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
                        cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
@@ -64,9 +64,9 @@ module Squared
           }.freeze,
           image: {
             list: %w[a|all q|quiet digests no-trunc tree f|filter=q format=q].freeze,
-            push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
-            rm: %w[f|force no-prune platform=b].freeze,
-            save: %w[o|output=p platform=b].freeze
+            push: %w[a|all-tags disable-content-trust=b? platform=q q|quiet].freeze,
+            rm: %w[f|force no-prune platform=q].freeze,
+            save: %w[o|output=p platform=q].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
@@ -262,21 +262,20 @@ module Squared
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
           return opts if script == false
 
-          ret = docker_session
           if from == :run
             if bake?(n = filetype)
-              ret << 'buildx bake'
+              ret = docker_session 'buildx bake'
               append_file n
               from = :bake
             elsif compose?(n)
-              ret << 'compose build'
+              ret = docker_session 'compose build'
               append_file n
               from = :compose
             else
-              ret << 'build'
+              ret = docker_session 'build'
             end
           else
-            ret << from
+            ret = docker_session from
           end
           case opts
           when String

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

@@ -863,6 +863,8 @@ module Squared
                         rev_parse(flag, ref: ref, size: size)
                       end
                     when :build
+                      next unless build?
+
                       format_desc action, flag, 'opts*'
                       task flag do |_, args|
                         revbuild flag, args.to_a
@@ -1114,7 +1116,7 @@ module Squared
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   values: values, column: /^[^@]+@\{(\d+)\}/, force: true)
+                                   values: values, column: /^[^@]+@\{(\d+)\}/)
                 if values
                   op.merge(out.reverse)
                 else
@@ -1766,7 +1768,7 @@ module Squared
                   files << "#{sub_style(b, styles: color(:red))} #{a}"
                 end
                 unless files.empty?
-                  files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
+                  files = choice_index('Select files', files, multiple: true, trim: /^\S+\s/,
                                                               accept: [['Add?', false, true]])
                 end
                 op.swap(list + files)
@@ -1833,7 +1835,7 @@ module Squared
               return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
-              ret = `#{cmd}`
+              ret = `#{cmd}`.chomp
               if !ret.empty?
                 puts ret
               elsif success?(!banner.nil?)

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

@@ -27,7 +27,8 @@ module Squared
                       use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       reporter=b].freeze,
-          install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
+          install_base: %w[dangerously-allow-all-builds global-dir ignore-scripts offline prefer-offline store-dir=p
+                           virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
           install_as: %w[D|dev no-optional P|prod].freeze,
           update: %w[g|global i|interactive L|latest depth=i].freeze,
@@ -448,6 +449,7 @@ module Squared
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
+              cmd << '--dangerously-allow-all-builds' if option('approve-builds')
               append_nocolor
             else
               cmd = session 'npm', 'install'

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

@@ -30,15 +30,15 @@ module Squared
         OPT_POETRY = {
           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=b
-                      u|username=b].freeze
+          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=q r|repository=b
+                      u|username=qq].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
-                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
+                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b 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
@@ -50,7 +50,7 @@ module Squared
         OPT_TWINE = {
           publish: %w[attestations disable-progress-bar non-interactive s|sign skip-existing verbose cert=p
                       client-cert=p c|comment=q config-file=p i|identity=b p|password=q r|repository=b repository-url=q
-                      sign-with=b u|username=q].freeze
+                      sign-with=b u|username=qq].freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE
 
@@ -78,7 +78,7 @@ module Squared
 
         attr_reader :venv, :editable
 
-        def initialize(*, editable: '.', verbose: nil, **kwargs)
+        def initialize(*, editable: '.', **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -307,10 +307,10 @@ module Squared
                         next unless build_backend == 'hatchling.build'
                       end
                       format_desc(action, flag, 'opts*', after: case flag
-                                                                when :python then 'srcdir?'
                                                                 when :poetry then 'output?'
                                                                 when :pdm then 'dest?'
                                                                 when :hatch then 'location?'
+                                                                else 'outdir?'
                                                                 end)
                       task flag do |_, args|
                         build! flag, args.to_a
@@ -343,6 +343,7 @@ module Squared
               cmd << '--no-root' if option('no-root')
             else
               cmd = pip_session 'install'
+              cmd << '--upgrade-strategy=eager' if env('PYTHON_UPDATE')
               if flag
                 case flag
                 when :user
@@ -478,9 +479,6 @@ module Squared
 
         def build!(flag, opts = [])
           case flag
-          when :python
-            cmd, opts = python_session('-m build', opts: opts)
-            list = OPT_PYTHON[:build]
           when :poetry
             cmd = poetry_session 'build'
             list = OPT_POETRY[:build] + OPT_POETRY[:common]
@@ -490,37 +488,31 @@ module Squared
           when :hatch
             cmd, opts = hatch_session('build', opts: opts)
             list = OPT_HATCH[:build]
+          else
+            cmd, opts = python_session('-m build', opts: opts)
+            list = OPT_PYTHON[:build]
           end
-          srcdir = nil
           op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
-          op.each do |opt|
-            if !srcdir && basepath(opt.chomp('*')).exist? && projectpath?(opt.chomp('*'))
-              srcdir = opt
-            else
-              op.found << opt
-            end
-          end
-          op.swap
           case flag
-          when :poetry, :pdm
-            if srcdir
-              args = flag == :pdm ? ['d', 'dest'] : ['o', 'output']
-              if op.arg?(*args)
-                op.push(srcdir)
-              else
-                op << quote_option(args.last, basepath(srcdir))
-              end
-              srcdir = nil
-            end
           when :hatch
-            if ENV['HATCH_BUILD_LOCATION']
-              srcdir = nil
-            else
-              srcdir ||= path
+            if !ENV['HATCH_BUILD_LOCATION'] && (outdir ||= op.shift)
+              op.add_path(outdir)
+            end
+          else
+            unless op.empty?
+              args = case flag
+                     when :poetry
+                       %w[o output]
+                     when :pdm
+                       %w[d dest]
+                     else
+                       srcdir = true
+                       %w[o outdir]
+                     end
+              op << quote_option(args.last, basepath(op.shift)) unless op.arg?(*args)
             end
-            op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
           end
-          op.add_path(srcdir) if srcdir
+          op.exist?(add: true, first: true) if srcdir
           op.clear
           run(from: :"#{flag}:build")
         end
@@ -581,17 +573,21 @@ module Squared
         def variable_set(key, *val, **)
           case key
           when :dependfile
-            req = basepath(*val)
-            if (index = DEP_PYTHON.index(req.basename.to_s))
-              @dependindex = index
-              @dependfile = req
+            if val.first.nil?
+              super
             else
-              log.warn "variable_set: @#{key}=#{req} (not supported)"
+              req = basepath(*val)
+              if (index = DEP_PYTHON.index(req.basename.to_s))
+                @dependindex = index
+                @dependfile = req
+              else
+                log.warn "variable_set: @#{key}=#{req} (not supported)"
+              end
             end
           when :editable
             editable_set val.first
           when :venv
-            instance_variable_set(:"@#{key}", val.empty? ? nil : basepath(*val))
+            @venv = val.empty? || val.first.nil? ? nil : basepath(*val)
           else
             super
           end
@@ -612,10 +608,11 @@ module Squared
         end
 
         def python_session(*cmd, opts: nil)
-          return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
+          pre = preopts(quiet: false)
+          return session('python', *pre, *cmd, path: venv.nil?) unless opts
 
           op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: singleopt(:python))
-          ret = session('python', *op.to_a, *cmd, path: venv.nil?)
+          ret = session('python', *pre, *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
 
@@ -638,8 +635,8 @@ module Squared
         def create_session(*cmd, name:, common:, opts: nil)
           return session(name, *preopts, *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, single: singleopt)
-          ret = session(name, *op.to_a, *cmd, path: venv.nil?)
+          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          ret = session(name, *preopts, *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
 
@@ -693,14 +690,16 @@ module Squared
             OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
-              return
+              return unless installable?
             else
               val = basepath val
             end
-          elsif session_arg?('e', 'editable', target: target) || !(val = editable)
+          elsif session_arg?('e', 'editable', target: target) || !installable?
             return
+          else
+            val = editable
           end
-          target << quote_option('e', basepath(val))
+          target << (val ? quote_option('e', basepath(val)) : '.')
         end
 
         def append_global(target: @session)
@@ -876,6 +875,7 @@ module Squared
             .clear(pass: false)
           status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
+          install(:upgrade, ['poetry']) if poetry?
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 

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

@@ -24,10 +24,10 @@ module Squared
           common: %w[no-color V|verbose r|retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[force full-index quiet redownload gemfile=p j|jobs=i].freeze,
+          install_base: %w[force full-index local quiet redownload gemfile=p j|jobs=i].freeze,
           update: %w[all conservative local major minor patch pre ruby strict bundler=b? g|group=q source=b].freeze,
-          outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
-                       update-strict group=q source=b].freeze,
+          outdated: %w[filter-major filter-minor filter-patch filter-strict groups local parseable porcelain pre
+                       only-explicit strict update-strict group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
           cache: %w[all all-platforms frozen no-all no-install no-prune quiet cache-path=p gemfile=p path=p].freeze,
           check: %w[dry-run gemfile=p path=p].freeze
@@ -38,7 +38,7 @@ module Squared
           install_base: %w[E f w b|both clear-sources conservative default development development-all explain
                            ignore-dependencies l|local N|no-document r|remote vendor n|bindir=p build-root=p
                            B|bulk-threshold=i document=b? g|file=p? p|http-proxy=q? i|install-dir=p platform=q
-                           s|source=q target-rbconfig=p? P|trust-policy=b without=b].freeze,
+                           s|source=q target-rbconfig=p? P|trust-policy=b without=q].freeze,
           update: %w[system=b?].freeze,
           uninstall: %w[a D I x vendor n|bindir=p i|install-dir=p platform=b v|version=q].freeze,
           outdated: %w[b|both clear-sources l|local r|remote B|bulk-threshold=i p|http-proxy=q? platform=q
@@ -69,7 +69,7 @@ module Squared
           end
 
           def bannerargs
-            %i[dependfile gemname].freeze
+            %i[dependfile gemname gemdir].freeze
           end
 
           def config?(val)
@@ -93,6 +93,8 @@ module Squared
           'irb' => nil
         })
 
+        attr_reader :gemdir
+
         def initialize(*, autodetect: false, gemspec: nil, **kwargs)
           super
           if @pass.include?(Ruby.ref)
@@ -126,6 +128,14 @@ module Squared
           end
         end
 
+        def gemdir=(val)
+          @gemdir = if val.is_a?(Pathname)
+                      val
+                    else
+                      Pathname.new(val).realdirpath rescue nil
+                    end
+        end
+
         def ref
           Ruby.ref
         end
@@ -241,7 +251,7 @@ module Squared
                                  else
                                    a, b, c = choice_index('Select a file', Dir.glob(file || path.join('*.rb')),
                                                           values: (file ? [] : ['Options']).push('Arguments'),
-                                                          force: true, series: true)
+                                                          series: true)
                                    if file
                                      file = a
                                      b
@@ -287,7 +297,7 @@ module Squared
           end
         end
 
-        def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+        def copy(from: gemlib, into: gemdir, override: false, **kwargs)
           return if @copy == false
 
           glob = kwargs[:include]
@@ -716,7 +726,7 @@ module Squared
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 gems = Dir.glob(basepath('*.gem')).map { |val| File.basename(val) }
-                                choice_index('Select a file', gems, force: true)
+                                choice_index 'Select a file', gems
                               end)
             else
               file = op.shift
@@ -844,62 +854,63 @@ module Squared
 
         def copy?
           return true if @copy.is_a?(Hash) ? copy[:into] : super
-          return gemdir? if @gemdir
+          return gemdir? if gemdir
 
           if version
             begin
               case @autodetect
               when 'rvm'
-                @gemdir = pwd_set { `rvm info homes` }[/^\s+gem:\s+"(.+)"$/, 1]
+                self.gemdir = pwd_set { `rvm info homes` }[/^\s+gem:\s+"(.+)"$/, 1]
               when 'rbenv'
                 if pwd_set { `rbenv which ruby` } =~ %r{^(.+[\\/]versions[\\/](\d\.\d)\.[^\\/]+)[\\/]bin[\\/]ruby$}
-                  @gemdir = File.join($1, 'lib/ruby/gems', "#{$2}.0")
+                  self.gemdir = File.join($1, 'lib/ruby/gems', "#{$2}.0")
                 end
               when 'asdf'
-                @gemdir = pwd_set { `asdf where ruby` }
-                @gemdir = @gemdir =~ /(\d\.\d)\.[^.]+$/ && File.join(@gemdir, 'lib/ruby/gems', "#{$1}.0")
+                val = pwd_set { `asdf where ruby` }
+                self.gemdir = File.join(val, 'lib/ruby/gems', "#{$1}.0") if val =~ /(\d\.\d)\.[^.]+$/
+              when 'env'
+                ENV['GEM_HOME'] || ENV['GEM_ROOT']
               when /bundler?/
-                @gemdir = pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
+                path = pwd_set { `bundle env` }[/^\s+Gem Path\s+(.+)$/, 1]
+                self.gemdir = path.split(File::PATH_SEPARATOR).find { |val| Dir.exist?(val) }
               end
             rescue StandardError => e
               log.debug e
-            else
-              @gemdir = Pathname.new(@gemdir) if @gemdir
             end
             return true if gemdir?
           end
           return false unless @autodetect
 
           set = lambda do |val, path|
-            if (ver = version) && ver != val
-              log.warn "using version #{val} (given #{ver})"
-            end
+            base = Pathname.new(path.strip)
+            return false unless base.join(gempath(val, 'specification')).exist?
+
+            log.warn "using version #{val} (given #{version})" if version && version != val
             self.version = val
-            @gemdir = Pathname.new(path.strip) + gempath
+            self.gemdir = base + gempath
           end
           if version
             opt = gempwd
             pwd_set(pass: !opt.nil?) do
               out = `#{gem_output(opt, 'list --local -d', gemname)}`
-              if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
+              if out =~ /#{Regexp.escape(gemname)}\s+\((.+)\)$/
                 split_escape($1)
                   .unshift(@version)
                   .uniq
                   .each do |val|
-                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+                    next unless out =~ /(?:\(#{Regexp.escape(val)}[^)]*\)|Installed at):\s+(.+)$/
 
-                    set.call(val, $1)
-                    return gemdir? if @gemdir
+                    return gemdir? if set.call(val, $1)
                   end
               end
             end
-            @gemdir = Pathname.new(Gem.dir) + gempath
+            self.gemdir = Pathname.new(Gem.dir) + gempath
           else
             parse = lambda do |path|
               next unless path
 
               lib = Regexp.new(['', 'gems', "#{gemname}-([^#{File::SEPARATOR}]+)", ''].join(File::SEPARATOR))
-              if (ver = path[lib, 1]) && (val = path[/\A(.+)#{gempath(ver[1])}/, 1])
+              if (ver = path[lib, 1]) && (val = path[/\A(.+)#{Regexp.escape(gempath(ver))}/, 1])
                 set.call(ver, val)
               end
             end
@@ -907,7 +918,7 @@ module Squared
               target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
               parse.call(target.resolve_feature_path(gemname)&.last)
             end
-            if !@gemdir && !pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
+            if !gemdir && !pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
               raise_error 'gems directory not found'
             end
           end
@@ -1042,14 +1053,16 @@ module Squared
           end
         end
 
-        def gempath(val = version)
-          File.join('gems', "#{gemname}-#{val}")
+        def gempath(val = version, dir = 'gems')
+          ret = File.join(dir, "#{gemname}-#{val}")
+          ret += '.gemspec' if dir == 'specifications'
+          ret
         end
 
         def gemdir?
-          return false unless @gemdir
+          return false unless gemdir
 
-          @gemdir.exist? && !@gemdir.empty?
+          gemdir.exist? && !gemdir.empty?
         end
 
         alias read_rakefile raketasks

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

@@ -114,7 +114,7 @@ module Squared
 
             def matchopts(list, value = false)
               a, b = Array(list).partition { |val| val.size == 1 || val.match?(OPT_SINGLE) }
-              return /\A#{shortopt(*a)}}/ if b.empty?
+              return /\A#{shortopt(*a)}/ if b.empty?
               return /\A#{longopt(*b, value)}/ if a.empty?
 
               /\A(?:#{shortopt(*a)}|#{longopt(*b, value)})/
@@ -135,9 +135,9 @@ module Squared
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :compact, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
-          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :concat, :index, :join, :map, :map!, :detect, :select, :select!, :reject, :size,
-                         :delete_at
+          def_delegators :@extras, :empty?, :member?, :each, :each_with_index, :each_with_object, :partition, :dup,
+                         :first, :last, :shift, :unshift, :pop, :push, :concat, :index, :join, :map, :map!, :detect,
+                         :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -309,6 +309,7 @@ module Squared
               else
                 add val
               end
+              found << val if args.empty?
             end
             self
           end
@@ -405,26 +406,26 @@ module Squared
           end
 
           def splice(*exclude, quote: true, delim: true, path: false, pattern: false, &blk)
-            found, other = if block_given?
-                             partition(&blk)
-                           elsif exclude.first.is_a?(Symbol)
-                             partition(&exclude.first)
-                           else
-                             partition do |val|
-                               next false if pattern && OptionPartition.pattern?(val)
-
-                               exclude.none? { |pat| val.match?(Regexp.new(pat)) }
-                             end
-                           end
-            unless found.empty?
+            temp, other = if block_given?
+                            partition(&blk)
+                          elsif exclude.first.is_a?(Symbol)
+                            partition(&exclude.first)
+                          else
+                            partition do |val|
+                              next false if pattern && OptionPartition.pattern?(val)
+
+                              exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                            end
+                          end
+            unless temp.empty?
               add '--' if delim
               extras.clear
               concat other
               if path
-                found.each { |val| add_path(val) }
+                temp.each { |val| add_path(val) }
               else
-                found.map! { |val| shell_quote(val) } if quote
-                merge found
+                temp.map! { |val| shell_quote(val) } if quote
+                merge temp
               end
             end
             self

data/lib/squared/workspace/repo.rb

@@ -228,10 +228,10 @@ module Squared
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
+        timeout = env('REPO_TIMEOUT').to_i
+        timeout = 15 unless timeout > 0
         @repo_override = Common::Prompt.confirm(
-          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
-          'N',
-          timeout: env('REPO_TIMEOUT', 15, ignore: '0')
+          "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ", 'N', timeout: timeout
         )
       end
 

data/lib/squared/workspace/series.rb

@@ -31,15 +31,19 @@ module Squared
             end
           elsif (data = TASK_BATCH[obj])
             args.each { |ref| data.delete(ref) }
-            TASK_KEYS.delete(obj) if data.empty?
+            if data.empty?
+              TASK_KEYS.delete(obj)
+              TASK_BATCH.delete(obj)
+            end
           end
         end
 
         def alias(ref, obj)
           if obj.is_a?(Hash)
             obj.each { |key, val| TASK_ALIAS[key][ref] = val }
-          else
-            TASK_ALIAS[obj]&.delete(ref)
+          elsif TASK_ALIAS.key?(obj)
+            TASK_ALIAS[obj].delete(ref)
+            TASK_ALIAS.delete(obj) if TASK_ALIAS[obj].empty?
           end
         end
 
@@ -165,6 +169,8 @@ module Squared
       end
 
       def alias_get(key)
+        return unless TASK_ALIAS.key?(key)
+
         TASK_ALIAS[key]
       end
 
@@ -182,12 +188,14 @@ module Squared
       end
 
       def extend?(obj, key)
-        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
+        return false unless TASK_EXTEND.key?(key)
 
         meth = :"#{key}?"
         ret = false
-        items.each do |kind|
-          if kind.instance_methods.include?(meth)
+        TASK_EXTEND[key].each do |kind|
+          next unless obj.is_a?(kind)
+
+          if kind.method_defined?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
@@ -228,7 +236,7 @@ module Squared
       end
 
       def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && @data[key].empty?)
+        @exclude.include?(key) || (empty && (!@data.key?(key) || @data[key].empty?))
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.32
+  version: 0.4.34
 platform: ruby
 authors:
 - An Pham