squared 0.4.13 → 0.4.15

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

@@ -3,7 +3,7 @@
 module Squared
   module Workspace
     module Git
-      GIT_REPO = {}
+      GIT_REPO = Workspace.hashobj
       GIT_PROTO = %r{^(?:https?|ssh|git|file)://}i.freeze
       private_constant :GIT_REPO, :GIT_PROTO
 
@@ -27,7 +27,7 @@ module Squared
           base = name
           @project.each_value { |proj| repo << proj if !proj.parent && check.call(proj) }
         else
-          warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid', pass: true) if warning
+          warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid') if warning
           return self
         end
         if base
@@ -58,8 +58,8 @@ module Squared
             end
           end
           key = task_name key
-          (GIT_REPO[main] ||= {})[key] = [uri.to_s, opts]
-          (@kind[key] ||= []) << Project::Git
+          GIT_REPO[main][key] = [uri.to_s, opts]
+          @kind[key] << Project::Git
         end
         if cache == true
           revbuild
@@ -340,7 +340,7 @@ module Squared
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit build output].freeze,
           'show' => %i[format oneline textconv].freeze,
-          'stash' => %i[push pop apply drop clear list].freeze,
+          'stash' => %i[push pop apply branch drop clear list].freeze,
           'switch' => %i[create detach merge].freeze,
           'tag' => %i[add sign delete list].freeze
         })
@@ -367,13 +367,13 @@ module Squared
                   case action
                   when 'pull', 'fetch'
                     if flag == :remote
-                      format_desc action, flag, 'remote,opts*'
+                      format_desc action, flag, 'remote?,opts*'
                       task flag, [:remote] do |_, args|
                         if (remote = args.remote)
                           args = args.extras
                         else
                           remote = choice_remote
-                          args = args.to_a.drop(1)
+                          args = args.to_a
                         end
                         __send__(action, flag, args, remote: remote)
                       end
@@ -396,12 +396,12 @@ module Squared
                         if flag == :fixup
                           ref, squash, pick = choice_commit(accept: [['Auto squash?', true]], reflog: false,
                                                             values: ['Pick [amend|reword]'])
-                          pick = case pick&.downcase
-                                 when 'a', 'amend'
-                                   'amend'
-                                 when 'r', 'reword'
-                                   'reword'
-                                 end
+                          pick &&= case pick.downcase
+                                   when 'a', 'amend'
+                                     'amend'
+                                   when 'r', 'reword'
+                                     'reword'
+                                   end
                           if squash
                             found = false
                             git_spawn(git_output('log --format=%h'), stdout: false).each do |val|
@@ -413,12 +413,14 @@ module Squared
                             end
                           end
                         end
-                        refs = pick == 'reword' ? [] : param_guard(action, flag, args: args.to_a)
-                        if flag == :add
-                          opts = refs
-                          refs = []
-                        else
-                          opts = []
+                        opts = []
+                        refs = []
+                        unless pick == 'reword'
+                          if flag == :add
+                            opts = param_guard(action, flag, args: args.to_a)
+                          elsif (refs = args.to_a).empty?
+                            refs = readline('Enter file patterns', force: true).shellsplit
+                          end
                         end
                         commit(flag, opts, refs: refs, ref: ref, squash: squash, pick: pick)
                       end
@@ -459,6 +461,7 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*'
+                                                              when :branch then 'name,stash?|:'
                                                               when :clear, :list then nil
                                                               else 'stash?|:' end)
                     task flag do |_, args|
@@ -927,7 +930,7 @@ module Squared
           source(sync: sync, sub: if verbose
                                     [
                                       { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: color(:red), index: 4 },
-                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: color(:green), index: 3 }
+                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(.*)$/, styles: color(:green), index: 3 }
                                     ]
                                   end, **threadargs)
         end
@@ -942,7 +945,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << shell_escape(upstream)
+            cmd << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -950,7 +953,7 @@ module Squared
 
             cmd << '--interactive' if option('interactive', 'i')
             cmd << shell_option('onto', commit) if commit
-            cmd << shell_escape(upstream)
+            cmd << upstream
             append_head branch
           else
             return unless VAL_GIT[:rebase][:send].include?(command)
@@ -1012,12 +1015,26 @@ module Squared
             case flag
             when :push
               append_pathspec op.extras
-            when :pop, :apply, :drop
+            when :pop, :apply, :drop, :branch
               if op.extras.delete(':')
-                op << choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   column: /^[^@]+@\{(\d+)\}/, force: true)
+                if flag == :branch
+                  if op.empty?
+                    values = [['Branch name', true]]
+                  else
+                    op << op.pop
+                  end
+                end
+                out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
+                                   values: values, column: /^[^@]+@\{(\d+)\}/, force: true)
+                if values
+                  op.merge(out.reverse)
+                else
+                  op << out
+                end
               elsif !op.empty?
