squared 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73203f27b80dac94c1a96127b27afeb60d939e27adc578724264c9db26380ac0
-  data.tar.gz: 308784d8e94aefcb5b2da4b75e6614bb94e6d1a5d66fc4754d7e72072655e588
+  metadata.gz: bd07ce40c31b81be676defc0120ee1090e6bf020153b0234bcc9656e791279d3
+  data.tar.gz: e4179c5daf66d93a6795a3a15be28f93936d90da081fdfde2f779d05cddbc20e
 SHA512:
-  metadata.gz: 1f477ca8a24e892a052a2375283fbbf08af5cfc4714eaadba8c9465d59ad20e5d9bc6ae6cd624ff09780d62831cf2355918f01a851bbe09c52861d45479b1b6b
-  data.tar.gz: 289b353519bd3d5d7b13eb6f190428c74d9f4975e176094e65ba052a1febf28b2d719210efae09768cf0c3729d03b944bfd2344bde2025705cf2b0627d6bdfeb
+  metadata.gz: 437e260ef864d9734038ef84cf17bef22582d68f0081f4a8a7c4c16157bc32b3322673d2cb069ee84313b61243df30d65e3a3be432d613a2b977981e95b32aae
+  data.tar.gz: 02efccc2029b33cdfa91cf0da6454f7c9116e12320c7a378d8ccdf19d16a70414f36999fbf97bfd975ca24007c932e3d62d13753c4227ca565e6c569e3a36824

data/CHANGELOG.md

@@ -1,5 +1,76 @@
 # Changelog
 
+## [0.6.9] - 2025-01-07
+
+### Added
+
+- Bundler command config can be executed without [set|get] actions.
+
+### Changed
+
+- Application method with using hide and pass compatibility was implemented.
+
+## [0.5.21] - 2025-12-31
+
+### Fixed
+
+- See `0.4.35`.
+
+## [0.4.35] - 2025-12-31
+
+### Changed
+
+- Ruby task copy uses GEM_HOME as fallback for autodetect.
+
+### Fixed
+
+- Git commands [rebase|clone] did not forward sync flag.
+- Pip command install carelessly used an undefined method.
+- Common prompt method readline with multiline did not permit empty lines.
+- Application method with using pass did not ignore exceptions.
+- Git method source did not check command object for supported method.
+
+## [0.6.8] - 2025-12-26
+
+### Added
+
+- Ruby attribute project is extracted from Gemspec.
+
+### Changed
+
+- Project base task unpack no longer hard codes any extensions.
+
+### Fixed
+
+- Gem command outdated did not set bindir with update command.
+- Bundler ultimately never ended up learning how to spell JIT.
+
+## [0.5.20] - 2025-12-26
+
+### Fixed
+
+- Bundle config get method did not always discard newline.
+
+## [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.6.7] - 2025-12-07
 
 ### Added
@@ -1524,6 +1595,8 @@
 
 - Changelog was created.
 
