squared 0.7.4 → 0.7.6

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

@@ -156,7 +156,7 @@ module Squared
           'package' => %i[install add update dedupe rebuild reinstall].freeze,
           'outdated' => %i[major minor patch].freeze,
           'bump' => %i[version major minor patch].freeze,
-          'publish' => %i[latest tag].freeze,
+          'publish' => %i[latest tag verify].freeze,
           'tsc' => %i[project build].freeze,
           'add' => nil,
           'run' => nil,
@@ -209,11 +209,10 @@ module Squared
                     depend(:add, packages: packages, save: save)
                   end
                 when 'run'
-                  next if scripts.empty?
-
                   format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
-                    list = scripts.to_a
+                    next if (list = scripts.to_a).empty?
+
                     if args.script == '#'
                       format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
@@ -242,7 +241,7 @@ module Squared
                              else
                                npmopts :run
                              end
-                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self)
+                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self, strict: strict?)
                                      .add_first
                                      .append(delim: true, quote: false)
                       run(from: :run)
@@ -261,7 +260,7 @@ module Squared
                               list = npmopts :exec
                               session 'npm', 'exec'
                             end
-                      op = OptionPartition.new(args, list, cmd, project: self)
+                      op = OptionPartition.new(args, list, cmd, project: self, strict: strict?)
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
@@ -334,21 +333,34 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?', before: ('tag' if flag == :tag))
-                      task flag do |_, args|
-                        args = args.to_a
-                        access = if has_value!(args, 'r', 'restricted')
-                                   'restricted'
-                                 elsif has_value!(args, 'p', 'public')
-                                   'public'
-                                 end
-                        dryrun = has_value!(args, 'd', 'dry-run')
-                        if flag == :latest
-                          otp = args.first
-                        else
-                          tag, otp = param_guard(action, flag, args: args)
+                      if flag == :verify
+                        format_desc action, flag, 'version?,ext*'
+                        task flag, [:version] do |_, args|
+                          ext = args.extras
+                          if (version = args.version)&.match?(/^\.?[a-z]+$/i)
+                            ext.unshift(version)
+                            version = nil
+                          end
+                          publish(flag, version: version, ext: ext)
+                        end
+                      else
+                        format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?',
+                                    before: ('tag' if flag == :tag))
+                        task flag do |_, args|
+                          args = args.to_a
+                          access = if has_value!(args, 'r', 'restricted')
+                                     'restricted'
+                                   elsif has_value!(args, 'p', 'public')
+                                     'public'
+                                   end
+                          dryrun = has_value!(args, 'd', 'dry-run')
+                          if flag == :latest
+                            otp = args.first
+                          else
+                            tag, otp = param_guard(action, flag, args: args)
+                          end
+                          publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                         end
-                        publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                       end
                     when 'tsc'
                       break unless @tsfile
@@ -532,6 +544,7 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
+            ci = option('ci')
             om = lambda do |cmd|
               if omit
                 save = case save
@@ -569,7 +582,7 @@ module Squared
                 end
                 if nolockfile?('yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif ci
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -605,15 +618,15 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif ci
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', ci ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
+              cmd << '--force' if option('force')
               append_nocolor
               append_loglevel
               if omit
@@ -881,47 +894,122 @@ module Squared
           package(:update, from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil,
+                    version: nil, ext: [], workspace: false)
           if read_package('private')
+            return if workspace
+
             ws = children.select { |proj| proj.ref?(Node.ref) }
             if ws.empty?
               print_error('nothing to publish', subject: name, hint: 'private')
-            elsif confirm_basic('Publish workspace?', ws.map(&:name).join(', '), 'N')
-              ws.each { |proj| proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun) }
+            elsif confirm_basic("#{flag == :verify ? 'Verify' : 'Publish'} workspace?", ws.map(&:name).join(', '), 'N')
+              ws.each do |proj|
+                proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, version: version,
+                                   ext: ext, workspace: true)
+              end
             end
