squared 0.4.33 → 0.4.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4c3610fd67d9cf3afa29add2ea865f0fbe13e075c384cb746f5074c473f7ef
-  data.tar.gz: 6328ffe0d303b321d8663a53c6d0c59b3b758bfb881d693c2d7ac5b322961db4
+  metadata.gz: 87083dafc757443f6f6afb994664bbb3089d4c57af8f32e06e2a9b76a21f520d
+  data.tar.gz: 8025828b76fce4826e3572e2546977ee7d998027aed144d9b119d84ba0a6e05d
 SHA512:
-  metadata.gz: 5e7c0fdee86fd208433ed3736383a1cd0bac10792fdbdb1e8e3c4829b9d77e78e02d603a79efe81b1b4c5944159bfd464aad9ccc834aeeea1431508554c0fc14
-  data.tar.gz: cfb6cc7335731677c8643ef3667dcb03707c6d3f9c7c1285f1ecf89c7f75ec827083c687a57449bd94d75d5881bf542031d430325035f594ba3300caa21faf64
+  metadata.gz: 868a4f6d3fbbd406eab3ce1d2c87850f7a59fe2161314b001e8a20b540f9c98bd71a8f4250699d463220337be7124e7d437d34178e5f6036f40087c188e4ab98
+  data.tar.gz: 60e6625462ad8f9d6efbf4b9029629f6eceee0316647be5bf19098c9c951a7de42b6411395135b1664c76f598ac63a40656541f3e669775cfefa6f9261d356cc

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [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.
+
+## [0.4.34] - 2025-12-26
+
+### Added
+
+- Project public base method scope for nested tasks was created.
+- Ruby task copy can autodetect "env" using [GEM_HOME|GEM_ROOT].
+
+### Changed
+
+- Python virtual environment did not install poetry during initialization.
+
+### Fixed
+
+- Workspace global banner never referenced the correct hash key.
+- Python task depend without editable did not append context directory.
+- Docker task build did not parse DOCKER_OPTIONS as command options.
+- Project base method build did not call Method routines.
+- Bundler autodetect did not check for valid gems directory.
+- Ruby copy to version detection did not check for valid gemspec.
+
 ## [0.4.33] - 2025-12-07
 
 ### Added
@@ -1144,6 +1177,8 @@
 
 - Changelog was created.
 
+[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/lib/squared/common/prompt.rb

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

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

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -179,7 +179,7 @@ module Squared
       end
 
       def with(*val, pass: false, group: nil, **kwargs, &blk)
-        return self if pass == true || (pass && Array(pass).map(&:to_s).any? { |s| respond_to?(s) && __send__(s) })
+        return self if pass == true || (pass && as_a(pass, :to_s).any? { |s| respond_to?(s) && __send__(s) rescue nil })
 
         @group = nil
         @ref = nil
@@ -274,9 +274,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group]
+                 @pass[:group][group.to_s]
                elsif ref
-                 @pass[:ref][ref]
+                 @pass[:ref][ref.to_sym]
                else
                  @pass[:global]
                end
@@ -573,7 +573,7 @@ module Squared
         return ret if group && (ret = @banner[:group][group.to_sym])
 
         ref.reverse_each { |val| return ret if (ret = @banner[:ref][val]) }
-        @banner[:ref][:'']
+        @banner[:ref][:_]
       end
 
       def enabled?

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

@@ -460,8 +460,14 @@ module Squared
             cmd = []
             var = {}
             args.each do |val|
-              next instance_exec(*val[1..-1], &val.first) if val.first.is_a?(Proc)
-
+              case val.first
+              when Proc
+                instance_exec(*val[1..-1], &val.first)
+                next
+              when Method
+                val.first.call(*val[1..-1])
+                next
+              end
               a, b, c, d, e = val
               case b
               when Hash
@@ -859,6 +865,12 @@ module Squared
           end
         end
 
+        def scope(*args, **kwargs, &blk)
+          namespace name do
+            task(*args, **kwargs, &blk)
+          end
+        end
+
         def variable_set(key, *args, **kwargs, &blk)
           if variables.include?(key) || blocks.include?(key)
             val = case args.size
@@ -891,7 +903,8 @@ module Squared
             when :env
               run_set(output[0], *args, **kwargs)
             when :dependfile
-              @dependfile = basepath(*args)
+              @dependindex = nil
+              @dependfile = val.nil? ? nil : basepath(*args)
             else
               if block_given?
                 if blocks.include?(key)
@@ -1052,8 +1065,7 @@ module Squared
           begin
             cmd.flatten.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
           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

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

@@ -262,21 +262,20 @@ module Squared
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
           return opts if script == false
 
-          ret = docker_session
           if from == :run
             if bake?(n = filetype)
-              ret << 'buildx bake'
+              ret = docker_session 'buildx bake'
               append_file n
               from = :bake
             elsif compose?(n)
-              ret << 'compose build'
+              ret = docker_session 'compose build'
               append_file n
               from = :compose
             else
-              ret << 'build'
+              ret = docker_session 'build'
             end
           else
-            ret << from
+            ret = docker_session from
           end
           case opts
           when String
@@ -666,8 +665,8 @@ module Squared
           end
         end
 
-        def list_image(flag, cmd, hint: nil, from: nil, no: true)
-          pwd_set do
+        def list_image(flag, cmd, hint: nil, no: true, from: nil)
+          pwd_set(from: from) do
             found = false
             index = 0
             all = option('all', prefix: 'docker')

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

@@ -1049,7 +1049,7 @@ module Squared
 
             cmd << "--#{command}"
           end
-          source
+          source(sync: sync)
         end
 
         def autostash(*, sync: invoked_sync?('autostash'), **)
@@ -1090,7 +1090,7 @@ module Squared
           append_hash opts
           cmd << '--quiet' unless 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))
