squared 0.5.2 → 0.5.4

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

@@ -98,7 +98,7 @@ module Squared
           'pack' => nil
         })
 
-        def initialize(*, **kwargs)
+        def initialize(*, init: nil, **kwargs)
           super
           if @pass.include?(Node.ref)
             initialize_ref Node.ref
@@ -108,7 +108,7 @@ module Squared
             initialize_env(**kwargs)
           end
           @dependfile = @path + 'package.json'
-          @pm = {}
+          @pm = { __: init }
         end
 
         def ref
@@ -117,11 +117,11 @@ module Squared
 
         def populate(*, **)
           super
-          return unless outdated? && ref?(Node.ref)
+          return unless (outdated? && ref?(Node.ref)) || @only
 
           namespace name do
             Node.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               if flags.nil?
                 case action
@@ -129,10 +129,7 @@ module Squared
                   format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
                   task action, [:save] do |_, args|
                     save = param_guard(action, 'save', args: args, key: :save)
-                    if save.start_with?('=')
-                      exact = true
-                      save = save[1..-1]
-                    end
+                    exact = true if save.delete_prefix!('=')
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
                       packages = args.extras
@@ -269,6 +266,11 @@ 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
@@ -280,7 +282,7 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, workspace: false,
+        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
@@ -289,6 +291,7 @@ module Squared
 
             from = @copy[:from] if @copy.key?(:from)
             into = @copy[:into] if @copy.key?(:into)
+            files = @copy[:files] if @copy.key?(:files)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             link = @copy[:link] if @copy.key?(:link)
             force = @copy[:force] if @copy.key?(:force)
@@ -310,6 +313,7 @@ module Squared
 
           on :first, :copy
           print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          packed = false
           items.each do |dir|
             case dir
             when Pathname
@@ -347,9 +351,49 @@ module Squared
             end
             next unless from && dest&.directory?
 
-            from = path + from
+            if from == :npm
+              begin
+                unless packed
+                  require 'open3'
+                  files = pwd_set do
+                    Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
+                         .first
+                         .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
+                         .map { |item| Pathname.new(item.first) }
+                         .select(&:exist?)
+                  end
+                  .concat(Array(files))
+                  packed = true
+                end
+                to = dest.join(into, npmname)
+                to.mkpath
+                log.info "cp npm:#{npmname} #{to}"
+                subdir = []
+                errors = 0
+                files.each do |file|
+                  s, d = file.is_a?(Array) ? file : [file, file]
+                  dest = to + d
+                  unless subdir.include?((target = dest.dirname).to_s)
+                    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
+                end
+              rescue StandardError => e
+                on_error e, :copy
+              else
+                puts message(to, subdir.size, files.size - errors) if verbose
+              end
+              next
+            end
             glob = Array(glob || '**/*')
             target = []
+            from = path + from
             if workspace
               from.glob('*').each do |entry|
                 next unless entry.directory?
@@ -373,16 +417,14 @@ module Squared
                 end
               end
             else
-              target << [from, dest.join(into, scope || project)]
+              target << [from, dest.join(into, scope || npmname)]
             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
-                log.error e
-                ret = on :error, :copy, e
-                raise if exception && ret != true
+                on_error e, :copy
               end
             end
           end
@@ -396,7 +438,19 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
-            if (yarn = dependtype(:yarn)) > 0
+            pnpm = pnpm?
+            yarn = pnpm ? 0 : dependtype(:yarn)
+            if @pm[:__] && !pnpm && yarn == 0
+              case @pm[:__]
+              when 'pnpm'
+                pnpm = true
+              when 'yarn'
+                yarn = 1
+              when 'berry'
+                yarn = 2
+              end
+            end
+            if yarn > 0
               cmd = session 'yarn'
               if flag == :add
                 cmd << 'add'
@@ -406,7 +460,7 @@ module Squared
                 cmd << 'install'
                 cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
               end
-            elsif pnpm?
+            elsif pnpm
               cmd = session 'pnpm'
               if flag == :add
                 cmd << 'add' << "--save-#{save}"
@@ -448,19 +502,14 @@ module Squared
             log.info cmd.to_s
             on :first, :outdated
           end
-          banner = format_banner(cmd.temp(dryrun ? ' --dry-run' : nil))
+          banner = format_banner(cmd.temp(dryrun ? '--dry-run' : nil))
           print_item banner if sync
           begin
