squared 0.6.9 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd07ce40c31b81be676defc0120ee1090e6bf020153b0234bcc9656e791279d3
-  data.tar.gz: e4179c5daf66d93a6795a3a15be28f93936d90da081fdfde2f779d05cddbc20e
+  metadata.gz: e9559cf340c4a95816cc2853417bfb3c43053cf59cdd4e4b38fac0c074f41264
+  data.tar.gz: 60d6c5b20aa58e9606402745283948393253363ed38d5f15322be5d7cbfde7d5
 SHA512:
-  metadata.gz: 437e260ef864d9734038ef84cf17bef22582d68f0081f4a8a7c4c16157bc32b3322673d2cb069ee84313b61243df30d65e3a3be432d613a2b977981e95b32aae
-  data.tar.gz: 02efccc2029b33cdfa91cf0da6454f7c9116e12320c7a378d8ccdf19d16a70414f36999fbf97bfd975ca24007c932e3d62d13753c4227ca565e6c569e3a36824
+  metadata.gz: 0b34a0a55c607060040c027b19bc16b5ad93ba1403d753c45a75edadb3086f179b1e533b4d5058787b544012e0eda60d5e1b70ed9ff26c5fda65d55fd74b5513
+  data.tar.gz: 65478734cb5d093f3abb96022479ba3aec90b7b08741f0f924c348b06466dedb0a8db9d19e7d78e2d0f7cd26c874f7ff56d387323b943baa969097f2c97f37c5

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [0.6.11] - 2026-03-11
+
+### Changed
+
+- Git internal data calls do not write to logs.
+
+## [0.5.22] - 2026-03-11
+
+- Project base run command was not covered due to lack of type checking.
+
+## [0.4.36] - 2026-03-11
+
+### Added
+
+- Python venv initialization installs setuptools when detected.
+- Node task depend adds prod option flags when NODE_ENV=production.
+
+### Fixed
+
+- OptionPartition methods with escape parameter were reordered.
+- OptionPartition methods with quote parameter were revised.
+
+## [0.6.10] - 2025-02-23
+
+### Added
+
+- Docker command image action [ls|rm|tag|save] can be filtered.
+- Pip command options were updated to 26.1.
+
+### Changed
+
+- Ruby property autodetect was converted into an accessor.
+- Python property editable was converted into an accessor.
+
+### Fixed
+
+- Git task show was completely non-functional due to excessive formatting.
+- Gem command install did not respond to interactive prompt.
+- Docker task clean does not run in parallel without ENV override.
+
 ## [0.6.9] - 2025-01-07
 
 ### Added
@@ -1568,7 +1608,7 @@
 - Rake did not set original rakefile when calling itself.
 - Extended tasks were not associated to their supporting class method.
 
-## [0.1.0] - 2024-12-7
+## [0.1.0] - 2024-12-07
 
 ### Added
 
@@ -1589,12 +1629,14 @@
 - Git pull did not display colors for diff bar chart.
 - Git commit did not fetch latest refs before submitting.
 
-## [0.0.12] - 2024-12-1
+## [0.0.12] - 2024-12-01
 
 ### Added
 
 - Changelog was created.
 
