squared 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed5b9e99423ac6374d36ad8dffd6a50f2714cef292d6324e358ae19d6a547ed9
-  data.tar.gz: 1e6358b439d1defc1f6d9601e915c49b619b00614fc104911ac0554dd61ce6cd
+  metadata.gz: 7bc8d196a7c5068373757f7bbb9ba037cafd30500875d924628690f57451b927
+  data.tar.gz: '00078ddc57f3f357cc9833a679c42d636936d0db91e75a327a07ba19dedd0165'
 SHA512:
-  metadata.gz: 0e973fe0eb9137cd8e822b3eb5e28fc8275e69f17414373205944c28350b616cb58dae4fe41eb647ab2a018f5a21a3e7e43854cf0711a4f59c15614948bb328c
-  data.tar.gz: '0293c7c12c7c8d66a7783162a4d1fd5b9a0ae87f3476e0c0dae73f9a3d918fcda4d93a31894b327161a6b571be9c4988bcb0fb2abff0c10995fe4a64af4e93de'
+  metadata.gz: c5b85d626962791e9da8355f82999b0ab8bcd1e63f88605c6a3dfecb8b5b515469373acb8f7d79eab4887b3b3f826e1d540133361b74e5c3e3160545215b3641
+  data.tar.gz: ee09108c1abea47c45ae2a931e01a9b1e42097dd597537796543321aaca03b9825d9942a26274c7fbca344f748b1d4b8765102dcd7b74f54489e7dc2115b5a97

data/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [0.9.2] - 2026-11-04
+
+### Added
+
+- sqd: Option --no-gemfile for undoing bundle exec project wrapper.
+- sqd: Option --commit for pushing files to remote branch.
+- sqd: Option --mulitline for writing messages with newlines.
+- sqd: Option --amend[-orig] for replacing current commit.
+- sqd: Option --project can match common subtasks.
+
+### Changed
+
+- Logger warn statements from project misconfiguration were downgraded.
+- sqd: Task creation from joins are validated before consuming arguments.
+
+### Fixed
+
+- sqd: Option --project did not support multiple patterns.
+
+## [0.8.8]
+
+- See `0.7.15`.
+
+## [0.7.15]
+
+### Added
+
+- Git command commit action pathspec was implemented.
+- Common base argument TAB for column alignment was created.
+- Node command package action deny can modify currently approved scripts.
+
+### Changed
+
+- Node command package action [approve|deny] uses install-scripts ls.
+
+### Fixed
+
+- Bundle exec wrapper as a Hash did not support using alternate Gemfile.
+- Common base ARG data objects were not frozen with __freeze__.
+
 ## [0.9.1] - 2026-10-22
 
 ### Added
@@ -99,7 +139,7 @@
 
 - OptionPartition did not parse quoted option values.
 
-## [0.6.20] - 2026-09-25
+## [0.6.20]
 
 ### Added
 
@@ -2234,8 +2274,10 @@
 
 - Changelog was created.
 
