squared 0.4.7 → 0.4.9

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

@@ -98,9 +98,8 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @buildtype = :run if script?
           @pm = {}
-          @dependfile = basepath('package.json')
+          @dependfile = @path + 'package.json'
         end
 
         def ref
@@ -112,7 +111,7 @@ module Squared
           return unless outdated? && ref?(Node.ref)
 
           namespace name do
-            @@tasks[Node.ref].each do |action, flags|
+            Node.subtasks do |action, flags|
               next if @pass.include?(action)
 
               if flags.nil?
@@ -201,11 +200,11 @@ module Squared
                           tag, otp, dryrun = args
                         end
                         check = ->(val) { val == 'dry-run' || val == 'true' }
-                        if check.(otp)
+                        if check.call(otp)
                           dryrun = true
                           otp = nil
-                        elsif dryrun
-                          dryrun = check.(dryrun)
+                        else
+                          dryrun &&= check.call(dryrun)
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun)
                       end
@@ -253,7 +252,7 @@ module Squared
               dest = dir
               @workspace.rev_clear(dest)
             when String
-              dest = @workspace.rootpath(dir)
+              dest = @workspace.root + dir
               @workspace.rev_clear(dest)
             when Symbol
               if (proj = @workspace.find(name: dir))
@@ -284,16 +283,16 @@ module Squared
             end
             next unless from && dest&.directory?
 
-            from = basepath(from)
+            from = path + from
             glob = as_a(glob || '**/*')
             target = []
             if workspace
-              Dir.glob(from.join('*')).each do |path|
+              Dir.glob(from + '*').each do |path|
                 next unless (path = Pathname.new(path)).directory?
 
                 sub = if (proj = @workspace.find(path))
                         proj.packagename
-                      elsif (file = path.join('package.json')).exist?
+                      elsif (file = path + 'package.json').exist?
                         begin
                           doc = JSON.parse(file.read)
                         rescue StandardError => e
@@ -313,7 +312,7 @@ module Squared
               target << [from, dest.join(into, scope || project)]
             end
             target.each do |src, to|
-              glob.each { |val| log.info "cp #{from.join(val)} #{to}" }
+              glob.each { |val| log.info "cp #{from + val} #{to}" }
               begin
                 copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
               rescue StandardError => e
@@ -428,8 +427,8 @@ module Squared
               want = rev == :major && !latest[SEM_VER, 6] ? latest : val['wanted']
               next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
-              f = semscan(file)
-              w = semscan(want)
+              f = semscan file
+              w = semscan want
               a = f[0]
               b = f[2]
               c = w[0]
@@ -445,14 +444,13 @@ module Squared
               if upgrade && !w[5]
                 next if file == want
 
-                index = if a != c
-                          1
-                        elsif b != d
-                          3
-                        else
-                          5
-                        end
-                found << [key, file, want, index, major, f, w]
+                found << [key, file, want, if a != c
+                                             1
+                                           elsif b != d
+                                             3
+                                           else
+                                             5
+                                           end, major, f, w]
               elsif !major
                 avail << [key, file, latest, latest != current]
               end
@@ -478,11 +476,12 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = size_col.(found, 0) + 4
-            col2 = size_col.(found, 1) + 4
+            col1 = size_col.call(found, 0) + 4
+            col2 = size_col.call(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              if inter && (rev != :major || e || semmajor?(item[5], item[6])) && !confirm_outdated(a, c, d, e)
+              inter &&= rev != :major || e || semmajor?(item[5], item[6])
+              if inter && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
                 cur = -1
               else
                 cur = modified
@@ -510,22 +509,22 @@ module Squared
                   else
                     sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
                   end
-              puts "#{pad_ord.(i, found)}. #{a + b + c}"
+              puts "#{pad_ord.call(i, found)}. #{a + b + c}"
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
             if dryrun || (modified == 0 && pending > 0)
-              footer.(modified, found.size)
+              footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.(0, found.size)
+              footer.call(0, found.size)
               File.write(dependfile, doc)
               commit(:add, refs: ['package.json'], pass: true)
               install if opts.include?('prune')
             end
           elsif !avail.empty?
-            col1 = size_col.(avail, 0) + 4
-            col2 = size_col.(avail, 1)
-            col3 = size_col.(avail, 2) + 4
+            col1 = size_col.call(avail, 0) + 4
+            col2 = size_col.call(avail, 1)
+            col3 = size_col.call(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -536,9 +535,9 @@ module Squared
                 c = sub_style(c, styles: color(:green))
                 pending += 1
               end
-              puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
+              puts "#{pad_ord.call(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
             end
-            footer.(0, avail.size)
+            footer.call(0, avail.size)
           else
             puts 'No updates were found'
           end
@@ -623,7 +622,7 @@ module Squared
             if opt =~ op.values
               case $1
               when 'w', 'workspace'
-                op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
               end
             elsif opt.include?('=')
               op.errors << opt
@@ -704,7 +703,7 @@ module Squared
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
             op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
-            op << quote_option('out', Pathname.pwd.join("#{project}-#{version}.tgz")) unless op.arg?('out')
+            op << quote_option('out', Pathname.pwd + "#{project}-#{version}.tgz") unless op.arg?('out')
           else
             op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
                                      project: self)
@@ -714,7 +713,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
                   op.found << opt
                 end
               end
@@ -725,7 +724,7 @@ module Squared
           run(from: :pack)
         end
 
-        def compose(target, opts = nil, script: false, args: nil, from: :run, **)
+        def compose(target, opts = nil, script: false, args: nil, from: nil, **)
           return unless target
 
           if script
@@ -902,21 +901,6 @@ module Squared
           end
         end
 
-        def confirm_outdated(pkg, ver, rev, lock)
-          a = sub_style(case rev
-                        when 1
-                          'MAJOR'
-                        when 3
-                          'MINOR'
-                        else
-                          'PATCH'
-                        end, styles: theme[:header])
-          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))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
-        end
-
         def dryrun?(prefix = dependbin, **)
           super || !option('dry-run', prefix: prefix).nil?
         end

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

