squared 0.4.16 → 0.4.17

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}"
@@ -737,15 +749,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
@@ -940,7 +955,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

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|
@@ -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
@@ -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

@@ -126,7 +126,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|
@@ -171,7 +171,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 +275,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
@@ -565,7 +565,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 +685,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 +703,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 +730,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 +797,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
@@ -817,7 +817,6 @@ module Squared
 
           begin
             if (file = gemfile)
-              require 'rubygems'
               @gemspec = Gem::Specification.load(file.to_s)
             end
           rescue StandardError => e
@@ -885,7 +884,6 @@ module Squared
                   end
               end
             end
-            require 'rubygems'
             @gemdir = Pathname.new(Gem.dir) + gempath
           else
             parse = lambda do |path|
@@ -983,9 +981,9 @@ module Squared
 
         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|
+            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]
@@ -1014,13 +1012,13 @@ 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 gempwd
-          return if pwd? || Gem::VERSION < '3.4.2'
+          return unless !pwd? && semgte?(Gem::VERSION, '3.4.2')
 
           quote_option 'C', path
         end
@@ -1033,6 +1031,16 @@ 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

data/lib/squared/workspace/project/support/class.rb

@@ -45,6 +45,15 @@ module Squared
               val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/i, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
             end
 
+            def select(list, bare: true, no: true, single: false, double: false)
+              ret = bare ? list.grep_v(/=/) : list.grep(/=/).map! { |val| val.split('=', 2).first }
+              ret.map! { |val| val.split('|', 2).last }
+              ret = ret.grep_v(/^no-/) unless no
+              return ret if single == double
+
+              ret.select { |val| single ? val.size == 1 : val.size > 1 }
+            end
+
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
@@ -53,15 +62,22 @@ module Squared
               end
               target.any? { |opt| r.any? { |val| opt&.match?(val) } }
             end
+
+            def pattern?(val)
+              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*\})/)
+            end
           end
 
           attr_reader :target, :extras, :found, :errors, :values, :project, :path
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
-                         :merge, :delete, :delete?, :delete_if, :grep, :inspect, :to_a, :to_s
+                         :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
                          :pop, :push, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
 
+          def_delegator :@extras, :delete, :remove
+          def_delegator :@extras, :delete_if, :remove_if
+
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
             @target = target.is_a?(Set) ? target : Set.new(target)
             @project = project
@@ -138,35 +154,35 @@ module Squared
             skip = false
             opts.each do |opt|
               next skip = true if opt == '--'
-              next @extras << opt if skip
+              next push opt if skip
 
               if single&.match?(opt)
-                target << "-#{opt}"
+                add "-#{opt}"
               elsif bare.include?(opt)
-                target << (opt.size == 1 ? "-#{opt}" : "--#{opt}")
+                add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
               elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
-                target << "--no-#{name}"
+                add "--no-#{name}"
               else
                 if opt =~ /\A([^=]+)=(.+)\z/
                   key = $1
                   val = $2
                   merge = m.include?(key)
                   if e.include?(key)
-                    target << shell_option(key, val, merge: merge)
+                    add shell_option(key, val, merge: merge)
                   elsif q.include?(key)
-                    target << quote_option(key, val, double: qq.include?(key), merge: merge)
+                    add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
-                    target << quote_option(key, path + val, merge: merge)
+                    add quote_option(key, path + val, merge: merge)
                   elsif b.include?(key) || numcheck.call(key, val)
-                    target << basic_option(key, val, merge: merge)
+                    add basic_option(key, val, merge: merge)
                   elsif merge
-                    target << basic_option(key, val, merge: true)
+                    add basic_option(key, val, merge: true)
                   else
-                    @extras << opt
+                    push opt
                   end
                   opt = key
                 else
-                  @extras << opt
+                  push opt
                   skip = true if args
                 end
                 skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
@@ -229,7 +245,42 @@ module Squared
               args = items[0...i] + args + items[i..-1]
               target.clear
             end
-            merge(args)
+            merge args
+            self
+          end
+
+          def add_path(*args, **kwargs)
+            add shell_quote(path ? path.join(*args) : File.join(*args), **kwargs)
+            self
+          end
+
+          def add_quote(*args, **kwargs)
+            merge(args.map { |val| shell_quote(val, **kwargs) })
+            self
+          end
+
+          def splice(*exclude, quote: true, delim: true, path: false, pattern: false, &blk)
+            found, other = if block_given?
+                             partition(&blk)
+                           elsif exclude.first.is_a?(Symbol)
+                             partition(&exclude.first)
+                           else
+                             partition do |val|
+                               next false if pattern && OptionPartition.pattern?(val)
+
+                               exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                             end
+                           end
+            unless found.empty?
+              add '--' if delim
+              extras.clear
+              extras.concat(other)
+              if path
+                found.each { |val| add_path(val) }
+              else
+                merge(quote ? found.map! { |val| shell_quote(val) } : found)
+              end
+            end
             self
           end
 