-            return
-          end
-          return print_error("version: #{dependname}", subject: name, hint: 'not found') unless version
-
-          cmd = session 'npm', 'publish'
-          cmd << basic_option('otp', otp) if otp ||= option('otp')
-          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'
-          else
-            from = :'npm:publish'
-            log.info cmd.to_s
-          end
-          if sync
-            run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
-          else
-            require 'open3'
-            on :first, from
-            pwd_set(cmd, dryrun: dryrun) do
-              cmd = session_done cmd
-              Open3.popen2e(cmd) do |_, out|
-                write_lines(out, banner: format_banner(cmd),
-                                 sub: npmnotice(opt_style(color(:bright_blue), /^(.+)(Tarball .+)$/, 2)))
+          elsif version ||= self.version
+            if flag == :verify
+              require 'open-uri'
+              require 'digest'
+              ext = ext.map { |val| val[0] == '.' ? val : ".#{val}" }
+              url = "https://unpkg.com/#{read_package('name')}@#{version}?meta"
+              print_item format_banner(url, command: false)
+              URI.open(url) do |f|
+                doc = JSON.parse(f.read)
+                n = doc['prefix'].size
+                i = 0
+                j = doc['files'].size
+                pad = j.to_s.size
+                m = 0
+                c = 0
+                e = 0
+                doc['files'].each do |item|
+                  path = item['path'][n..-1]
+                  js = File.extname(path)
+                  next unless ext.empty? || ext.any? { |val| val == js }
+
+                  begin
+                    raise unless (file = basepath!(path)) && item['integrity'] =~ /^(sha\d+)-(.+)$/
+
+                    hash = case $1
+                           when 'sha384'
+                             Digest::SHA384
+                           when 'sha512'
+                             Digest::SHA512
+                           else
+                             Digest::SHA256
+                           end
+                           .base64digest(file.read)
+                    status = if hash == $2
+                               m += 1
+                               sub_style 'match', color(:green)
+                             else
+                               c += 1
+                               sub_style 'check', theme[:caution]
+                             end
+                  rescue
+                    status = sub_style 'error', theme[:warn]
+                    e += 1
+                  end
+                  i += 1
+                  puts "#{i.to_s.rjust(pad)}. #{status} #{path}"
+                end
+                if i == 0
+                  puts("No files #{ext.empty? ? 'found' : "matched: #{ext.join(', ')}"}")
+                else
+                  total = ["match #{m}"]
+                  total << "check #{c}" unless c == 0
+                  total << "error #{e}" unless e == 0
+                  unless i == j
+                    s = "in #{j}"
+                    if total.size == 1
+                      total[0] += " #{s}"
+                    else
+                      total << s
+                    end
+                  end
+                  puts print_footer(total.join(' / '), right: true, sub: [
+                    opt_style(color(:green), /^(.*)(match)(.+)$/, 2),
+                    opt_style(theme[:caution], /^(.+)(check)(.+)$/, 2),
+                    opt_style(theme[:warn], /^(.+)(error)(.+)$/, 2)
+                  ])
+                end
+              end
+            else
+              cmd = session 'npm', 'publish'
+              cmd << basic_option('otp', otp) if otp ||= option('otp')
+              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'
+              else
+                from = :'npm:publish'
+                log.info cmd.to_s
+              end
+              if sync
+                run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
+              else
+                require 'open3'
+                on :first, from
+                pwd_set(cmd, dryrun: dryrun) do
+                  cmd = session_done cmd
+                  Open3.popen2e(cmd) do |_, out|
+                    write_lines(out, banner: format_banner(cmd),
+                                     sub: npmnotice(opt_style(color(:bright_blue), /^(.+)(Tarball .+)$/, 2)))
+                  end
+                end
+                on :last, from
               end
             end
-            on :last, from
+          elsif !workspace
+            print_error("version: #{dependname}", subject: name, hint: 'not found')
           end
         end
 
@@ -958,7 +1046,7 @@ module Squared
                                                                          when :add, :update then OPT_BERRY[:add_a]
                                                                          else []
                                                                          end
-                                           end, cmd, project: self)
+                                           end, cmd, project: self, strict: strict?)
             if yarn == 1 && flag != :reinstall
               op << '--no-lockfile' if nolockfile?('yarn')
               op << '--ignore-engines' if option('ignore-engines')
