squared 0.8.4 → 0.8.6

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

@@ -394,7 +394,7 @@ module Squared
                                      elsif has_value!(args, 'p', 'public')
                                        'public'
                                      end
-                            dryrun = has_value!(args, 'd', 'dry-run')
+                            dryrun = has_value! args, 'd', 'dry-run'
                           end
                           case flag
                           when :stage
@@ -411,7 +411,7 @@ module Squared
                                 [ver, tag, item['id'], item['actor']]
                               end
                               if data.empty?
-                                print_error('no staged releases', loglevel: Logger::INFO, subject: npmname)
+                                print_error(Logger::INFO, 'no staged releases', subject: npmname)
                                 exit 1
                               end
                               data.each do |item|
@@ -456,7 +456,7 @@ module Squared
                                       @tsfile
                                     end
                         end
-                        watch = has_value!(args, 'w', 'watch')
+                        watch = has_value! args, 'w', 'watch'
                         tsc(*args, banner: true, project: project, build: flag == :build, watch: !watch.nil?)
                       end
                     end
@@ -662,7 +662,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif option('ci') || (ci? && exist?('yarn.lock'))
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -698,13 +698,14 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif option('ci') || (ci? && exist?('pnpm-lock.yaml'))
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session('npm', (ci = option('ci', prefix: 'npm')) ? 'ci' : 'install')
+              ci = option('ci', prefix: 'npm') || (ci? && exist?('package-lock.json'))
+              cmd = session('npm', ci ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -873,7 +874,7 @@ module Squared
           pending = 0
           modified = 0
           width = ->(a, i) { a.map { |aa| aa[i] }.max_by(&:size).size }
-          pad = ->(val, ord) { val.succ.to_s.rjust([ord.size.to_s.size, 2].max) }
+          pad = ->(a, n) { n.succ.to_s.rjust([a.size.to_s.size, 2].max) }
           footer = lambda do |val, size|
             return unless verbose
 
@@ -889,7 +890,7 @@ module Squared
           if !found.empty?
             col1 = width.call(found, 0) + 4
             col2 = width.call(found, 1) + 4
-            col3 = pad.call(found.size, found).size + 2 + col1 + col2 + width.call(found, 2)
+            col3 = pad.call(found, found.size).size + 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|
@@ -911,21 +912,21 @@ module Squared
               end
               a = a.ljust(col1)
               b = b.ljust(col2)
-              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              b = sub_style b, theme[:current] if theme[:current] && !stdin?
               if cur == -1
                 c = 'SKIP'
               elsif modified == cur
                 c = 'FAIL'
               elsif !stdin?
                 if d == 1
-                  sub_style! a, theme[:major]
-                  sub_style! c, :bold, color(:green)
+                  a = sub_style a, theme[:major]
+                  c = sub_style c, :bold, color(:green)
                 else
-                  sub_style!(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
+                  c = sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
                 end
                 g = item
               end
-              s = "#{pad.call(i, found)}. #{a}#{b}#{c}"
+              s = "#{pad.call(found, i)}. #{a}#{b}#{c}"
               if se
                 items << [s, g]
                 next
@@ -994,11 +995,11 @@ module Squared
               b = sub_style b.ljust(col2), color(d ? :red : :yellow)
               c = c.ljust(col3)
               unless d
-                sub_style! a, theme[:active]
-                sub_style! c, color(:green)
+                a = sub_style a, theme[:active]
+                c = sub_style c, color(:green)
                 pending += 1
               end
-              puts "#{pad.call(i, avail)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
+              puts "#{pad.call(avail, i)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
             end
             footer.call(0, avail.size)
           else
@@ -1380,7 +1381,7 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          ret = run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: from)
+          ret = run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from)
           print_status(name, subject: 'tsc', start: start) if success?(ret, banner, start.nil?) && start
           ret
         end
@@ -1621,10 +1622,10 @@ module Squared
           modules.rmtree
         rescue Timeout::Error => e
           puts
-          print_error(e, hint: modules, pass: true)
+          print_error(e, subject: name, hint: modules, pass: true)
           exit 1
         rescue => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, pass: true)
           false
         else
           true

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