-            data = pwd_set { `#{cmd.temp('--json', '--loglevel=error')}` }
+            data = pwd_set(dryrun: dryrun) { `#{cmd.temp('--json', '--loglevel=error')}` }
             doc = dependfile.read
             json = JSON.parse(doc)
           rescue StandardError => e
-            log.error e
-            unless dryrun
-              ret = on :error, :outdated, e
-              raise if exception && ret != true
-            end
-            warn log_message(Logger::WARN, e) if warning?
+            on_error(e, :outdated, dryrun: dryrun)
             return
           else
             dep1 = json['dependencies'] || {}
@@ -611,7 +660,7 @@ module Squared
           package('update', from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
+        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)
             return
@@ -620,7 +669,7 @@ module Squared
           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')
-          dryrun = dryrun?('npm') if dryrun.nil?
+          dryrun ||= dryrun?('npm')
           if dryrun
             cmd << '--dry-run'
           else
@@ -628,10 +677,10 @@ module Squared
             log.info cmd.to_s
           end
           if sync
-            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(project, styles: theme[:active])}")
+            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
             on :first, from
-            pwd_set(from: from) do
+            pwd_set(from: from, dryrun: dryrun) do
               require 'open3'
               banner = format_banner cmd.to_s
               Open3.popen2e(cmd.done) do |_, out|
@@ -708,21 +757,23 @@ module Squared
             when :major
               if seg[0] != '0' || seg[2].nil?
                 seg[0] = seg[0].succ
+                seg[2] = '0'
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :minor
               if seg[0] == '0'
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
               end
+              seg[4] = '0'
             when :patch
               seg[4] &&= seg[4].succ
             end
             return if (val = seg.join) == cur
           end
-
           begin
             doc = dependfile.read
             if doc.sub!(/"version"\s*:\s*"#{cur}"/, "\"version\": \"#{val}\"")
@@ -746,9 +797,7 @@ module Squared
               raise_error('version not found', hint: dependfile)
             end
           rescue StandardError => e
-            log.debug e
-            ret = on :error, :bump, e
-            raise if exception && ret != true
+            on_error e, :bump
           end
         end
 
@@ -887,7 +936,7 @@ module Squared
         end
 
         def version
-          super || (@version = read_packagemanager(:version))
+          @version ||= read_packagemanager(:version)
         end
 
         def packagename
@@ -913,7 +962,7 @@ module Squared
         else
           if key
             @pm[key]
-          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
+          elsif (ret = @pm[:_]) && (!version || semgte?(ret[(ret.index('@') + 1)..-1], version))
             ret
           end
         end
@@ -978,6 +1027,10 @@ module Squared
           'package.json' if parent&.has?('outdated', Node.ref)
         end
 
