squared 0.6.1 → 0.6.3

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

@@ -7,16 +7,16 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          common: %w[b=+ B d E h i I O P q=+ s S u v=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
                     o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
                    prompt=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input q|quiet require-virtualenv
-                     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
+          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,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
@@ -43,21 +43,21 @@ module Squared
           wheel: %w[no-verify w|wheel-dir=p].freeze
         }.freeze
         OPT_POETRY = {
-          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
+          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet=+ v|verbose=+ P|project=p].freeze,
           build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
           publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=q
                       u|username=b].freeze
         }.freeze
         OPT_PDM = {
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
-                    k|skip=b].freeze,
-          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+                    p|project=p k|skip=b].freeze,
+          publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
-                     q|quiet v|verbose].freeze,
+                     q|quiet=+ v|verbose=+].freeze,
           build: %w[clean-hooks-after ext hooks-only no-hooks c|clean t|target=b].freeze,
           publish: %w[initialize-auth n|no-prompt y|yes a|auth=q ca-cert=p client-cert=p client-key=p o|option=q
                       p|publisher=b r|repo=q u|user=q].freeze
@@ -269,7 +269,7 @@ module Squared
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
                         task flag do |_, args|
-                          if (file = pip(flag, opts: args.to_a, banner: true)) && verbose
+                          if (file = pip(flag, opts: args.to_a, banner: true)) && !silent?
                             puts File.read(file)
                           end
                         end
@@ -457,15 +457,15 @@ module Squared
                     styles = color(:yellow)
                   else
                     styles = color(:green)
-                    line = sub_style(line, styles: if type == 2
-                                                     styles += [:bold]
-                                                     theme[:major]
-                                                   else
-                                                     theme[:active]
-                                                   end, pat: /^(\S+)(.+)$/)
+                    sub_style!(line, if type == 2
+                                       styles += [:bold]
+                                       theme[:major]
+                                     else
+                                       theme[:active]
+                                     end, pat: /^(\S+)(.+)$/)
                   end
-                  line = sub_style(line, **opt_style(tc, /^(.+)(#{Regexp.escape(current)})(.+)$/, 2)) if tc
-                  line = sub_style(line, **opt_style(styles, /^(.+)(#{Regexp.escape(latest)})(.+)$/, 2))
+                  sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(current)})(.+)$/, 2)) if tc
+                  sub_style!(line, **opt_style(styles, /^(.+)(#{Regexp.escape(latest)})(.+)$/, 2))
                   found += 1
                 end
                 if items
@@ -923,6 +923,8 @@ module Squared
           case flag
           when :python
             /\A(?:v+|q+|b+)\z/
+          when :pdm
+            /\Av+\z/
           when :twine
             nil
           else

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

@@ -217,33 +217,41 @@ module Squared
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, "task+|#{indexchar}index+,opts*|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
                       format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile, &:join)
                     else
-                      items, opts = args.to_a.partition { |val| indexitem(val) }
-                      if items.empty?
-                        rake(banner: true, opts: opts)
-                      else
-                        tasks = raketasks
-                        while (n, pre = indexitem(items.shift))
+                      tasks = raketasks
+                      cmd = nil
+                      opts = []
+                      queue = lambda do
+                        if cmd
+                          cmd += "[#{opts.join(',')}]" unless opts.empty?
+                          rake(cmd, banner: true)
+                          cmd = nil
+                        elsif !opts.empty?
+                          rake(banner: true, opts: opts)
+                        end
+                        opts.clear
+                      end
+                      args.to_a.each do |item|
+                        if (n, pre = indexitem(item))
+                          queue.call
                           if (item = tasks[n.pred])
-                            cmd = pre ? "#{pre} #{item.first}" : item.first
+                            cmd = [pre, item.first].compact.join(' ')
                           elsif exception
                             indexerror n, tasks
                           else
                             log.warn "rake task #{n} of #{tasks.size} (out of range)"
-                            next
-                          end
-                          if opts.empty?
-                            rake(cmd, banner: true)
-                          else
-                            rake(cmd + "[#{opts.join(',')}]", banner: true)
                             opts.clear
+                            next
                           end
+                        else
+                          opts << item
                         end
                       end
+                      queue.call
                     end
                   end
                 when 'irb'
@@ -344,9 +352,9 @@ module Squared
                                  end
                           gem(flag, opts: opts, banner: true, filter: {
                             semver: semver,
-                            update: opts.delete('u') || opts.delete('update'),
-                            interactive: opts.delete('i') || opts.delete('interactive'),
-                            select: opts.delete('s') || opts.delete('select')
+                            update: has_value!(opts, 'u', 'update'),
+                            interactive: has_value!(opts, 'i', 'interactive'),
+                            select: has_value!(opts, 's', 'select')
                           })
                         end
                       when :build, :push, :exec, :update
@@ -390,7 +398,7 @@ module Squared
                         format_desc action, flag, 'f/orce?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'redownload' if opts.delete('f') || opts.delete('force')
+                          opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath('Gemfile.lock')).exist?
                             config = basepath '.bundle', 'config'
                             if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
@@ -476,17 +484,17 @@ module Squared
         end
 
         def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
             return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
+            into = @copy[:into] if @copy.key?(:into)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-            into = @copy[:into] if @copy.key?(:into)
-          elsif @copy == false
-            return
           end
           return unless into
 
@@ -499,7 +507,7 @@ module Squared
             b = dest + val
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
-            copy_dir(a, b, c, pass: pass, verbose: verbosetype > 0)
+            copy_dir(a, b, c, pass: pass, verbose: !silent?)
           rescue StandardError => e
             on_error e, :copy
           end
@@ -509,8 +517,8 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = (opts.delete('s') || opts.delete('select')) && !stdin?
-            up = opts.delete('u') || opts.delete('update')
+            se = has_value!(opts, 's', 'select') && !stdin?
+            up = has_value!(opts, 'u', 'update')
             cmd << "--#{flag}"
             OptionPartition.new(opts, bundleopts(:outdated), cmd, project: self)
                            .clear
@@ -540,13 +548,13 @@ module Squared
                   c = cur.join
                   l = lat.join
                   styles = []
-                  major_set = lambda do
+                  ma = lambda do
                     styles = %i[green bold]
                     major += 1
                   end
-                  minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  mi = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
                   if data.empty?
-                    semmajor?(cur, lat) ? major_set.call : minor_set.call
+                    semmajor?(cur, lat) ? ma.call : mi.call
                   else
                     data.each do |val|
                       break unless line =~ /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/
@@ -554,11 +562,11 @@ module Squared
                       v = semver(val).join
                       case $1
                       when '>', '>='
-                        semmajor?(cur, lat) ? major_set.call : minor_set.call
+                        semmajor?(cur, lat) ? ma.call : mi.call
                       when '<', '<='
                         if c <= v
                           if semmajor?(cur, lat)
-                            major_set.call
+                            ma.call
                           else
                             styles[0] = :yellow
                           end
@@ -584,14 +592,14 @@ module Squared
                   unless styles.empty?
                     case styles.first
                     when :green
-                      line = sub_style(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
+                      sub_style!(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
                       found += 1
                     when :yellow
                       found += 1
                     end
                     l = Regexp.escape(l)
-                    line = sub_style(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
-                    line = sub_style(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
+                    sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
+                    sub_style!(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
                   end
                 end
                 items&.push([line, name])
@@ -743,6 +751,7 @@ module Squared
               end
               out.map!(&:split)
               pad = out.map(&:first).map!(&:size).max
+              print_item
               puts(out.map! { |line| '%*s %s' % [pad, line.first, line[1..-1].join(' ')] })
             end
             return
@@ -790,8 +799,7 @@ module Squared
           when :build, :cert, :generate_index, :mirror, :outdated, :push, :server, :signin, :signout, :sources, :stale
             opts.concat(args)
           end
-          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag, *preopts), project: self,
-                                                                                     no: OPT_GEM[:no][flag])
+          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag), project: self, no: OPT_GEM[:no][flag])
           from = :"gem:#{flag}"
           if flag == :outdated
             op.adjoin(gempwd, start: 0) if gempwd
@@ -839,6 +847,7 @@ module Squared
                 e = 0
                 f = 0
                 j = 0
+                col4 = 0
                 queue = nil
                 rows.each do |row|
                   a, b, c = row.first
@@ -852,14 +861,15 @@ module Squared
                   a, b, c = row.first
                   if i == 0
                     line = '%-*s %-*s    %*s  %*s' % [pad, ' #', d, a, e, b, f, c]
-                    n = line.size
+                    col4 = line.size
+                    s = ARG[:BORDER][1] * col4
                     queue = if stdin?
-                              [line, ARG[:BORDER][1] * n]
+                              [line, s]
                             else
                               2.times do
-                                line = sub_style(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
+                                sub_style!(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
                               end
-                              [line, sub_style(ARG[:BORDER][1] * n, styles: borderstyle)]
+                              [line, sub_style(s, borderstyle)]
                             end
                   else
                     g = a.ljust(d)
@@ -875,7 +885,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:major])
+                        sub_style! g, theme[:major]
                         styles = %i[green bold]
                         pat = (pat.first if pre)
                         latest << :bold
@@ -889,7 +899,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:active])
+                        sub_style! g, theme[:active]
                         styles = %i[green]
                         pat = pre ? pat.last : pat.first
                       end
@@ -908,8 +918,8 @@ module Squared
                     b = b.rjust(e)
                     h = c.rjust(f)
                     unless stdin?
-                      b = sub_style(b, **opt_style(colormap(styles), pat, 2))
-                      h = sub_style(h, **opt_style(latest.flatten.compact, pat, 2))
+                      sub_style!(b, **opt_style(colormap(styles), pat, 2))
+                      sub_style!(h, **opt_style(latest.flatten.compact, pat, 2))
                     end
                     j += 1
                     if queue
@@ -922,7 +932,7 @@ module Squared
                     else
                       out.call('%*s %s' % [pad, "#{j}.", s])
                     end
-                    update.delete(a) if ia && !confirm_outdated(a, c, row.last, timeout: 0)
+                    update.delete(a) if ia && !confirm_outdated(a, c, row.last, col4: col4, timeout: 0)
                   end
                 end
               end
@@ -1134,9 +1144,7 @@ module Squared
               output = val.match?(/(?:un)?set/)
             else
               a = op.dup
-              b = op.shift
-              c = op.shift
-              d = op.shift
+              b, c, d = op.slice!(0, 3)
               e = op.arg?('global', 'local')
               op << b
               getname = -> { op << (c || readline('Enter name', force: true)) }
@@ -1250,7 +1258,7 @@ module Squared
               dir = basepath sig, file.dirname
               dir.mkpath unless dir.exist?
               base = file.basename.to_s
-              rbs = dir.join(base.stripext + '.rbs')
+              rbs = dir.join("#{base.stripext}.rbs")
               status = if rbs.exist?
                          case y
                          when '0', 'false'
@@ -1387,18 +1395,11 @@ module Squared
         end
 
         def gem_session(*cmd, **kwargs)
-          ret = session('gem', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          ret.merge(preopts)
+          session('gem', *cmd, *preopts, **kwargs)
         end
 
         def bundle_session(*cmd, **kwargs)
-          ret = session('bundle', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          append_nocolor
-          ret.merge(preopts)
+          session('bundle', *cmd, *preopts, **kwargs).tap { append_nocolor }
         end
 
         def rake_session(*cmd, **kwargs)
@@ -1451,7 +1452,7 @@ module Squared
         end
 
         def preopts
-          verbose? && !session_arg?('quiet') ? ['--verbose'] : []
+          verbose? ? ['--verbose'] : []
         end
 
         def variables
@@ -1531,8 +1532,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= begin
-            lib = Set.new(['lib'])
+          @gemlib ||= Set.new(['lib']).yield_self do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end
@@ -1545,7 +1545,9 @@ module Squared
         end
 
         def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+          return false unless @gemdir
+
+          @gemdir.exist? && !@gemdir.empty?
         end
       end