@@ -19,10 +19,10 @@ module Squared
                          setuptools=b try-first-with=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input require-virtualenv
-                     q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p
-                     proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
-                     use-feature=b].freeze,
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-proxy-env
+                     require-virtualenv q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b
+                     keyring-provider=b log=p proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b
+                     use-deprecated=b use-feature=b].freeze,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
           config: %w[global user site editor=p].freeze,
@@ -35,12 +35,12 @@ module Squared
                       no-warn-conflicts no-warn-script-location U|upgrade user prefix=p report=p root=p
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
-                        no-binary=q only-binary=q only-final=b].freeze,
-          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps require-hashes use-pep517
-                        build-constraint=p c|constraint=p group=q progress-bar=b r|requirement=p
-                        requirements-from-script=p src=p].freeze,
+                        no-binary=q only-binary=q only-final=b refresh-package=q uploaded-prior-to=q].freeze,
+          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps no-require-hashes only-deps
+                        require-hashes use-pep517 build-constraint=p c|constraint=p group=q progress-bar=b
+                        r|requirement=p requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
-          install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
+          install_d: %w[ignore-requires-python].freeze,
           hash: %w[a|algorithm].freeze,
           list: %w[e|editable exclude-editable include-editable l|local not-required o|outdated u|uptodate user
                    exclude=b format=b path=p].freeze,
@@ -749,7 +749,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :python)
+          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :python)
         end
 
         def pip(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -831,7 +831,7 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: symjoin('pip', flag))
+          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('pip', flag))
             .yield_self { |val| ret || val }
         end
 
@@ -1089,12 +1089,12 @@ module Squared
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(?:v+|q+|b+|V+|O+)\z/
+            /\A(v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
           when :twine, :meson then nil
           else
-            /\A(?:v+|q+)\z/
+            /\A(v+|q+)\z/
           end
         end
 
@@ -1112,19 +1112,18 @@ module Squared
         def pipopts(flag)
           ret = OPT_PIP.fetch(flag, []) + OPT_PIP[:common]
           if pip_install?(flag)
-            ret.concat(OPT_PIP[:install_a])
+            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
             ret.concat(OPT_PIP[:install_b]) unless flag == :index
-            ret.concat(OPT_PIP[:install_d])
             case flag
             when :install
-              ret.concat(OPT_PIP[:install_c] + OPT_PIP[:debug])
+              ret.concat(OPT_PIP[:install_c], OPT_PIP[:debug])
             when :lock, :wheel
               ret.concat(OPT_PIP[:install_c])
             when :download, :index
               ret.concat(OPT_PIP[:debug])
             end
           elsif flag == :list
-            ret.concat(OPT_PIP[:install_a])
+            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
           end
           ret
         end

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

@@ -21,24 +21,25 @@ module Squared
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
-          rdbg: %w[no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q e=q host=q x|init-script=p
+          rdbg: %w[e=q no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q host=q x|init-script=p
                    O|open=q? port=i port-range=b session-name=q sock-path=q util=q].freeze,
           rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
-          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
-                      display-only-correctable display-only-fail-level-offenses display-only-failed
-                      display-only-safe-correctable S|display-style-guide display-time disable-uncorrectable editor-mode
-                      enable-pending-cops E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
-                      ignore-disable-comments ignore-parent-exclusion ignore-unrecognized-cops init l|lint
-                      list-enabled-cops-for=p L|list-target-files lsp memory no-detach only-guide-cops
-                      only-recognized-file-types no-exclude-limit profile raise-cop-error regenerate-todo
-                      restart-server safe server-status start-server stderr stop-server C|cache=b cache-root=p config=p
-                      exclude-limit=i fail-level=b f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q
-                      show-docs-url=q s|stdin=p].freeze,
+          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug diff disable-all-cops
+                      disable-pending-cops display-only-correctable display-only-fail-level-offenses display-only-failed
+                      display-only-safe-correctable S|display-style-guide display-suppressed display-time
+                      disable-uncorrectable editor-mode enable-pending-cops E|extra-details F|fail-fast
+                      force-default-config force-exclusion x|fix-layout ignore-disable-comments ignore-parent-exclusion
+                      ignore-unrecognized-cops init l|lint L|list-target-files lsp mcp memory no-detach no-exclude-limit
+                      only-guide-cops only-recognized-file-types profile raise-cop-error regenerate-todo
+                      report-unused-todo-entries restart-server safe server-status start-server stderr stop-server
+                      verbose-version C|cache=b cache-root=p changed=b config=p exclude-limit=i fail-level=b f|format=b
+                      except=q list-enabled-cops-for=p only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
+                      s|stdin=p].freeze,
           pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
                   d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
             rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
