squared 0.5.17 → 0.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91dfb7530ecdb1ab70461ab8bbbf894e706ea6f78b5e9ada99c930d0819e9ec9
-  data.tar.gz: 82591aa893baf80057a3193e95763b8ce98c13593de54dffd00e31f0c27a3bf8
+  metadata.gz: 90e816457aa629a2416781e2480aa4025f0b5395eb41dc45157ecbb0d9a57262
+  data.tar.gz: a03eca5dba74e2b6c3c6d6946291f788e5f3a75c84afa89a8e5139c325d3397a
 SHA512:
-  metadata.gz: ce78218f60162cda536062dc37e5f27f30b5cd25e1afcac502c3519085988594c01ea149b47ecd536373ba2f4312162d468915fd6792f27f15d1d301bf2e03eb
-  data.tar.gz: b0b6cec02ec4c531ddbabfa4ff1f3f8a87cf4592dd48fd86b74a8ac3787c602df165b0526cd69af8c585c221dcace1bcfc606a1bc511e3722f1e1b9cd1161e17
+  metadata.gz: 3ec9a3d2105f6355485a71820b4631554dfe9a47a6b4fbfb36d690b09693cd54abad75877aa7b17fe235dadcf2f03c0508b5ea33dd0e3a67c69faa73ad6c19b4
+  data.tar.gz: 8ed22f2ba7bb7195082d616ab085ead6e1795fa23a06f9bc48035206e1dedec4f146b2934711c2d88ac52e77b8c000838a517bdc8ddb616a3b0d5c1a9c608bd8

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.5.19] - 2025-12-07
+
+### Fixed
+
+- See `0.4.33`.
+
+## [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.5.18] - 2025-11-25
+
+### Fixed
+
+- See `0.4.32`.
+
+## [0.4.32] - 2025-11-25
+
+### Fixed
+
+- Git method commit did not include --dry-run with add command.
+- JoinSet method include? did not always search to start of delimiter.
+- Config viewer did not check for a readable package registry document.
+- Powershell executable did not check for alternate path location.
+
 ## [0.5.17] - 2025-11-22
 
 ### Fixed
@@ -1271,6 +1306,8 @@
 
 - Changelog was created.
 
