squared 0.3.10 → 0.4.0

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

@@ -4,9 +4,11 @@ module Squared
   module Workspace
     module Project
       class Node < Git
+        include Prompt
+
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
-          install: %w[prefer-dedupe package-lock-only cpu=q libc=e os=q].freeze,
+          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=b].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,
           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
@@ -37,15 +39,14 @@ module Squared
                            no-node-version-check no-progress non-interactive offline pnp prefer-offline prod
                            pure-lockfile skip-integrity-check strict-semver update-checksums cache-folder=p emoji=b?
                            global-folder=p https-proxy=q link-folder=p modules-folder=p mutex=q network-concurrency=i
-                           network-timeout=i preferred-cache-folder=p production=e? proxy=q otp=e registry=q
-                           scripts-prepend-node-path=e?].freeze,
-          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=e].freeze
+                           network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q].freeze,
+          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze
         }.freeze
         OPT_BERRY = {
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
-                      mode=e].freeze,
-          update: %w[C|caret E|exact F|fixed interactive T|tilde R|recursive mode=e].freeze,
-          dedupe: %w[check json mode=e strategy=b].freeze,
+                      mode=b].freeze,
+          update: %w[C|caret E|exact F|fixed interactive T|tilde R|recursive mode=b].freeze,
+          dedupe: %w[check json mode=b strategy=b].freeze,
           pack: %w[n|dry-run install-if-needed json o|out=p].freeze
         }.freeze
         private_constant :OPT_NPM, :OPT_PNPM, :OPT_YARN, :OPT_BERRY
@@ -93,12 +94,13 @@ module Squared
         def initialize(*, **kwargs)
           super
           if @pass.include?(Node.ref)
-            initialize_ref(Node.ref)
+            initialize_ref Node.ref
             initialize_logger(**kwargs)
           else
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
+          @buildtype = :run if script?
           @pm = {}
           @dependfile = basepath('package.json')
         end
@@ -218,26 +220,25 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', workspace: false, scope: nil, also: nil, create: nil,
+        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, workspace: false,
                  link: false, force: false, override: false, **kwargs)
-          return if @copy == false
-
+          glob = kwargs[:include]
+          pass = kwargs[:exclude]
           if @copy && !override
-            return super if runnable?(@copy)
+            return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
             into = @copy[:into] if @copy.key?(:into)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             link = @copy[:link] if @copy.key?(:link)
-            force = @copy[:force] if @copy.key?(:link)
-            glob = @copy[:include]
-            exclude = @copy[:exclude]
-            scope = @copy[:scope]
-            also = @copy[:also]
-            create = @copy[:create]
-          else
-            glob = kwargs[:include]
-            exclude = kwargs[:exclude]
+            force = @copy[:force] if @copy.key?(:force)
+            scope = @copy[:scope] if @copy.key?(:scope)
+            also = @copy[:also] if @copy.key?(:also)
+            create = @copy[:create] if @copy.key?(:create)
+            glob = @copy[:include] if @copy.key?(:include)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
+          elsif @copy == false
+            return
           end
           items = []
           items << @workspace.home if build? && path != @workspace.home && @workspace.home?
@@ -256,8 +257,6 @@ module Squared
               dest = @workspace.find(name: dir)&.path
               log.warn message("copy project :#{dir}", hint: 'not found') unless dest
             when Hash
-              glob = dir[:include]
-              exclude = dir[:exclude]
               from = dir[:from] if dir.key?(:from)
               into = dir[:into] if dir.key?(:into)
               scope = dir[:scope] if dir.key?(:scope)
@@ -266,11 +265,13 @@ module Squared
               dest = dir[:target]
               create = dir[:create]
               workspace = dir[:workspace]
+              glob = dir[:include]
+              pass = dir[:exclude]
               dest = items.first unless dest && dest != true
             when Project::Base
               dest = dir.path
             else
-              raise_error("given: #{dir}", hint: 'unknown')
+              raise_error "copy given: #{dir}"
             end
             next unless from && dest&.directory?
 
@@ -305,7 +306,7 @@ module Squared
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from.join(val)} #{to}" }
               begin
-                copy_dir(src, to, glob, create: create, link: link, force: force, pass: exclude, verbose: verbose)
+                copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
               rescue StandardError => e
                 log.error e
                 ret = on(:error, :copy, e)