@@ -1027,7 +1115,7 @@ module Squared
                        session('npm', flag)
                      ]
                    end
-            op = OptionPartition.new(*args, no: no, project: self)
+            op = OptionPartition.new(*args, no: no, project: self, strict: strict?)
             append_platform if flag == :install
             append_nocolor
           end
@@ -1047,7 +1135,8 @@ module Squared
               end
             end
             op.swap.concat(packages)
-            raise_error ArgumentError, 'no packages to add' if op.empty? && spec == 1
+            raise ArgumentError, 'no packages to add' if op.empty? && spec == 1
+
             op.append(quote: true)
               .clear(errors: true)
           else
@@ -1092,10 +1181,11 @@ module Squared
 
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
-            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
+            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self, strict: strict?)
             op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
           else
-            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self)
+            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self,
+                                                                                          strict: strict?)
             unless pnpm?
               op.each do |opt|
                 next unless opt =~ op.values
@@ -1130,7 +1220,7 @@ module Squared
             list.concat(OPT_TSC[:watch])
             cmd << '-w'
           end
-          op = OptionPartition.new(args, list, cmd, project: self, sep: ' ')
+          op = OptionPartition.new(args, list, cmd, project: self, strict: strict?, sep: ' ')
           unless p
             if b.is_a?(String)
               op.add_path(b)

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

@@ -216,7 +216,8 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise_error "script: #{val}" if exception
+                              raise "script: #{val}" if exception
+
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
                             end
@@ -227,12 +228,12 @@ module Squared
                     end
                     next if found.anybits?(1)
 
-                    puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
+                    puts log_message(found == 0 ? Logger::INFO : Logger::WARN,
                                      "no scripts #{found == 0 ? 'found' : 'executed'}",
                                      subject: name, hint: pyprojectfile)
                   end
                 when 'exec'
-                  format_desc action, nil, ':|command,args*'
+                  format_desc action, nil, 'command|:,args*'
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !workspace.windows?
@@ -243,7 +244,7 @@ module Squared
                             command_args(args, min: 1, prefix: 'python')
                             args.join(' ')
                           end
-                    shell(cmd, name: :exec, chdir: path)
+                    run(cmd, send: :exec, banner: false)
                   end
                 end
               else
@@ -296,11 +297,24 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/uninstall,opts*"
                         task flag do |_, args|
-                          next unless (file = pip(flag, opts: args.to_a, banner: true)) && !silent?
-
-                          puts File.read(file)
+                          opts = args.to_a
+                          if has_value!(opts, 'u', 'uninstall')
+                            unless venv
+                              print_error('no venv detected', subject: name)
+                              exit 1
+                            end
+                            require 'tempfile'
+                            temp = Tempfile.new("#{name}-")
+                            temp.close
+                            requirement = Pathname.new(temp)
+                          end
+                          file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
+                          puts File.read(file) unless silent?
+                          if requirement && confirm_basic('Uninstall?', file)
+                            pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
+                          end
                         end
                       when :uninstall
                         format_desc action, flag, 'package+,opts*'
@@ -590,7 +604,7 @@ module Squared
         def install(flag, opts = [], packages: [], banner: !silent?)
           if flag == :poetry
             OptionPartition.new(opts, OPT_POETRY[:install] + OPT_POETRY[:common], poetry_session('install'),
-                                project: self, single: singleopt(flag))
+                                project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
           end
@@ -600,7 +614,7 @@ module Squared
             op.clear
           when :user, :upgrade
             op.concat(packages)
