squared 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3fd4d34940e2ce81d6aff4d5bb9ccd827c8c11f755808778c0f266fc53fbf00
-  data.tar.gz: 4a030838743ef95041fe4cd53a6a4491f9d5a5f89cca6dc1283c04429644cdc1
+  metadata.gz: bd07ce40c31b81be676defc0120ee1090e6bf020153b0234bcc9656e791279d3
+  data.tar.gz: e4179c5daf66d93a6795a3a15be28f93936d90da081fdfde2f779d05cddbc20e
 SHA512:
-  metadata.gz: d4e1ddf573b20ea122f1b03d0c7d14ac23542d09aac252ae5eda2185a13a1e42fc32302b82896a6ca07ec6dfcf58dfed81dc3e009f2f7b8c2b8f4ba10fddfe5c
-  data.tar.gz: 97bda796bfed20453137241f0f6cd98362d877fccc4674e1a1a0e615f1059ea8067d28a9f1d31e4a96b60c7fbb4011bb58ee05877e47ae3be0c41aea855bc872
+  metadata.gz: 437e260ef864d9734038ef84cf17bef22582d68f0081f4a8a7c4c16157bc32b3322673d2cb069ee84313b61243df30d65e3a3be432d613a2b977981e95b32aae
+  data.tar.gz: 02efccc2029b33cdfa91cf0da6454f7c9116e12320c7a378d8ccdf19d16a70414f36999fbf97bfd975ca24007c932e3d62d13753c4227ca565e6c569e3a36824

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # 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
@@ -1565,6 +1595,7 @@
 
 - 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
@@ -1574,6 +1605,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.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
@@ -1595,6 +1627,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.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

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

@@ -138,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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.6.8'
+  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

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

@@ -508,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
 
@@ -716,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?
@@ -1226,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
@@ -1277,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)
@@ -1370,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)
@@ -1541,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
@@ -1725,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)
@@ -1809,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
@@ -2269,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
@@ -2278,8 +2283,6 @@ module Squared
                         cmd.dup
                       end
             return
-          when Hash
-            @output = parse.call(data)
           else
             @output[0] = cmd
           end

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

@@ -774,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
@@ -1914,7 +1917,7 @@ module Squared
               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

@@ -877,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
@@ -1055,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

@@ -404,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
 

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
@@ -442,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
@@ -551,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
 
@@ -765,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 ') }
@@ -1258,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
@@ -1286,54 +1300,57 @@ module Squared
                                                     else
                                                       flag
                                                     end),
-                                   cmd, project: 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
@@ -1485,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
@@ -1496,36 +1523,23 @@ 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 'env'
-                ENV['GEM_HOME'] || ENV['GEM_ROOT']
               when /bundler?/
                 pwd_set { `bundle env` }[/^\s+Gem Path\s+(.+)$/, 1].split(File::PATH_SEPARATOR).find do |val|
-                  Dir.exist?(val)
+                  Dir.exist?(File.join(val, 'gems'))
                 end
-              end.tap { |val| self.gemdir = val if val }
+              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|
-            base = Pathname.new(path.strip)
-            dir = base + gempath
-            return false unless dir.writable? && base.join(gempath(val, 'specification')).exist?
-
-            log.warn "using version #{val}".subhint("given #{version}") if version && version != val
-            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)}`
+            pwd_set(pass: !gempwd.nil?) do
+              out = `#{gem_output(gempwd, 'list --local -d', gemname)}`
               next unless out =~ /#{Regexp.escape(gemname)}\s+\((.+)\)$/
 
               split_escape($1)

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

@@ -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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  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: []