+[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
 [0.6.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.6
 [0.6.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.5
@@ -1532,6 +1605,8 @@
 [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.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
 [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
@@ -1552,6 +1627,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.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
 [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

data/README.md

@@ -75,7 +75,7 @@ Workspace::Application
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("pi-r2", "pir2", copy: { from: :npm, also: %i[squared express], files: ["LICENSE", ["README.md.ruby", "README.md"]] }) # Uses dist files from NPM package spec
-  .add("squared", init: 'pnpm', script: ["build:stage1", "build:stage2"], group: "app") do # Use pnpm/yarn/berry for depend + Copy target (main)
+  .add("squared", init: "pnpm", script: ["build:stage1", "build:stage2"], group: "app") do # Use pnpm/yarn/berry for depend + Copy target (main)
     # Repo (global)
     as(:run, "build:dev", "dev")                                             # npm run build:dev -> npm run dev
     as(:run, { "build:dev": "dev", "build:prod": "prod" })
@@ -165,7 +165,7 @@ Workspace::Application
       .each(&:join)
     }
     apply :lint, proc {
-      bundle("exec", "-A --cache=true", with: "lint", verbose: true) # bundle exec --gemfile='/squared/Gemfile' rubocop --parallel -A --cache=true
+      bundle("exec", "-A --cache=true", with: "lint", verbose: true) # bundle exec --gemfile="/squared/Gemfile" rubocop --parallel -A --cache=true
     }
   end
   .with(:python, editable: false) do                                 # ref=Symbol | group=String
@@ -567,7 +567,7 @@ Commands which use commit hashes are parsed using a ":" prefix as to not be conf
 
 ```sh
 rake squared:log:view[:af012345]                   # git log af012345
-rake squared:log:view[H1,HEAD^5,all,lib,./H12345]  # git log --all @~1 @^5 -- 'lib' 'H12345'
+rake squared:log:view[H1,HEAD^5,all,lib,./H12345]  # git log --all @~1 @^5 -- "lib" "H12345"
 ```
 
 ## Environment
@@ -723,7 +723,7 @@ DOCKER_ALL=1                             # list every image/container
 DOCKER_Y=1                               # confirm all
 
 BUILD_SQUARED_OPTS="NODE_TAG=24 RUBY_VERSION=3.4.0" DOCKER_SQUARED_OPTS="--no-cache --label=v1" rake squared:build
-docker build --no-cache --label=v1 --build-arg='NODE_TAG=24' --build-arg='RUBY_VERSION=3.4.0' .
+docker build --no-cache --label=v1 --build-arg="NODE_TAG=24" --build-arg="RUBY_VERSION=3.4.0" .
 ```
 
 | Command    | Flag               | ENV                                             |
@@ -839,7 +839,8 @@ Features can be enabled through ENV when calling global tasks such as through *C
 | 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                     |
-| pnpm           | depend         | ALLOW_BUILD=s PUBLIC_HOIST_PATTERN=s                     |
+| pnpm           | depend         | PUBLIC_HOIST_PATTERN=s APPROVE_BUILDS                    |
+| pnpm           | depend:add     | ALLOW_BUILD=s                                            |
 | yarn           | depend package | IGNORE_ENGINES=0                                         |
 
 #### Python

data/lib/squared/common/format.rb

@@ -261,6 +261,8 @@ module Squared
           lines = val.to_s.lines(chomp: true)
           lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
         end
+        return if lines.empty?
+
         n = (cols.is_a?(::Array) ? cols.map(&:size).max : cols) || max.call(lines)
         if $stdout.tty?
           require 'io/console'

data/lib/squared/common/prompt.rb

@@ -89,7 +89,8 @@ module Squared
                 k = if ch == '*'
                       (min..max).to_a
                     else
-                      ch.split(/\s*,\s*/).map! do |s|
+                      ch.split(',').map! do |s|
+                        s.strip!
                         if s =~ /^(\d+)-(\d+)$/
                           next unless between.call($1) && between.call($2)
 
@@ -137,7 +138,11 @@ module Squared
           elsif block_given?
             Readline.readmultiline(msg, history, &blk)
           else
-            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val.to_s) } }
+            Readline.readmultiline(msg, history) do |line|
+              next if line.strip.empty?
+
+              multiline.any? { |val| line.split.last.end_with?(val.to_s) }
+            end
           end
         end
         case force

data/lib/squared/common/shell.rb

@@ -150,6 +150,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.6.7'
+  VERSION = '0.6.9'
 end

data/lib/squared/workspace/application.rb

@@ -201,8 +201,25 @@ module Squared
         self
       end
 
-      def with(*val, pass: false, group: nil, **kwargs, &blk)
-        return self if pass == true || (pass && as_a(pass, :to_s).any? { |s| respond_to?(s) && __send__(s) })
+      def with(*val, hide: nil, group: nil, **kwargs, &blk)
+        if hide.nil? && kwargs.key?(:pass)
+          pass = kwargs[:pass]
+          case pass
+          when true, false
+            hide = pass
+            kwargs.delete(:pass)
+          else
+            hide, pass = Array(pass).partition { |s| respond_to?(s) || s.to_s.end_with?('?') }
+            if pass.empty?
+              kwargs.delete(:pass)
+            elsif hide.empty?
+              hide = nil
+            else
+              kwargs[:pass] = pass
+            end
+          end
+        end
+        return self if hide == true || (hide && Array(hide).any? { |s| respond_to?(s) && __send__(s) rescue nil })
 
         @group = nil
         @ref = nil
@@ -298,9 +315,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
@@ -606,7 +623,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

@@ -396,13 +396,12 @@ module Squared
                       tag = param_guard(action, flag, args: args, key: :tag)
                       dir = param_guard(action, flag, args: args, key: :dir)
                       unless tag.match?(URI_SCHEME)
-                        tag = if ext == 'gem'
-                                "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
-                              elsif @release
-                                "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
-                              else
-                                raise_error ArgumentError, "no base uri: #{tag}", hint: ext
-                              end
+                        tag = unpack_get tag, ext
+                        tag ||= if @release
+                                  "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
+                                else
+                                  raise_error ArgumentError, "no base uri: #{tag}", hint: ext
+                                end
                       end
                       force = case (digest = args.digest)
                               when 'f', 'force'
@@ -509,7 +508,7 @@ module Squared
         end
 
         def build(*args, sync: invoked_sync?('build'), from: :run, **)
-          banner = verbose
+          banner = !silent?
           if args.empty?
             return unless from == :run
 
@@ -526,8 +525,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
@@ -711,7 +716,7 @@ module Squared
         end
 
         def unpack(target, file = nil, uri: nil, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
-                   verbose: self.verbose, from: :unpack)
+                   verbose: !silent?, from: :unpack)
           if !target.exist?
             target.mkpath
           elsif !target.directory?
@@ -862,6 +867,7 @@ module Squared
                    end
             cmd << name << version
           when :exec
+            cmd << name unless opts.first.start_with?(/#{name}\b/)
             cmd.merge(opts)
           when :current
             cmd << '--no-header' unless legacy
@@ -961,6 +967,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 block_given?
             if blocks.include?(key)
@@ -995,7 +1007,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
               instance_variable_set(:"@#{key}", val)
             end
@@ -1213,8 +1226,7 @@ module Squared
               run(val, var, sync: sync, banner: banner, **kwargs)
             end
           rescue StandardError => e
-            ret = on :error, from, e
-            raise unless ret == true
+            on_error(e, from, exception: kwargs.fetch(:exception, exception))
           end
           on :last, from
         end
@@ -1264,6 +1276,8 @@ module Squared
           else
             items = data[target.name] - done
           end
+          return done if items.empty?
+
           if out
             a, b, c, d, e = ARG[:GRAPH]
             f = tag.call(target)
@@ -1357,8 +1371,8 @@ module Squared
             if (obj = workspace.find(name: val))
               obj.enabled? ? [obj] : []
             else
-              workspace.find(group: val, ref: val.to_sym)
-            end.sort.each do |proj|
+              workspace.find(group: val, ref: val.to_sym).sort
+            end.each do |proj|
               next if pass.include?(name = proj.name)
 
               if proj.graph? && !data.key?(name) && !root.include?(name)
@@ -1528,7 +1542,7 @@ module Squared
         end
 
         def print_run(cmd, banner = true, verbose: nil, **)
-          return if banner || !stdout? || verbose == false
+          return if banner || !stdout? || verbose == false || env('BANNER', equals: '0')
 
           puts "\n> #{cmd}"
           printsucc
@@ -1712,7 +1726,9 @@ module Squared
               next if val.nil?
             end
             case val
-            when Array
+            when Hash
+              append_hash(val, target: target, build: build)
+            when Enumerable
               append_repeat(key, val, target: target)
             when Numeric
               target << basic_option(key, val)
@@ -1796,10 +1812,10 @@ module Squared
             next unless data.key?(key)
 
             out[key] = case (val = data[key])
-                       when Array
-                         base.fetch(key, []) + val
                        when Hash
                          base.fetch(key, {}).update(val)
+                       when Enumerable
+                         Array(base.fetch(key, [])) + val.to_a
                        else
                          val
                        end
@@ -2008,7 +2024,9 @@ module Squared
 
         def command(*args, verbose: true)
           out = unless verbose
-                  [">#{File::NULL}", '2>&1'].tap { |a| a.reverse if File::NULL == 'NUL' }.unshift('').join(' ')
+                  cmd = [">#{File::NULL}", '2>&1']
+                  cmd.reverse! if File::NULL == 'NUL'
+                  cmd.unshift('').join(' ')
                 end
           if workspace.powershell?
             "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
@@ -2254,7 +2272,9 @@ module Squared
           end
           self.global = global
           case cmd
-          when Array
+          when Hash
+            @output = parse.call(data)
+          when Enumerable
             @output = if cmd.all? { |data| data.is_a?(Hash) }
                         noopt = false
                         noenv = false
@@ -2263,8 +2283,6 @@ module Squared
                         cmd.dup
                       end
             return
-          when Hash
-            @output = parse.call(data)
           else
             @output[0] = cmd
           end
@@ -2362,6 +2380,10 @@ module Squared
           (global && @as[from][val]) || val
         end
 
+        def unpack_get(*)
+          nil
+        end
+
         def task_build(keys)
           namespace name do
             ws = workspace

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

@@ -323,21 +323,20 @@ module Squared
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
           return opts unless script
 
-          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
@@ -775,8 +774,8 @@ module Squared
           [cmd, status, no]
         end
 
-        def list_image(flag, cmd = docker_output('image ls -a'), hint: nil, from: nil, no: true)
-          pwd_set do
+        def list_image(flag, cmd = docker_output('image ls -a'), 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')

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

@@ -1075,7 +1075,7 @@ module Squared
 
             cmd << "--#{command}"
           end
-          source
+          source(sync: sync)
         end
 
         def autostash(*, sync: invoked_sync?('autostash'), **)
@@ -1128,7 +1128,7 @@ module Squared
           append_hash opts
           cmd << '--quiet' if option('quiet') || !verbose
           append_value(data[0], path, delim: true)
-          source(banner: sync && !quiet?, multiple: !sync || quiet?)
+          source(sync: sync, banner: sync && !quiet?, multiple: !sync || quiet?)
         end
 
         def stash(flag = nil, opts = [], sync: invoked_sync?('stash', flag))
@@ -1892,16 +1892,19 @@ module Squared
               banner = nil unless banner? && !multiple
               args = true
             end
-            if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
-              from = :"git:#{from}"
-            elsif from == false
+            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)
           end
           cmd = session_done cmd
           log&.info cmd
-          banner = format_banner(banner.is_a?(String) ? banner : cmd, hint: hint, strip: true) if banner
+          banner = if banner
+                     format_banner(banner.is_a?(String) ? banner : cmd, hint: hint, strip: true)
+                   end
           on :first, from
           begin
             if io
@@ -1910,11 +1913,11 @@ module Squared
               return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
-              ret = `#{cmd}`
-              raise(ret.chomp.empty? ? $?.to_s : ret) unless $?.success?
+              ret = `#{cmd}`.chomp
+              raise(ret.empty? ? $?.to_s : ret) unless $?.success?
 
               if ret.empty?
-                success?(nil, !banner.nil?)
+                success?(true, !banner.nil?)
               else
                 puts ret
               end
@@ -1928,7 +1931,7 @@ module Squared
                   n = write_lines(out, banner: banner, pass: true, **kwargs)
                   if n == 0
                     n = write_lines(err, banner: banner)
-                    success?(nil, n == 0 && !banner.nil?)
+                    success?(n == 0, n == 0 && !banner.nil?)
                   else
                     write_lines(err, loglevel: Logger::DEBUG)
                   end

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

@@ -31,7 +31,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_a: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
+          install_a: %w[dangerously-allow-all-builds global-dir ignore-scripts offline prefer-offline store-dir=p
+                        virtual-store-dir=p].freeze,
           install_b: %w[D|dev no-optional P|prod].freeze,
           add: %w[allow-build config g|global save-catalog D|save-dev O|save-optional save-peer P|save-prod
                   save-catalog-name=b].freeze,
@@ -577,6 +578,7 @@ module Squared
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
+              cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
               cmd = session 'npm'
               cmd << (ci = option('ci') ? 'ci' : 'install')
@@ -875,7 +877,7 @@ module Squared
             log.info cmd.to_s
           end
           if sync
-            run(from: from, sync: sync, interactive: !dryrun && ['Publish', 'N', npmname])
+            run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
           else
             require 'open3'
             on :first, from
@@ -1053,7 +1055,7 @@ module Squared
             raise_error 'version not found', hint: dependfile
           end
         rescue StandardError => e
-          on_error e, :bump
+          on_error(e, :bump, dryrun: dryrun?)
         end
 
         def pack(opts = [])

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

@@ -45,15 +45,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=q
-                      u|username=b].freeze
+          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=q r|repository=q
+                      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 q|quiet v|verbose=+ config-setting=q d|dest=p
                     p|project=p k|skip=b].freeze,
           publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|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
@@ -65,7 +65,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
         PASS_PYTHON = {
           python: %w[c v V].freeze,
@@ -386,6 +386,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
@@ -403,7 +404,7 @@ module Squared
               cmd << "-r #{DEP_PYTHON[4]}" if exist?(DEP_PYTHON[4]) && !session_arg?('r', 'requirement')
               append_editable
             end
-            run(from: :depend, sync: sync)
+            run(sync: sync, from: :depend)
           end
         end
 
@@ -588,7 +589,6 @@ module Squared
             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
@@ -762,17 +762,21 @@ module Squared
           end
           case key
           when :dependfile
-            val = basepath(*args)
-            if (index = DEP_PYTHON.index(val.basename.to_s))
-              @dependindex = index
-              @dependfile = val
+            if args.first.nil?
+              super
             else
-              log.warn "variable_set: @#{key}=#{val} (not supported)"
+              val = basepath(*args)
+              if (index = DEP_PYTHON.index(val.basename.to_s))
+                @dependindex = index
+                @dependfile = val
+              else
+                log.warn "variable_set: @#{key}=#{val} (not supported)"
+              end
             end
           when :editable
             editable_set args.first
           when :venv
-            instance_variable_set(:"@#{key}", (basepath(*args) unless args.empty?))
+            @venv = args.empty? || args.first.nil? ? nil : basepath(*args)
           else
             super
           end
@@ -797,10 +801,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))
-          [session('python', *op.to_a, *cmd, path: venv.nil?), op.extras]
+          [session('python', *pre, *op.to_a, *cmd, path: venv.nil?), op.extras]
         end
 
         def poetry_session(*cmd)
@@ -820,8 +825,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)
-          [session(name, *op.to_a, *cmd, path: venv.nil?), op.extras]
+          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          [session(name, *preopts, *op.to_a, *cmd, path: venv.nil?), op.extras]
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
@@ -877,14 +882,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)
@@ -1063,9 +1070,9 @@ module Squared
           status = op.append(dir, delim: true)
                      .clear(pass: false)
                      .arg?(/\A-v+\z/)