+[0.5.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.19
+[0.5.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.18
 [0.5.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.17
 [0.5.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.16
 [0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
@@ -1289,6 +1326,8 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.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/shell.rb

@@ -112,7 +112,8 @@ module Squared
       end
 
       def shell_bin(name, env: true)
-        key = name.upcase
+        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,
                     option: false, force: false, double: true)
       end

data/lib/squared/config.rb

@@ -22,8 +22,8 @@ module Squared
           nil
         end
 
-        def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
-          return unless project.enabled?
+        def link(project, main = project.dependfile&.basename, name = nil, **kwargs, &blk)
+          return unless project.enabled? && main
 
           ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
@@ -159,7 +159,7 @@ module Squared
       end
 
       def also(path, type = nil, name: nil, **kwargs)
-        return self if @mime.frozen? || !(file = basepath(path)).exist?
+        return self unless (file = basepath(path)).exist? && !@mime.frozen?
 
         ext = mimetype file
         type ||= ext
@@ -211,7 +211,7 @@ module Squared
             file = nil
             ext[0] = mime
           elsif file
-            keys.prepend(file)
+            keys.unshift(file)
             alt = basepath "#{main}.{#{ext.join(',')}}"
             file = Dir[alt].first
           else
@@ -293,7 +293,7 @@ module Squared
         if stdin?
           puts out.map!(&:last).join("\n")
         else
-          out.map! { |item| '%-*s : %s' % [pad, item[0], item[1]] }
+          out.map! { |a, b| '%-*s : %s' % [pad, a, b] }
         end
       end
 
@@ -309,7 +309,7 @@ module Squared
         return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
-        args = *name.split(':').append(command, val)
+        args = *name.split(':').push(command, val)
         if project
           project.workspace.task_desc(*args)
         else
@@ -322,7 +322,9 @@ module Squared
       end
 
       def warning?
-        project ? project.workspace.warning : true
+        return true unless project
+
+        project.workspace.warning
       end
 
       def stdin?
@@ -347,7 +349,9 @@ module Squared
       end
 
       def basepath(*args)
-        project ? project.basepath(*args) : Pathname.pwd.join(*args)
+        return Pathname.pwd.join(*args) unless project
+
+        project.basepath(*args)
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -29,7 +29,7 @@ module Squared
               self.impl_project = obj
               impl_series.base_set(obj)
             else
-              kind_project.prepend(obj)
+              kind_project.unshift(obj)
               obj.tasks&.each { |task| impl_series.add(task, obj) }
             end
             if (args = obj.batchargs)
@@ -335,9 +335,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]
@@ -785,7 +785,7 @@ module Squared
                 end
               end
               if step == -1
-                level.prepend(data.action)
+                level.unshift(data.action)
                 step = 0
               elsif step > 0
                 (level[step -= 1] ||= []).concat(data.action)

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

@@ -365,7 +365,7 @@ module Squared
                   when 'unpack'
                     format_desc(action, flag, 'tag/url,dir,digest?,f|force?', before: flag == :ext ? 'ext' : nil)
                     params = %i[tag dir digest force]
-                    params.prepend(:ext) if flag == :ext
+                    params.unshift(:ext) if flag == :ext
                     task flag, params do |_, args|
                       ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                       tag = param_guard(action, flag, args: args, key: :tag)
@@ -402,8 +402,8 @@ module Squared
                                                               @asdf[1].children
                                                                       .map(&:basename)
                                                                       .sort { |a, b| b <=> a }
-                                                                      .append('latest', 'system'),
-                                                              force: true, accept: [['Confirm?', false, true]],
+                                                                      .push('latest', 'system'),
+                                                              accept: [['Confirm?', false, true]],
                                                               values: ['Options'])
                                  OptionPartition.strip(opts)
                                end
@@ -514,7 +514,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)
 
@@ -528,12 +528,12 @@ 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
               when Hash
-                cmd = Array(cmd).append(flags)
+                cmd = Array(cmd).push(flags)
                                 .concat(append_hash(opts, target: [], build: true))
                                 .compact
                                 .join(' ')
@@ -1662,6 +1662,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)
@@ -1770,7 +1777,7 @@ module Squared
         def command(*args)
           return args.join(' && ') unless workspace.powershell?
 
-          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
+          "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\""
         end
 
         def relativepath(*list, all: false)

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,

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

@@ -864,6 +864,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
@@ -1122,7 +1124,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
@@ -1457,13 +1459,14 @@ module Squared
             append_pathspec op.extras
           end
           co = git_session('commit', options: false)
-          pu = git_output 'push', upstream && '--set-upstream'
+          pu = git_output 'push'
+          co << '--amend' if amend
+          pu << '--set-upstream' if upstream
           if dryrun?
-            op.delete('--dry-run')
+            op.adjoin('--dry-run')
             co << '--dry-run'
             pu << '--dry-run'
           end
-          co << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('edit', equals: '0')
@@ -1471,7 +1474,6 @@ module Squared
           end
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
-          puts if pass
           adding = git_spawn 'diff --name-only --no-color'
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
@@ -1771,7 +1773,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)

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

@@ -219,7 +219,7 @@ module Squared
                     version = param_guard(action, 'version', args: args, key: :version)
                     args = args.extras
                     args << readline('Enter command', force: true) if args.empty?
-                    args.prepend(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    args.unshift(File.join(ENV['NVM_DIR'], 'nvm-exec'))
                     run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
                   end
                 when 'pack'
@@ -632,6 +632,7 @@ module Squared
               else
                 footer.call(0, found.size)
               end
+              printsucc
               commit(:add, ['package.json'], pass: true)
             end
           elsif !avail.empty?

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

@@ -8,7 +8,7 @@ module Squared
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
           common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
-          build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
+          build: %w[C=bm n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel 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
@@ -78,7 +78,7 @@ module Squared
 
         attr_reader :venv, :editable
 
-        def initialize(*, editable: '.', verbose: nil, asdf: 'python', **kwargs)
+        def initialize(*, editable: '.', asdf: 'python', **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -310,10 +310,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
@@ -487,9 +487,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]
@@ -499,37 +496,32 @@ 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
             op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
+          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
           end
-          op.add_path(srcdir) if srcdir
+          op.exist?(add: true, first: true) if srcdir
           op.clear
           run(from: :"#{flag}:build")
         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, asdf: 'ruby', **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 || '*.rb', base: path),
                                                           values: (file ? [] : ['Options']).push('Arguments'),
-                                                          force: true, series: true)
+                                                          series: true)
                                    if file
                                      file = a
                                      b