@@ -320,6 +321,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
+            workspace.rev_clear name
             return update if !flag && env('NODE_UPDATE')
 
             if (yarn = dependtype(:yarn)) > 0
@@ -387,7 +389,7 @@ module Squared
               ret = on(:error, :outdated, e)
               raise if exception && ret != true
             end
-            warn log_message(Logger::WARN, e) if warning?
+            warn log_message(Logger::WARN, e, pass: true) if warning?
             return
           else
             dep1 = json['dependencies'] || {}
@@ -405,7 +407,7 @@ module Squared
 
               latest = val['latest']
               ch = file[0]
-              if ch =~ /[~^]/
+              if ch.match?(/[~^]/)
                 file = file[1..-1]
               elsif inter && rev == :major
                 major = true
@@ -414,7 +416,7 @@ module Squared
                 next
               end
               current = val['current'] || file
-              want = rev == :major && (ver = latest.match(SEM_VER)) && !ver[6] ? latest : val['wanted']
+              want = rev == :major && !latest[SEM_VER, 6] ? latest : val['wanted']
               next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               f = semscan(file)
@@ -540,7 +542,9 @@ module Squared
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, **)
           if read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private') if warning?
+            if warning?
+              warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private', pass: true)
+            end
             return
           end
           return unless version
@@ -564,7 +568,7 @@ module Squared
                 banner = format_banner(cmd.to_s)
                 Open3.popen2e(cmd.done) do |_, out|
                   write_lines(out, banner: banner, sub: npmnotice + [
-                    { pat: /^(.+)(Tarball .+)$/, styles: :blue, index: 2 }
+                    { pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2 }
                   ])
                 end
               end
@@ -676,7 +680,7 @@ module Squared
               end
               on :last, :bump unless dryrun?
             else
-              raise_error('not found', hint: 'version')
+              raise_error('version not found', hint: dependfile)
             end
           rescue StandardError => e
             log.debug e
@@ -699,26 +703,26 @@ module Squared
           run(from: :pack)
         end
 
-        def compose(opts, flags = nil, script: false, args: nil, from: nil, **)
-          return unless opts
+        def compose(target, opts = nil, script: false, args: nil, from: :run, **)
+          return unless target
 
           if script
             ret = session dependbin, 'run'
-            raise_error("#{dependbin} run script: given #{opts}", hint: from) unless append_any(opts)
-            append_any flags if flags
+            raise_error("#{dependbin} run: given #{target}", hint: from) unless append_any(target, build: true)
+            append_any opts if opts
             append_loglevel
             append_any(args, delim: true) if args
             ret
           else
-            case opts
+            case target
             when String
-              opts
+              target
             when Hash
-              append_hash(opts).join(' ')
+              append_hash(target).join(' ')
             when Enumerable
-              opts.to_a.join(' ')
+              target.to_a.join(' ')
             else
-              raise_error("#{project}: given #{opts}", hint: from)
+              raise_error("compose given: #{target}", hint: from)
             end
           end
         end
@@ -727,10 +731,6 @@ module Squared
           @depend != false && (!@depend.nil? || outdated?)
         end
 
-        def copy?
-          super || @copy.is_a?(Hash)
-        end
-
         def outdated?
           dependfile.exist?
         end
@@ -740,8 +740,8 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if basepath('yarn.lock', ascend: dependext).exist?
-                            if (rc = basepath('.yarnrc.yml', ascend: dependext)).exist?
+          (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependext).exist?
+                            if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?
                               begin
                                 require 'yaml'
                                 doc = YAML.load_file(rc)
@@ -761,7 +761,7 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if basepath('pnpm-lock.yaml', ascend: dependext).exist?
+          (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependext).exist?
                             begin
                               require 'yaml'
                               doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependext))
@@ -913,9 +913,9 @@ module Squared
 
         def npmnotice
           [
-            { pat: /^(npm error )(code|\d+)(.+)$/, styles: :cyan, index: 2 },
-            { pat: /^(npm )(error)(.*)$/, styles: :red, index: 2 },
-            { pat: /^(npm )(notice)(.*)$/, styles: :cyan, index: 2 },
+            { 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 )(.+)$/, styles: :bold }
           ]
         end

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