@@ -1835,7 +1835,7 @@ module Squared
               return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
-              ret = `#{cmd}`
+              ret = `#{cmd}`.chomp
               if !ret.empty?
                 puts ret
               elsif success?(!banner.nil?)

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

@@ -27,7 +27,8 @@ module Squared
                       use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       reporter=b].freeze,
-          install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
+          install_base: %w[dangerously-allow-all-builds global-dir ignore-scripts offline prefer-offline store-dir=p
+                           virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
           install_as: %w[D|dev no-optional P|prod].freeze,
           update: %w[g|global i|interactive L|latest depth=i].freeze,
@@ -448,6 +449,7 @@ module Squared
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
+              cmd << '--dangerously-allow-all-builds' if option('approve-builds')
               append_nocolor
             else
               cmd = session 'npm', 'install'
@@ -676,7 +678,7 @@ module Squared
             log.info cmd.to_s
           end
           if sync
-            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
+            run(sync: sync, from: from, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
             require 'open3'
             on :first, from
@@ -799,7 +801,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
         end
 

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

@@ -30,15 +30,15 @@ module Squared
         OPT_POETRY = {
           common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
           build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
-          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=b
-                      u|username=b].freeze
+          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=q r|repository=b
+                      u|username=qq].freeze
         }.freeze
         OPT_PDM = {
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
           build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
                     k|skip=b].freeze,
           publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
-                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
+                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=qq].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
@@ -50,7 +50,7 @@ module Squared
         OPT_TWINE = {
           publish: %w[attestations disable-progress-bar non-interactive s|sign skip-existing verbose cert=p
                       client-cert=p c|comment=q config-file=p i|identity=b p|password=q r|repository=b repository-url=q
-                      sign-with=b u|username=q].freeze
+                      sign-with=b u|username=qq].freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE
 
@@ -343,6 +343,7 @@ module Squared
               cmd << '--no-root' if option('no-root')
             else
               cmd = pip_session 'install'
+              cmd << '--upgrade-strategy=eager' if env('PYTHON_UPDATE')
               if flag
                 case flag
                 when :user
@@ -497,7 +498,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
@@ -573,17 +573,21 @@ module Squared
         def variable_set(key, *val, **)
           case key
           when :dependfile
-            req = basepath(*val)
-            if (index = DEP_PYTHON.index(req.basename.to_s))
-              @dependindex = index
-              @dependfile = req
+            if val.first.nil?
+              super
             else
-              log.warn "variable_set: @#{key}=#{req} (not supported)"
+              req = basepath(*val)
+              if (index = DEP_PYTHON.index(req.basename.to_s))
+                @dependindex = index
+                @dependfile = req
+              else
+                log.warn "variable_set: @#{key}=#{req} (not supported)"
+              end
             end
           when :editable
             editable_set val.first
           when :venv
-            instance_variable_set(:"@#{key}", val.empty? ? nil : basepath(*val))
+            @venv = val.empty? || val.first.nil? ? nil : basepath(*val)
           else
             super
           end
@@ -604,10 +608,11 @@ module Squared
         end
 
         def python_session(*cmd, opts: nil)
-          return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
+          pre = preopts(quiet: false)
+          return session('python', *pre, *cmd, path: venv.nil?) unless opts
 
           op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: singleopt(:python))