-                op << shell_escape(op.pop)
+                op << op.pop
+              elsif flag == :branch
+                raise_error 'no branch name'
               end
               op.clear
             when :clear
@@ -1079,8 +1096,8 @@ module Squared
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           statusargs = lambda do
             {
-              include: relativepath(as_a(kwargs[:include]), all: true),
-              exclude: relativepath(as_a(kwargs[:exclude]), all: true)
+              include: relativepath(Array(kwargs[:include]), all: true),
+              exclude: relativepath(Array(kwargs[:exclude]), all: true)
             }
           end
           unless workspace.closed
@@ -1189,13 +1206,14 @@ module Squared
           else
             op = OptionPartition.new(opts, OPT_GIT[:checkout], cmd, project: self, no: OPT_GIT[:no][:checkout],
                                                                     first: flag == :path ? matchpathspec : nil)
-            if flag == :commit
-              op.append(commit)
-                .clear(pass: false)
-            else
+            if flag == :path
               append_head
               append_pathspec(op.extras, pass: false)
+              print_success if success?(source)
+              return
             end
+            op.append(commit)
+              .clear(pass: false)
           end
           source
         end
@@ -1235,9 +1253,9 @@ module Squared
 
         def log!(flag, opts = [], range: [], index: [])
           cmd, opts = git_session('log', opts: opts)
-          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
-                                   project: self, no: collect_hash(OPT_GIT[:no][:log]),
-                                   first: matchpathspec)
+          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self,
+                                                                           no: collect_hash(OPT_GIT[:no][:log]),
+                                                                           first: matchpathspec)
           case flag
           when :between, :contain
             op << shell_quote(range.join(flag == :between ? '..' : '...'))
@@ -1624,19 +1642,20 @@ module Squared
                 red = color(:red)
                 grep.map! { |val| Regexp.new(val[1..-2]) }
                 files = status_data.map! do |a, b|
-                  next unless grep.empty? || grep.any? { |pat| pat.match?(a) }
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
                   "#{sub_style(b, styles: red)} #{a}"
                 end
                 .compact
                 unless files.empty?
                   files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
-                                                              accept: 'Add?')
+                                                              accept: [['Add?', false, true]])
                 end
                 op.swap(list + files)
               end
             end
-            append_pathspec(op.extras)
+            return source(git_session('status', '-s'), banner: false) unless append_pathspec(op.extras)
+
             verbose = flag == :add && !op.arg?('verbose')
             print_success if success?(source) && verbose
             return
@@ -1665,30 +1684,36 @@ module Squared
         private
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
-                   multiple: false, **kwargs)
+                   multiple: false, from: nil, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          banner = nil if banner && (multiple || !banner?)
-          if cmd.respond_to?(:done)
-            if io && banner == false
-              from = nil
-            elsif !from && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
-              from = :"git:#{from}"
+          if io && banner == false
+            from = nil
+            banner = nil
+          else
+            banner = nil if banner && (multiple || !banner?)
+            if cmd.respond_to?(:done)
+              if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
+                from = :"git:#{from}"
+              end
+              banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
             end
-            banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
+            from = nil if from == false
           end
           cmd = session_done cmd
           log&.info cmd
-          on :first, from
           banner = if banner
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
                    end
+          on :first, from
           begin
             if io
-              return `#{cmd}` if stdout
-
-              return banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-            end
-            if stdin? ? sync : stdout
+              ret = if stdout
+                      `#{cmd}`
+                    else
+                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
+                    end
+              return ret
+            elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
               if !ret.empty?
@@ -1696,7 +1721,7 @@ module Squared
               elsif success?(!banner.nil?)
                 print_success
               end
-            elsif sync || (!exception && !stderr)
+            elsif !kwargs[:sub] && (sync || (!exception && !stderr))
               print_item banner unless multiple
               ret = shell(cmd, exception: exception)
             else
@@ -1889,6 +1914,7 @@ module Squared
         def append_pathspec(files = [], target: @session, expect: false, parent: false, pass: true)
           if session_arg?('pathspec-from-file', target: target)
             option_clear files
+            true
           else
             if files.empty? && (val = option('pathspec', target: target))
               files = split_escape val
@@ -1896,8 +1922,11 @@ module Squared
             files = projectmap(files, parent: parent, pass: pass)
             if !files.empty?
               target << '--' << files.join(' ')
+              true
             elsif expect
               raise_error(parent ? 'pathspec not present' : 'pathspec not within worktree')
