squared 0.8.1 → 0.8.3

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

@@ -8,8 +8,8 @@ module Squared
           common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           common_scripts: %w[dangerously-allow-all-scripts=!? strict-allow-scripts=!? allow-scripts=q].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
-          install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
-                        package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
+          install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
+                        install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
                         S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
@@ -327,7 +327,7 @@ module Squared
                     when 'package'
                       format_desc(action, flag, 'opts*', before: case flag
                                                                  when :dedupe, :rebuild then nil
-                                                                 when :reinstall then 'force?'
+                                                                 when :reinstall then 'f/orce?'
                                                                  else 'name*'
                                                                  end)
                       task flag do |_, args|
@@ -672,8 +672,7 @@ module Squared
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', (ci = option('ci', prefix: 'npm')) ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -687,6 +686,26 @@ module Squared
                 print_run cmd, silent?
                 run(cmd, banner: false)
               end
+              option('allow-scripts', ignore: false) do |val|
+                cmd << case val
+                       when '0'
+                         '--ignore-scripts'
+                       when 'false'
+                         '--strict-allow-scripts'
+                       when '1', 'true'
+                         '--dangerously-allow-all-scripts'
+                       else
+                         quote_option 'allow-scripts', val
+                       end
+              end
+              option('engine-strict', ignore: false) do |val|
+                cmd << case val
+                       when '0', 'false'
+                         '--engine-strict=false'
+                       else
+                         '--engine-strict'
+                       end
+              end
               cmd << '--workspaces=false' if ws
               cmd << '--force' if option('force')
               append_nocolor
@@ -1088,6 +1107,7 @@ module Squared
 
         def package(flag, opts = [], packages: [], from: nil)
           workspace.rev_clear(name)
+          force = true if flag == :reinstall && has_value!(opts, 'f')
           yarn = dependtype(:yarn)
           if yarn > 0 && !(yarn == 1 && ((flag == :update && !packages.empty?) || %i[approve deny
                                                                                      rebuild].include?(flag)))
@@ -1101,8 +1121,8 @@ module Squared
                                     end
                                   when :reinstall
                                     if yarn == 1
-                                      remove_modules(prefix: 'yarn') if opts.include?('force')
-                                    elsif opts.delete('force')
+                                      remove_modules(prefix: 'yarn') if opts.include?('force') || force
+                                    elsif opts.delete('force') || force
                                       opts << 'check-cache'
                                     end
                                     opts << 'no-lockfile' if lockfile(true)
@@ -1171,7 +1191,7 @@ module Squared
                          spec = 1
                          flag = :install
                        when :reinstall
-                         remove_modules(prefix: 'npm') if opts.delete('force')
+                         remove_modules(prefix: 'npm') if opts.delete('force') || force
                          opts.unshift('package-lock=false') if lockfile(true)
                          flag = :install
                        end
@@ -1509,8 +1529,7 @@ module Squared
                     next if yarntype(exist: true) == 0
                   when /^pnpm/
                     next if pnpmtype(exist: true) == 0
-                  when /^npm/
-                    nil
+                  when /^npm/ then nil
                   else
                     next
                   end
@@ -1564,8 +1583,8 @@ module Squared
         end
 
         def remove_modules(prefix: dependbin)
-          modules = basepath 'node_modules'
-          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
+          modules = basepath!('node_modules', type: 'd')
+          return false unless modules && confirm_basic('Remove?', modules, prefix: prefix)
 
           modules.rmtree
         rescue Timeout::Error => e

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

@@ -36,9 +36,9 @@ module Squared
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
                         no-binary=q only-binary=q only-final=b].freeze,
-          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps require-hashes
-                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p requirements-from-script=p
-                        src=p].freeze,
+          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps require-hashes use-pep517
+                        build-constraint=p c|constraint=p group=q progress-bar=b r|requirement=p
+                        requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
           install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
@@ -181,8 +181,8 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, i|
-                      next if (list = read_pyproject(table)).empty?
+                    %w[tool.poetry tool.pdm project].each_with_index do |table, i|
+                      next if (list = read_pyproject("#{table}.scripts")).empty?
 
                       if args.command == '#'
                         format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: pyprojectfile)
@@ -208,7 +208,7 @@ module Squared
                               log.warn "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