-          ret = session('python', *op.to_a, *cmd, path: venv.nil?)
+          ret = session('python', *pre, *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
 
@@ -630,8 +635,8 @@ module Squared
         def create_session(*cmd, name:, common:, opts: nil)
           return session(name, *preopts, *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, single: singleopt)
-          ret = session(name, *op.to_a, *cmd, path: venv.nil?)
+          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          ret = session(name, *preopts, *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
 
@@ -685,14 +690,16 @@ module Squared
             OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
-              return
+              return unless installable?
             else
               val = basepath val
             end
-          elsif session_arg?('e', 'editable', target: target) || !(val = editable)
+          elsif session_arg?('e', 'editable', target: target) || !installable?
             return
+          else
+            val = editable
           end
-          target << quote_option('e', basepath(val))
+          target << (val ? quote_option('e', basepath(val)) : '.')
         end
 
         def append_global(target: @session)
@@ -868,9 +875,18 @@ module Squared
             .clear(pass: false)
           status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
+          install(:upgrade, ['poetry']) if poetry?
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 
+        def installable?
+          setuptools? || !!pyprojectfile
+        end
+
+        def setuptools?
+          dependtype == 2 || dependtype == 4
+        end
+
         def poetry?
           dependtype == 1
         end

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

@@ -855,7 +855,16 @@ 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)
+            return false unless base.join(gempath(val, 'specifications')).exist?
 
+            log.warn "using version #{val} (given #{version})" if version && version != val
+            self.version = val
+            self.gemdir = base + gempath
+          end
           if version
             begin
               case @autodetect
@@ -866,38 +875,28 @@ module Squared
                   self.gemdir = File.join($1, 'lib/ruby/gems', "#{$2}.0")
                 end
               when 'asdf'
-                val = pwd_set { `asdf where ruby` }
+                val = pwd_set { `asdf where ruby`.chomp }
                 self.gemdir = File.join(val, 'lib/ruby/gems', "#{$1}.0") if val =~ /(\d\.\d)\.[^.]+$/
               when /bundler?/
-                self.gemdir = pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
+                path = pwd_set { `bundle env` }[/^\s+Gem Path\s+(.+)$/, 1]
+                self.gemdir = path.split(File::PATH_SEPARATOR).find { |val| Dir.exist?(val) }
+              else
+                self.gemdir = ENV['GEM_HOME'] || ENV['GEM_ROOT']
               end
+              return true if gemdir?
             rescue StandardError => e
               log.debug e
             end
-            return true if gemdir?
-          end
-          return false unless @autodetect
-
-          set = lambda do |val, path|
-            if (ver = version) && ver != val
-              log.warn "using version #{val} (given #{ver})"
-            end
-            self.version = val
-            self.gemdir = Pathname.new(path.strip) + gempath
-          end
-          if version
-            opt = gempwd
-            pwd_set(pass: !opt.nil?) do
-              out = `#{gem_output(opt, 'list --local -d', gemname)}`
-              if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
+            pwd_set(pass: !gempwd.nil?) do
+              out = `#{gem_output(gempwd, 'list --local -d', gemname)}`
+              if out =~ /#{Regexp.escape(gemname)}\s+\((.+)\)$/
                 split_escape($1)
                   .unshift(@version)
                   .uniq
                   .each do |val|
-                    next unless out =~ /\(#{Regexp.escape(val)}(?:,[^)]+|\b)\):([^\n]+)/
+                    next unless out =~ /(?:\(#{Regexp.escape(val)}[^)]*\)|Installed at):\s+(.+)$/
 
-                    set.call(val, $1)
-                    return gemdir? if gemdir
+                    return gemdir? if set.call(val, $1)
                   end
               end
             end
@@ -1050,8 +1049,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/class.rb

@@ -135,9 +135,9 @@ module Squared
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :compact, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
-          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :concat, :index, :join, :map, :map!, :detect, :select, :select!, :reject, :size,
-                         :delete_at
+          def_delegators :@extras, :empty?, :member?, :each, :each_with_index, :each_with_object, :partition, :dup,
+                         :first, :last, :shift, :unshift, :pop, :push, :concat, :index, :join, :map, :map!, :detect,
+                         :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_at, :remove_at

data/lib/squared/workspace/repo.rb

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

data/lib/squared/workspace/series.rb

@@ -31,7 +31,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
 
@@ -40,6 +43,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
 
@@ -191,7 +195,7 @@ module Squared
         TASK_EXTEND[key].each do |kind|
           next unless obj.is_a?(kind)
 
-          if kind.instance_methods.include?(meth)
+          if kind.method_defined?(meth)
             out = obj.__send__(meth)
             return true if out == 1
             return out if obj.ref?(kind.ref)
@@ -232,7 +236,7 @@ module Squared
       end
 
       def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && @data[key].empty?)
+        @exclude.include?(key) || (empty && (!@data.key?(key) || @data[key].empty?))
       end
 
       private

metadata

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