@@ -293,7 +303,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]
@@ -516,7 +526,7 @@ module Squared
                   c < d ? -1 : 1
                 end
               end
-              .append('')
+              .push('')
               .each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
@@ -754,7 +764,7 @@ module Squared
               file = basepath(if !n && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
-                                choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
+                                choice_index 'Select a file', Dir.glob('*.gem', base: path)
                               end)
             else
               file = op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" }
@@ -882,27 +892,25 @@ 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 /bundler?/
-                @gemdir = pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
+                self.gemdir = pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
               end
             rescue StandardError => e
               log.debug e
-            else
-              @gemdir = Pathname.new(@gemdir) if @gemdir
             end
             return true if gemdir?
           end
@@ -913,7 +921,7 @@ module Squared
               log.warn "using version #{val} (given #{ver})"
             end
             self.version = val
-            @gemdir = Pathname.new(path.strip) + gempath
+            self.gemdir = Pathname.new(path.strip) + gempath
           end
           if version
             opt = gempwd
@@ -921,23 +929,23 @@ module Squared
               out = `#{gem_output(opt, 'list --local -d', gemname)}`
               if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
                 split_escape($1)
-                  .prepend(version)
+                  .unshift(version)
                   .uniq
                   .each do |val|
                     next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
 
                     set.call(val, $1)
-                    return gemdir? if @gemdir
+                    return gemdir? if gemdir
                   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
@@ -945,7 +953,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
@@ -1106,9 +1114,9 @@ module Squared
         end
 
         def gemdir?
-          return false unless @gemdir
+          return false unless gemdir
 
-          @gemdir.exist? && !@gemdir.empty?
+          gemdir.exist? && !gemdir.empty?
         end
       end
 

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)})/
@@ -309,6 +309,7 @@ module Squared
               else
                 add val
               end
+              found << val if args.empty?
             end
             self
           end
@@ -437,26 +438,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
@@ -558,7 +559,7 @@ module Squared
           end
 
           def last(val, pat)
-            (@last ||= []).append([val, pat, $1]) if val =~ pat
+            (@last ||= []).push([val, pat, $1]) if val =~ pat
             self << val
           end
 
@@ -641,6 +642,13 @@ module Squared
             super + extras.size
           end
 
+          def include?(obj)
+            return true if super
+            return extras.include?(obj) unless (n = extras.index(@partition))
+
+            extras[0..n].include?(obj)
+          end
+
           def to_a
             pass
           end
@@ -663,6 +671,7 @@ module Squared
 
           alias add :<<
           alias add? :<<
+          alias member? include?
 
           private
 

data/lib/squared/workspace/repo.rb

@@ -216,7 +216,7 @@ module Squared
             end
           end
 
-          series.sync.append(
+          series.sync.push(
             task_join(path, 'all'),
             task_join(path, 'init'),
             task_join(path, 'sync')

data/lib/squared/workspace/series.rb

@@ -38,8 +38,8 @@ module Squared
         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)
           end
         end
 
@@ -165,6 +165,8 @@ module Squared
       end
 
       def alias_get(key)
+        return unless TASK_ALIAS.key?(key)
+
         TASK_ALIAS[key]
       end
 
@@ -182,11 +184,13 @@ 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|
+        TASK_EXTEND[key].each do |kind|
+          next unless obj.is_a?(kind)
+
           if kind.instance_methods.include?(meth)
             out = obj.__send__(meth)
             return true if out == 1

data/lib/squared/workspace.rb

@@ -20,7 +20,7 @@ module Squared
 
       def expect(name)
         ret = project name
-        return ret if ret&.path&.directory?
+        return ret if ret&.path&.directory? && !ret.path.empty?
 
         raise NoMethodError, "project is not initialized (#{name})"
       end

metadata

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