-                            case i
+                            case (i > 1 && poetry? ? 0 : i)
                             when 0
                               found |= 1
                               run(session_output('poetry', 'run', val), from: :run)
@@ -297,7 +297,7 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/uninstall,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -312,7 +312,7 @@ module Squared
                           end
                           file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
                           puts File.read(file) unless silent?
-                          if requirement && confirm_basic('Uninstall?', file)
+                          if requirement && confirm_basic('Uninstall?', file, prefix: 'pip')
                             pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
                           end
                         end
@@ -482,7 +482,7 @@ module Squared
                               :patch
                             end
                    end
-                   '--not-required' if option('not-required', notequals: '0') && !env('PYTHON_DEFAULT')
+                   '--not-required' if option('not-required', notequals: '0')
                  end
           cmd << '--local' if option('l', 'local')
           append_global
@@ -607,18 +607,18 @@ module Squared
                                 project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
-          end
-          case flag
-          when :editable
-            op << quote_option('e', op.pop || editable || '.')
-            op.clear
-          when :user, :upgrade
-            op.concat(packages)
-            raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
+            case flag
+            when :editable
+              op << quote_option('e', op.pop || editable || '.')
+              op.clear
+            when :user, :upgrade
+              op.concat(packages)
+              raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
 
-            op << "--#{flag}"
-            op.append
-            python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+              op << "--#{flag}"
+              op.append
+              python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+            end
           end
           run(banner: banner, from: :install)
         end
@@ -723,7 +723,7 @@ module Squared
             op.clear(pass: false)
           else
             if op.empty?
-              op << "#{dist.call}/*"
+              op.add_path(dist.call, '*')
             else
               op.add_path
             end
@@ -796,8 +796,7 @@ module Squared
 
             op << (action = op.shift)
             case action
-            when 'dir', 'info', 'purge'
-              nil
+            when 'dir', 'info', 'purge' then nil
             when 'list', 'remove'
               op.add_first(quote: true)
             else
@@ -811,8 +810,7 @@ module Squared
             action = op.shift
             op << action
             case action
-            when 'list', 'edit', 'debug'
-              nil
+            when 'list', 'edit', 'debug' then nil
             when 'get', 'unset', 'set'
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
@@ -923,6 +921,7 @@ module Squared
           if (target = append_nocolor('no-color', target: [], prefix: 'hatch'))
             (opts ||= []).concat(target)
           end
+          ENV['HATCH_ENV_TYPE_VIRTUAL_PATH'] ||= venv if venv?
           create_session('hatch', *cmd, common: OPT_HATCH[:common], opts: opts)
         end
 
@@ -1089,8 +1088,7 @@ module Squared
             /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
-          when :twine, :meson
-            nil
+          when :twine, :meson then nil
           else
             /\A(?:v+|q+)\z/
           end
@@ -1214,7 +1212,22 @@ module Squared
             args << 'setuptools' << 'wheel'
           end
           pip(:install, *args, banner: false) unless args.empty?
-          success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
+          success?(ret, banner, !status) do |out|
+            if out && dir.directory?
+              if poetry?
+                dir += (workspace.windows? ? 'Scripts/python.exe' : 'bin/python')
+                cmd = poetry_session 'env use'
+              else
+                puts "Success: #{dir}"
+                return
+              end
+              cmd << shell_quote(dir)
+              print_run cmd, silent?
+              run(banner: false)
+            else
+              puts 'Failed'
+            end
+          end
         end
 
         def venv_package?(val)

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

@@ -26,14 +26,14 @@ module Squared
           rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
           rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
                       display-only-correctable display-only-fail-level-offenses display-only-failed
-                      display-only-safe-correctable S|display-style-guide display-time editor-mode enable-pending-cops
-                      E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
+                      display-only-safe-correctable S|display-style-guide display-time disable-uncorrectable editor-mode
+                      enable-pending-cops E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
                       ignore-disable-comments ignore-parent-exclusion ignore-unrecognized-cops init l|lint
-                      L|list-target-files lsp memory no-detach only-guide-cops only-recognized-file-types
-                      no-exclude-limit profile raise-cop-error regenerate-todo restart-server safe server-status
-                      start-server stderr stop-server C|cache=b cache-root=p config=p exclude-limit=i fail-level=b
-                      f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
-                      s|stdin=p].freeze,
+                      list-enabled-cops-for=p L|list-target-files lsp memory no-detach only-guide-cops
+                      only-recognized-file-types no-exclude-limit profile raise-cop-error regenerate-todo
+                      restart-server safe server-status start-server stderr stop-server C|cache=b cache-root=p config=p
+                      exclude-limit=i fail-level=b f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q
+                      show-docs-url=q s|stdin=p].freeze,
           pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
                   d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
