squared 0.5.3 → 0.5.5

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

@@ -98,7 +98,7 @@ module Squared
           'pack' => nil
         })
 
-        def initialize(*, **kwargs)
+        def initialize(*, init: nil, asdf: 'nodejs', **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,7 +117,7 @@ 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|
@@ -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
@@ -144,12 +141,12 @@ module Squared
                     depend(:add, packages: packages, save: save, exact: exact)
                   end
                 when 'run'
-                  next if (list = read_scripts).empty?
+                  next if scripts.empty?
 
                   format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
+                      format_list(scripts.to_a, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -441,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'
@@ -451,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}"
@@ -496,7 +505,7 @@ module Squared
           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
@@ -660,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
@@ -671,7 +680,7 @@ module Squared
             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|
@@ -748,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}\"")
@@ -771,15 +782,15 @@ module Squared
                 log.info "bump version #{cur} to #{val} (#{flag})"
                 on :first, :bump
               end
-              if verbose
+              if stdin?
+                puts val
+              elsif verbose
                 major = flag == :major
                 emphasize("version: #{val}", title: name, border: borderstyle, sub: [
                   headerstyle,
                   { pat: /\A(version:)( )(\S+)(.*)\z/, styles: color(major ? :green : :yellow), index: 3 },
                   { pat: /\A(version:)(.*)\z/, styles: theme[major ? :major : :active] }
                 ])
-              elsif stdin?
-                puts val
               end
               on :last, :bump unless dryrun?
             else
@@ -796,7 +807,7 @@ module Squared
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
             op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
-            op << quote_option('out', Pathname.pwd + "#{project}-#{version}.tgz") unless op.arg?('out')
+            op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
           else
             op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
                                      project: self)
@@ -811,7 +822,7 @@ module Squared
                 end
               end
             end
-            op << quote_option('pack-destination', Dir.pwd) unless op.arg?('pack-destination')
+            op.append?('pack-destination', Dir.pwd)
           end
           op.clear
           run(from: :pack)
@@ -925,13 +936,17 @@ module Squared
         end
 
         def version
-          @version ||= read_packagemanager(:version)
+          self.version ||= read_packagemanager(:version)
         end
 
         def packagename
           read_packagemanager :name
         end
 
+        def scripts
+          @scripts ||= read_packagemanager(:scripts).yield_self { |ret| ret.is_a?(Hash) ? ret : {} }
+        end
+
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
@@ -951,7 +966,7 @@ module Squared
         else
           if key
             @pm[key]
-          elsif (ret = @pm[:_]) && !(version && semcmp(ret[(ret.index('@') + 1)..-1], version) == 1)
+          elsif (ret = @pm[:_]) && (!version || semgte?(ret[(ret.index('@') + 1)..-1], version))
             ret
           end
         end
@@ -963,13 +978,8 @@ module Squared
           ret
         end
 
-        def read_scripts
-          ret = read_packagemanager(:scripts)
-          ret.is_a?(Hash) ? ret.to_a : []
-        end
-
         def append_loglevel(target: @session)
-          level = env 'NODE_LOGLEVEL'
+          level = env('NODE_LOGLEVEL')
           silent = !verbose || level == 'silent'
           return unless silent || level
 
@@ -1000,10 +1010,6 @@ module Squared
           end
         end
 
-        def dryrun?(prefix = dependbin, **)
-          super || !option('dry-run', prefix: prefix).nil?
-        end
-
         def dependbin
           if yarn?
             'yarn'
@@ -1028,6 +1034,10 @@ module Squared
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end
+
+        def dryrun?(prefix = dependbin, **)
+          super || !option('dry-run', prefix: prefix).nil?
+        end
       end
 
       Application.implement Node

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

@@ -30,7 +30,7 @@ module Squared
         OPT_POETRY = {
           common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
           build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
-          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=b
+          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=q
                       u|username=b].freeze
         }.freeze
         OPT_PDM = {
@@ -45,7 +45,7 @@ module Squared
                      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
+                      p|publisher=b r|repo=q u|user=q].freeze
         }.freeze
         OPT_TWINE = {
           publish: %w[attestations disable-progress-bar non-interactive s|sign skip-existing verbose cert=p
@@ -78,7 +78,7 @@ module Squared
 
         attr_reader :venv, :editable
 
-        def initialize(*, editable: '.', verbose: nil, **kwargs)
+        def initialize(*, editable: '.', verbose: nil, asdf: 'python', **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -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,13 +103,22 @@ 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|
@@ -124,7 +132,7 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    ['tool.poetry.scripts', 'tool.pdm.scripts', 'project.scripts'].each_with_index do |table, index|
+                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, index|
                       next if (list = read_pyproject(table)).empty?
 
                       if args.command == '#'
@@ -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
@@ -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|
@@ -260,13 +276,16 @@ module Squared
                         end
                       when :upgrade
                         task flag, [:strategy] do |_, args|
-                          case (strategy = args.strategy)
-                          when 'eager', 'only-if-needed'
-                            args = args.extras
-                          else
-                            args = args.to_a
-                            strategy = nil
-                          end
+                          args = case (strategy = args.strategy)
+                                 when 'eager', 'only-if-needed'
+                                   args.extras
+                                 when 'needed'
+                                   strategy = 'only-if-needed'
+                                   args.extras
+                                 else
+                                   strategy = nil
+                                   args.to_a
+                                 end
                           install(flag, args, strategy: strategy)
                         end
                       when :target
@@ -287,7 +306,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
@@ -304,12 +323,18 @@ module Squared
                       end
                       break unless flag == :python
                     when 'publish'
-                      format_desc(action, flag, 'opts*', after: case flag
-                                                                when :hatch then 'artifacts?'
-                                                                when :twine then 'dist?'
-                                                                end)
+                      format_desc(action, flag, 'test?,opts*', after: case flag
+                                                                      when :hatch then 'artifacts?'
+                                                                      when :twine then 'dist?'
+                                                                      end)
                       task flag do |_, args|
-                        publish flag, args.to_a
+                        args = args.to_a
+                        publish(flag, args, test: if args.first == 'test'
+                                                    args.shift
+                                                    true
+                                                  else
+                                                    false
+                                                  end)
                       end
                     end
                   end
@@ -325,8 +350,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 +376,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
@@ -458,6 +483,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
@@ -506,12 +536,12 @@ 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
 
-        def publish(flag, opts = [])
+        def publish(flag, opts = [], test: false)
           case flag
           when :poetry
             poetry_session 'publish'
@@ -528,10 +558,17 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            (path + 'dist').tap do |dir|
+            path.join('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
+          if test
+            if op.arg?('r', flag == :hatch ? 'repo' : 'repository')
+              op.push('test')
+            else
+              op << quote_option('r', 'testpypi')
+            end
+          end
           case flag
           when :hatch, :twine
             if op.empty?
@@ -552,7 +589,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
@@ -655,9 +692,10 @@ module Squared
                 op.found << opt
               end
             end
+            op << '--no-build-isolation' if option('build-isolation', equals: '0')
             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.push(edit)
               else
@@ -769,7 +807,7 @@ module Squared
             end
             @pyproject[table] = ret
           end
-          return ret.find { |val| val[0] == key }&.last if key
+          return ret.find { |val| val.first == key }&.last if key
 
           ret
         end
@@ -870,6 +908,14 @@ module Squared
           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