-                        offense-counts parallel server].freeze
+                        offense-counts parallel preview server].freeze
           }
         }.freeze
         OPT_BUNDLE = {
@@ -226,9 +227,10 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
+          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : exec }
           @steepfile = basepath! steep if steep
-          @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
+          rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
+          @rubocopfile = basepath! rubocop if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !self.autodetect
 
@@ -565,7 +567,7 @@ module Squared
                         task flag do |_, args|
                           args = args.to_a
                           multiline = case args.first
-                                      when ';', '#'
+                                      when ';', /^#+$/
                                         args.shift
                                       else
                                         %w[## ;]
@@ -844,11 +846,11 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = has_value!(opts, 's', 'select')
+            se = has_value! opts, 's', 'select'
             ia = has_value!(opts, 'i', 'interactive') && !se
-            up = has_value!(opts, 'u', 'update')
+            up = has_value! opts, 'u', 'update'
             opts << 'only-explicit' if has_value!(opts, 'e', 'explicit')
-            dryrun = has_value!(opts, 'd', 'dry-run')
+            dryrun = has_value! opts, 'd', 'dry-run'
             if !sync || stdin?
               se = false
               ia = false
@@ -1039,7 +1041,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs) unless flag
-          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: from || :ruby)
+          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from || :ruby)
         end
 
         def gem(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1416,7 +1418,7 @@ module Squared
           op.clear(errors: true) if gems
           print_run(op, banner, **kwargs)
           run(banner: banner && %w[q silent quiet no-verbose].none? { |s| op.include?(shell_option(s)) },
-              exception: kwargs.fetch(:exception, exception?), from: from)
+              exception: exception?(**kwargs), from: from)
         end
 
         def bundle(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1553,7 +1555,7 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          ret = run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?),
+          ret = run(sync: sync, banner: banner, exception: exception?(**kwargs),
                     from: symjoin('bundle', flag))
           success?(ret, banner, output)
         end
@@ -1566,7 +1568,7 @@ module Squared
           op.append(escape: true)
           print_run(op, banner, **kwargs)
           var = { 'BANNER' => '0' } unless banner
-          run(op, var, sync: sync, banner: false, exception: kwargs.fetch(:exception, exception?), from: :rake)
+          run(op, var, sync: sync, banner: false, exception: exception?(**kwargs), from: :rake)
         end
 
         def irb(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:irb], **kwargs)
@@ -1594,7 +1596,7 @@ module Squared
           op.concat(args)
           op.append(quote: false, delim: true)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: :rdbg)
+          run(banner: false, exception: exception?(**kwargs), from: :rdbg)
         end
 
         def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1643,7 +1645,7 @@ module Squared
             op.clear
               .append(*args)
             print_run(op, banner, **kwargs)
-            run(banner: false, exception: kwargs.fetch(:exception, exception?), from: symjoin('rbs', flag))
+            run(banner: false, exception: exception?(**kwargs), from: symjoin('rbs', flag))
           end
         end
 
@@ -1666,13 +1668,13 @@ module Squared
           op.append(delim: true)
             .clear(errors: true)
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :rubocop)
+          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :rubocop)
         end
 
         def serve(root, *, bind: nil, port: 3000, **kwargs)
           require 'webrick'
         rescue LoadError => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, hint: 'webrick', pass: true)
         else
           config = kwargs.merge({ DocumentRoot: root })
           config[:BindAddress] = bind if bind
@@ -1860,7 +1862,7 @@ module Squared
           op.concat(args)
           op.append(delim: delim)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: from)