@@ -507,16 +507,22 @@ module Squared
                         format_desc action, flag, 'f/orce?,l/ocal?,opts*'
                         task flag do |_, args|
                           opts = args.to_a
-                          opts << 'local' if has_value!(opts, 'l')
+                          opts << 'local' if has_value!(opts, 'l', 'local')
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
-                            config = basepath '.bundle', 'config'
-                            if config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
-                              if opts.include?('redownload')
-                                run(bundle_output('config unset frozen'), banner: false)
-                              else
-                                print_error('Gemfile.lock is frozen', subject: name, hint: flag)
+                            case (val = ENV['BUNDLE_FROZEN'])
+                            when '0', 'false' then nil
+                            else
+                              if val
+                                print_error("BUNDLE_FROZEN: #{val}", loglevel: Logger::INFO, subject: name, hint: flag)
                                 lock = nil
+                              elsif basepath!('.bundle', 'config')&.read&.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+                                if opts.include?('redownload')
+                                  run(bundle_output('config unset frozen'), banner: false)
+                                else
+                                  print_error('Gemfile.lock is frozen', subject: name, hint: flag)
+                                  lock = nil
+                                end
                               end
                             end
                             lock&.delete
@@ -776,8 +782,7 @@ module Squared
                 next if val == '0' || val == 'false'
 
                 run(bundle_output('binstubs --all', case val
-                                                    when '1', 'true'
-                                                      nil
+                                                    when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
                                                         val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
@@ -1069,6 +1074,7 @@ module Squared
             filter = kwargs.fetch(:filter, {})
             semver = filter[:semver]
             equals = filter[:equals]
+            dryrun = filter[:dryrun] || dryrun?(prefix: 'gem')
             update = if sync && filter[:select]
                        semver ||= 'major'
                        items = []
@@ -1225,7 +1231,7 @@ module Squared
                             'user-install'
                           end
                 end
-                if filter[:dryrun]
+                if dryrun
                   print_run gem_output('update -f', *update.quote!(escape: true)), false
                 else
                   gem(:update, *update, opts: opts)
@@ -1268,9 +1274,9 @@ module Squared
                 .clear(pass: false)
             end
           when :push
-            target = gemname
-            if op.empty? || (n = op.index(':'))
-              file = basepath(if !n && (spec = gemspec)
+            target = nil
+            if op.empty? || ia
+              file = basepath(if !ia && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 choice_index 'Select a file', Dir.glob('*.gem', base: path)
@@ -1289,7 +1295,7 @@ module Squared
 
               op.add_path(file)
             end
-            return run(from: from, interactive: ['Push', 'N', target]) unless with || !banner
+            return run(from: from, interactive: ['Push', 'N', target || gemname]) unless with || !banner
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1843,8 +1849,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)), project: self, strict: strict?,
-                                                                                      first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(*bundle_args(from)),
+                                   project: self, strict: strict?, first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1932,8 +1938,7 @@ module Squared
               val = case (val = $2)
                     when 'true'
                       true
-                    when '', '[]'
-                      nil
+                    when '', '[]' then nil
                     else
                       if val =~ /\A\[:(.+)\]\z/
                         $1.split(', :').map { |s| (s[/\A"(.+)"\z/, 1] || s).to_sym }

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

@@ -27,7 +27,15 @@ module Squared
               target << '--' if delim && !target.include?('--')
               if strip
                 pat, s = Array(strip)
-                ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
+                ret.map! do |val|
+                  next val unless val.is_a?(String)
+
+                  if pat.is_a?(String) && pat.size == 1 && s.nil?
+                    val.delete_prefix(pat)
+                  else
+                    val.gsub(pat, s || '')
+                  end
+                end
               end
               if filter
                 ret, err = ret.partition { |val| filter.match?(val.to_s) }
@@ -100,7 +108,17 @@ module Squared
               ret.select { |val| single ? val.size == 1 : val.size > 1 }
             end
 
-            def uniq!(list, pass = [])
+            def union(list, other)
+              base = list.map { |val| parse_option(val).first }
+              other.each do |val|
+                next if base.include?(parse_option(val).first)
+
+                list << val
+              end
+              list
+            end
+
+            def uniq!(list, pass: [])
               keys = {}
               list.each_with_index do |val, i|
                 j = val =~ OPT_VALUE ? $1 : val
@@ -152,8 +170,11 @@ module Squared
             end
 
             def pattern?(val)
+              Regexp.new(val)
               val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
               val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+            rescue RegexpError
+              false
             end
 
             private
@@ -564,11 +585,21 @@ module Squared
           end
 
           def add_first(fallback = nil, prefix: nil, path: false, escape: false, reverse: false, expect: false,
-                        **kwargs)
+                        strip: nil, **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
               temp = val
-              val = val.delete_prefix(prefix) if prefix && val.is_a?(String)
+              if val.is_a?(String)
+                val = val.delete_prefix(prefix) if prefix
+                if strip
+                  pat, s = Array(strip)
+                  val = if pat.is_a?(String) && pat.size == 1 && s.nil?
+                          val.delete_prefix(pat)
+                        else
+                          val.gsub(pat, s || '')
+                        end
+                end
+              end
               unless block_given? && !(val = yield val).is_a?(String)
                 if path
                   add_path(val, **kwargs)

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

@@ -35,13 +35,29 @@ module Squared
             end
           end
 
-          def matchmap(list, prefix: nil)
-            list.map do |val|
-              next val if val.is_a?(Regexp)
-
-              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
-              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+          def matchmap(list, prefix: nil, negate: false)
+            ret = negate ? [[], []] : []
+            list.each do |val|
+              unless val.is_a?(Regexp)
+                val = val.dup
+                n = 1 if negate && val.delete_prefix!('!')
+                if prefix
+                  a = nil
+                  val.sub!(/\A(\^|\\A)/) do |s|
+                    a = s
+                    nil
+                  end
+                  val = ".*#{val}" unless a
+                end
+              end
+              pat = Regexp.new("#{a}#{prefix}#{val == '*' ? '.+' : val}")
+              if negate
+                ret[n || 0] << pat
+              else
+                ret << pat
+              end
             end
+            ret
           end
 
           def matchany?(list, *args, empty: true)

data/lib/squared/workspace/repo.rb

@@ -157,8 +157,6 @@ module Squared
                   [proj, proj.build? && (script || run), doc && proj.doc?, lint && proj.lint?, test && proj.test?]
                 end
                 .select do |proj, run, doc, lint, test|
-                  next unless proj
-
                   proj.doc(sync: true) if doc
                   proj.build(sync: true) if run
                   next if n.anybits?(4)
@@ -186,8 +184,7 @@ module Squared
               end
               env('REPO_GROUPS', **envargs) do |val|
                 g = case val
-                    when '0', 'false'
-                      nil
+                    when '0', 'false' then nil
                     else
                       val
                     end
@@ -316,9 +313,7 @@ module Squared
           i = -1
           n = repo_scriptdata(proj, name).reduce(0) do |a, b|
             i += 1
-            next a unless b
-
-            a + (1 << i)
+            b ? a + (1 << i) : a
           end
           proj.global(n) && (pass || g.include?(proj.group) || r.any? { |val| proj.ref?(val) })
         end
@@ -364,7 +359,7 @@ module Squared
       def repo_install?(dir = root, parent: false)
         return true if root?(dir, pass: ['.repo']) || dir.join('.repo').directory?
 
-        parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent != home }
+        parent && root.children.none? { |ent| ent.directory? && ent != home }
       end
     end
 

data/lib/squared/workspace/series.rb

@@ -88,7 +88,7 @@ module Squared
         update @session[:parent] if @session[:id].uniq.size > 1
         update @session[:group]
         each do |key, items|
-          next if exclude?(key, true) || @workspace.task_exclude?(t = name_get(key))
+          next if exclude?(key, empty: true) || @workspace.task_exclude?(t = name_get(key))
 
           key = task_name t
           title = format_desc(key, out: true)
@@ -217,7 +217,7 @@ module Squared
         already_invoked? parallel, val
       end
 
-      def exclude?(key, empty = false)
+      def exclude?(key, empty: false)
         @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []