squared 0.5.7 → 0.5.9

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
 
@@ -251,9 +251,11 @@ module Squared
         end
 
         def clean(*, sync: invoked_sync?('clean'), **)
-          return super unless @clean.nil?
-
-          image(:rm, sync: sync)
+          if runnable?(@clean)
+            super
+          else
+            image(:rm, sync: sync)
+          end
         end
 
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)
@@ -310,7 +312,7 @@ module Squared
             append_context
           when :bake, :compose
             option(from == :bake ? 'target' : 'service', ignore: false) do |a|
-              ret.merge(split_escape(a).map! { |b| shell_escape(b) })
+              ret.merge(split_escape(a).map! { |b| shell_quote(b) })
             end
           end
           ret
@@ -412,7 +414,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}"
@@ -586,16 +588,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
@@ -604,9 +605,9 @@ module Squared
 
         def read_composefile(*keys, target: nil)
           require 'yaml'
-          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') if !target || target.empty?
+          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') unless target && !target.empty?
           Array(target || dockerfile).each do |val|
-            doc = YAML.load_file(path + val)
+            doc = YAML.load_file(basepath(val))
             if keys.empty?
               yield doc
             elsif (data = doc.dig(*keys))
@@ -648,17 +649,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)
@@ -839,7 +840,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

@@ -104,11 +104,11 @@ module Squared
       end
 
       def rev_timeutc(*keys)
-        rev_entry(*keys, val: rev_timenow)
+        rev_entry(*keys, val: time_epoch)
       end
 
       def rev_timesince(*keys, clock: false)
-        epoch = rev_timenow - rev_entry(*keys).to_i
+        epoch = time_epoch - rev_entry(*keys).to_i
       rescue StandardError
         nil
       else
@@ -162,7 +162,7 @@ module Squared
           add: %w[A|all e|edit f|force ignore-errors ignore-missing ignore-removal i|interactive no-all
                   no-ignore-removal n|dry-run p|patch pathspec-file-nul renormalize sparse u|update v|verbose
                   chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose vv abbrev=i color=b
+          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose abbrev=i color=b
                      column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
                      sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
@@ -1236,10 +1236,10 @@ module Squared
               return
             end
           end
-          start = epochtime
+          start = time_epoch
           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) },
@@ -1472,8 +1472,11 @@ module Squared
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
           puts if pass
+          adding = git_spawn 'diff --name-only --no-color'
           source op
-          if amend || !git_spawn('diff --cached --name-only --no-color').empty? || dryrun?
+          cached = git_spawn 'diff --cached --name-only --no-color'
+          if amend || !cached.empty? || dryrun?
+            puts cached if adding.empty? && !cached.empty? && banner?
             source co
             source pu
           elsif banner?
@@ -1601,9 +1604,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))
@@ -1746,8 +1747,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) }
@@ -1757,7 +1758,7 @@ module Squared
             else
               append_commit(*op.extras)
             end
-          when :add, :clean
+          when :add
             if flag == :add && !op.arg?('pathspec-from-file')
               grep, list = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !list.empty?
@@ -1784,8 +1785,8 @@ module Squared
             refs = projectmap op.extras
             raise_error 'no source/destination' unless refs.size > 1
             op.merge(refs)
-          when :rm
-            append_pathspec(op.extras, expect: true)
+          when :rm, :clean
+            append_pathspec(op.extras, expect: flag == :rm)
           end
           source(sync: false, stderr: true)
         end
@@ -1950,7 +1951,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
@@ -1982,7 +1983,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
@@ -2000,12 +2001,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)
@@ -2141,7 +2142,7 @@ module Squared
         end
 
         def matchpathspec
-          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}]
+          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}, /\A--\z/]
         end
 
         def messageopt

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