+        def npmname
+          packagename || project
+        end
+
         def npmnotice
           [
             { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },

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

@@ -87,7 +87,6 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          @verbose = verbose.size if verbose.is_a?(String) && verbose.match?(/\Av+\z/)
           dependfile_set DEP_PYTHON
           editable_set editable
           venv_set kwargs[:venv]
@@ -95,7 +94,7 @@ module Squared
 
         subtasks({
           'venv' => %i[exec create remove show].freeze,
-          'pip' => %i[uninstall freeze].freeze,
+          'pip' => %i[upgrade uninstall freeze].freeze,
           'install' => %i[user force upgrade target editable].freeze,
           'outdated' => %i[major minor patch].freeze,
           'build' => %i[python poetry pdm hatch].freeze,
@@ -104,17 +103,26 @@ module Squared
           'exec' => nil
         })
 
+        def verbose=(val)
+          case val
+          when /\Av+\z/
+            @verbose = val.size
+          else
+            super
+          end
+        end
+
         def ref
           Python.ref
         end
 
         def populate(*, **)
           super
-          return unless outdated? && ref?(Python.ref)
+          return unless (outdated? && ref?(Python.ref)) || @only
 
           namespace name do
             Python.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               if flags.nil?
                 case action
@@ -159,7 +167,7 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise_error("script: #{val}", hint: 'unknown') if exception
+                              raise_error "script: #{val}" if exception
                               found |= 2
                               log.warn "run script \"#{val}\" (not indexed)"
                             end
@@ -183,7 +191,7 @@ module Squared
                           elsif i || args.empty?
                             readline('Enter command', force: true)
                           else
-                            if (val = command_args(args, prefix: 'python'))
+                            if (val = command_args(args, min: 1, prefix: 'python'))
                               args << val
                             end
                             args.join(' ')
@@ -234,6 +242,14 @@ module Squared
                       end
                     when 'pip'
                       case flag
+                      when :upgrade
+                        format_desc action, flag, 'opts*'
+                        task flag do |_, args|
+                          args = args.to_a
+                          args.prepend('upgrade')
+                          args.append('pip')
+                          install flag, args
+                        end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
                         task flag do |_, args|
@@ -287,7 +303,7 @@ module Squared
                     when 'build'
                       case flag
                       when :poetry
-                        next unless build_backend == 'poetry.core.masonry.api'
+                        next unless poetry?
                       when :pdm
                         next unless build_backend == 'pdm.backend'
                       when :hatch
@@ -325,8 +341,8 @@ module Squared
           elsif outdated?
             venv_init
             workspace.rev_clear(name, sync: sync)
-            if !flag && dependtype == 1
-              cmd = poetry_session 'install', '-n'
+            if !flag && poetry?
+              cmd = poetry_session 'install -n'
               cmd << '--no-root' if option('no-root')
             else
               cmd = pip_session 'install'
@@ -351,7 +367,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated'))
-          cmd = pip_session 'list', '--outdated'
+          cmd = pip_session 'list --outdated'
           append_global
           cmd = session_done cmd
           log.info cmd
@@ -366,7 +382,11 @@ module Squared
           pwd_set(from: :outdated) do
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
-            IO.popen(runenv || {}, cmd).each do |line|
+            if workspace.windows?
+              (venv ? command(runenv, cmd) : `#{cmd}`).lines
+            else
+              IO.popen(runenv || {}, cmd)
+            end.each do |line|
               next if line.match?(/^[ -]+$/)
 
               if start > 0
@@ -454,6 +474,11 @@ 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
           end
           run(from: :install)
         end
@@ -488,7 +513,7 @@ module Squared
             if srcdir
               args = flag == :pdm ? ['d', 'dest'] : ['o', 'output']
               if op.arg?(*args)
-                op.extras << srcdir
+                op.push(srcdir)
               else
                 op << quote_option(args.last, path + srcdir)
               end
@@ -502,7 +527,7 @@ module Squared
             end
             op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
           end
-          op << shell_quote(path + srcdir) if srcdir
+          op.add_path(srcdir) if srcdir
           op.clear
           run(from: :"#{flag}:build")
         end
@@ -531,7 +556,7 @@ module Squared
           case flag
           when :hatch, :twine
             if op.empty?
-              op.extras << "#{dist.call}/*"
+              op.push("#{dist.call}/*")
             else
               op.map! { |val| path + val }
             end
@@ -548,7 +573,7 @@ module Squared
           out = append_pip(nil, opts, from: flag)
           case flag
           when :uninstall
-            raise_error('no packages listed', hint: 'uninstall') if out.empty?
+            raise_error('no packages listed', hint: flag) if out.empty?
             cmd.merge(out)
           when :freeze
             venv_init
@@ -653,9 +678,9 @@ module Squared
             end
             op.swap
             if edit
-              edit = path + edit unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
-                op.extras << edit
+                op.push(edit)
               else
                 target << quote_option('e', edit)
               end
@@ -851,21 +876,29 @@ module Squared
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
-          @venvopts &&= @venvopts.map { |val| OptionPartition.strip(val) }.flatten
-          venv_create(venv, @venvopts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
+          opts = @venvopts&.map { |val| OptionPartition.strip(val) }&.flatten
+          venv_create(venv, opts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
         end
 
         def venv_create(dir, opts = [], env: nil, banner: true)
           cmd, opts = python_session('-m venv', opts: opts)
           op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
-          op.append(dir, delim: true)
-            .clear(pass: false)
-          status = op.arg?(/\A-v+\z/, 'verbose')
+          status = op.append(dir, delim: true)
+                     .clear(pass: false)
+                     .arg?(/\A-v+\z/, 'verbose')
           run(op, env, exception: true, banner: banner)
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 
+        def setuptools?
+          build_backend ? build_backend == 'setuptools.build_meta' : dependtype == 2 || dependtype == 4
+        end
+
+        def poetry?
+          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+        end
+
         def requirements?
           dependtype == 5
         end