+            else
+              false
             end
           end
         end
@@ -1940,8 +1969,10 @@ module Squared
         end
 
         def foreachref(path, *args, format: nil)
-          path = as_a(path).map! { |val| "refs/#{val}" }
-          git_spawn('for-each-ref', format && quote_option('format', format), *args, *path, stdout: false)
+          path = Array(path).map! { |val| "refs/#{val}" }
+          format &&= quote_option('format', format)
+          ret = git_spawn('for-each-ref', format, *args, *path, stdout: workspace.windows?)
+          ret.is_a?(String) ? ret.lines : ret
         end
 
         def git_session(*cmd, opts: nil, worktree: true, **kwargs)
@@ -1979,8 +2010,8 @@ module Squared
 
         def repotrack(origin, branch, quote: true)
           i = origin.index('/')
-          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
-          ret = [origin[0..i - 1], branch]
+          branch = "#{branch}:#{origin[(i + 1)..-1]}" unless origin.end_with?("/#{branch}")
+          ret = [origin[0..(i - 1)], branch]
           quote ? ret.map! { |val| shell_quote(val) } : ret
         end
 

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

@@ -134,7 +134,7 @@ module Squared
                     end
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.to_a.drop(1)
+                      packages = args.extras
                     else
                       save = 'prod'
                       packages = args.to_a
@@ -145,10 +145,10 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
+                  format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
+                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -185,7 +185,7 @@ module Squared
                   format_desc action, nil, 'pkg/cmd,opts*,args*'
                   task action, [:package] do |_, args|
                     if (package = args.package)
-                      args = args.to_a.drop(1)
+                      args = args.extras
                       if pnpm?
                         pre = ->(ch) { "-#{ch}" if (ch = args.delete(ch)) }
                         cmd = session 'pnpm', pre.call('r'), pre.call('c'), 'exec'
@@ -226,7 +226,7 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'names*')
+                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'name*')
                       task flag do |_, args|
                         package flag, args.to_a
                       end
@@ -336,7 +336,7 @@ module Squared
             next unless from && dest&.directory?
 
             from = path + from
-            glob = as_a(glob || '**/*')
+            glob = Array(glob || '**/*')
             target = []
             if workspace
               Dir.glob(from + '*').each do |path|
@@ -448,7 +448,7 @@ module Squared
               ret = on(:error, :outdated, e)
               raise if exception && ret != true
             end
-            warn log_message(Logger::WARN, e, pass: true) if warning?
+            warn log_message(Logger::WARN, e) if warning?
             return
           else
             dep1 = json['dependencies'] || {}
@@ -596,50 +596,43 @@ module Squared
         end
 
         def update(*)
-          package 'update'
+          package('update', from: :update)
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
-          if read_packagemanager(:private)
-            if warning?
-              warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private', pass: true)
-            end
+          if !version || read_packagemanager(:private)
+            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
-          return unless version
-
           cmd = session 'npm', 'publish'
-          dryrun = dryrun?('npm') if dryrun.nil?
           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')
-          if verbose
-            if dryrun
-              cmd << '--dry-run'
-            else
-              log.info cmd.to_s
-            end
-            unless sync
-              on :first, :publish unless dryrun
-              pwd_set(from: :publish, dryrun: dryrun) do
-                require 'open3'
-                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 }
-                  ])
-                end
+          dryrun = dryrun?('npm') if dryrun.nil?
+          if dryrun
+            cmd << '--dry-run'
+          else
+            from = :publish
+            log.info cmd.to_s
+          end
+          if sync
+            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(project, styles: theme[:active])}")
+          else
+            on :first, from
+            pwd_set(from: :publish, dryrun: dryrun) do
+              require 'open3'
+              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 }
+                ])
               end
-              on :last, :publish unless dryrun
-              return
             end
-          elsif dryrun
-            return
+            on :last, from
           end
-          run(from: :publish, sync: sync)
         end
 
-        def package(flag, opts = [])
+        def package(flag, opts = [], from: nil)
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
@@ -665,6 +658,7 @@ module Squared
               list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
               list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
               no = OPT_NPM[:install_no]
+              cmd << '--save=true' if option('save')
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
             op.each do |opt|
@@ -689,7 +683,7 @@ module Squared
             end
             op.clear(errors: true)
           end
-          run(from: :"package:#{flag}")
+          run(from: from || :"package:#{flag}")
         end
 
         def bump(flag, val = nil)
@@ -906,9 +900,11 @@ module Squared
           @pm[:_] = false
           nil
         else
-          return @pm[key] if key
-
-          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
+          if key
+            @pm[key]
+          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
+            ret
+          end
         end
 
         def read_install