squared 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bc9a21d89644d6af172db450fcd7e4221df93564e8a047791f47cb536d27abd
-  data.tar.gz: 3e2b746efc3797971655d80430135e2a599018e6c8037ebaab3d70200409e74b
+  metadata.gz: 404b6e4de1ff62a628030bfa5487287dac6a962a6e052297537533a29ff6be2c
+  data.tar.gz: a136f94da4653d88325e3ed571523d1d3a57d8974695ce306bfadd6c2264e6c1
 SHA512:
-  metadata.gz: 2f7351e9a9aeef1cd2016d3406d6d71408a6e7ae1b51d9e0973e56eae5bf290c3ecf633e12ddec196bf5b21f53a7c97e0762f5fdfc78e4c22c9f54bd2e9a235a
-  data.tar.gz: 7c699292f19f06c8a03e8e92a7ccc2e82fe7ce640acd268a60c31b12e2a4dc9fa10669b357222e3b3c3ee2227b7846f9e5fa91f6da9d499d7b6ff8340e440958
+  metadata.gz: 26e2e83cdefdb8b3c9641f1aa5880432426cfbd807ddb659252f10735eafb0353d61d80ef87876251c6b8720fa434d5cb0df7a541476ff4573f71e6c8a49b27d
+  data.tar.gz: c457360ca63c5941594781613662c51b3d5ae18d9bac436f70357ebbc4ef2418504f8f376981cc03bb5590bc20d9540909fd2318414b631c091b64ee8e58df04

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [0.3.7] - 2025-04-08
+
+- See `0.2.7`.
+
+## [0.2.7] - 2025-04-08
+
+### Fixed
+
+- Paths that conflict with git options can be quoted.
+- Bundle command update did not append package names.
+- Git result status type was truncated.
+- Log messages were concatenated without separator.
+- Python pip environment options used undefined session.
+- Regexp "o" modifier was not used properly.
+- Rake did not run individual project Rakefile.
+- Ruby commands did not delimit exec arguments.
+
+## [0.3.6] - 2025-03-12
+
+### Added
+
+- Git command stash action clear was implemented.
+
+### Fixed
+
+- Git command stash did not validate index argument.
+- Project graph command does not require arguments.
+- Ruby gem command exec did not add project name.
+
 ## [0.3.5] - 2025-03-06
 
 ### Fixed
@@ -302,12 +331,15 @@
 
 - Changelog was created.
 
+[0.3.7]: https://github.com/anpham6/squared/releases/tag/v0.3.7-ruby
+[0.3.6]: https://github.com/anpham6/squared/releases/tag/v0.3.6-ruby
 [0.3.5]: https://github.com/anpham6/squared/releases/tag/v0.3.5-ruby
 [0.3.4]: https://github.com/anpham6/squared/releases/tag/v0.3.4-ruby
 [0.3.3]: https://github.com/anpham6/squared/releases/tag/v0.3.3-ruby
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.7]: https://github.com/anpham6/squared/releases/tag/v0.2.7-ruby
 [0.2.6]: https://github.com/anpham6/squared/releases/tag/v0.2.6-ruby
 [0.2.5]: https://github.com/anpham6/squared/releases/tag/v0.2.5-ruby
 [0.2.4]: https://github.com/anpham6/squared/releases/tag/v0.2.4-ruby

data/lib/squared/common/format.rb

@@ -114,7 +114,7 @@ module Squared
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
-          elsif val >= 0 && val <= 256
+          elsif val.between?(0, 256)
             ret << val
           elsif val < 0 && (b = val.to_s.split('.')[1])
             b = b[0, 3]
@@ -174,12 +174,8 @@ module Squared
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]
-          if subject
-            msg << (color ? sub_style(subject, :underline) : subject)
-          else
-            msg += args
-            args.clear
-          end
+          msg << (color ? sub_style(subject, :underline) : subject) if subject
+          msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
       end

data/lib/squared/common/shell.rb

@@ -27,7 +27,8 @@ module Squared
 
       def shell_quote(val, force: true)
         val = val.to_s
-        return val if (!force && !val.include?(' ')) || val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m)
+        return val if !force && !val.include?(' ')
+        return val if option && val =~ /(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m
 
         Rake::Win32.windows? || ARG[:QUOTE] == '"' ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
@@ -79,7 +80,7 @@ module Squared
       end
 
       def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/o)
+        val.split(/\s*(?<!\\)#{char}\s*/)
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -88,7 +88,7 @@ module Squared
             return ret.to_i
           end
         when ::Numeric
-          return key if key >= 0 && key <= 2
+          return key if key.between?(0, 2)
         end
         default
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -404,7 +404,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/o, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)

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

