squared 0.4.16 → 0.4.18

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

@@ -97,7 +97,7 @@ module Squared
           'pack' => nil
         })
 
-        def initialize(*, **kwargs)
+        def initialize(*, init: nil, **kwargs)
           super
           if @pass.include?(Node.ref)
             initialize_ref Node.ref
@@ -107,7 +107,7 @@ module Squared
             initialize_env(**kwargs)
           end
           @dependfile = @path + 'package.json'
-          @pm = {}
+          @pm = { __: init }
         end
 
         def ref
@@ -116,7 +116,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|
@@ -429,7 +429,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'
@@ -439,7 +451,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}"
@@ -645,10 +657,10 @@ module Squared
             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')
-          dryrun &&= dryrun?('npm')
+          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
             cmd << '--dry-run'
           else
@@ -659,13 +671,12 @@ module Squared
             run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
             on :first, from
-            pwd_set(from: :publish, dryrun: dryrun) do
+            pwd_set(from: from, dryrun: dryrun) do
               require 'open3'
-              banner = format_banner(cmd.to_s)
+              banner = format_banner cmd.to_s
               Open3.popen2e(cmd.done) do |_, out|
-                write_lines(out, banner: banner, sub: npmnotice + [
-                  { pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2 }
-                ])
+                write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
+                                 banner: banner)
               end
             end
             on :last, from
@@ -737,15 +748,18 @@ 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
@@ -760,15 +774,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
@@ -785,7 +799,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)
@@ -800,7 +814,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)
@@ -914,13 +928,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_scripts.to_h
+        end
+
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
@@ -940,7 +958,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
@@ -989,10 +1007,6 @@ module Squared
           end
         end
 
-        def dryrun?(prefix = dependbin, **)
-          super || !option('dry-run', prefix: prefix).nil?
-        end
-
         def dependbin
           if yarn?
             'yarn'
@@ -1017,6 +1031,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

@@ -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.unshift('upgrade')
+                          args << '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
@@ -458,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
@@ -506,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
@@ -552,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,7 +674,7 @@ 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.push(edit)
               else
@@ -765,7 +786,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
@@ -866,6 +887,10 @@ module Squared
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 
+        def poetry?
+          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+        end
+
         def requirements?
           dependtype == 5
         end

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

@@ -25,8 +25,8 @@ module Squared
           common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
+          install_base: %w[force full-index quiet redownload retry gemfile=p j|jobs=i].freeze,
+          update: %w[conservative local pre ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
                        update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
@@ -102,7 +102,13 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          @gemfile = path + gemspec if gemspec
+          @gemfile = if gemspec == false
+                       false
+                     elsif gemspec
+                       path + (gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
+                     elsif (gemspec = path + "#{name}.gemspec").exist? || (gemspec = path + "#{project}.gemspec").exist?
+                       gemspec
+                     end
           return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
           begin
@@ -126,7 +132,7 @@ module Squared
 
         def populate(*, **)
           super
-          return unless outdated? && ref?(Ruby.ref)
+          return unless (outdated? && ref?(Ruby.ref)) || @only
 
           namespace name do
             Ruby.subtasks do |action, flags|
@@ -140,21 +146,21 @@ module Squared
                   format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
-                                                                                 each: ->(val) { val[0] + val[1].to_s })
+                      format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
+                                                                             each: ->(val) { val[0] + val[1].to_s })
                     else
                       args, opts = args.to_a.partition { |val| indexitem(val) }
                       if args.empty?
                         rake(opts: opts)
                       else
-                        list = read_rakefile
+                        tasks = raketasks
                         while (n, pre = indexitem(args.shift))
-                          if (item = list[n - 1])
+                          if (item = tasks[n - 1])
                             cmd = pre ? "#{pre} #{item.first}" : item.first
                           elsif exception
-                            indexerror n, list
+                            indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{list.size} (out of range)"
+                            log.warn "rake task #{n} of #{tasks.size} (out of range)"
                             next
                           end
                           if opts.empty?
@@ -171,7 +177,7 @@ module Squared
                   format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
                     args = args.to_a
-                    name = basepath('lib').join("#{gemname}.rb").exist? ? gemname : nil
+                    name = gemlib.any? { |file| basepath(file).join("#{gemname}.rb").exist? } ? gemname : nil
                     irb(name, args, args: (readline('Enter file [arguments]', force: false) if args.delete(':')))
                   end
                 else
@@ -275,7 +281,7 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+        def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -426,7 +432,16 @@ module Squared
 
         def install(flag, opts = [])
           bundle_session 'install', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          op = append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          if op.arg?('force')