@@ -10,13 +10,13 @@ module Squared
           common: %w[b B d E h i I O OO 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 v|verbose w|wheel x|skip-dependency-check 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
+          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 no-python-version-warning
-                     q|quiet require-virtualenv v|verbose cache-dir=p cert=p client-cert=p exists-action=b log=p
-                     proxy=q python=q retries=i timeout=i trusted-host=b use-deprecated=b use-feature=b].freeze,
+                     q|quiet require-virtualenv v|verbose cache-dir=p cert=p client-cert=p exists-action=b log=p proxy=q
+                     python=q retries=i timeout=i trusted-host=b use-deprecated=b use-feature=b].freeze,
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
                       no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=b
@@ -34,7 +34,7 @@ module Squared
                       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=e
+          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,
           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
@@ -55,7 +55,7 @@ module Squared
           end
 
           def bannerargs
-            [:dependfile].freeze
+            %i[dependfile venv].freeze
           end
 
           def venv?
@@ -81,8 +81,8 @@ module Squared
             initialize_env(**kwargs)
           end
           @dependindex = DEP_PYTHON.index { |file| basepath(file).exist? }
-          @dependfile = basepath(DEP_PYTHON[@dependindex || 0])
-          @verbose = $1.size if verbose.is_a?(String) && verbose =~ /^(v+)$/
+          @dependfile = @path + DEP_PYTHON[@dependindex || 0]
+          @verbose = verbose.size if verbose.is_a?(String) && verbose.match?(/\Av+\z/)
           @editable = case editable
                       when '.', Pathname
                         editable
@@ -109,7 +109,7 @@ module Squared
           return unless outdated? && ref?(Python.ref)
 
           namespace name do
-            @@tasks[Python.ref].each do |action, flags|
+            Python.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -119,12 +119,12 @@ module Squared
                     if flag == :create
                       format_desc action, flag, 'dir,opts*'
                       task flag, [:dir] do |_, args|
-                        dir = basepath(param_guard(action, flag, args: args, key: :dir))
+                        dir = path + param_guard(action, flag, args: args, key: :dir)
                         cmd, opts = python_session('-m venv', opts: args.extras)
                         op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
                         op.append(dir, delim: true)
                           .clear(pass: false)
-                        v = op.arg?(/^-v+$/, 'verbose')
+                        v = op.arg?(/\A-v+\z/, 'verbose')
                         run(exception: true)
                         puts(dir.directory? ? "Success: #{dir}" : 'Failed') unless v
                       end
@@ -142,7 +142,8 @@ module Squared
                       when :run
                         format_desc action, flag, 'args+'
                         task flag do |_, args|
-                          args = param_guard(action, flag, args: args.to_a)
+                          args = args.to_a
+                          args = readline('Enter command', force: true).split(' ', 2) if args.empty?
                           venv_init
                           run session(*args, path: false)
                         end
@@ -170,12 +171,9 @@ module Squared
                     end
                   when 'install'
                     format_desc(action, flag, 'opts*', before: case flag
-                                                               when :target
-                                                                 'dir'
-                                                               when :editable
-                                                                 'path/url?'
-                                                               when :upgrade
-                                                                 'strategy?,package+'
+                                                               when :target then 'dir'
+                                                               when :editable then 'path/url?'
+                                                               when :upgrade then 'strategy?,package+'
                                                                end)
                     case flag
                     when :editable