-          success?(run(op, env, exception: true, banner: banner), banner, !status) do |ret|
-            puts(ret && dir.directory? ? "Success: #{dir}" : 'Failed')
-          end
+          ret = run(op, env, exception: true, banner: banner)
+          pip(:install, 'poetry', banner: false) if poetry?
+          success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
         end
 
         def pip_install?(flag)

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

@@ -48,7 +48,7 @@ module Squared
           cache: %w[frozen no-all no-install no-prune quiet cache-path=p gemfile=p].freeze,
           check: %w[dry-run gemfile=p path=p].freeze,
           clean: %w[dry-run force].freeze,
-          config: %w[global local].freeze,
+          config: %w[global local skip-parseable].freeze,
           doctor: %w[quiet ssl gemfile=p].freeze,
           doctor_ssl: %w[host=q tls-version=b verify-mode=b].freeze,
           exec: %w[gemfile=p].freeze,
@@ -69,6 +69,7 @@ module Squared
           show: %w[outdated paths].freeze,
           update: %w[all conservative local major minor patch pre ruby strict bundler=b? g|group=q source=q].freeze,
           no: {
+            config: %w[parseable].freeze,
             gem: %w[changelog ci coc exe linter mit test].freeze
           }.freeze
         }.freeze
@@ -223,6 +224,10 @@ module Squared
           end
         end
 
