squared 0.5.6 → 0.5.8

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

@@ -5,15 +5,17 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
-          install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,
-          install_base: %w[ignore-scripts install-links strict-peer-deps include=b omit=b install-strategy=b].freeze,
+          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
+                      package-lock=!].freeze,
+          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
+                           install-strategy=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
-                         save-peer S|save-prod].freeze,
-          run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
+          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
+                         g|global=!? S|save=!? E|save-exact=!?].freeze,
+          run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
-          pack: %w[json ignore-scripts pack-destination=p].freeze
+          pack: %w[json=!? pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
           common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
@@ -107,7 +109,7 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependfile = @path + 'package.json'
+          @dependfile = basepath 'package.json'
           @pm = { __: init }
         end
 
@@ -266,11 +268,6 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
-                          unless SEM_VER.match?(tag)
-                            a = sub_style(project, styles: theme[:active])
-                            b = sub_style(tag, styles: theme[:inline])
-                            exit 1 unless confirm("Publish #{a}@#{b}?", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -377,12 +374,10 @@ module Squared
                     target.mkpath
                     subdir << target.to_s
                   end
-                  begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
-                  rescue StandardError => e
-                    print_error e
-                    errors += 1
-                  end
+                  FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                rescue StandardError => e
+                  print_error e
+                  errors += 1
                 end
               rescue StandardError => e
                 on_error e, :copy
@@ -393,7 +388,7 @@ module Squared
             end
             glob = Array(glob || '**/*')
             target = []
-            from = path + from
+            from = basepath from
             if workspace
               from.glob('*').each do |entry|
                 next unless entry.directory?
@@ -421,11 +416,9 @@ module Squared
             end
             target.each do |src, 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
-                on_error e, :copy
-              end
+              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
+            rescue StandardError => e
+              on_error e, :copy
             end
           end
           on :last, :copy
@@ -478,7 +471,7 @@ module Squared
               if flag == :add
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
-                cmd.merge(packages.map { |pkg| shell_escape(pkg) })
+                cmd.merge(packages.map { |pkg| shell_quote(pkg) })
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -661,14 +654,19 @@ module Squared
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+          unless version && !read_packagemanager(:private)
+            print_error('invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
           cmd = session 'npm', 'publish'
           cmd << basic_option('otp', otp) if otp ||= option('otp')
-          cmd << basic_option('tag', tag) if tag ||= option('tag')
-          cmd << basic_option('access', access) if access ||= option('access')
+          cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+          case access || option('access')
+          when 'p', 'public'
+            cmd << '--access=public'
+          when 'r', 'restricted'
+            cmd << '--access=restricted'
+          end
           dryrun ||= dryrun?('npm')
           if dryrun
             cmd << '--dry-run'
@@ -679,13 +677,13 @@ module Squared
           if sync
             run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
+            require 'open3'
             on :first, from
             pwd_set(from: from, dryrun: dryrun) do
-              require 'open3'
-              banner = format_banner cmd.to_s
-              Open3.popen2e(cmd.done) do |_, out|
-                write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
-                                 banner: banner)
+              cmd = session_done cmd
+              Open3.popen2e(cmd) do |_, out|
+                write_lines(out, banner: format_banner(cmd),
+                                 sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2])
               end
             end
             on :last, from
@@ -725,7 +723,7 @@ module Squared
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                 end
               elsif opt.include?('=')
                 op.errors << opt
@@ -817,7 +815,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                   op.found << opt
                 end
               end
@@ -1028,9 +1026,9 @@ module Squared
 
         def npmnotice
           [
-            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },
-            { pat: /^(npm )(error)(.*)$/, styles: color(:red), index: 2 },
-            { pat: /^(npm )(notice)(.*)$/, styles: color(:cyan), index: 2 },
+            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:bright_cyan), index: 2 },
+            { pat: /^(npm )(error)(.*)$/, styles: color(:bright_red), index: 2 },
+            { pat: /^(npm )(notice)(.*)$/, styles: color(:bright_cyan), index: 2 },
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end

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

@@ -37,8 +37,8 @@ module Squared
           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 identity=b