@@ -254,7 +254,7 @@ module Squared
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
-                      args = param_guard(action, flag, args: args.to_a.reject { |val| name == val.to_s })
+                      args = args.to_a.reject { |val| name == val.to_s }
                       if flag == :run
                         graph args
                       else
@@ -684,7 +684,7 @@ module Squared
               log&.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync
+              print_item format_banner(cmd, banner: banner) if sync && !env('BANNER', equals: '0')
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
               shell(*args, chdir: chdir, exception: exception)
             end
@@ -778,7 +778,13 @@ module Squared
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
+                  if ENV.key?(key = "BANNER_#{proj.name.upcase}")
+                    key = nil
+                  else
+                    ENV[key] = '0'
+                  end
                   run(cmd, sync: false, banner: false)
+                  ENV.delete(key) if key
                 elsif proj.has?(meth, tasks || group ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end
@@ -892,7 +898,7 @@ module Squared
           nil
         end
 
-        def option_sanitize(opts, list, target: @session, no: nil, first: false, pass: ['='])
+        def option_sanitize(opts, list, target: @session, no: nil, args: false, first: false, pass: ['='])
           ret = []
           reg = []
           bare = []
@@ -961,6 +967,7 @@ module Squared
                 opt = a
               else
                 ret << opt
+                found = true if args
               end
               found = true if first && pass.none? { |val| opt.include?(val) }
             end
@@ -969,9 +976,11 @@ module Squared
         end
 
         def option_clear(opts, target: @session, **kwargs)
+          return if opts.empty?
+
           kwargs[:subject] ||= target&.first
-          kwargs[:hint] ||= 'not used'
-          warn log_message(Logger::WARN, opts.join(', '), **kwargs) unless opts.empty?
+          kwargs[:hint] ||= 'unrecognized'
+          warn log_message(:warn, opts.join(', '), **kwargs)
         end
 
         def print_item(*val)
@@ -1221,7 +1230,7 @@ module Squared
 
         def param_guard(action, flag, args: nil, key: nil, pat: nil)
           if args && key
-            val = args[key]
+            val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat))
 
             @session = nil

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

@@ -72,12 +72,14 @@ module Squared
 
     module Project
       class Git < Base
+        include Prompt
+
         OPT_GIT = {
           branch: %w[a|all create-reflog i|ignore-case q|quiet r|remotes v|verbose abbrev=i color=b column=b
                      contains=e format=q merged=e no-contains=e no-merged=e points-at=e u|set-upstream-to=e sort=q
                      t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
-                       pathspec-file-nul q quiet orphan=e ours theirs conflict=b pathspec-from-file=p
+                       pathspec-file-nul q|quiet orphan=e ours theirs conflict=b pathspec-from-file=p
                        t|track=b].freeze,
           diff: {
             base: %w[0 1|base 2|ours 3|theirs].freeze,
@@ -236,7 +238,7 @@ module Squared
           'restore' => %i[source worktree staged overlay].freeze,
           'rev' => %i[commit branch output parseopt].freeze,
           'show' => %i[format oneline].freeze,
-          'stash' => %i[push pop apply drop list].freeze,
+          'stash' => %i[push pop apply drop clear list].freeze,
           'tag' => %i[add delete list].freeze
         }.freeze
 
@@ -544,7 +546,7 @@ module Squared
                       format_desc action, flag, 'remote,opts*,pattern*'
                       task flag, [:remote] do |_, args|
                         remote = param_guard(action, flag, args: args, key: :remote)
-                        ls_remote(flag, args.to_a.drop(1), remote: remote)
+                        ls_remote(flag, args.extras, remote: remote)
                       end
                     else
                       format_desc action, flag, 'opts*,pattern*'
@@ -656,8 +658,15 @@ module Squared
             when :push
               append_pathspec refs
             when :pop, :apply, :drop
-              cmd << shell_quote(refs.pop)
-              option_clear refs
+              unless refs.empty?
+                cmd << shell_escape(refs.pop)
+                option_clear refs
+              end
+            when :clear
+              if confirm("Remove #{sub_style('all', styles: theme[:active])} the stash entries? [y/N] ", 'N')
+                source(stdout: true)
+              end
+              return
             when :list
               out, banner, from = source(io: true)
               print_item banner
@@ -905,10 +914,10 @@ module Squared
               unless (origin = option('repository', prefix: 'git', ignore: false))
                 out = source(git_output('log -n1 --format=%h%d'), io: true, stdout: true, banner: false).first
                 if out =~ /^#{data[2]} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/
-                  split_escape($1).each do |val|
-                    next unless val.end_with?("/#{branch}")
+                  split_escape($1).each do |s|
+                    next unless s.end_with?("/#{branch}")
 
-                    origin = val[0, val.size - branch.size - 1]
+                    origin = s[0, s.size - branch.size - 1]
                     break
                   end
                 end
@@ -1203,7 +1212,7 @@ module Squared
             if size > 0
               styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
               styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/e?s\z/, '') : type}",