@@ -205,20 +203,16 @@ module Squared
                     end
                   when 'build'
                     format_desc(action, flag, 'opts*', after: case flag
-                                                              when :python
-                                                                'srcdir?'
-                                                              when :hatch
-                                                                'location?'
+                                                              when :python then 'srcdir?'
+                                                              when :hatch then 'location?'
                                                               end)
                     task flag do |_, args|
-                      buildx flag, args.to_a
+                      build! flag, args.to_a
                     end
                   when 'publish'
                     format_desc(action, flag, 'opts*', after: case flag
-                                                              when :hatch
-                                                                'artifacts?'
-                                                              when :twine
-                                                                'dist?'
+                                                              when :hatch then 'artifacts?'
+                                                              when :twine then 'dist?'
                                                               end)
                     task flag do |_, args|
                       publish flag, args.to_a
@@ -246,7 +240,7 @@ module Squared
                 when :user
                   cmd << '--user'
                 when :target
-                  cmd << quote_option('target', basepath(target))
+                  cmd << quote_option('target', path + target)
                 when :force
                   cmd << '--force-reinstall'
                 end
@@ -264,10 +258,10 @@ module Squared
         def outdated(*, sync: invoked_sync?('outdated'))
           cmd = pip_session 'list', '--outdated'
           append_global
-          cmd = session_done(cmd)
+          cmd = session_done cmd
           log.info cmd
           on :first, :outdated
-          banner = format_banner(cmd)
+          banner = format_banner cmd
           print_item banner if sync
           start = 0
           found = 0
@@ -285,8 +279,8 @@ module Squared
 
                   latest = lat.join
                   current = cur.join
-                  semver(cur)
-                  semver(lat)
+                  semver cur
+                  semver lat
                   if semmajor?(cur, lat)
                     type = 2
                     major += 1
@@ -311,12 +305,12 @@ module Squared
                   line = sub_style(line, pat: /^(.+)(#{Regexp.escape(latest)})(.+)$/, styles: styles, index: 2)
                   found += 1
                 end
-                out.("#{start.to_s.rjust(2)}. #{line}")
+                out.call("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
               elsif line.start_with?('Package')
                 unless stdin?
                   sub = { pat: /^(.*)(?<!\dm)(Package|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
+                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
                 start += 1
               end
@@ -350,7 +344,7 @@ module Squared
           run(from: :install)
         end
 
-        def buildx(flag, opts = [])
+        def build!(flag, opts = [])
           case flag
           when :python
             cmd, opts = python_session('-m build', opts: opts)
@@ -378,7 +372,7 @@ module Squared
               if op.arg?('o', 'output')
                 op.extras << srcdir
               else
-                op << quote_option('output', basepath(srcdir))
+                op << quote_option('output', path + srcdir)
               end
               srcdir = nil
             end
@@ -390,7 +384,7 @@ module Squared
             end
             op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
           end
-          op << shell_quote(basepath(srcdir)) if srcdir
+          op << shell_quote(path + srcdir) if srcdir
           op.clear
           run(from: :"#{flag}:build")
         end
@@ -409,7 +403,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           if op.empty?
-            dist = basepath.join('dist')
+            dist = path + 'dist'
             raise_error('no source files found', hint: dist) unless dist.directory? && !dist.empty?
             op.extras << "#{dist}/*" unless flag == :poetry
           end
@@ -468,7 +462,7 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /^v+$/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\Av+\z/)
           ret = session('python', *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
@@ -476,7 +470,7 @@ module Squared
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
           if (val = option('project', ignore: false))
-            ret << quote_option('project', basepath(val))
+            ret << quote_option('project', path + val)
           end
           ret
         end
@@ -513,7 +507,7 @@ module Squared
             end
             op.swap
             if edit
-              edit = basepath(edit) unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = path + edit unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 op.extras << edit
               else
@@ -541,7 +535,7 @@ module Squared
             when '0', 'false'
               return
             else
-              val = basepath(val)
+              val = path + val
             end
           elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
@@ -555,29 +549,29 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', basepath(val))
+                        quote_option('cache-dir', path + val)
                       end
           end
           target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
+          target << quote_option('python', path + val) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
         def singleopt(flag = nil)
           case flag
           when :python
-            /^(?:v+|q+|b+)$/
+            /\A(?:v+|q+|b+)\z/
           when :twine
             nil
           else
-            /^(?:v+|q+)$/
+            /\A(?:v+|q+)\z/
           end
         end
 
         def preopts(quiet: true)
           ret = []
           case verbose
-          when false
+          when FalseClass
             ret << '--quiet' if quiet
           when Numeric
             ret << "-#{'v' * verbose}" if verbose > 0
@@ -605,7 +599,7 @@ module Squared
 
         def venv_set(val)
           @venv = Pathname.new(val)
-          @venv = basepath(@venv) unless @venv.absolute?
+          @venv = @path + @venv unless @venv.absolute?
           if projectpath?(@venv)
             if @venv.exist?
               log.debug "venv found: #{@venv}"