@@ -5,34 +5,34 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? 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,
+          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          install: %w[package-lock-only=!? prefer-dedupe=!? cpu=b libc=b os=b].freeze,
+          install_base: %w[audit=! bin-links=! fund=! ignore-scripts=!? install-links=!? package-lock=!
+                           strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
+          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod before=q 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=!? pack-destination=p].freeze
+          pack: %w[ignore-scripts=!? 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,
+          cpu: %w[cpu=b libc=b os=b].freeze,
           filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
           install: %w[fix-lockfile force ignore-pnpmfile ignore-workspace lockfile-only merge-git-branch-lockfiles
-                      no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only shamefully-hoist
-                      side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
+                      optimistic-repeat-install no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only
+                      shamefully-hoist side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
                       use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       reporter=b].freeze,
           install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
           install_as: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
-          update: %w[global interactive latest depth=i].freeze,
+          update: %w[g|global i|interactive L|latest depth=i].freeze,
           dedupe: %w[check].freeze,
-          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from sequential
-                  stream use-stderr].freeze,
+          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from
+                  sequential].freeze,
           exec: %w[no-reporter-hide-prefix parallel r|recursive report-summary resume-from c|shell-mode].freeze,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
@@ -109,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
 
@@ -232,7 +232,7 @@ module Squared
                   flags.each do |flag|
                     case action
                     when 'outdated'
-                      format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
+                      format_desc(action, flag, %w[update interactive dry-run], arg: 'opts?')
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -268,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
@@ -379,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
@@ -395,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?
@@ -423,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
@@ -469,6 +460,7 @@ module Squared
                 cmd << '--save-exact' if exact
               else
                 cmd << 'install'
+                append_platform
               end
               option('public-hoist-pattern', ignore: false) do |val|
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
@@ -480,7 +472,9 @@ 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) })
+              else
+                append_platform
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -630,10 +624,13 @@ module Squared
               footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.call(0, found.size)
               File.write(dependfile, doc)
+              if opts.include?('update') || opts.include?('u') || option('update')
+                update
+              else
+                footer.call(0, found.size)
+              end
               commit(:add, refs: ['package.json'], pass: true)
-              install if opts.include?('prune') || opts.include?('p')
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -659,18 +656,23 @@ module Squared
         end
 
         def update(*)
-          package('update', from: :update)
+          package(:update, from: :update)
         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'
@@ -698,15 +700,16 @@ module Squared
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
-                                    flag = yarn == 1 ? 'upgrade' : 'up'
+                                    yarn == 1 ? 'upgrade' : 'up'
                                   else
-                                    flag
+                                    yarn == 1 && flag == :dedupe ? 'install' : flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
-                                             OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                             OPT_YARN.fetch(flag == :dedupe ? :install : flag, []) + OPT_YARN[:common]
                                            else
                                              OPT_BERRY[flag]
                                            end, cmd, project: self)
+            op << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
             op.clear
             append_loglevel
           else
@@ -714,20 +717,20 @@ module Squared
               cmd = session 'pnpm', flag
               list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
               list.concat(OPT_PNPM[:install_as] + OPT_PNPM[:filter]) unless flag == :dedupe
+              list.concat(OPT_PNPM[:cpu]) unless flag == :update
               no = OPT_PNPM[:"#{flag}_no"]
             else
               cmd = session 'npm', flag
               list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
               list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
               no = OPT_NPM[:install_no]
-              cmd << '--save=true' if option('save')
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
             op.each do |opt|
               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
@@ -736,12 +739,13 @@ module Squared
               end
             end
             op.swap
+            append_platform if flag == :install
             append_nocolor
             append_loglevel
             if flag == :dedupe
               op.clear
             else
-              op.append(escape: true)
+              op.append(quote: true)
             end
             op.clear(errors: true)
           end
@@ -819,7 +823,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
@@ -937,6 +941,14 @@ module Squared
           respond_to?(meth) && __send__(meth) ? @pm[prog] : 0
         end
 
+        def dependbin
+          if yarn?
+            'yarn'
+          else
+            pnpm? ? 'pnpm' : 'npm'
+          end
+        end
+
         def version
           @version ||= read_packagemanager(:version)
         end
@@ -1012,12 +1024,8 @@ module Squared
           end
         end
 
-        def dependbin
-          if yarn?
-            'yarn'
-          else
-            pnpm? ? 'pnpm' : 'npm'
-          end
+        def append_platform(target: @session)
+          %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
         end
 
         def dependext