+[0.6.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.11
+[0.6.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.10
 [0.6.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.9
 [0.6.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.8
 [0.6.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.7
@@ -1605,6 +1647,7 @@
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.22
 [0.5.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.21
 [0.5.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.20
 [0.5.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.19
@@ -1627,6 +1670,7 @@
 [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.36]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.36
 [0.4.35]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.35
 [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

data/README.md

@@ -11,7 +11,7 @@
 | 2025-01-07 |   0.2.0 |        |  3.4.0 |
 | 2025-02-07 |   0.3.0 |        |  3.4.1 |
 | 2025-03-06 |   0.4.0 |        |  3.4.2 |
-| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.3 |
+| 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.4 |
 | ---------- |   ----- |  ----- |  ----- |
 | 2025-08-23 |   0.5.5 |        |  3.4.5 |
 | 2025-10-31 |   0.6.0 |        |  3.4.7 |
@@ -733,12 +733,13 @@ docker build --no-cache --label=v1 --build-arg="NODE_TAG=24" --build-arg="RUBY_V
 | compose    | build              | TARGET=s                                        |
 | compose    | run                | VERSION=s                                       |
 | container  | commit             | REGISTRY=s PLATFORM=s DISABLE_CONTENT_TRUST=0,1 |
-| container  | -run -create -exec | ALL=1                                           |
+| container  | -run -create -exec | ALL=1 FILTER=s                                  |
 |            | -update -commit    |                                                 |
 | image      | rm                 | Y=1                                             |
 | image      | push               | TAG=s REGISTRY=s                                |
 | image      | -push              | ALL=1                                           |
-| network    | *                  | ALL=1                                           |
+| image      | -push -pull        | FILTER=s                                        |
+| network    | *                  | ALL=1 FILTER=s                                  |
 
 ### asdf
 
@@ -806,7 +807,7 @@ REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
 REPO_STAGE           # 0,1,2,3,4
 REPO_SUBMODULLES     # 0,1
-REPO_Y               # 0,1
+REPO_Y               # 0,1 (bypass interactive prompt)
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
@@ -835,7 +836,7 @@ Features can be enabled through ENV when calling global tasks such as through *C
 | :------------- | :------------- | :------------------------------------------------------- |
 | depend         | -              | FORCE CI IGNORE_SCRIPTS                                  |
 | outdated       | -              | U|UPDATE=major|minor|patch DIFF DRY_RUN                  |
-| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN                         |
+| publish        | -              | OTP=s TAG=s ACCESS=0,1,s DRY_RUN Y                       |
 | depend package | *              | PACAKGE_LOCK|LOCKFILE=0 NO_LOCKFILE=1 Y                  |
 | npm pnpm       | depend package | CPU=s OS=s LIBC=s                                        |
 | npm            | package        | SAVE IGNORE_SCRIPTS STRICT_PEER_DEPS                     |

data/lib/squared/version.rb

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

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

@@ -251,7 +251,7 @@ module Squared
                    print_error e
                  end
           log[:progname] ||= @name
-          env('LOG_LEVEL', ignore: false) { |val| log[:level] = val.start_with?(/\d/) ? log_sym(val.to_i) : val }
+          env('LOG_LEVEL', ignore: false) { |s| log[:level] = s.start_with?(/\d/) ? log_sym(s.to_i) : s }
           log.delete(:file)
           @log = [file, log]
         end
@@ -521,7 +521,7 @@ module Squared
             args[0] = instance_eval(&blk) || f
             return unless args.first
           end
-          if args.all? { |val| val.is_a?(Array) }
+          if args.all?(Array)
             cmd = []
             var = {}
             args.each do |val|
@@ -841,7 +841,7 @@ module Squared
           ensure
             if dir
               remove_entry dir
-            elsif delete && file&.exist?
+            elsif delete && file.exist?
               file.unlink
             end
           end
@@ -1323,17 +1323,17 @@ module Squared
                            s += "#{indent || (last && data[final].last == context) ? ' ' : a}   "
                            k += 1
                          end
-                         s += "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
+                         s + "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
                        end
               end
               if order
                 n = order.size
                 order[name] ||= if proj.parent
-                                  if order[s = proj.parent.name]
-                                    order[s] += 1
+                                  if order[key = proj.parent.name]
+                                    order[key] += 1
                                     n.pred
                                   else
-                                    order[s] = n.succ
+                                    order[key] = n.succ
                                     n
                                   end
                                 else
@@ -1918,8 +1918,10 @@ module Squared
           args
         end
 
-        def confirm_basic(msg, target, default = 'Y', style: :inline, **kwargs)
-          confirm("#{msg} [#{sub_style(target.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
+        def confirm_basic(msg, hint, default = 'Y', style: :inline, target: @session, prefix: nil, **kwargs)
+          return true if prefix ? option('y', prefix: prefix) : target && option('y', target: target)
+
+          confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
         end
 
         def confirm_outdated(pkg, ver, type, cur = nil, lock: false, col0: 0, col1: 0, col2: nil, col3: 0, col4: 0,
@@ -2258,7 +2260,7 @@ module Squared
             ret = []
             if data[:command]
               ret[0] = data[:command]
-              ret[1] = data[:opts] unless diso
+              ret[1] = data[:opts] unless noopt
               ret[3] = data[:args]
             elsif data[:script]
               ret[1] = data[:script]
@@ -2267,7 +2269,7 @@ module Squared
             else
               ret[0] = false
             end
-            ret[2] = data[:env] unless dise
+            ret[2] = data[:env] unless noenv
             ret
           end
           self.global = global
@@ -2275,7 +2277,7 @@ module Squared
           when Hash
             @output = parse.call(data)
           when Enumerable
-            @output = if cmd.all? { |data| data.is_a?(Hash) }
+            @output = if cmd.all?(Hash)
                         noopt = false
                         noenv = false
                         cmd.map { |data| parse.call(data) }

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

@@ -282,14 +282,18 @@ module Squared
                         end
                       else
                         format_desc(action, flag, case flag
-                                                  when :rm, :save then 'id*,opts*'
-                                                  when :tag then 'version?'
+                                                  when :rm, :save then 'id,opts*'
+                                                  when :tag then 'version'
                                                   else 'opts*,args*'
-                                                  end)
+                                                  end, before: 'pattern?')
                         task flag do |_, args|
                           args = args.to_a
+                          n = args.size
+                          if (n > 1 || (flag == :ls && n > 0)) && OptionPartition.pattern?(args.first)
+                            filter = args.shift
+                          end
                           if !args.empty? || flag == :ls
-                            image flag, args
+                            image(flag, args, filter: filter)
                           else
                             choice_command flag
                           end
@@ -315,8 +319,8 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          else
-            image(:rm, sync: sync)
+          elsif sync || option('y', prefix: 'docker')
+            image :rm
           end
         end
 
@@ -533,7 +537,7 @@ module Squared
           run(from: from)
         end
 
-        def image(flag, opts = [], sync: true, id: nil, registry: nil)
+        def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
           exception = self.exception
@@ -551,7 +555,7 @@ module Squared
                 opts.delete(val)
                 break
               end
-              list_image(:run, from: from) do |val|
+              list_image(:run, filter: filter, from: from) do |val|
                 container(:run, if name
                                   opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
                                 else
@@ -565,9 +569,7 @@ module Squared
           when :rm
             unless id
               if op.empty?
-                list_image(:rm, from: from) do |val|
-                  image(:rm, opts, sync: sync, id: val)
-                end
+                list_image(:rm, filter: filter, from: from) { |val| image(:rm, opts, sync: sync, id: val) }
               else
                 op.each { |val| run(cmd.temp(val), sync: sync, from: from) }
               end
@@ -579,13 +581,16 @@ module Squared
               banner = false
             end
           when :tag, :save
-            list_image(flag, from: from) do |val|
+            found = false
+            list_image(flag, filter: filter, from: from) do |val|
               op << val
+              found = true
               if flag == :tag
                 op << tagname("#{project}:#{op.first}")
                 break
               end
             end
+            raise_error ArgumentError, 'target not specified', hint: flag unless found
           when :push
             id ||= option('tag', ignore: false) || tagmain
             registry ||= op.shift || option('registry') || @registry
@@ -774,12 +779,20 @@ module Squared
           [cmd, status, no]
         end
 
-        def list_image(flag, cmd = docker_output('image ls -a'), hint: nil, no: true, from: nil)
+        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, from: nil)
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
             y = from == :'image:rm' && option('y', prefix: 'docker')
-            pat = /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})\b/
+            filter = env('DOCKER_FILTER', filter).to_s
+            pat = if OptionPartition.pattern?(filter)
+                    Regexp.new(filter)
+                  elsif filter.match?(/[:_-]$/)
+                    /\b#{Regexp.escape(filter)}/
+                  else
+                    filter = filter.empty? ? '(?:[:_-]|$)' : "[:_-]#{filter}"
+                    /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
+                  end
             IO.popen(cmd.temp('--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']

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

@@ -426,7 +426,7 @@ module Squared
                                    end
                           if squash
                             found = false
-                            git_spawn(git_output('log --format=%h'), stdout: false).each do |val|
+                            git_spawn('log --format=%h', stdout: false).each do |val|
                               if found
                                 squash = val.chomp
                                 break
@@ -1747,8 +1747,9 @@ module Squared
             opts << format if format
           end
           list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
-          op = OptionPartition.new(opts, list, cmd, project: self, pass: [:base],
-                                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log]))
+          op = OptionPartition.new(opts, list, cmd,
+                                   project: self,
+                                   no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
           op.append(delim: true)
           source(exception: false, banner: flag != :oneline)
         end
@@ -1887,22 +1888,22 @@ module Squared
           if io && banner == false
             from = nil
             banner = nil
+            args = false
           else
-            if banner
-              banner = nil unless banner? && !multiple
-              args = true
-            end
             if from == false
               from = nil
             elsif !from && cmd.respond_to?(:drop)
               from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) }
               from &&= :"git:#{from}"
             end
-            banner &&= cmd.temp { |val| val.start_with?(/--(?:work-tree|git-dir)/) } if cmd.respond_to?(:temp)
+            if banner
+              banner = cmd.temp { |val| val.start_with?(/--(work-tree|git-dir)/) } if cmd.respond_to?(:temp)
+              args = true
+            end
           end
           cmd = session_done cmd
-          log&.info cmd
-          banner = if banner
+          log&.info cmd unless args == false
+          banner = if banner && banner? && !multiple
                      format_banner(banner.is_a?(String) ? banner : cmd, hint: hint, strip: true)
                    end
           on :first, from
@@ -2121,9 +2122,7 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          return unless val
-
-          target << quote_option('message', val)
+          target << quote_option('message', val) if val
         end
 
         def append_head(val = nil, target: @session)

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
           install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
                         package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
@@ -529,31 +529,36 @@ module Squared
               run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
             end
             if (yarn = dependtype(:yarn)) > 0
-              cmd = session('yarn', flag || 'install')
-              append_loglevel
-              if yarn == 1
-                cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                cmd << '--ignore-scripts' if option('ignore-scripts')
-                cmd << '--force' if option('force')
+              if !flag && yarn > 1 && prod?
+                cmd = session 'yarn', 'workspaces focus --all --production'
               else
-                cmd << '--mode=skip-build' if option('ignore-scripts')
-                cmd << '--check-cache' if !flag && option('force')
-              end
-              if nolockfile?('yarn')
-                cmd << '--no-lockfile'
-              elsif option('ci')
+                cmd = session('yarn', flag || 'install')
                 if yarn == 1
-                  cmd << '--frozen-lockfile'
-                elsif !flag
-                  cmd << '--immutable' << '--refresh-lockfile'
+                  cmd << '--production' if prod?
+                  cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+                  cmd << '--ignore-scripts' if option('ignore-scripts')
+                  cmd << '--force' if option('force')
+                else
+                  cmd << '--mode=skip-build' if option('ignore-scripts')
+                  cmd << '--check-cache' if !flag && option('force')
+                end
+                if nolockfile?('yarn')
+                  cmd << '--no-lockfile'
+                elsif option('ci')
+                  if yarn == 1
+                    cmd << '--frozen-lockfile'
+                  elsif !flag
+                    cmd << '--immutable' << '--refresh-lockfile'
+                  end
+                end
+                if add
+                  cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
+                  rm.call(cmd)
+                  om.call(cmd)
+                  cmd << '--exact' if exact
                 end
               end
-              if add
-                cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
-                rm.call(cmd)
-                om.call(cmd)
-                cmd << '--exact' if exact
-              end
+              append_loglevel
             elsif pnpm?
               cmd = session('pnpm', flag || 'install')
               append_nocolor
@@ -564,6 +569,7 @@ module Squared
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
+                cmd << '--prod' if prod?
                 append_platform
               end
               option('public-hoist-pattern') do |val|
@@ -588,6 +594,8 @@ module Squared
               if omit
                 cmd << "--omit=#{save || omit}"
                 save = nil
+              elsif !add && prod?
+                cmd << '--include=prod'
               end
               unless ci
                 if add
@@ -1329,7 +1337,7 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
+          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
 
           modules.rmtree
         rescue Timeout::Error => e

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

@@ -29,14 +29,16 @@ module Squared
           install: %w[break-system-packages compile dry-run force-reinstall I|ignore-installed no-compile
                       no-warn-conflicts no-warn-script-location U|upgrade user prefix=p report=p root=p
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
-          install_a: %w[ignore-requires-python no-index pre extra-index-url=q f|find-links=q i|index-url=q no-binary=q
-                        only-binary=q].freeze,
-          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps prefer-binary
-                        require-hashes use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
+          install_a: %w[ignore-requires-python no-index pre prefer-binary all-releases=b extra-index-url=q
+                        f|find-links=q i|index-url=q no-binary=q only-binary=q only-final=b uploaded-prior-to=q].freeze,
+          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps
+                        require-hashes use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p
+                        requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
           hash: %w[a|algorithm].freeze,
-          list: %w[e|editable exclude-editable include-editable l|local no-index not-required o|outdated pre u|uptodate
-                   user exclude=b extra-index-url=q format=b f|find-links=q i|index-url=q path=p].freeze,
+          list: %w[e|editable exclude-editable include-editable l|local no-index not-required o|outdated pre
+                   prefer-binary u|uptodate user all-releases=b exclude=b extra-index-url=q format=b f|find-links=q
+                   i|index-url=q no-binary=q only-binary=q only-final=b path=p].freeze,
           lock: %w[o|output=p].freeze,
           show: %w[f|files].freeze,
           uninstall: %w[break-system-packages y|yes r|requirement=p root-user-action=b].freeze,
@@ -73,7 +75,7 @@ module Squared
             debug: %w[platform].freeze,
             install: %w[C config-settings c constraint extra-index-url no-binary only-binary platform
                         r requirement].freeze,
-            list: %w[exclude extra-index-url].freeze
+            list: %w[exclude extra-index-url no-binary only-binary].freeze
           }.freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE,
@@ -99,7 +101,8 @@ module Squared
           end
         end
 
-        attr_reader :venv, :editable
+        attr_reader :venv
+        attr_accessor :editable
 
         def initialize(*, editable: '.', asdf: 'python', **kwargs)
           super
@@ -249,7 +252,7 @@ module Squared
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
                             elsif args.size == 1 && !option('interactive', equals: '0', prefix: ref)
-                              args << readline('Enter arguments', force: false)
+                              args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
                             run args.join(' ')
@@ -1071,7 +1074,11 @@ module Squared
                      .clear(pass: false)
                      .arg?(/\A-v+\z/)
           ret = run(op, env, exception: true, banner: banner)
-          pip(:install, 'poetry', banner: false) if poetry?
+          if poetry?
+            pip(:install, 'poetry', banner: false)
+          elsif setuptools?
+            pip(:install, 'setuptools', 'wheel', banner: false)
+          end
           success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
         end
 

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

@@ -187,6 +187,7 @@ module Squared
         })
 
         attr_reader :gemdir
+        attr_accessor :autodetect
 
         def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', rubocop: '.rubocop.yml', asdf: 'ruby',
                        **kwargs)
@@ -199,7 +200,7 @@ module Squared
             initialize_env(**kwargs)
           end
           dependfile_set GEMFILE
-          @autodetect = autodetect
+          self.autodetect = autodetect
           @gemfile = if gemspec == false
                        false
                      elsif gemspec
@@ -207,7 +208,7 @@ module Squared
                      end
           @steepfile = basepath! steep if steep
           @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
-          return unless rakefile && @output[0].nil? && @copy.nil? && !version && !@autodetect
+          return unless rakefile && @output[0].nil? && @copy.nil? && !version && !self.autodetect
 
           begin
             File.foreach(rakefile) do |line|
@@ -811,7 +812,7 @@ module Squared
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
                                    name = `rbenv version-name`
-                                   name.match?(SEM_VER) ? "ruby #{name}" : name
+                                   (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
@@ -1106,6 +1107,7 @@ module Squared
           when :dependency, :environment, :list, :search, :specification, :which
             op.concat(args)
           end
+          ia = op.remove(':')
           op.each do |opt|
             if gems && !opt.start_with?('-') && !opt.match?(GEMNAME)
               op.errors << opt
@@ -1169,7 +1171,7 @@ module Squared
             end
           when :install, :uninstall, :pristine
             if flag == :install
-              post = if op.remove(':')
+              post = if ia
                        op.concat(args)
                        readline('Enter command [args]', force: true)
                      elsif op.empty?
@@ -1187,14 +1189,14 @@ module Squared
               else
                 op.clear
               end
-            elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+            elsif (n = op.index { |val| val.match?(/(\A|[\w.-])@\d/) })
               name = op.remove_at(n)
               pre, ver = if (n = name.index('@')) == 0
                            [gemname, name[1..-1]]
                          else
                            [name[0, n], name[n.succ..-1]]
                          end
-              op.adjoin(pre, basic_option('version', ver))
+              op.adjoin(pre, quote_option('version', ver))
                 .clear
             end
             if flag == :install
@@ -1502,7 +1504,7 @@ module Squared
         def copy?
           return true if @copy.is_a?(Hash) ? copy[:into] : super
           return gemdir? if gemdir
-          return false unless @autodetect
+          return false unless autodetect
 
           set = lambda do |val, path|
             base = Pathname.new(path.strip)
@@ -1515,7 +1517,7 @@ module Squared
           end
           if version
             begin
-              case @autodetect
+              case autodetect
               when 'rvm'
                 pwd_set { `rvm info homes` }[/^\s+gem:\s+"(.+)"$/, 1]
               when 'rbenv'
@@ -1573,7 +1575,7 @@ module Squared
           log.error e
           self.version = nil
           @gemdir = nil
-          @autodetect = false
+          self.autodetect = false
         else
           gemdir?
         end
@@ -1652,7 +1654,7 @@ module Squared
         def unpack_get(tag, ext)
           return super unless ext == 'gem'
 
-          "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
+          "https://rubygems.org/downloads/#{tag.sub_ext('.gem')}"
         end
 
         def preopts

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

@@ -27,7 +27,7 @@ module Squared
           def multiple=(val)
             case val
             when Enumerable
-              @multiple.concat(val.to_a.map { |val| val.is_a?(Regexp) ? val : val.to_s })
+              @multiple.concat(val.to_a.map { |pat| pat.is_a?(Regexp) ? pat : pat.to_s })
             when String, Symbol, Pathname
               @multiple << val.to_s
             when Regexp

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

@@ -48,10 +48,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if quote || val.is_a?(Pathname)
-                  shell_quote(val, force: force, double: double)
-                elsif escape
+                if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
+                elsif quote || pa
+                  shell_quote(val, force: force, double: double)
                 else
                   val
                 end
@@ -336,7 +336,7 @@ module Squared
                   push opt
                   skip = true if args
                 end
-                skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
+                skip = true if first&.any? { |pat| pat.is_a?(Regexp) ? opt.match?(pat) : !opt.include?(pat) }
               end
             end
             @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})#{sep}(.+)\z/m
@@ -361,7 +361,8 @@ module Squared
             self
           end
 
-          def append_any(*args, escape: false, quote: true, **kwargs)
+          def append_any(*args, escape: false, **kwargs)
+            quote = kwargs.fetch(:quote, true)
             (args.empty? ? extras : args.flatten).each do |val|
               if block_given?
                 temp = val
@@ -369,7 +370,7 @@ module Squared
                 if val.is_a?(Array)
                   found << temp
                   k, v, q = val
-                  add_option(k, v, escape: escape, quote: quote, double: q == '"', merge: q == true, **kwargs)
+                  add_option(k, v, escape: escape, double: q == '"', merge: q == true, **kwargs)
                   next
                 end
               end
@@ -377,10 +378,10 @@ module Squared
 
               if exist?(val)
                 add_path(val, **kwargs)
-              elsif quote
-                add_quote(val, **kwargs)
               elsif escape
                 add shell_escape(val, **kwargs)
+              elsif quote
+                add_quote(val, **kwargs)
               else
                 add val
               end
@@ -494,7 +495,7 @@ module Squared
 
           def add_path(*args, option: nil, force: true, double: false, **kwargs)
             if args.empty?
-              args = select { |val| val.is_a?(String) }
+              args = grep(String)
               found.concat(args)
               args.map! { |val| path + val } if path
               append(args, force: force, **kwargs)
@@ -510,6 +511,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
+            kwargs.delete(:quote)
             merge(args.compact
                       .map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
@@ -520,8 +522,8 @@ module Squared
             self
           end
 
-          def add_first(fallback = nil, prefix: nil, path: false, escape: false, quote: false, reverse: false,
-                        expect: false, **kwargs)
+          def add_first(fallback = nil, prefix: nil, path: false, escape: false, reverse: false, expect: false,
+                        **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
               temp = val
@@ -529,10 +531,10 @@ module Squared
               unless block_given? && !(val = yield val).is_a?(String)
                 if path
                   add_path(val, **kwargs)
-                elsif quote
-                  add_quote(val, **kwargs)
                 elsif escape
                   add shell_escape(val, **kwargs)
+                elsif kwargs[:quote]
+                  add_quote(val, **kwargs)
                 else
                   add val
                 end

metadata

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