+        def project=(val)
+          @project = val.dup
+        end
+
         def gemdir=(val)
           @gemdir = if val.is_a?(Pathname)
                       val
@@ -438,10 +443,10 @@ module Squared
                                                                   when :exec then 'command,args*|:'
                                                                   end)
                         task flag do |_, args|
-                          bundle(flag, opts: args.to_a, banner: true)
+                          bundle(flag, opts: args.to_a, banner: flag == :exec ? verbose? : true)
                         end
                       when :config
-                        format_desc action, flag, 'list|set|get|unset?,args*'
+                        format_desc action, flag, 'list|set|get|unset?,opts*,args*'
                         task flag do |_, args|
                           bundle(flag, *args.to_a, banner: true)
                         end
@@ -547,7 +552,7 @@ module Squared
               end
             end
             option('jobs') { |n| cmd << "-j#{n}" if n.to_i > 0 }
-            run_rb(from: :depend, sync: sync)
+            run_rb(sync: sync, from: :depend)
           end
         end
 
@@ -761,41 +766,42 @@ module Squared
               order = { 'rbenv' => -1, 'rvm' => -1, 'asdf' => -1, 'chruby' => -1 }
               ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
                 order.each_key do |key|
-                  if val.match?(%r{[/.]#{key}/})
-                    order[key] = index
-                    break
-                  end
+                  next unless val.match?(%r{[/.]#{key}/})
+
+                  order[key] = index
+                  break
                 end
               end
-              paths = [
-                "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
-                '$HOME/.rvm/bin/rvm',
-                @asdf ? "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/installs/#{@asdf.first}" : nil,
-                '/usr/bin/rbenv',
-                '/usr/local/rvm/bin/rvm',
-                '/usr/share/rvm/bin/rvm',
-                '/usr/local/share/chruby/chruby.sh'
-              ].compact
-              paths.sort do |a, b|
-                c = -1
-                d = -1
-                order.each do |key, val|
-                  pat = %r{/\.?#{key}}
-                  c = val if a.match?(pat)
-                  d = val if b.match?(pat)
-                end
-                if c == d
-                  0
-                elsif c == -1
-                  1
-                elsif d == -1
-                  -1
-                else
-                  c < d ? -1 : 1
+              if @asdf
+                [File.join(ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf'), "installs/#{@asdf.first}")]
+              else
+                [
+                  "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
+                  '$HOME/.rvm/bin/rvm',
+                  '/usr/bin/rbenv',
+                  '/usr/local/rvm/bin/rvm',
+                  '/usr/share/rvm/bin/rvm',
+                  '/usr/local/share/chruby/chruby.sh'
+                ].sort do |a, b|
+                  c = -1
+                  d = -1
+                  order.each do |key, val|
+                    pat = %r{/\.?#{key}}
+                    c = val if a.match?(pat)
+                    d = val if b.match?(pat)
+                  end
+                  if c == d
+                    0
+                  elsif c == -1
+                    1
+                  elsif d == -1
+                    -1
+                  else
+                    c < d ? -1 : 1
+                  end
                 end
-              end
-              .push('')
-              .each do |val|
+                .push('')
+              end.each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
                 trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
@@ -1064,28 +1070,27 @@ module Squared
                                 multiple: true, force: false, index: true, border: true).map! { |n| items[n.pred].last }
               end
               unless Array(update).empty?
-                cmd = gem_output 'update -f'
+                opts = ['f']
                 option('document', prefix: 'gem', ignore: false) do |val|
-                  cmd << case val
-                         when '0', 'false'
-                           '--no-document'
-                         else
-                           basic_option 'document', val
-                         end
+                  opts << case val
+                          when '0', 'false'
+                            'no-document'
+                          else
+                            "document=#{val}"
+                          end
                 end
                 option('user-install', prefix: 'gem', ignore: false) do |val|
-                  cmd << case val
-                         when '0', 'false'
-                           '--no-user-install'
-                         else
-                           '--user-install'
-                         end
+                  opts << case val
+                          when '0', 'false'
+                            'no-user-install'
+                          else
+                            'user-install'
+                          end
                 end
-                cmd.merge(update.quote!)
                 if filter[:dryrun]
-                  print_run cmd, false
+                  print_run gem_output('update -f', *update.quote!), false
                 else
-                  run(cmd, sync: sync, banner: false, from: :'gem:update')
+                  gem(:update, *update, opts: opts)
                 end
               end
               print_status(*major, from: :outdated)
@@ -1154,6 +1159,9 @@ module Squared
             end
             op.append(quote: false)
           when :update
+            if !op.arg?('n', 'bindir') && (bin = config_get('bin')) && Dir.exist?(bin)
+              op << quote_option('bindir', bin)
+            end
             if op.arg?('system')
               op.add_first(quote: false) { |val| val if val.match?(SEM_VER) }
             else
@@ -1252,15 +1260,27 @@ module Squared
           when :cache, :check, :clean, :init, :install, :lock, :pack, :package, :platform
             pre = true
             opts.concat(args)
+          when :config
+            if args.empty?
+              pre = true
+            else
+              case (pre = args.shift)
+              when 'list', 'get', 'set', 'unset'
+                cmd << pre
+              else
+                args.unshift(pre)
+              end
+              opts.concat(args)
+            end
           when :doctor
             case (pre = (val = args.shift) || opts.shift)
             when 'diagnose', 'ssl'
               cmd << pre
             else
               if val
-                args << val
+                args.unshift(val)
               elsif pre
-                opts << pre
+                opts.unshift(pre)
               end
               pre = true
             end
@@ -1280,54 +1300,57 @@ module Squared
                                                     else
                                                       flag
                                                     end),
-                                   cmd, proect: self, no: OPT_BUNDLE[:no][flag], args: flag == :exec)
+                                   cmd,
+                                   project: self, no: OPT_BUNDLE[:no][flag], args: flag == :exec || flag == :config)
           op.concat(args) unless pre
           output = false
           invalid = ->(a) { raise_error ArgumentError, "unrecognized args: #{a.join(', ')}", hint: flag }
           case flag
           when :config
-            if op.empty?
-              op << (val = readline('Enter arguments', force: false))
-              output = val.match?(/(?:un)?set/)
-            else
+            if pre == 'list'
+              op.clear
+            elsif !op.empty?
               a = op.dup
-              b, c, d = op.slice!(0, 3)
-              e = op.arg?('global', 'local')
-              op << b
-              getname = -> { op << (c || readline('Enter name', force: true)) }
-              case b
-              when 'list'
-                nil
+              b, c = op.slice!(0, 2)
+              d = op.arg?('global', 'local')
+              getname = -> { op << (b || readline('Enter name', force: true)) }
+              case pre
               when 'get'
                 getname.call
               when 'set'
-                if e
-                  op << c
-                  c = d
-                  d = op.shift
+                if d
+                  op << b
+                  b = c
+                  c = op.shift
                 end
                 getname.call
-                op << (d || readline('Enter value', force: true))
+                op << (c || readline('Enter value', force: true))
                 output = true
               when 'unset'
-                if e
-                  op << c
-                  c = d
+                if d
+                  op << b
+                  b = c
                 end
                 getname.call
                 output = true
               else
-                if b
-                  op << b
-                  if c
-                    op.add_quote(c)
-                    output = true
-                  end
+                if c && !op.arg?('parseable', 'no-parseable')
+                  op.adjoin('set') << b
+                  op.add_quote(c)
+                  output = true
+                  exit 1 unless confirm_basic('Confirm?', op, 'Y')
+                elsif b
+                  op.adjoin('get') << b
+                  op.unshift(c) if c
                 else
                   invalid.call(a)
                 end
               end
               op.clear
+            else
+              val = readline('Enter arguments', force: false)
+              op << (val.empty? ? 'list' : val)
+              output = val.match?(/^(un)?set/)
             end
           when :plugin
             case plu
@@ -1337,7 +1360,7 @@ module Squared
               op.clear
             end
           when :exec
-            if op.empty? || (op.delete(':') && op.append(quote: false))
+            if op.empty? || (op.remove(':') && op.append(quote: false))
               op << readline('Enter arguments', force: true)
             else
               op.append(quote: false)
@@ -1466,6 +1489,12 @@ module Squared
           @gemname ||= ((spec = gemspec) ? spec.name : project)
         end
 
+        def project
+          return @project unless @project.frozen?
+
+          @project = ((spec = gemspec) ? spec.name : @project).dup
+        end
+
         def depend?
           @depend != false && (!@depend.nil? || outdated?)
         end
@@ -1473,7 +1502,17 @@ module Squared
         def copy?
           return true if @copy.is_a?(Hash) ? copy[:into] : super
           return gemdir? if gemdir
+          return false unless @autodetect
 
+          set = lambda do |val, path|
+            base = Pathname.new(path.strip)
+            dir = base + gempath
+            return false unless dir.writable? && base.join(gempath(val, 'specifications')).exist?
+
+            log.warn "using version #{val}".subhint("given #{version}") if version && version != val
+            self.version = val
+            self.gemdir = dir
+          end
           if version
             begin
               case @autodetect
@@ -1484,43 +1523,32 @@ module Squared
                   File.join($1, 'lib/ruby/gems', "#{$2}.0")
                 end
               when 'asdf'
-                pwd_set { `asdf where ruby` }.yield_self do |val|
+                pwd_set { `asdf where ruby`.chomp }.yield_self do |val|
                   val =~ /(\d\.\d)\.[^.]+$/ && File.join(val, 'lib/ruby/gems', "#{$1}.0")
                 end
               when /bundler?/
-                pwd_set { `bundle env` }[/^\s+Gem Path\s+([^#{File::PATH_SEPARATOR}]+)/, 1]
-              end.tap { |val| self.gemdir = val if val }
+                pwd_set { `bundle env` }[/^\s+Gem Path\s+(.+)$/, 1].split(File::PATH_SEPARATOR).find do |val|
+                  Dir.exist?(File.join(val, 'gems'))
+                end
+              else
+                ENV['GEM_HOME'] || ENV['GEM_ROOT']
+              end.tap do |val|
+                return true if val && set.call(version, val)
+              end
             rescue StandardError => e
               log.debug e
             end
-            return true if gemdir?
-          end
-          return false unless @autodetect
-
-          set = lambda do |val, path|
-            dir = Pathname.new(path.strip) + gempath
-            return false unless dir.writable?
-
-            if (ver = version) && ver != val
-              log.warn "using version #{val}".subhint("given #{ver}")
-            end
-            self.version = val
-            self.gemdir = dir
-          end
-          if version
-            opt = gempwd
-            pwd_set(pass: !opt.nil?) do
-              out = `#{gem_output(opt, 'list --local -d', gemname)}`
-              next unless out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
+            pwd_set(pass: !gempwd.nil?) do
+              out = `#{gem_output(gempwd, 'list --local -d', gemname)}`
+              next unless out =~ /#{Regexp.escape(gemname)}\s+\((.+)\)$/
 
               split_escape($1)
                 .unshift(version)
                 .uniq
                 .each do |val|
-                  next unless out =~ /\(#{Regexp.escape(val)}[^)]*\):([^\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
             self.gemdir = Pathname.new(Gem.dir) + gempath
@@ -1600,19 +1628,19 @@ module Squared
         end
 
         def config_get(key)
-          ret = if pwd_set { `#{bundle_output('config get --parseable', key)}` } =~ /\A([^=]+)=(.*)\z/ && $1 == key
-                  $2.chomp
-                end
-          case ret
+          out = pwd_set { `#{bundle_output('config get --parseable', key)}`.chomp }
+          return unless out =~ /\A([^=]+)=(.*)\z/ && $1 == key
+
+          case (out = $2)
           when 'true'
             true
           when '', '[]'
             nil
           else
-            if ret =~ /\A\[:(.+)\]\z/
-              $1.split(', :').map! { |val| ((val.delete_prefix!('"') && val.delete_suffix!('"')) || val).to_sym }
+            if out =~ /\A\[:(.+)\]\z/
+              $1.split(', :').map { |val| ((val.delete_prefix!('"') && val.delete_suffix!('"')) || val).to_sym }
             else
-              ret || false
+              out || false
             end
           end
         end
@@ -1621,6 +1649,12 @@ module Squared
           run(bundle_output('config', ('--global' if global), 'set', key, *val), banner: false, series: true)
         end
 
+        def unpack_get(tag, ext)
+          return super unless ext == 'gem'
+
+          "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
+        end
+
         def preopts
           verbose? ? ['--verbose'] : []
         end
@@ -1698,9 +1732,9 @@ module Squared
 
         def gemfile
           if @gemfile.nil?
-            @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
-                                      .concat(path.glob('*.gemspec'))
-                                      .find(&:exist?) || false
+            @gemfile = [@project, name].map { |val| basepath("#{val}.gemspec") }
+                                       .concat(path.glob('*.gemspec'))
+                                       .find(&:exist?) || false
           end
           @gemfile || nil
         end
@@ -1714,8 +1748,10 @@ 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?

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

@@ -173,9 +173,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, :shift, :unshift,
-                         :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select, :select!, :slice, :slice!,
-                         :reject, :size
+          def_delegators :@extras, :empty?, :member?, :each, :each_with_index, :each_with_object, :partition, :dup,
+                         :first, :shift, :unshift, :pop, :push, :concat, :index, :join, :detect, :map, :map!, :select,
+                         :select!, :reject, :slice, :slice!, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at
@@ -587,10 +587,12 @@ module Squared
                           elsif exclude.first.is_a?(Symbol)
                             partition(&exclude.first)
                           else
+                            exclude.map! { |pat| Regexp.new(pat) }
                             partition do |val|
-                              next false if pattern && OptionPartition.pattern?(val)
+                              val = val.to_s
+                              next if pattern && OptionPartition.pattern?(val)
 
-                              exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                              exclude.none? { |pat| val.match?(pat) }
                             end
                           end
             unless temp.empty?

data/lib/squared/workspace/repo.rb

@@ -243,9 +243,8 @@ module Squared
                            true
                          else
                            Common::Prompt.confirm(
-                             "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?",
-                             'N',
-                             force: true, timeout: env('REPO_TIMEOUT', 15, ignore: '0')
+                             "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation?", 'N',
+                             force: true, timeout: env('REPO_TIMEOUT').to_i.yield_self { |n| n > 0 ? n : 15 }
                            )
                          end
       end

data/lib/squared/workspace/series.rb

@@ -32,7 +32,10 @@ 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
 
@@ -41,6 +44,7 @@ module Squared
             obj.each { |key, val| TASK_ALIAS[key][ref] = val }
           elsif TASK_ALIAS.key?(obj)
             TASK_ALIAS[obj].delete(ref)
+            TASK_ALIAS.delete(obj) if TASK_ALIAS[obj].empty?
           end
         end
 
@@ -243,7 +247,7 @@ module Squared
       end
 
       def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && self[key].empty?)
+        @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
       end
 
       private

metadata

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