squared 0.6.0 → 0.6.2

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

@@ -31,7 +31,7 @@ module Squared
           return self
         end
         if base
-          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : @root + base
+          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : rootpath(base)
           repo.each do |target|
             if target.is_a?(Project::Git)
               data[target.localname] = target.project
@@ -50,7 +50,7 @@ module Squared
                 end
           unless uri.match?(GIT_PROTO) || Pathname.new(uri).absolute?
             if uri.start_with?('.')
-              uri = @root + uri
+              uri = rootpath uri
             elsif base
               uri = base + uri
             else
@@ -154,9 +154,9 @@ module Squared
                      namespace=p].freeze,
           add: %w[A e|edit f|force ignore-errors ignore-missing i|interactive n|dry-run p|patch pathspec-file-nul
                   refresh renormalize sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose abbrev=i color=b column=b
-                     contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b sort=q
-                     t|track=b].freeze,
+          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
+                     column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
+                     sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
                        pathspec-file-nul q|quiet ours theirs conflict=b orphan=b pathspec-from-file=p t|track=b].freeze,
           diff: {
@@ -183,9 +183,9 @@ module Squared
                      A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=i
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
-            revert: %w[e S=bm? abort continue n|no-commit quit reference skip cleanup=b gpg-sign=b? m|mainline=i
-                       s|signoff strategy=b X|strategy-option=b].freeze,
-            rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse v|verbose
+            revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
+                       X|strategy-option=b].freeze,
+            rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse
                    pathspec-from-file=p].freeze
           }.freeze,
           log: {
@@ -245,7 +245,7 @@ module Squared
             pop: %w[index].freeze,
             apply: %w[index].freeze
           }.freeze,
-          status: %w[z u=bm? b|branch long s|short show-stash v|verbose column=b find-renames=i? ignore-submodules=b?
+          status: %w[z u=bm? b|branch long s|short show-stash v|verbose=+ column=b find-renames=i? ignore-submodules=b?
                      ignored=b? porcelain=b? untracked-files=b?].freeze,
           submodule: {
             status: %w[cached recursive].freeze,
@@ -296,7 +296,8 @@ module Squared
             send: %w[continue skip abort quit].freeze,
             value: %w[true false merges interactive].freeze
           }.freeze,
-          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze
+          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
+          revbuild: %w[untracked-files ignore-submodules ignored].freeze
         }.freeze
         private_constant :OPT_GIT, :VAL_GIT
 
@@ -462,15 +463,18 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        if (name = args.name)
-                          message = args.message
-                          commit = commithead args.commit
-                          remote = args.remote
-                        else
-                          commit, name, message = choice_commit(reflog: false, series: true,
-                                                                values: [['Enter tag name', true], 'Enter message'])
-                          remote = choice_remote
-                        end
+                        remote = if (name = args.name)
+                                   message = args.message
+                                   commit = commithead args.commit
+                                   args.remote
+                                 else
+                                   commit, name, message = choice_commit(reflog: false, series: true,
+                                                                         values: [
+                                                                           ['Enter tag name', true],
+                                                                           'Enter message'
+                                                                         ])
+                                   choice_remote
+                                 end
                         tag(flag, refs: [name], message: message, commit: commit, remote: remote).tap do |ret|
                           success?(ret, !remote)
                         end
@@ -996,7 +1000,7 @@ module Squared
             end
           end
           append_pull(opts, OPT_GIT[:pull] + OPT_GIT[:fetch][:pull],
-                      no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag, from: :pull)
+                      flag: flag, from: :pull, remote: remote, no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull])
           source(sync: sync, sub: if stdout?
                                     [
                                       opt_style(color(:red), /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, 4),
@@ -1044,8 +1048,8 @@ module Squared
         def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
           opts = git_session('fetch', opts: opts).last
           opts << 'all' if flag == :all || option('all')
-          append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]),
-                                                           remote: remote, flag: flag, from: :fetch)
+          append_pull(opts, collect_hash(OPT_GIT[:fetch]), flag: flag, from: :fetch, remote: remote,
+                                                           no: collect_hash(OPT_GIT[:no][:fetch]))
           source(sync: sync, **threadargs)
         end
 