@@ -4,22 +4,39 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        REQUIREMENTS = %w[requirements.txt pyproject.toml].freeze
+        REQUIREMENTS = %w[requirements.txt pyproject.toml setup.cfg].freeze
         SETUPTOOLS = %w[setup.py pyproject.toml].freeze
         DIR_PYTHON = (REQUIREMENTS + SETUPTOOLS).freeze
+        OPT_PYTHON = {
+          common: %w[b B d E h i I O OO P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          build: %w[n|no-isolation s|sdist v|verbose w|wheel x|skip-dependency-check C|config-setting=q installer=b
+                    o|outdir=p].freeze
+        }.freeze
         OPT_PIP = {
           common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-python-version-warning
                      q|quiet require-virtualenv v|verbose cache-dir=p cert=p client-cert=p exists-action=b log=p
-                     proxy=q python=e retries=i timeout=i trusted-host=e use-deprecated=e use-feature=e].freeze,
+                     proxy=q python=q retries=i timeout=i trusted-host=b use-deprecated=b use-feature=b].freeze,
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
-                      no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=e
-                      config-settings=q c|constraint=p e|editable=v? extra-index-url=q f|find-links=q global-option=q
+                      no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=b
+                      config-settings=q c|constraint=p e|editable=b? extra-index-url=q f|find-links=q global-option=q
                       implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
-                      python-version=q report=p r|requirement=p root=p root-user-action=e src=p t|target=p
+                      python-version=q report=p r|requirement=p root=p root-user-action=b src=p t|target=p
                       upgrade-strategy=b].freeze
         }.freeze
-        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PIP
+        OPT_HATCH = {
+          common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=e
+                     q|quiet v|verbose].freeze,
+          build: %w[clean-hooks-after ext hooks-only no-hooks c|clean t|target=b].freeze,
+          publish: %w[initialize-auth n|no-prompt y|yes a|auth=q ca-cert=p client-cert=p client-key=p o|option=q
+                      p|publisher=b r|repo=b u|user=q].freeze
+        }.freeze
+        OPT_TWINE = {
+          publish: %w[attestations disable-progress-bar non-interactive skip-existing verbose s|sign c|comment=q
+                      config-file=p cert=p client-cert=p i|identity=b p|password=q r|repository=b repository-url=q
+                      sign-with=b u|username=q].freeze
+        }.freeze
+        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_HATCH, :OPT_TWINE
 
         class << self
           def populate(*); end
@@ -47,7 +64,7 @@ module Squared
         def initialize(*, **kwargs)
           super
           if @pass.include?(Python.ref)
-            initialize_ref(Python.ref)
+            initialize_ref Python.ref
             initialize_logger(**kwargs)
           else
             initialize_build(Python.ref, **kwargs)
@@ -58,7 +75,9 @@ module Squared
         end
 
         @@tasks[ref] = {
-          'install' => %i[user force upgrade target editable].freeze
+          'install' => %i[user force upgrade target editable].freeze,
+          'build' => %i[python hatch].freeze,
+          'publish' => %i[twine hatch].freeze
         }.freeze
 
         def ref
@@ -111,6 +130,16 @@ module Squared
                         depend flag, args.to_a
                       end
                     end
+                  when 'build'
+                    format_desc(action, flag, 'opts*', after: flag == :hatch ? 'location?' : 'srcdir?')
+                    task flag do |_, args|
+                      buildx flag, args.to_a
+                    end
+                  when 'publish'
+                    format_desc(action, flag, 'opts*', after: flag == :hatch ? 'artifacts?' : 'dist?')
+                    task flag do |_, args|
+                      publish flag, args.to_a
+                    end
                   end
                 end
               end
@@ -122,6 +151,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
+            workspace.rev_clear name
             cmd = pip_session 'install'
             case flag
             when :user
@@ -143,21 +173,6 @@ module Squared
           end
         end
 
-        def install(flag, opts, strategy: nil)
-          cmd = pip_session 'install'
-          out = append_pip(flag, opts, from: :install)
-          case flag
-          when :editable
-            cmd << '--editable' << (out.pop || '.')
-            option_clear out
-          when :upgrade
-            cmd << '--upgrade'
-            cmd << basic_option('upgrade-strategy', strategy) if strategy
-            append_value out
-          end
-          run(from: :install)
-        end
-
         def outdated(*, sync: invoked_sync?('outdated'))
           cmd = pip_session 'list', '--outdated'
           append_global