+          run(banner: false, exception: exception?(**kwargs), from: from)
         end
 
         def ruby_session(*cmd, **kwargs)

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

@@ -219,6 +219,7 @@ module Squared
           end
 
           attr_reader :target, :extras, :found, :errors, :values, :project, :path, :sep
+          attr_accessor :stdout
 
           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
@@ -241,14 +242,16 @@ module Squared
             @sep = sep
             @errors = []
             @found = []
+            @stdout = false
             parse(list, opts, **kwargs, &blk)
           end
 
           def parse(list, opts = extras, no: nil, single: nil, args: false, multiple: nil, first: nil, underscore: nil,
-                    explicit: false, bool: %w[true false], stdin: false, &blk)
+                    explicit: false, bool: %w[true false], auto: [], stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
+            auto = auto.flat_map { |val| val.split('|', 2) }
             e = []
             b = []
             m = []
@@ -350,6 +353,7 @@ module Squared
               tr = ->(a) { a.map { |val| val.tr('-', '_') } }
               @values.concat(tr.call(@values))
               bare.concat(tr.call(bare))
+              auto.concat(tr.call(auto))
               e.concat(tr.call(e))
               b.concat(tr.call(b))
               m.concat(tr.call(m))
@@ -363,6 +367,7 @@ module Squared
               ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
+            bare.concat(auto)
             if target.is_a?(JoinSet)
               target.multiple = multiple if multiple
               target.multiple = ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }
@@ -395,6 +400,10 @@ module Squared
                   add "#{sw[opt]}#{opt}"
                 else
                   add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
+                  if auto.include?(opt)
+                    @stdout = true
+                    break
+                  end
                 end
               elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..-1])
                 add "--no-#{s}"
@@ -408,17 +417,23 @@ module Squared
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
+                  if val =~ QUOTE_VALUE
+                    val = $2
+                    double = $1 == '"'
+                  end
                   get = ->(h) { h[key] || h.find { |k,| k.end_with?(':*') }.last }
                   kwargs = { sep: se[key] || sep, merge: has.call(m, key), switch: sw[key] }
+                  kwargs[:double] = double unless double.nil?
                   if has.call(e, key) || (has.call(bl, key) && bool.include?(val))
                     add shell_option(key, val, **kwargs)
                   elsif has.call(ex, key) && bool.include?(val)
                     add shell_option(key, val, explicit: explicit, **kwargs)
                   elsif has.call(q, key)
-                    add quote_option(key, val, double: has.call(qq, key), **kwargs)
+                    kwargs[:double] = true if has.call(qq, key)
+                    add quote_option(key, val, **kwargs)
                   elsif has.call(p, key)
-                    if val =~ QUOTE_VALUE
-                      add shell_option(key, val, double: $1 == '"', escape: false, **kwargs)
+                    if !double.nil?
+                      add shell_option(key, val, escape: false, **kwargs)
                     elsif path
                       add quote_option(key, path + val, **kwargs)
                     else
@@ -449,7 +464,7 @@ module Squared
                   end
                   opt = key unless opt == last
                 elsif has.call(m, key = opt[0]) && opt[1..-1] =~ QUOTE_VALUE
-                  add basic_option(key, $2, double: $1 == '"', **kwargs, merge: true)
+                  add basic_option(key, $2, double: $1 == '"' || has.call(qq, key), **kwargs, merge: true)
                   opt = key
                 else
                   push opt
@@ -815,6 +830,10 @@ module Squared
             end
           end
 
+          def style?(*args)
+            !stdout && args.none?(&:!)
+          end
+
           def uniq!(list)
             list = uniq list
             return if list.empty?

data/lib/squared/workspace/repo.rb

@@ -281,7 +281,7 @@ module Squared
         env('REPO_OPTIONS', **kwargs) { |val| cmd << val } if options
         cmd = cmd.join(' ')
         puts log_message(cmd, subject: main, hint: root) if verbose
-        Common::System.shell(cmd, chdir: root, exception: exception)
+        Common::System.shell(cmd, chdir: root, exception: exception || env('REPO_FAIL', equals: %w[1 true]))
       end
 
       def repo_bin

metadata

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