@@ -1148,7 +1152,7 @@ module Squared
             append_option(OptionPartition.select(OPT_GIT[:stash][:push], no: false), no: true, ignore: false)
             append_message
           end
-          source(banner: !quiet?, sync: sync, **threadargs)
+          source(sync: sync, banner: !quiet?, **threadargs)
         end
 
         def status(flag = nil, opts = [])
@@ -1214,22 +1218,22 @@ module Squared
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
           case flag
           when :build
-            op = OptionPartition.new(opts, %w[ignore-submodules=b? ignored=b? untracked-files=b?], project: self)
+            op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
             op.clear(append: true)
             args = op.to_a
           else
-            args = [
-              option('untracked-files', prefix: 'git') { |val| basic_option('untracked-files', val) },
-              option('ignore-submodules', prefix: 'git') { |val| basic_option('ignore-submodules', val) },
-              option('ignored', prefix: 'git') { |val| basic_option('ignored', val) }
-            ].compact
+            args = parse_env('GIT_OPTIONS')
+                   .grep(/\A--#{Regexp.union(*VAL_GIT[:revbuild])}/)
+                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option(key, val) } })
+                   .compact
+            OptionPartition.uniq!(args)
           end
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               workspace.rev_timeutc(name, 'build') unless (since = workspace.rev_timesince(name, 'build'))
               if stdout?
-                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: since && "#{since} ago")
+                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: ("#{since} ago" if since))
               end
               return
             end
@@ -1427,7 +1431,7 @@ module Squared
             return ret
           end
           message ||= messageopt
-          if !message && !amend
+          unless message || amend
             return if pass
 
             message = readline('Enter message', force: true)
@@ -1638,10 +1642,10 @@ module Squared
             case flag
             when :create
               cmd << quote_option(branch.delete_prefix!('^') ? 'C' : 'c', branch)
-              cmd << case (track ||= option('track', ignore: false))
-                     when 'n', 'N', '0', 'false'
+              cmd << case (track ||= option('track', ignore: false))&.downcase
+                     when 'n', '0', 'false'
                        '--no-track'
-                     when 'y', 'Y', '1', 'true'
+                     when 'y', '1', 'true'
                        '--track'
                      when 'direct', 'inherit'
                        basic_option 'track', track
@@ -1751,7 +1755,12 @@ module Squared
         def git(flag, opts = [])
           cmd, opts = git_session(flag, opts: opts)
           list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
-          list.concat(OPT_GIT[:log][:diff_context]) if flag == :add
+          case flag
+          when :add
+            list.concat(OPT_GIT[:log][:diff_context])
+          when :revert
+            list.concat(VAL_GIT[:rebase][:send])
+          end
           op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GIT[:no][flag], single: /\A\d+\z/,
                                                     first: case flag
                                                            when :blame, :revert then nil
@@ -1763,7 +1772,7 @@ module Squared
             op.append(basepath(op.remove_at(n)), delim: true)
               .clear
           when :revert
-            if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
+            if op.arg?(*VAL_GIT[:rebase][:send])
               op.clear
             elsif op.empty?
               raise_error 'no commit target'
@@ -1844,9 +1853,10 @@ module Squared
             end
             if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
               from = :"git:#{from}"
+            elsif from == false
+              from = nil
             end
             banner &&= cmd.temp { |val| val.start_with?(/--(?:work-tree|git-dir)/) } if cmd.respond_to?(:temp)
-            from = nil if from == false
           end
           cmd = session_done cmd
           log&.info cmd
@@ -1969,7 +1979,7 @@ module Squared
           ret = {}
           status_data(*args).each do |file,|
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
-            next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
+            next if pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
             ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
@@ -1986,7 +1996,7 @@ module Squared
           end
         end
 
-        def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil, from: nil)
+        def append_pull(opts, list, flag:, from:, target: @session, no: nil, remote: nil)
           target << '--force' if option('f', 'force', target: target)
           append_submodules(target: target, from: from)
           return if !remote && opts.empty?

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