@@ -173,7 +188,7 @@ module Squared
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
             IO.popen(cmd).each do |line|
-              next if line =~ /^[\s-]+$/
+              next if line.match?(/^[\s-]+$/)
 
               if start > 0
                 unless stdin?
@@ -210,7 +225,7 @@ module Squared
                 end
                 out.("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
-              elsif line =~ /^Package /
+              elsif line.start_with?('Package')
                 unless stdin?
                   sub = { pat: /^(.*)(?<!\dm)(Package|Latest)(.+)$/, styles: theme[:header], index: 2 }
                   out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
@@ -231,6 +246,82 @@ module Squared
           on :last, :outdated
         end
 
+        def install(flag, opts = [], strategy: nil)
+          cmd = pip_session 'install'
+          out = append_pip(flag, opts, from: :install)
+          case flag
+          when :editable
+            cmd << '--editable' << (out.pop || '.')
+            option_clear out
+          when :upgrade
+            cmd << '--upgrade'
+            cmd << basic_option('upgrade-strategy', strategy) if strategy
+            append_value out
+          end
+          run(from: :install)
+        end
+
+        def buildx(flag, opts = [])
+          cmd = session flag
+          out = []
+          srcdir = nil
+          case flag
+          when :python
+            cmd << shell_option('m', 'build')
+            list = OPT_PYTHON[:build] + OPT_PYTHON[:common]
+          when :hatch
+            cmd << 'build'
+            list = OPT_HATCH[:build] + OPT_HATCH[:common]
+          end
+          option_sanitize(opts, list).first.each do |opt|
+            if opt =~ /^(v+|q+)$/ || (flag == :python && opt =~ /^(b+)$/)
+              cmd << "-#{$1}"
+            elsif !srcdir && basepath(opt).exist? && projectpath?(opt)
+              srcdir = opt
+            else
+              out << opt
+            end
+          end
+          if flag == :hatch
+            if ENV['HATCH_BUILD_LOCATION']
+              srcdir = nil
+            else
+              srcdir ||= path
+            end
+            cmd << basic_option('p', project) unless ENV['HATCH_PROJECT'] || session_arg?('p', 'project')
+          end
+          cmd << shell_quote(basepath(srcdir)) if srcdir
+          option_clear out
+          run(from: :"#{flag}:build")
+        end
+
+        def publish(flag, opts = [])
+          cmd = session flag
+          out = []
+          case flag
+          when :twine
+            cmd << 'upload'
+            list = OPT_TWINE[:publish]
+          when :hatch
+            cmd << 'publish'
+            list = OPT_HATCH[:publish] + OPT_HATCH[:common]
+          end
+          option_sanitize(opts, list).first.each do |opt|
+            if flag == :hatch && opt =~ /^(v+|q+)$/
+              cmd << "-#{$1}"
+            else
+              out << opt
+            end
+          end
+          if out.empty?
+            dist = basepath.join('dist')
+            raise_error('no source files given', hint: dist) unless dist.directory? && !dist.empty?
+            out << "#{dist}/*"
+          end
+          append_value out
+          run(from: :"#{flag}:publish")
+        end
+
         def variable_set(key, *val, **)
           case key
           when :dependfile
@@ -265,12 +356,10 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          if !from || opts.empty?
-            append_global(target: target)
-            return []
-          end
+          append_nocolor(target: target)
+          return [] unless from && !opts.empty?
+
           opts, pat = option_sanitize(opts, OPT_PIP[from] + OPT_PIP[:common], target: target)
-          append_global(target: target)
           out = []
           edit = nil
           opts.each do |opt|
@@ -304,18 +393,18 @@ module Squared
           end
         end
 
-        def append_global(target: @session)
-          if (val = option('cache-dir', target: target))
-            target << case val
-                      when '0', 'false'
-                        '--no-cache-dir'
-                      else
-                        quote_option('cache-dir', basepath(val))
-                      end
+        def append_global
+          if (val = option('cache-dir'))
+            cmd << case val
+                   when '0', 'false'
+                     '--no-cache-dir'
+                   else
+                     quote_option('cache-dir', basepath(val))
+                   end
           end
-          target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
-          append_nocolor(target: target)
+          cmd << shell_option('proxy', val) if (val = option('proxy'))
+          cmd << quote_option('python', basepath(val)) if (val = option('python'))
+          append_nocolor
         end
       end