-            raise_error 'no packages listed', hint: flag if op.empty?
+            raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
             op << "--#{flag}"
             op.append
             python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
@@ -626,7 +640,7 @@ module Squared
                    cmd, opts = python_session('-m build', opts: opts)
                    OPT_PYTHON[:build]
                  end
-          op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, single: singleopt(flag))
           case flag
           when :hatch
             op.add_path(outdir) if !ENV['HATCH_BUILD_LOCATION'] && (outdir ||= op.shift)
@@ -662,7 +676,9 @@ module Squared
           from = symjoin flag, 'build'
           if flag == :meson
             cmd = session_output 'meson', 'compile', quote_option('C', basepath(outdir))
-            OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self).append unless op.empty?
+            unless op.empty?
+              OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self, strict: strict?).append
+            end
             run_s(op, cmd.done, from: from)
           else
             op.clear
@@ -685,7 +701,7 @@ module Squared
                    session 'twine', 'upload'
                    OPT_TWINE[:publish]
                  end
-          op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, @session, project: self, strict: strict?, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
@@ -720,8 +736,8 @@ module Squared
         def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], **kwargs)
           op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
                                    session('python', path: !venv?),
-                                   project: self, multiple: [/^-c/], single: singleopt(:python), args: true,
-                                   stdin: true)
+                                   project: self, strict: strict?, multiple: [/^-c/], single: singleopt(:python),
+                                   args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
             op.exist?(add: true)
@@ -755,7 +771,7 @@ module Squared
               when :install, :uninstall
                 op << '.' if installable? && !op.arg?('r', 'requirement')
               else
-                raise_error 'no packages listed', hint: flag
+                raise_error ArgumentError, 'no packages listed', hint: flag
               end
             elsif flag == :install
               op.append_any
@@ -769,7 +785,12 @@ module Squared
           when :freeze
             venv_init
             op << '>'
-            op.add_quote(ret = basepath(op.detect { |val| op.exist?(val) } || DEP_PYTHON[4]))
+            ret = kwargs[:requirement] || begin
+              file = op.detect { |val| op.exist?(val) }
+              op.remove(file) if file
+              basepath(file || DEP_PYTHON[4])
+            end
+            op.add_quote(ret)
               .clear
           when :cache
             op.concat(args)
@@ -852,7 +873,7 @@ module Squared
           when :editable
             editable_set args.first
           when :venv
-            @venv = args.empty? || args.first.nil? ? nil : basepath(*args)
+            @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
             super
           end
@@ -867,7 +888,7 @@ module Squared
         end
 
         def venv?
-          !venv.nil?
+          !venv.nil? && venv.directory? && !venv.empty?
         end
 
         def serve?
@@ -877,11 +898,18 @@ module Squared
         private
 
         def pip_session(*cmd)
-          session('pip', *cmd, *preopts, path: !venv?)
+          main = venv?
+          ret = session('pip', *cmd, *preopts, main: main, path: false)
+          return ret if main
+
+          python_session '-m', ret.to_s
         end
 
         def pip_output(*cmd)
-          session_output('pip', *cmd, *preopts, path: !venv?)
+          ret = session_output('pip', *cmd, path: false)
+          return ret if venv?
+
+          session_output 'python', '-m', ret.to_s
         end
 
         def python_session(*cmd, opts: nil)
@@ -910,12 +938,12 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          op = OptionPartition.new(opts, common, project: self, strict: strict?, single: singleopt(name.to_sym))
           [session(name, *pre, *op.to_a, *cmd, path: !venv?), op.extras]
         end
 
         def append_pip(flag, opts, list, target: @session)
-          op = OptionPartition.new(opts, list, target, project: self, single: singleopt)
+          op = OptionPartition.new(opts, list, target, project: self, strict: strict?, single: singleopt)
           append_global(target: target)
           case flag
           when :install, :lock, :wheel, :editable, :upgrade
@@ -1172,7 +1200,7 @@ module Squared
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self, strict: strict?)
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)