@@ -302,22 +302,21 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,d/ry-run?,p/ublic|r/estricted?',
-                                  before: ('tag' if flag == :tag))
+                      format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?', before: ('tag' if flag == :tag))
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('d')
-                        access = if args.delete('public') || args.delete('p')
-                                   'public'
-                                 elsif args.delete('restricted') || args.delete('r')
+                        access = if has_value!(args, 'r', 'restricted')
                                    'restricted'
+                                 elsif has_value!(args, 'p', 'public')
+                                   'public'
                                  end
+                        dryrun = has_value!(args, 'd', 'dry-run')
                         if flag == :latest
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
                         end
-                        publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
+                        publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                       end
                     when 'tsc'
                       break unless @tsfile
@@ -325,15 +324,11 @@ module Squared
                       format_desc(action, flag, 'opts*', "#{flag == :project ? 'before' : 'after'}": 'config?')
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :project
-                          project = if !args.empty? && exist?(args.first)
-                                      args.shift
-                                    else
-                                      @tsfile
-                                    end
-                        end
-                        watch = !(args.delete('watch') || args.delete('w')).nil?
-                        tsc(*args, banner: true, project: project, build: flag == :build, watch: watch)
+                        tsc(*args, banner: true, "#{flag}": if flag == :build
+                                                              true
+                                                            else
+                                                              exist?(args.first) ? args.shift : @tsfile
+                                                            end, watch: has_value!(args, 'w', 'watch'))
                       end
                     end
                   end
@@ -345,6 +340,8 @@ module Squared
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -361,8 +358,6 @@ module Squared
             create = @copy[:create] if @copy.key?(:create)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-          elsif @copy == false
-            return
           end
           items = []
           if build? && path != @workspace.home && @workspace.home?
@@ -381,7 +376,7 @@ module Squared
               dest = dir
               @workspace.rev_clear(dest, sync: sync)
             when String
-              dest = @workspace.root + dir
+              dest = @workspace.rootpath(dir)
               @workspace.rev_clear(dest, sync: sync)
             when Symbol
               dest = if (proj = @workspace.find(name: dir))
@@ -918,12 +913,9 @@ module Squared
         end
 
         def bump(flag, val = nil)
-          if flag != :version
-            val = sembump version, flag
-            return if val == version
-          elsif !val
-            return
-          end
+          val = sembump version, flag unless flag == :version
+          return unless val
+
           doc = dependfile.read
           if doc.sub!(/"version"\s*:\s*"#{version}"/, "\"version\": \"#{val}\"")
             unless dryrun?

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

@@ -7,16 +7,16 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          common: %w[b=+ B d E h i I O P q=+ s S u v=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
                     o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
                    prompt=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input q|quiet require-virtualenv
-                     v|verbose cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p proxy=q
-                     python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input require-virtualenv
+                     q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p
+                     proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
                      use-feature=b].freeze,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
@@ -31,8 +31,8 @@ module Squared
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[ignore-requires-python no-index pre extra-index-url=q f|find-links=q i|index-url=q no-binary=q
                         only-binary=q].freeze,
-          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps prefer-binary require-hashes
-                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
+          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps prefer-binary
+                        require-hashes use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
           hash: %w[a|algorithm].freeze,
           list: %w[e|editable exclude-editable include-editable l|local no-index not-required o|outdated pre u|uptodate
@@ -43,21 +43,21 @@ module Squared
           wheel: %w[no-verify w|wheel-dir=p].freeze
         }.freeze
         OPT_POETRY = {
-          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
+          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=q
                       u|username=b].freeze
         }.freeze
         OPT_PDM = {
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
-                    k|skip=b].freeze,
-          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+                    p|project=p k|skip=b].freeze,
+          publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
-                     q|quiet v|verbose].freeze,
+                     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=q u|user=q].freeze
@@ -923,6 +923,8 @@ module Squared
           case flag
           when :python
             /\A(?:v+|q+|b+)\z/
+          when :pdm
+            /\Av+\z/
           when :twine
             nil
           else