+            op.delete('--force')
+            if flag != :redownload
+              op << '--redownload'
+            elsif (lock = basepath('Gemfile.lock')).exist?
+              config = basepath('.bundle', 'config')
+              lock.delete unless config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+            end
+          end
           run_rb(from: :install)
         end
 
@@ -565,7 +580,7 @@ module Squared
             minor = 0
             patch = 0
             update = []
-            pwd_set(pass: !pwd.nil?, from: from) do
+            pwd_set(pass: !gempwd.nil?, from: from) do
               items = [[%w[Gem Current Latest], nil]]
               IO.popen(cmd.done).each do |line|
                 if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
@@ -685,11 +700,11 @@ module Squared
             on :last, from
             return
           when :build
-            if !op.empty?
-              op << shell_quote(path + op.shift)
-              op.clear(pass: false)
-            elsif (file = gemfile)
-              op << shell_quote(file)
+            if op.empty?
+              op.add_path(gemfile)
+            else
+              op.add_path(op.shift)
+                .clear(pass: false)
             end
           when :push
             if op.empty?
@@ -703,7 +718,7 @@ module Squared
               raise_error('gem not found', hint: file) unless file.exist?
               raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             end
-            op << shell_quote(file)
+            op.add_path(file)
             run_rb(from: from, interactive: "Push #{sub_style(gemname, styles: theme[:active])}")
             return
           when :exec
@@ -730,7 +745,7 @@ module Squared
             raise_error('missing gemname', hint: flag) if op.empty?
             case flag
             when :install, :uninstall, :pristine
-              post = readline('Enter command [args]', force: true) if flag == :install && op.extras.delete(':')
+              post = readline('Enter command [args]', force: true) if flag == :install && op.remove(':')
               if op.arg?('all')
                 if flag == :pristine
                   append_repeat 'skip', op.extras
@@ -797,7 +812,7 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name = nil, opts = [], path: basepath('lib'), args: nil)
+        def irb(name = nil, opts = [], path: gemlib, args: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
           r = args ? [] : ['bundler/setup']
           r << name if name
@@ -815,15 +830,11 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          begin
-            if (file = gemfile)
-              require 'rubygems'
-              @gemspec = Gem::Specification.load(file.to_s)
-            end
-          rescue StandardError => e
-            log.debug e
-          end
-          @gemspec ||= false
+          @gemspec = if (file = gemfile)
+                       Gem::Specification.load(file.to_s) rescue false
+                     else
+                       false
+                     end
         end
 
         def gemname
@@ -885,7 +896,6 @@ module Squared
                   end
               end
             end
-            require 'rubygems'
             @gemdir = Pathname.new(Gem.dir) + gempath
           else
             parse = lambda do |path|
@@ -940,6 +950,7 @@ module Squared
           else
             op.clear
           end
+          op
         end
 
         def ruby_session(*cmd, **kwargs)
@@ -981,27 +992,10 @@ module Squared
           session_output('rake', *cmd, **kwargs)
         end
 
-        def read_rakefile
-          @read_rakefile ||= [].tap do |ret|
-            pwd = rakepwd
-            pwd_set(pass: !pwd.nil?) do
-              IO.popen(rake_output(pwd, '-AT').to_s).each do |line|
-                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
-
-                ret << [$1, $2]
-              end
-            end
-          end
-        end
-
         def preopts
           verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end
 
-        def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
-        end
-
         def variables
           (super + %i[version autodetect]).freeze
         end
@@ -1014,13 +1008,26 @@ module Squared
         end
 
         def rakepwd
-          return if pwd? || Rake::VERSION < '13.0.4'
+          return unless !pwd? && semgte?(Rake::VERSION, '13.0.4')
 
           quote_option 'C', path
         end
 
+        def raketasks
+          @raketasks ||= [].tap do |ret|
+            opt = rakepwd
+            pwd_set(pass: !opt.nil?) do
+              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
+                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+
+                ret << [$1, $2]
+              end
+            end
+          end
+        end
+
         def gempwd
-          return if pwd? || Gem::VERSION < '3.4.2'
+          return unless !pwd? && semgte?(Gem::VERSION, '3.4.2')
 
           quote_option 'C', path
         end
@@ -1033,9 +1040,25 @@ module Squared
                                     .find { |file| File.exist?(file) } || false
         end
 
+        def gemlib
+          @gemlib ||= begin
+            lib = Set.new(['lib'])
+            if (spec = gemspec)
+              lib.merge(spec.require_paths || [])
+            end
+            lib.select { |file| basepath(file).exist? }
+          end
+        end
+
         def gempath(val = version)
           File.join('gems', "#{gemname}-#{val}")
         end
+
+        def gemdir?
+          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+        end
+
+        alias read_rakefile raketasks
       end
 
       Application.implement Ruby