squared 0.4.19 → 0.4.21

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

@@ -6,7 +6,7 @@ module Squared
       class Docker < Base
         COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml docker-compose.yml].freeze
         BAKEFILE = %w[docker-bake.json docker-bake.hcl docker-bake.override.json docker-bake.override.hcl].freeze
-        DIR_DOCKER = (COMPOSEFILE + BAKEFILE).freeze
+        DIR_DOCKER = (COMPOSEFILE + BAKEFILE + ['Dockerfile']).freeze
         OPT_DOCKER = {
           common: %w[tls tlsverify config=p c|context=b D|debug H|host=q l|log-level=b tlscacert=p tlscert=p
                      tlskey=p].freeze,
@@ -91,7 +91,7 @@ module Squared
           def config?(val)
             return false unless (val = as_path(val))
 
-            val.join('Dockerfile').exist? || DIR_DOCKER.any? { |file| val.join(file).exist? }
+            DIR_DOCKER.any? { |file| val.join(file).exist? }
           end
         end
 
@@ -312,7 +312,7 @@ module Squared
             append_context
           when :bake, :compose
             if (val = option(from == :bake ? 'target' : 'service', ignore: false))
-              ret.merge(split_escape(val).map! { |s| shell_escape(s) })
+              ret.merge(split_escape(val).map! { |s| shell_quote(s) })
             end
           end
           ret
@@ -401,7 +401,7 @@ module Squared
                       args << k
                       next
                     when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      v = path + v
+                      v = basepath v
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     args << "#{k}=#{q + v + q}"
@@ -520,7 +520,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.extras.first}")
+                op << tagname("#{@project}:#{op.first}")
                 break
               end
             end
@@ -575,16 +575,15 @@ module Squared
         end
 
         def dockerfile(val = nil)
-          if val == 'Dockerfile'
-            @file = false
-          elsif val
+          if val
             @file = if val.is_a?(Array)
                       val = val.select { |file| basepath(file).exist? }
                       val.size > 1 ? val : val.first
-                    else
-                      val || DIR_DOCKER.find { |file| basepath(file).exist? }
+                    elsif val == true
+                      DIR_DOCKER.find { |file| basepath(file).exist? }
+                    elsif val != 'Dockerfile'
+                      val
                     end
-            @file ||= false
           end
           basepath((@file.is_a?(Array) ? @file.first : @file) || 'Dockerfile')
         end
@@ -622,17 +621,17 @@ module Squared
         end
 
         def append_file(type, target: @session)
-          return if ENV['COMPOSE_FILE'] && compose?(type)
+          return if !@file || (ENV['COMPOSE_FILE'] && compose?(type))
 
           unless @file.is_a?(Array)
             case type
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.map { |val| path + val }.select(&:exist?).size > 1
+              return unless COMPOSEFILE.map { |val| basepath(val) }.select(&:exist?).size > 1
             end
           end
-          files = Array(@file).map { |val| quote_option('file', path + val) }
+          files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
             opts = target.to_a.insert(2, *files)
             target.clear.merge(opts)
@@ -812,7 +811,7 @@ module Squared
         end
 
         def contextdir(val = nil)
-          val && projectpath?(val) ? shell_quote(path + val) : '.'
+          val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
         end
 
         def tagjoin(*args, char: '/')

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

@@ -542,7 +542,7 @@ module Squared
                           commit1 = commithead args.commit1
                           if commit1
                             commit2 = commithead param_guard(action, flag, args: args, key: :commit2)
-                            args = args.extras.to_a
+                            args = args.extras
                             range = [commit1, commit2]
                           else
                             range, opts, refs = choice_commit(multiple: view ? true : 2, values: %w[Options Pathspec])
@@ -752,12 +752,12 @@ module Squared
                           args = args.extras
                         else
                           commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                          args = args.extras.to_a.concat(case mode&.downcase
-                                                         when 'h', 'hard' then ['hard']
-                                                         when 's', 'soft' then ['soft']
-                                                         when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed']
-                                                         end)
+                          args = args.extras.concat(case mode&.downcase
+                                                    when 'h', 'hard' then ['hard']
+                                                    when 's', 'soft' then ['soft']
+                                                    when 'n', 'N' then ['mixed', 'N']
+                                                    else ['mixed']
+                                                    end)
                         end
                         print_success if success?(reset(flag, args, commit: commit))
                       end
@@ -992,7 +992,7 @@ module Squared
               cur = nil
               foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
                 line.chomp!
-                cur ||= line.delete_prefix!('* ')
+                cur ||= line.sub!(/\A\* /, '')
                 heads << line if matchany?(line, reg)
               end
               raise_error('head not found', hint: 'for-each-ref') unless cur
@@ -1028,7 +1028,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << upstream
+            op << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -1110,7 +1110,7 @@ module Squared
                   if op.empty?
                     values = [['Branch name', true]]
                   else
-                    op << op.pop
+                    op << op.shift
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
@@ -1121,7 +1121,7 @@ module Squared
                   op << out
                 end
               elsif !op.empty?
-                op << op.pop
+                op << op.shift
               elsif flag == :branch
                 raise_error 'no branch name'
               end