-                      p|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
+          publish: %w[no-build no-very-ssl quiet S|sign skip-existing 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
@@ -207,7 +207,7 @@ module Squared
                       if flag == :create
                         format_desc action, flag, 'dir,opts*'
                         task flag, [:dir] do |_, args|
-                          dir = path + param_guard(action, flag, args: args, key: :dir)
+                          dir = basepath param_guard(action, flag, args: args, key: :dir)
                           venv_create dir, args.extras
                         end
                       elsif venv
@@ -245,10 +245,7 @@ module Squared
                       when :upgrade
                         format_desc action, flag, 'opts*'
                         task flag do |_, args|
-                          args = args.to_a
-                          args.prepend('upgrade')
-                          args.append('pip')
-                          install flag, args
+                          install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
@@ -306,7 +303,7 @@ module Squared
                     when 'build'
                       case flag
                       when :poetry
-                        next unless poetry?
+                        next unless build_backend == 'poetry.core.masonry.api'
                       when :pdm
                         next unless build_backend == 'pdm.backend'
                       when :hatch
@@ -360,7 +357,7 @@ module Squared
                 when :user
                   cmd << '--user'
                 when :target
-                  cmd << quote_option('target', path + target)
+                  cmd << quote_option('target', basepath(target))
                 when :force
                   cmd << '--force-reinstall'
                 end
@@ -483,11 +480,7 @@ module Squared
             cmd << '--user' if user
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
-            if workspace.windows?
-              pip = cmd.to_a.drop(1)
-              cmd = python_session '-m pip'
-              cmd.merge(pip)
-            end
+            python_session('-m pip', *cmd.to_a.drop(1)) if workspace.windows?
           end
           run(from: :install)
         end
@@ -524,7 +517,7 @@ module Squared
               if op.arg?(*args)
                 op.push(srcdir)
               else
-                op << quote_option(args.last, path + srcdir)
+                op << quote_option(args.last, basepath(srcdir))
               end
               srcdir = nil
             end
@@ -558,7 +551,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            path.join('dist').tap do |dir|
+            basepath('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
@@ -574,7 +567,7 @@ module Squared
             if op.empty?
               op.push("#{dist.call}/*")
             else
-              op.map! { |val| path + val }
+              op.map! { |val| basepath(val) }
             end
             op.append
           else
@@ -650,7 +643,7 @@ module Squared
 
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
-          option('project', ignore: false) { |val| ret << quote_option('project', path + val) }
+          option('project', ignore: false) { |val| ret << quote_option('project', basepath(val)) }
           ret
         end
 
@@ -671,7 +664,7 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          if !from || opts.empty?
+          unless from && !opts.empty?
             append_global(target: target)
             return []
           end
@@ -695,11 +688,11 @@ module Squared
             op << '--no-build-isolation' if option('build-isolation', equals: '0')
             op.swap
             if edit
-              edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = basepath(edit) unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 op.push(edit)
               else
-                target << quote_option('e', edit)
+                op << quote_option('e', edit)
               end
             end
             case flag
@@ -710,25 +703,25 @@ module Squared
               []
             end
           else
-            opts
+            op.extras
           end
         end
 
         def append_editable(target: @session)
-          return if requirements?
+          return if requirements? && editable == '.'
 
           if (val = option('editable', 'e', target: target, ignore: false))
-            session_delete('e', 'editable', target: target)
+            OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
               return
             else
-              val = path + val
+              val = basepath val
             end
           elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          target << quote_option('e', val)
+          target << quote_option('e', basepath(val))
         end
 
         def append_global(target: @session)
@@ -737,11 +730,11 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', path + val)
+                        quote_option('cache-dir', basepath(val))
                       end
           end
           option('proxy', target: target) { |val| target << shell_option('proxy', val) }
-          option('python', target: target) { |val| target << quote_option('python', path + val) }
+          option('python', target: target) { |val| target << quote_option('python', basepath(val)) }
           append_nocolor(target: target)
         end
 
@@ -863,7 +856,7 @@ module Squared
                       when '.', Pathname
                         val
                       when String
-                        Pathname.new(editable)
+                        Pathname.new(val) unless val.empty?
                       end
         end
 
@@ -874,8 +867,7 @@ module Squared
             val, *opts = val
             @venvopts = opts
           end
-          @venv = Pathname.new(val)
-          @venv = @path + @venv unless @venv.absolute?
+          @venv = basepath(val)
           if projectpath?(@venv)
             if @venv.exist?
               log.debug "venv found: #{@venv}"
@@ -909,11 +901,11 @@ module Squared
         end
 
         def setuptools?
-          build_backend ? build_backend == 'setuptools.build_meta' : dependtype == 2 || dependtype == 4
+          dependtype == 2 || dependtype == 4
         end
 
         def poetry?
-          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+          dependtype == 1
         end
 
         def requirements?