data/lib/squared/workspace/repo.rb

@@ -113,35 +113,17 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        namespace(name = task_name('repo')) do |repo|
+        namespace(task_name('repo')) do |ns|
+          path = ns.scope.path
           branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
           target = branch || manifest
+          cmd = nil
           stage = nil
-          failfast = true
-          cmd = []
           newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
-          parse_opts = lambda do |args|
-            args.to_a.each do |val|
-              case val
-              when 'no-fail'
-                failfast = false
-              when 'force'
-                cmd << '--force-checkout'
-              when 'rebase'
-                cmd << '--rebase'
-              when 'detach'
-                cmd << '--detach'
-              when 'gc'
-                cmd << '--auto-gc'
-              when 'no-update'
-                cmd << '--no-manifest-update'
-              end
-            end
-          end
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
-              val = val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail')
-              task_desc(task_name('repo'), val, ver)
+              val = val.sub('{0}', 'opts*=force,rebase,detach,fail,no-update,gc')
+              task_desc(path, val, ver)
             else
               task_desc 'inactive'
             end
@@ -149,20 +131,22 @@ module Squared
 
           desc.call('all[{0}]')
           task 'all', [:opts] do |_, args|
-            parse_opts.call(args)
+            cmd ||= repo_opts args
             stage ||= 'all'
-            repo['sync'].invoke
-            next if env('REPO_DRYRUN', equals: '2')
+            ns['sync'].invoke
+            next if env('REPO_STAGE', equals: '1')
 
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref)
 
               proj.depend(sync: true) if proj.depend?
-              proj.build? unless env('REPO_DRYRUN', ignore: '0')
+              next if env('REPO_STAGE', equals: '2')
+
+              proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next unless proj.dev? && proj.copy?
+              next unless proj.dev? && proj.copy? && !env('REPO_STAGE', equals: '3')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -174,38 +158,37 @@ module Squared
 
           desc.call("init[manifest?=#{target},{0}]", target)
           task 'init', [:manifest, :opts] do |_, args|
-            parse_opts.call(args)
+            cmd = repo_opts args
             stage = 'init'
             puts if newline
             Common::System.shell("repo init -u #{env('REPO_URL') || manifest_url} -m #{args.manifest || target}.xml",
                                  chdir: root)
-            repo['all'].invoke
+            next if env('REPO_STAGE', equals: '0')
+
+            ns['all'].invoke
           end
 
           desc.call('sync[{0}]')
-          task 'sync', [:opts] do |_, args|
-            unless branch || stage == 'init'
-              raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
-            end
-            parse_opts.call(args)
+          task 'sync', [:opts] do |t, args|
+            raise_error 'repo not initialized' unless branch || stage == 'init'
+            cmd ||= repo_opts args
             cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
-            cmd << '--fail-fast' if failfast
-            puts if newline && stage != 'init'
+            puts unless !newline || stage == 'init'
             begin
-              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
+              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: cmd.include?('--fail-fast'))
             rescue Errno::ENOENT => e
               emphasize(e, title: root)
               raise
             rescue StandardError => e
-              emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
+              emphasize(e, title: "rake stash #{t.name}")
               raise
             end
           end
 
           series.sync.push(
-            task_join(name, 'all'),
-            task_join(name, 'init'),
-            task_join(name, 'sync')
+            task_join(path, 'all'),
+            task_join(path, 'init'),
+            task_join(path, 'sync')
           )
         end
       end
@@ -221,6 +204,27 @@ module Squared
         )
       end
 
+      def repo_opts(args)
+        ret = []
+        args.to_a.each do |val|
+          case val
+          when 'force'
+            ret << '--force-checkout'
+          when 'rebase'
+            ret << '--rebase'
+          when 'detach'
+            ret << '--detach'
+          when 'fail'
+            ret << '--fail-fast'
+          when 'no-update'
+            ret << '--no-manifest-update'
+          when 'gc'
+            ret << '--auto-gc'
+          end
+        end
+        ret
+      end
+
       def repo?
         !manifest_url.nil? && (repo_install? || @repo_override == true)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - An Pham