+[0.9.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.9.2
 [0.9.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.9.1
 [0.9.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.9.0
+[0.8.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.8
 [0.8.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.7
 [0.8.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.6
 [0.8.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.5
@@ -2244,6 +2286,7 @@
 [0.8.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.2
 [0.8.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.1
 [0.8.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.0
+[0.7.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.15
 [0.7.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.14
 [0.7.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.13
 [0.7.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.12

data/README.md

@@ -32,7 +32,7 @@ gem install squared
 There is an additional program wrapper for ``rake`` to be used when running batch commands and to enable global settings more easily.
 
 ```xml
-Usage: sqd [options] [rake options] [global...] [:targets...] -- [rake targets...]
+Usage: sqd [options] [rake options] [pathspec...] -- [global...] [:targets...] -- [rake targets...]
 
     -R, --ref STR,STR                Run global commands by class reference
     -G, --group STR,STR              Run global commands by project group
@@ -49,14 +49,19 @@ Usage: sqd [options] [rake options] [global...] [:targets...] -- [rake targets..
     -y, --yes [STR,STR]              Enable auto-approve through ENV by application
     -d, --dry-run                    Run commands without any modifying actions
 
-    -S, --select PAGE[:CHOICE]       Prompt menu selection pagination display (e.g. 15:75)
+    -S, --select PAGE[:CHOICE]       Prompt menu selection pagination display (e.g. 20:60)
+    -M, --multiline STR              Use advanced editor with custom message terminator (e.g. EOF)
 
-    -g, --gemfile                    Execute commands using bundle exec and nearest Gemfile
+    -g, --[no-]gemfile               Execute commands using bundle exec and nearest Gemfile
     -p, --pipe 0|1|2                 Set file descriptor for communication
     -o, --pipe-out FILE              Write command data stream to a file
         --fail 0..4                  Set application exception level
         --log-level SEVERITY         Set logger and exception state (debug, info, warn, error, fatal)
 
+    -c, --commit                     Push files remotely on active branch from current directory
+        --amend                      Replace the tip of the active branch remotely with a force push
+        --amend-orig                 Perform an amend commit without changing the message
+
         --[no-]banner                Display executing command attributes
     -x, --[no-]color                 Use enhanced styling for terminal output
     -X, --plain                      Disable banner and styling for all commands

data/exe/sqd

@@ -1,43 +1,46 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-$:.unshift(File.expand_path('../lib', __dir__)) if File.exist?(File.expand_path('../squared.gemspec', __dir__))
-
 require 'squared'
 require 'rake'
 require 'optparse'
 
 class SqdParser < OptionParser
-  include Squared::Common::Format
+  include Squared
+  include Common::Format
   include Utils
 
+  OPT_DASH = /^--?[^-]/.freeze
+
   attr_reader :options, :global
+  attr_accessor :argv
 
   def initialize(*)
-    super
     @options = { 'project-args': [], 'project-env': [] }
     @global = []
+    @argv = ARGV.dup
+    super
     @program_name = 'squared'
     @raise_unknown = false
     @require_exact = true
   end
 
   def parse_global(list, assert:)
-    raise ArgumentError, "cannot be used with --#{assert}" if options.key?(assert)
-
-    ARGV.each_with_index do |val, index|
+    error_exit "cannot be used with --#{assert}" if options.key?(assert)
+    each_with_index do |val, index|
       if val == '--'
         separator!(index: index)
         break
       end
-      next if val.start_with?('-') || val.include?(':') || val.empty?
+      found = list.map { |name| "#{val}:#{name}" }.select { |name| tasks.include?(name) }
+      next if found.empty?
 
-      global.concat(list.map { |name| "#{val}:#{name}" })
+      global.concat(found)
       ARGV[index] = ''
     end
   end
 
-  def parse_common(list, session:, arg:)
+  def parse_common(list, arg:)
     if list && !list.include?('*')
       session[arg].merge!(list.to_h { |key| [key, 'true'] })
     else
@@ -45,7 +48,7 @@ class SqdParser < OptionParser
     end
   end
 
-  def parse_series(list, session:, flag:)
+  def parse_series(list, flag:)
     pattern, parallel = list.partition do |val|
       next false if val.match?(%r{^[\w~`!@#%&\-=:;"'<>/]+$})
 
@@ -58,18 +61,146 @@ class SqdParser < OptionParser
     (session[:APP][:"build_parallel#{s}"] ||= []).concat(parallel) unless parallel.empty?
   end
 
-  def banner_set(val, session:)
+  def parse_range(val, max:, arg:, min: 0)
+    error_exit('out of range', hint: val) unless val.between?(min, max)
+    session[arg] = val
+  end
+
+  def parse_rakefile
+    OptionParser.new do |opts|
+      opts.raise_unknown = false
+      opts.on('--rakefile', '-f [FILENAME]', '') do |val|
+        return val || ''
+      end
+    end.parse(ARGV.dup)
+    nil
+  end
+
+  def option_select(val)
+    page, choice = val.split(/\D/, 2).map(&:to_i)
+    error_exit('not an integer', hint: val) if choice.nil? ? page == 0 : choice == 0
+    session[:PAGE] = page if page > 0
+    session[:CHOICE] = choice if choice.to_i > 0
+    ENV['SELECT'] = "#{page}:#{choice}"
+  end
+
+  def option_multiline(val)
+    Common::Prompt.multiline = val
+  rescue NotImplementedError => e
+    warn log_warn(e, hint: argv.find { |val| multilineopts.include?(val) })
+  end
+
+  def option_gemfile(val)
+    require 'pathname'
+    session[:APP][:ruby_gemfile] = val
+    return unless val
+    return if ENV['RUBYOPT']&.match?(/(^|\b)-r.+#{File::SEPARATOR}bundler#{File::SEPARATOR}setup\b/)
+
+    gemfile = Pathname.pwd.ascend { |path| break path if path.join('Gemfile').file? } || ENV['BUNDLE_GEMFILE']
+    return unless gemfile && (argv.delete('--gemfile') || argv.delete('-g'))
+
+    argv.unshift('sqd')
+    if gemfile.is_a?(String)
+      gemfile = Common::Shell.shell_escape(Pathname.new(gemfile).relative_path_from(Dir.pwd), quote: true)
+      argv.unshift("--gemfile=#{gemfile}")
+      gemfile = Dir.pwd
+    end
+    ENV['BUNDLE_GEMFILE'] = nil
+    exec(Common::Shell.shell_bin('bundle'), 'exec', *argv, chdir: gemfile)
+  end
+
+  def option_loglevel(val)
+    require 'logger'
+    severity = case val
+               when :debug then Logger::DEBUG
+               when :info then Logger::INFO
+               when :warn then Logger::WARN
+               when :error then Logger::ERROR
+               when :fatal then Logger::FATAL
+               else
+                 val.to_i
+               end
+    session[:LEVEL] = severity
+    ENV['LOG_LEVEL'] = severity.to_s
+  end
+
+  def option_commit(*opts, flag:)
+    require 'squared/workspace'
+    c = argv.index { |val| opts.include?(val) } || error_exit('option was not found', hint: opts.last)
+    check_exclusive('-c', '--commit', '--amend', '--amend-orig', flag: argv[c])
+    first = lambda do
+      if ARGV.empty?
+        m = argv.index { |val| multilineopts.include?(val) }
+        t = argv.index { |val| !val.match?(OPT_DASH) } || -1
+        return true if c == 0 || (m == 0 && c == 2) || t > c
+      end
+      !rakefile?
+    end
+    refs = []
+    found = argv[c.succ]
+    j = -1
+    each_with_index do |pat, i|
+      found = nil if pat == found
+      if i == j
+        ARGV[i.pred] = ''
+        ARGV[i] = ''
+        option_multiline pat
+        next
+      end
+      next if found
+
+      case pat
+      when '--'
+        ARGV[i] = ''
+        break
+      when *multilineopts
+        j = i.succ
+        next
+      when OPT_DASH
+        next if refs.empty? || Dir[pat].empty?
+      else
+        next if refs.empty? && Dir[pat].empty?
+      end
+      refs << pat
+      ARGV[i] = ''
+    end
+    if refs.empty?
+      if !`git status -s --ignore-submodules=all --ignored=no`.empty?
+        refs << '*'
+      elsif first.call
+        warn 'No files to commit.'
+        exit 1
+      else
+        return
+      end
+    end
+    Workspace::Application
+      .new
+      .add(File.basename(Dir.pwd), ref: :git) { commit(flag, refs: refs.uniq, pass: nil) }
+    exit if first.call
+    self.argv = ARGV.dup
+  end
+
+  def option_verbose
+    unless session[:VERBOSE]
+      session[:VERBOSE] = $VERBOSE ? 1 : 0
+      global.unshift('--verbose')
+    end
+    ENV['VERBOSE'] = (session[:VERBOSE] += 1).to_s
+  end
+
+  def banner_set(val)
     session[:BANNER] = val
     ENV['BANNER'] = val ? 'true' : 'false'
   end
 
-  def color_set(val, session:)
+  def color_set(val)
     if (session[:COLOR] = val)
       enable_aixterm
       enable_drawing
     else
       enable_drawing false
-      Squared::Common.const_get(:VAR)[:colors].freeze
+      Common.const_get(:VAR)[:colors].freeze
     end
     ENV['NO_COLOR'] = val ? nil : '1'
     ENV['FORCE_COLOR'] = val ? '2' : '0'
@@ -86,57 +217,111 @@ class SqdParser < OptionParser
       rescue RegexpError
         false
       end
+      subtasks = []
       pattern.each do |val|
         val = if val == '*'
                 '[^:]+'
               else
                 val.sub(/^\*/, '.*')
                    .sub(/(?<!\.)\*$/, '.*')
-                   .gsub(/\.([*+])/, '[^:]\1?')
+                   .gsub(/(?<!\\)\.([*+])(?!\?)/, '[^:]\1?')
               end
-        IO.popen("rake -T \"^#{val}:\"").each { |line| project << $1 if line =~ /\Arake (#{val}):/o }
+        pat = /^(#{val.chomp(':')}):/
+        tasks.each do |task|
+          next unless task =~ pat
+
+          subtasks << $1
+          name = task.split(':', 2).first
+          project << name unless project.include?(name)
+        end
       end
       exit 1 if project.empty? && !pattern.empty?
-      project.uniq!
+      subtasks.uniq!
       options[:'project-env'].each do |val|
         n = val.index('=')
-        key = val[...n]
-        val = val[n.succ..].stripquote
+        key = val[0...n]
+        val = val[n.succ..-1].stripquote
         project.each { |name| ENV["#{key}_#{env_key(name.split(':').first)}"] = val }
       end
-      ARGV.each_with_index do |val, index|
+      each_with_index do |val, index|
         if val == '--'
           separator!(index: index)
           break
         end
         next unless val.start_with?(':')
 
-        args = options[:'project-args'].shift
-        global.concat(project.map { |name| "#{name}#{val}#{"[#{args}]" if args}" })
+        found = subtasks.map { |name| "#{name}#{val}" }.select { |name| tasks.include?(name) }
+        if (args = options[:'project-args'].shift)
+          found.map! { |name| "#{name}[#{args}]" }
+        end
+        global.concat(found)
         ARGV[index] = ''
       end
     end
-    ARGV.reject!(&:empty?)
     Rake.application.run(global.concat(ARGV))
   end
 
+  def tasks
+    @tasks ||= Rake.with_application do |rake|
+      if (rakefile = parse_rakefile)
+        rakefiles = rake.instance_variable_get(:@rakefiles)
+        rakefiles.clear
+        rakefiles << rakefile
+      end
+      rake.raw_load_rakefile
+    end.tasks.map(&:name)
+  end
+
   def separator!(index:)
     ARGV[index] = '' if ARGV.grep('--').size > 1
   end
 
-  def error_exit(*val, hint)
+  def check_exclusive(*args, flag:)
+    args.delete(flag)
+    return unless (n = index(*args))
+
+    error_exit "cannot be used with #{argv[n]}"
+  end
+
+  def error_exit(*val, hint: nil)
     raise OptionParser::InvalidArgument, message(*val, hint: hint), caller(1)
   end
+
+  def session
+    Common::ARG
+  end
+
+  def multilineopts
+    %w[-M --multiline]
+  end
+
+  def each_with_index(&blk)
+    ARGV.each_with_index(&blk)
+    ARGV.reject!(&:empty?)
+  end
+
+  def index(*args)
+    argv.each_with_index do |val, i|
+      return i if args.any? { |s| val == s || (s.start_with?('--') && val.start_with?("#{s}=")) }
+    end
+    nil
+  end
+
+  def warn(*args)
+    $stderr.puts(*args)
+  end
+
+  def rakefile?
+    Rake.application.find_rakefile_location || parse_rakefile ? true : false
+  end
 end
 
 SqdParser.new do |sqd|
-  session = Squared::Common::ARG
-  argv = ARGV.dup
-  sqd.banner = 'Usage: sqd [options] [rake options] [global...] [:targets...] -- [rake targets...]'
+  sqd.banner = 'Usage: sqd [options] [rake options] [pathspec...] -- [global...] [:targets...] -- [rake targets...]'
   sqd.separator ''
   sqd.on('-R', '--ref STR,STR', Array, 'Run global commands by class reference') do |val|
     sqd.parse_global(val, assert: :group)
-    session[:APP][:series_ref_min] = 1
+    sqd.session[:APP][:series_ref_min] = 1
   end
   sqd.on('-G', '--group STR,STR', Array, 'Run global commands by project group') do |val|
     sqd.parse_global(val, assert: :ref)
@@ -147,105 +332,84 @@ SqdParser.new do |sqd|
     sqd.options[:'project-args'] << val
   end
   sqd.on('-e', '--project-env KEY=STR', 'Provide command ENV variables for :targets (multiple)') do |val|
-    sqd.error_exit('missing value', "#{val}=") unless val.include?('=')
+    sqd.error_exit('missing value', hint: "#{val}=") unless val.include?('=')
     sqd.options[:'project-env'] << val
   end
   sqd.separator ''
   sqd.on('-s', '--[no-]strict', 'Do not run commands with invalid arguments') do |val|
-    session[:STRICT] = val
+    sqd.session[:STRICT] = val
     ENV['STRICT'] = val ? 'true' : 'false'
   end
   sqd.on('--update', 'Use update strategy for applicable commands') do
     ENV['UPDATE'] = 'true'
   end
   sqd.on('-u', '--parallel STR,PAT', Array, 'Run standard tasks with multi-task threads') do |val|
-    sqd.parse_series(val, session: session, flag: :parallel)
+    sqd.parse_series(val, flag: :parallel)
   end
   sqd.on('-U', '--sync STR,PAT', Array, 'Run parallel tasks in a series sequentially') do |val|
-    sqd.parse_series(val, session: session, flag: :sync)
+    sqd.parse_series(val, flag: :sync)
   end
   sqd.on('-F', '--force [STR,STR]', Array, 'Enable force through ENV by application') do |val|
-    sqd.parse_common(val, session: session, arg: :FORCE)
+    sqd.parse_common(val, arg: :FORCE)
   end
   sqd.on('-y', '--yes [STR,STR]', Array, 'Enable auto-approve through ENV by application') do |val|
-    sqd.parse_common(val, session: session, arg: :YES)
+    sqd.parse_common(val, arg: :YES)
   end
   sqd.on('-d', '--dry-run', 'Run commands without any modifying actions') do
     ENV['DRY_RUN'] = 'true'
   end
   sqd.separator ''
-  sqd.on('-S', '--select PAGE[:CHOICE]', 'Prompt menu selection pagination display (e.g. 15:75)') do |val|
-    page, choice = val.split(/\D/, 2).map(&:to_i)
-    sqd.error_exit('not an integer', val) if choice.nil? ? page == 0 : choice == 0
-    session[:PAGE] = page if page > 0
-    session[:CHOICE] = choice if choice.to_i > 0
-    ENV['SELECT'] = "#{page}:#{choice}"
+  sqd.on('-S', '--select PAGE[:CHOICE]', 'Prompt menu selection pagination display (e.g. 20:60)') do |val|
+    sqd.option_select(val)
+  end
+  sqd.on('-M', '--multiline STR', 'Use advanced editor with custom message terminator (e.g. EOF)') do |val|
+    sqd.option_multiline(val)
   end
   sqd.separator ''
-  sqd.on('-g', '--gemfile', 'Execute commands using bundle exec and nearest Gemfile') do
-    require 'pathname'
-    next if ENV['RUBYOPT']&.match?(/(^|\b)-r.+#{File::SEPARATOR}bundler#{File::SEPARATOR}setup\b/)
-
-    gemfile = Pathname.pwd.ascend { |path| break path if path.join('Gemfile').file? } || ENV['BUNDLE_GEMFILE']
-    next unless gemfile && (argv.delete('--gemfile') || argv.delete('-g'))
-
-    include Squared::Common
-    include Shell
-
-    argv.unshift('sqd')
-    if gemfile.is_a?(String)
-      argv.unshift("--gemfile=#{shell_escape(Pathname.new(gemfile).relative_path_from(Dir.pwd), quote: true)}")
-      gemfile = Dir.pwd
-    end
-    ENV['BUNDLE_GEMFILE'] = nil
-    exec(shell_bin('bundle'), 'exec', *argv, chdir: gemfile)
+  sqd.on('-g', '--[no-]gemfile', 'Execute commands using bundle exec and nearest Gemfile') do |val|
+    sqd.option_gemfile(val)
   end
   sqd.on('-p', '--pipe 0|1|2', Integer, 'Set file descriptor for communication') do |val|
-    sqd.error_exit('out of range', val) unless val.between?(0, 2)
-    session[:PIPE] = val
+    sqd.parse_range(val, max: 2, arg: :PIPE)
   end
   sqd.on('-o', '--pipe-out FILE', 'Write command data stream to a file') do |val|
-    sqd.error_exit("missing an explicit \".#{File::SEPARATOR}\"", val) unless val.include?(File::SEPARATOR)
-    session[:OUT] = val
+    sqd.error_exit("missing an explicit \".#{File::SEPARATOR}\"", hint: val) unless val.include?(File::SEPARATOR)
+    sqd.session[:OUT] = val
   end
   sqd.on('--fail 0..4', Integer, 'Set application exception level') do |val|
-    sqd.error_exit('out of range', val) unless val.between?(0, 4)
-    session[:FAIL] = val
+    sqd.parse_range(val, max: 4, arg: :FAIL)
   end
   %i[debug info warn error fatal].then do |state|
     values = state + (0..4).map(&:to_s)
     sqd.on('--log-level SEVERITY', values, "Set logger and exception state (#{state.join(', ')})") do |val|
-      require 'logger'
-      severity = case val
-                 when :debug then Logger::DEBUG
-                 when :info then Logger::INFO
-                 when :warn then Logger::WARN
-                 when :error then Logger::ERROR
-                 when :fatal then Logger::FATAL
-                 else
-                   val.to_i
-                 end
-      session[:LEVEL] = severity
-      ENV['LOG_LEVEL'] = severity.to_s
+      sqd.option_loglevel(val)
+    end
+  end
+  if Pathname.pwd.join('.git').directory?
+    sqd.separator ''
+    sqd.on('-c', '--commit', 'Push files remotely on active branch from current directory') do
+      sqd.option_commit('-c', '--commit', flag: :pathspec)
+    end
+    sqd.on('--amend', 'Replace the tip of the active branch remotely with a force push') do
+      sqd.option_commit('--amend', flag: :amend)
+    end
+    sqd.on('--amend-orig', 'Perform an amend commit without changing the message') do
+      sqd.option_commit('--amend-orig', flag: :'amend-orig')
     end
   end
   sqd.separator ''
   sqd.on('--[no-]banner', 'Display executing command attributes') do |val|
-    sqd.banner_set(val, session: session)
+    sqd.banner_set(val)
   end
   sqd.on('-x', '--[no-]color', 'Use enhanced styling for terminal output') do |val|
-    sqd.color_set(val, session: session)
+    sqd.color_set(val)
   end
   sqd.on('-X', '--plain', 'Disable banner and styling for all commands') do
-    sqd.banner_set(false, session: session)
-    sqd.color_set(false, session: session)
+    sqd.banner_set(false)
+    sqd.color_set(false)
   end
   sqd.on('-v', '--verbose', 'Increase output verbosity (multiple)') do
-    unless session[:VERBOSE]
-      session[:VERBOSE] = $VERBOSE ? 1 : 0
-      sqd.global.unshift('--verbose')
-    end
-    ENV['VERBOSE'] = (session[:VERBOSE] += 1).to_s
+    sqd.option_verbose
   end
   sqd.on('--version', 'Print the current version') do
     puts Squared::VERSION

data/lib/squared/common/base.rb

@@ -17,6 +17,7 @@ module Squared
       BANNER: true,
       PAGE: 20,
       CHOICE: 100,
+      TAB: 4,
       QUOTE: "'",
       SPACE: ' => ',
       SUCCESS: 'Success',
@@ -105,6 +106,7 @@ module Squared
 
     def __freeze__
       PATH.freeze
+      ARG.each_value { |val| val.freeze if val.is_a?(::Hash) || val.is_a?(::Array) }
       ARG.freeze
       VAR.each_value(&:freeze)
       VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }

data/lib/squared/common/format.rb

@@ -301,7 +301,7 @@ module Squared
         if footer
           unless sub.empty? && !right
             footer.map! do |s|
-              s = s.rjust(n + 4) if right
+              s = s.rjust(n + ARG[:TAB]) if right
               sub.each { |h| sub_style!(s, **h) }
               s
             end

data/lib/squared/common/prompt.rb

@@ -5,12 +5,30 @@ require 'timeout'
 module Squared
   module Common
     module Prompt
-      def self.reline
-        require 'reline'
-        Reline
-      rescue LoadError
-        require 'readline'
-        Readline
+      class << self
+        def reline
+          require 'reline'
+          Reline
+        rescue LoadError
+          require 'readline'
+          Readline
+        end
+
+        def multiline=(val)
+          raise NotImplementedError, 'multiline is available only with reline' unless multiline?
+
+          @multiline = case val
+                       when '', '0', 'false' then nil
+                       else
+                         val.split(',').map(&:strip)
+                       end
+        end
+
+        def multiline?
+          reline.respond_to?(:readmultiline)
+        end
+
+        attr_reader :multiline
       end
 
       module_function
@@ -169,8 +187,8 @@ module Squared
         end
       end
 
-      def readline(msg, history = false, force: nil, multiline: nil, &blk)
-        multiline = nil unless Prompt.reline.respond_to?(:readmultiline)
+      def readline(msg, history = false, force: nil, multiline: Prompt.multiline, &blk)
+        multiline = nil unless Prompt.multiline?
         read = lambda do
           if !multiline
             Prompt.reline.readline(msg, history)

data/lib/squared/version.rb

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

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

@@ -607,10 +607,10 @@ module Squared
               @clean.each do |val|
                 src = basepath(val = val.to_s)
                 if src.directory? && val.match?(%r{[\\/]\z})
-                  log&.warn "rm -rf #{src}"
+                  log&.info "rm -rf #{src}"
                   rm_rf(src, verbose: !silent?)
                 else
-                  log&.warn "rm #{src}"
+                  log&.info "rm #{src}"
                   (val.include?('*') ? Dir[src] : [src]).each do |file|
                     next unless File.file?(file)
 
@@ -864,7 +864,7 @@ module Squared
               instance_variable_set :"@#{key}", [blk]
             end
           else
-            log&.warn "series: @#{key}".subhint('invalid')
+            log&.debug "series: @#{key}".subhint('invalid')
           end
           self
         end
@@ -876,7 +876,7 @@ module Squared
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          if interactive && sync && !(@session && option('y'))
+          if interactive && sync && !(@session && option('y', 'yes'))
             print_item(series: true)
             msg, y, h = case interactive
                         when Array
@@ -1019,7 +1019,7 @@ module Squared
               instance_variable_set(:"@#{key}", val)
             end
           else
-            log&.warn "variable_set: @#{key}".subhint('private')
+            log&.debug "variable_set: @#{key}".subhint('private')
           end
           self
         end
@@ -1701,7 +1701,7 @@ module Squared
             ret = case key.downcase
                   when 'force'
                     getarg.call(:FORCE)
-                  when 'y'
+                  when 'y', 'yes'
                     getarg.call(:YES)
                   end
             return yield(ret) if !ret.nil? && block_given?
@@ -2161,7 +2161,7 @@ module Squared
         end
 
         def confirm_basic(msg, hint, accept = 'Y', style: :inline, target: @session, prefix: target&.first, **kwargs)
-          return true if option('y', prefix: prefix)
+          return true if option('y', 'yes', prefix: prefix)
 
           confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", accept, **kwargs)
         end
@@ -2726,10 +2726,12 @@ module Squared
         end
 
         def checkdir?(val)
-          return true if val.directory? && !val.empty?
-
-          log&.warn "directory \"#{val}\"".subhint(val.directory? ? 'empty' : 'missing')
-          false
+          if val.directory? && !val.empty?
+            true
+          else
+            log&.warn "directory \"#{val}\"".subhint(val.directory? ? 'empty' : 'missing')
+            false
+          end
         end
 
         def printfirst?

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

@@ -422,7 +422,7 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          elsif sync || option('y', prefix: 'docker')
+          elsif sync || option('y', 'yes', prefix: 'docker')
             image :rm
           end
         end
@@ -731,7 +731,7 @@ module Squared
               return
             end
             op << id
-            if option('y')
+            if option('y', 'yes')
               exception = false
               banner = false
             end
@@ -966,7 +966,7 @@ module Squared
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from == :'image:rm' && option('y', prefix: 'docker')
+            y = from == :'image:rm' && option('y', 'yes', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
@@ -1013,7 +1013,7 @@ module Squared
                        end
                 pad = cols.map(&:size).max
                 cols.each { |key| puts "#{g + f} #{key.rjust(pad)}: #{Array(data[key]).join(', ')}" }
-                w = 9 + flag.to_s.size + 4 + ee.size
+                w = 9 + flag.to_s.size + ARG[:TAB] + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
                 next unless confirm("#{h + b}?", no ? 'N' : 'Y')

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

@@ -363,7 +363,7 @@ module Squared
         subtasks({
           'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
-          'commit' => %i[head add all amend amend-orig fixup].freeze,
+          'commit' => %i[head add all pathspec amend amend-orig fixup].freeze,
           'clone' => %i[branch tag].freeze,
           'diff' => %i[head branch files view between contain].freeze,
           'range-diff' => %i[view between contain].freeze,
@@ -530,7 +530,7 @@ module Squared
                           if flag == :add
                             opts = param_guard(action, flag, args: args.to_a)
                           elsif (refs = args.to_a).empty?
-                            refs = readline('Enter file patterns', force: true).shellsplit
+                            refs = readline('Enter glob patterns', force: true).shellsplit
                           end
                         end
                         commit(flag, opts, refs: refs, ref: ref, squash: squash, pick: pick)
@@ -1773,7 +1773,7 @@ module Squared
             pathspec = false if pick == 'reword'
           end
           if pathspec.nil?
-            pathspec = if (flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
+            pathspec = if (flag == :pathspec || flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
                          '--all'
                        elsif (refs = projectmap(refs)).empty?
                          raise 'no qualified pathspec'
@@ -1847,7 +1847,7 @@ module Squared
             elsif stdout?
               puts log_message('nothing to commit', subject: name, hint: flag)
             end
-            exit 1
+            exit 1 unless pass.nil?
           end
         end
 

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

@@ -11,7 +11,7 @@ module Squared
           install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
                         install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
-                        S|save=!?].freeze,
+                        min-release-age=i min-release-age-exclude=q S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
@@ -230,7 +230,7 @@ module Squared
                           elsif exception?
                             indexerror n, list
                           else
-                            log.warn "run script #{n} of #{list.size}".subhint('out of range')
+                            log.debug "run script #{n} of #{list.size}".subhint('out of range')
                             next
                           end
                         else
@@ -330,26 +330,39 @@ module Squared
                     when 'package'
                       case flag
                       when :approve, :deny
-                        format_desc action, flag, 'name*|:,opts*'
+                        format_desc(action, flag, 'opts*', before: flag == :approve ? 'name*|:' : 'name*|:|::')
                         task flag do |_, args|
                           args = args.to_a
-                          if choice!(args)
+                          if choice!(args) || (flag == :deny && (all = choice!(args, char: '::')))
+                            list = []
+                            pad = 0
+                            size = ->(s) { pad = [pad, s.size].max }
                             pwd_set do
-                              pad = 0
-                              list = IO.popen(npm_output('approve-scripts --allow-scripts-pending').to_s)
-                                       .each_with_object([]) do |line, out|
-                                         next unless line =~ /^\s+([a-z\d@][^@]*)@(\S+)/
-
-                                         pad = [pad, $1.size].max
-                                         out << [$1, $2]
-                                       end
-                                       .map { |name, ver| name.ljust(pad + 4) + ver }
-                              if list.empty?
-                                puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
-                                exit
+                              json = JSON.parse(`#{npm_output('install-scripts ls --json')}`)
+                              json&.fetch('allowScripts', [])&.each do |data|
+                                line = data['changes']&.find { |item| item['change'] == 'pending' }
+                                next unless line && line['key'] =~ /^(.+)@([^@]+)$/
+
+                                size.call($1)
+                                list << [$1, $2]
+                              end
+                              if all
+                                current = read_package 'allowScripts'
+                                current&.each_pair do |key, val|
+                                  next unless val
+
+                                  md = key.match(/^(.+?)(?:@([^@]+))?$/)
+                                  size.call(md[1])
+                                  list << [md[1], sub_style(md[2] || 'any', theme[:inline])]
+                                end
                               end
-                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                             end
+                            if list.empty?
+                              puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                              exit
+                            end
+                            list.map! { |name, ver| name.ljust(pad + ARG[:TAB]) + ver }
+                            args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                           end
                           package flag, args
                         end
@@ -885,9 +898,9 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = width.call(found, 0) + 4
-            col2 = width.call(found, 1) + 4
-            col3 = pad.call(found, found.size).size + 2 + col1 + col2 + width.call(found, 2)
+            col1 = width.call(found, 0) + ARG[:TAB]
+            col2 = width.call(found, 1) + ARG[:TAB]
+            col3 = pad.call(found, found.size).size + (ARG[:TAB] / 2) + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -983,9 +996,9 @@ module Squared
               end
             end
           elsif !avail.empty?
-            col1 = width.call(avail, 0) + 4
+            col1 = width.call(avail, 0) + ARG[:TAB]
             col2 = width.call(avail, 1)
-            col3 = width.call(avail, 2) + 4
+            col3 = width.call(avail, 2) + ARG[:TAB]
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -1381,7 +1394,7 @@ module Squared
                 op.exist?(add: true)
               end
             end
-            op.append(flags, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+            op.append(flags, context: kwargs)
               .clear
             print_run(op, banner, **kwargs)
             start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)

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

@@ -221,7 +221,7 @@ module Squared
                               indexerror n, list
                             else
                               found |= 2
-                              log.warn "run script #{n} of #{list.size}".subhint('out of range')
+                              log.debug "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
                             case (i > 1 && poetry? ? 0 : i)
@@ -235,7 +235,7 @@ module Squared
                               raise message('script', val) if exception?
 
                               found |= 2
-                              log.warn "run script \"#{val}\"".subhint('not indexed')
+                              log.debug "run script \"#{val}\"".subhint('not indexed')
                             end
                           end
                         end
@@ -253,7 +253,7 @@ module Squared
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !windows?
-                            readline('Enter script', force: true, multiline: %w[## ;])
+                            readline('Enter script', force: true, multiline: Prompt.multiline || %w[## ;])
                           elsif i || args.empty?
                             readline('Enter command', force: true)
                           else
@@ -803,7 +803,7 @@ module Squared
               op.clear
             else
               op.exist?(add: true, first: true) unless op.arg?('m')
-              op.append(escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(context: kwargs)
             end
           end
           var = kwargs[:env]
@@ -914,7 +914,7 @@ module Squared
             when :install, :uninstall
               raise ArgumentError, message('no tags listed', hint: flag) if op.empty?
             end
-            op << '-y' if option('y')
+            op << '-y' if option('y', 'yes')
             op.append
             print_run(op, banner, **kwargs)
             run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('py', flag))
@@ -952,7 +952,7 @@ module Squared
                 @dependindex = index
                 @dependfile = val
               else
-                log.warn "variable_set: @dependfile=#{val}".subhint('not supported')
+                log.debug "variable_set: @dependfile=#{val}".subhint('not supported')
               end
             end
           when :venv

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

@@ -304,7 +304,7 @@ module Squared
                           elsif exception?
                             indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{tasks.size}".subhint('out of range')
+                            log.debug "rake task #{n} of #{tasks.size}".subhint('out of range')
                             opts.clear
                             next
                           end
@@ -572,10 +572,10 @@ module Squared
                                       when ';', /^#+$/
                                         args.shift
                                       else
-                                        %w[## ;]
+                                        Prompt.multiline || %w[## ;]
                                       end
                           unless (command = ENV['RUBY_E'])
-                            command = if Prompt.reline.respond_to?(:readmultiline)
+                            command = if Prompt.multiline?
                                         require 'ripper'
                                         readline('ruby>', force: true, multiline: multiline) do |code|
                                           next if code.strip.empty? || !Ripper.sexp(code)
@@ -956,7 +956,7 @@ module Squared
                 end
                 s = '%2d. %s' % [start, line]
                 if ia
-                  unless confirm_semver(s.ljust(col + 4 + line.size - n), type)
+                  unless confirm_semver(s.ljust(col + ARG[:TAB] + line.size - n), type)
                     start += 1
                     next
                   end
@@ -1049,7 +1049,7 @@ module Squared
             if op.arg?('e')
               op.clear
             else
-              op.append(delim: true, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(delim: true, context: kwargs)
             end
           end
           print_run(op, banner, **kwargs) unless flag || op.stdout
@@ -1394,10 +1394,10 @@ module Squared
             end
             if flag == :install
               op.append_any(escape: true)
+              op.delim << post if post
             else
               op.append(escape: true)
             end
-            op.delim << post if post
           when :check, :cleanup, :contents, :fetch, :list, :lock, :rdoc
             op.append
           when :dependency, :info, :search
@@ -1630,7 +1630,7 @@ module Squared
           case flag
           when :prototype
             sig = args.shift
-            y = option('y', ignore: false)
+            y = option('y', 'yes', ignore: false)
             i = 1
             args.map { |val| basepath(val).relative_path_from(path) }.each do |file|
               dir = basepath sig, file.dirname
@@ -1769,7 +1769,7 @@ module Squared
         end
 
         def gemname
-          @gemname ||= ((spec = gemspec) ? spec.name : project)
+          @gemname ||= gemspec&.name || project
         end
 
         def project
@@ -1922,24 +1922,22 @@ module Squared
         end
 
         def bundle_args(*args)
-          if (val = @bundle[:exec])
-            app = args.first
-            if val.is_a?(Hash)
-              env = val[app.to_s] || val[app.to_sym]
-              return args unless env
-
-              val = env.is_a?(String) ? basepath!(env) : true
-            elsif app == 'ruby'
-              return args
-            end
-            if val.is_a?(String)
-              return args unless (val = basepath!(val))
-
-              args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}")
-            end
-            args.unshift('bundle', 'exec')
+          gemfile = ARG[:APP][:ruby_gemfile]
+          val = gemfile.is_a?(Hash) ? gemfile : @bundle[:exec]
+          return args unless gemfile || (val && gemfile != false)
+
+          app = args.first
+          if val.is_a?(Hash)
+            val = val[app.to_s] || val[app.to_sym]
+          elsif app == 'ruby' && !gemfile
+            return args
+          end
+          case val
+          when String, Pathname
+            val = basepath!(val, type: 'f')
+            args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}") if val
           end
-          args
+          val ? args.unshift('bundle', 'exec') : args
         end
 
         def bundle_load
@@ -2133,7 +2131,7 @@ module Squared
         def serve?
           !Gem::Specification.find_by_name('webrick').nil?
         rescue Gem::MissingSpecError => e
-          log.warn e if @serve
+          log.debug e if @serve
           false
         end
       end

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

@@ -58,10 +58,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if !(pa = val.is_a?(Pathname)) && escape
-                  shell_escape(val, quote: quote, double: double)
-                elsif quote || pa
+                if (quote && !escape) || val.is_a?(Pathname)
                   shell_quote(val, double: double, **kwargs)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
                 else
                   val
                 end
@@ -487,7 +487,11 @@ module Squared
             self
           end
 
-          def append(*args, clear: false, preserve: '"', **kwargs, &blk)
+          def append(*args, clear: false, preserve: '"', context: nil, **kwargs, &blk)
+            if context
+              kwargs[:escape] = context.fetch(:escape, false) unless kwargs.key?(:escape)
+              kwargs[:quote] = context.fetch(:quote, false) unless kwargs.key?(:quote)
+            end
             args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
             OptionPartition.append(target, *args, preserve: preserve, **kwargs, &blk)

metadata

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