@@ -1234,7 +1234,7 @@ module Squared
           start = epochtime
           build(@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
+          print_error(e, pass: true)
         else
           print_status(name, subject: 'revbuild', start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
@@ -1265,7 +1265,6 @@ module Squared
             end
           when :patch
             cmd << '--patch'
-            append_pathspec(refs, pass: false)
           when :undo
             cmd << '--hard HEAD@{1}'
             ref = false
@@ -1486,12 +1485,12 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            raise_error 'no branch/commit' if op.empty?
             op << "--#{flag}" << '--'
             if branch
               op << branch
               op.clear(pass: false)
             else
+              raise_error 'no branch/commit' if op.empty?
               append_commit(*op.extras)
             end
           else
@@ -1598,9 +1597,7 @@ module Squared
               end
               on :last, from
             end
-            if ret == 0
-              warn log_message(Logger::WARN, name, 'no ref found', subject: 'branch', hint: 'head', pass: true)
-            end
+            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout))
@@ -1748,8 +1745,8 @@ module Squared
                                                                                  end)
           case flag
           when :blame
-            raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
-            op << '--' << shell_quote(path + op.delete_at(n))
+            raise_error 'no file found' unless (n = op.index { |s| basepath(s).file? })
+            op << '--' << shell_quote(basepath(op.delete_at(n)))
             op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
@@ -1813,7 +1810,10 @@ module Squared
             from = nil
             banner = nil
           else
-            banner = nil if banner && (multiple || !banner?)
+            if banner
+              banner = nil unless banner? && !multiple
+              args = true
+            end
             if cmd.respond_to?(:done)
               if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
                 from = :"git:#{from}"
@@ -1826,17 +1826,14 @@ module Squared
           log&.info cmd
           banner = if banner
                      banner = (banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), '')
-                     format_banner(hint ? "#{banner} (#{hint})" : banner, banner: true)
+                     format_banner(hint ? "#{banner} (#{hint})" : banner)
                    end
           on :first, from
           begin
             if io
-              ret = if stdout
-                      `#{cmd}`
-                    else
-                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-                    end
-              return ret
+              return `#{cmd}` if stdout
+
+              return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
@@ -1952,7 +1949,7 @@ module Squared
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
-            ret[file] = algorithm.hexdigest(File.read(path + file))
+            ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
           ret
         end
@@ -1984,7 +1981,7 @@ module Squared
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'
-                refspec << shell_escape($2, quote: true)
+                refspec << shell_quote($2)
               end
             elsif op.arg?('multiple')
               op.found << opt
@@ -2002,12 +1999,12 @@ module Squared
             end
             op.delete('--all')
           elsif op.arg?('multiple')
-            op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
+            op.add_quote(*op.found)
             return
           elsif option('all')
             op << '--all'
           end
-          op.clear(errors: true, subject: flag.to_s) if flag
+          op.clear(errors: true, subject: flag) if flag
         end
 
         def append_commit(*val, target: @session, head: false)

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[package-lock-only=!? prefer-dedupe=!? 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 install-strategy=b
+                           omit=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,
@@ -106,7 +108,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
 
@@ -257,11 +259,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}? [y/N] ", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -369,7 +366,7 @@ module Squared
                     subdir << target.to_s
                   end
                   begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                    FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
                   rescue StandardError => e
                     print_error e
                     errors += 1
@@ -384,7 +381,7 @@ module Squared
             end
             glob = Array(glob || '**/*')
             target = []
-            from = path + from
+            from = basepath from
             if workspace
               Dir.glob(from + '*').each do |path|
                 next unless (path = Pathname.new(path)).directory?
@@ -469,7 +466,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')
@@ -652,14 +649,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'
@@ -670,13 +672,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
@@ -716,7 +718,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
@@ -809,7 +811,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
@@ -1025,9 +1027,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.unshift('upgrade')
-                          args << 'pip'
-                          install flag, args
+                          install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
@@ -303,7 +300,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
@@ -351,7 +348,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
@@ -474,11 +471,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
@@ -515,7 +508,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
@@ -549,7 +542,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            (path + 'dist').tap do |dir|
+            basepath('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
@@ -558,7 +551,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
@@ -629,7 +622,7 @@ module Squared
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
           if (val = option('project', ignore: false))
-            ret << quote_option('project', path + val)
+            ret << quote_option('project', basepath(val))
           end
           ret
         end
@@ -651,7 +644,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
@@ -674,11 +667,11 @@ module Squared
             end
             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
@@ -689,25 +682,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)
@@ -716,11 +709,11 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', path + val)
+                        quote_option('cache-dir', basepath(val))
                       end
           end
           target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', path + val) if (val = option('python', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
@@ -842,7 +835,7 @@ module Squared
                       when '.', Pathname
                         val
                       when String
-                        Pathname.new(editable)
+                        Pathname.new(val) unless val.empty?
                       end
         end
 
@@ -853,8 +846,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}"
@@ -888,7 +880,7 @@ module Squared
         end
 
         def poetry?
-          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+          dependtype == 1
         end
 
         def requirements?