+              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
                                 sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
             else
               puts empty_status("No #{type} were #{action}", 'grep', grep.is_a?(Array) ? case grep.size

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

@@ -892,7 +892,7 @@ module Squared
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
           c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
           e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          Common::Prompt.confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
+          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
         end
 
         def dryrun?(prefix = dependbin, **)

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

@@ -265,10 +265,12 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          append_nocolor(target: target)
-          return [] unless from && !opts.empty?
-
+          if !from || opts.empty?
+            append_global(target: target)
+            return []
+          end
           opts, pat = option_sanitize(opts, OPT_PIP[from] + OPT_PIP[:common], target: target)
+          append_global(target: target)
           out = []
           edit = nil
           opts.each do |opt|
@@ -302,18 +304,18 @@ module Squared
           end
         end
 
-        def append_global
+        def append_global(target: @session)
           if (val = option('cache-dir'))
-            cmd << case val
-                   when '0', 'false'
-                     '--no-cache-dir'
-                   else
-                     quote_option('cache-dir', basepath(val))
-                   end
+            target << case val
+                      when '0', 'false'
+                        '--no-cache-dir'
+                      else
+                        quote_option('cache-dir', basepath(val))
+                      end
           end
-          cmd << shell_option('proxy', val) if (val = option('proxy'))
-          cmd << quote_option('python', basepath(val)) if (val = option('python'))
-          append_nocolor
+          target << shell_option('proxy', val) if (val = option('proxy'))
+          target << quote_option('python', basepath(val)) if (val = option('python'))
+          append_nocolor(target: target)
         end
       end
 

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

@@ -7,7 +7,7 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_BUNDLE = {
-          common: %w[no-color V verbose retry=i].freeze,
+          common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system path=p binstubs=p? standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
           install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
@@ -155,7 +155,7 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated, :build, :push, :exec
-                        format_desc action, flag, 'opts*'
+                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command+' : nil)
                         task flag do |_, args|
                           gemx flag, args.to_a
                         end
@@ -342,7 +342,8 @@ module Squared
 
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common]
+          append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
+                        append: flag != :all)
           run_rb(from: :update)
         end
 
@@ -366,8 +367,11 @@ module Squared
           when :install, :'user-install', :update
             list += OPT_GEM[:shared]
             no = OPT_GEM[:shared_no]
+            first = true
+          when :pristine
+            first = true
           end
-          opts, pat = option_sanitize(opts, list, no: no, first: true)
+          opts, pat = option_sanitize(opts, list, no: no, first: first)
           out = []
           opts.each do |opt|
             if opt =~ pat
@@ -470,7 +474,7 @@ module Squared
             end
           when :exec
             raise_error('gem', flag, hint: 'no command given') if out.empty?
-            cmd << out.join(' ')
+            cmd << project << out.join(' ')
           else
             if out.empty? && cmd.none? { |val| val =~ /^--system(?:=|$)/ }
               raise_error('gem', flag, hint: 'no gemname given')
@@ -502,7 +506,7 @@ module Squared
           cmd = bundle_session flag
           case flag
           when 'exec', 'check'
-            args = option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common]).first
+            args = option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common], args: flag == :exec).first
           end
           raise_error('bundle', flag, hint: 'no command given') unless !args.empty? || flag == 'check'
           cmd.merge(args)
@@ -511,7 +515,7 @@ module Squared
 
         def rake(*cmd)
           if cmd.empty?
-            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd)
+            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd, banner: false)
           else
             cmd = cmd.flatten.map { |val| rake_output(rakeapp, val) }
             run_s(cmd, from: :rake, chdir: workspace.pwd, banner: false)
@@ -588,9 +592,13 @@ module Squared
           run(banner: !@session.include?('--quiet'), **kwargs)
         end
 
-        def append_bundle(opts, list, target: @session)
+        def append_bundle(opts, list, target: @session, append: false)
           out = option_sanitize(opts, list, target: target).first
-          option_clear(out, target: target)
+          if append
+            append_value(out, target: target, escape: true)
+          else
+            option_clear(out, target: target)
+          end
         end
 
         def gem_session(*cmd, **kwargs)
@@ -651,7 +659,7 @@ module Squared
         end
 
         def rakeapp
-          quote_option 'rakefile', Rake.application.rakefile
+          quote_option 'f', rakefile
         end
 
         def rakepwd

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake