squared 0.5.2 → 0.5.3

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

@@ -3,7 +3,7 @@
 module Squared
   module Workspace
     module Git
-      GIT_REPO = Workspace.hashobj
+      GIT_REPO = Support.hashobj
       GIT_PROTO = %r{^(?:https?|ssh|git|file)://}i.freeze
       private_constant :GIT_REPO, :GIT_PROTO
 
@@ -181,6 +181,9 @@ module Squared
           }.freeze,
           git: {
             add: %w[N|intent-to-add refresh].freeze,
+            blame: %w[b c l s t w C=im? L=q M=im? S=p color-by-age color-lines first-parent incremental line-porcelain
+                      p|porcelain root score-debug f|show-name e|show-email n|show-number show-stats abbrev=i
+                      contents=p date=q encoding=b ignore-rev=b ignore-revs-file=p reverse=q].freeze,
             clean: %w[d x X f|force n|dry-run i|interactive q|quiet e|exclude=q].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
@@ -248,6 +251,7 @@ module Squared
           tag: %w[n=im cleanup=b create-reflog i|ignore-case omit-empty color=b? column=b contains=b? format=q merged=b?
                   no-contains=b? no-merged=b? points-at=q sort=q trailer=q].freeze,
           no: {
+            blame: %w[progress].freeze,
             branch: %w[color color-moved column track].freeze,
             checkout: %w[overwrite-ignore guess overlay progress recurse-submodules track].freeze,
             fetch: {
@@ -333,7 +337,7 @@ module Squared
           'diff' => %i[head branch files view between contain].freeze,
           'fetch' => %i[origin remote].freeze,
           'files' => %i[cached modified deleted others].freeze,
-          'git' => %i[add clean mv revert rm].freeze,
+          'git' => %i[add blame clean mv revert rm].freeze,
           'log' => %i[view between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote].freeze,
@@ -363,7 +367,7 @@ module Squared
 
           namespace name do
             Git.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               namespace action do
                 flags.each do |flag|
@@ -862,19 +866,14 @@ module Squared
                         args = args.to_a
                         if args.empty? || args.last == ':'
                           files = []
-                          status_data.each do |line|
-                            case (flag == :staged ? line[2] : line[1])
-                            when /[AMDRTC]/
-                              files << line[0]
-                            end
-                          end
+                          status_data.each { |row| files << row[0] if row[flag == :staged ? 2 : 1].match?(/[AMDRTC]/) }
                           unless files.empty?
                             files = choice_index('Select a file', files, multiple: true, force: false,
                                                                          accept: 'Restore?')
                           end
                           args.pop
                           args, glob = args.partition { |val| val.match?(/^(?:[a-z-]+=|[^*]+$)/) }
-                          (files ||= []).concat(glob)
+                          files.concat(glob)
                           next if args.empty? && files.empty?
                         end
                         restore(flag, args, files: files)
@@ -882,10 +881,11 @@ module Squared
                     end
                   when 'git'
                     before = case flag
+                             when :blame then 'file'
                              when :mv then 'source+,destination'
                              when :revert then 'commit+' end
                     format_desc(action, flag, 'opts*', before: before, after: case flag
-                                                                              when :add then 'pathspec*|:pattern:*'
+                                                                              when :add then 'pathspec*,:pattern:*'
                                                                               when :clean, :rm then 'pathspec*' end)
                     task flag do |_, args|
                       git flag, args.to_a
@@ -1146,10 +1146,7 @@ module Squared
         rescue StandardError => e
           warn log_message(Logger::WARN, e, pass: true) if warning?
         else
-          if verbose
-            msg = sub_style('completed', styles: theme[:active])
-            puts log_message(Logger::INFO, name, msg, subject: 'revbuild', hint: time_format(epochtime - start))
-          end
+          print_status(name, subject: 'revbuild', start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
                               sync: sync, utc: 'build')
         end
@@ -1627,10 +1624,16 @@ module Squared
 
         def git(flag, opts = [])
           cmd, opts = git_session(flag, opts: opts)
-          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
-          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GIT[:no][flag],
-                                                    first: flag == :revert ? nil : matchpathspec)
+          op = OptionPartition.new(opts, OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, []), cmd,
+                                   project: self, no: OPT_GIT[:no][flag], first: case flag
+                                                                                 when :blame, :revert
+                                                                                   nil
+                                                                                 else matchpathspec end)
           case flag
+          when :blame
+            raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
+            op << '--' << shell_quote(path + op.delete_at(n))
+            op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
               op.clear
@@ -1641,14 +1644,13 @@ module Squared
             end
           when :add, :clean
             if flag == :add && !op.arg?('pathspec-from-file')
-              grep, list = op.extras.partition { |val| val.start_with?(':') && val.end_with?(':') }
-              if list.empty? || !grep.empty?
-                red = color(:red)
+              grep, list = op.partition { |val| val.start_with?(':') && val.end_with?(':') }
+              unless grep.empty? && !list.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
                 files = status_data.map! do |a, b|
                   next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                  "#{sub_style(b, styles: red)} #{a}"
+                  "#{sub_style(b, styles: color(:red))} #{a}"
                 end
                 .compact
                 unless files.empty?
@@ -1745,11 +1747,7 @@ module Squared
               end
             end
           rescue StandardError => e
-            log&.error e
-            ret = on :error, from, e
-            raise if exception && ret != true
-
-            warn log_message(Logger::WARN, e, pass: true) if warning?
+            on_error(e, from, pass: true)
             nil
           else
             on :last, from

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

@@ -121,7 +121,7 @@ module Squared
 
           namespace name do
             Node.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               if flags.nil?
                 case action
@@ -269,6 +269,11 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
+                          unless SEM_VER.match?(tag)
+                            a = sub_style(project, styles: theme[:active])
+                            b = sub_style(tag, styles: theme[:inline])
+                            exit 1 unless confirm("Publish #{a}@#{b}?", 'N')
+                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -280,7 +285,7 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, workspace: false,
+        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)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
@@ -289,6 +294,7 @@ module Squared
 
             from = @copy[:from] if @copy.key?(:from)
             into = @copy[:into] if @copy.key?(:into)
+            files = @copy[:files] if @copy.key?(:files)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             link = @copy[:link] if @copy.key?(:link)
             force = @copy[:force] if @copy.key?(:force)
@@ -310,6 +316,7 @@ module Squared
 
           on :first, :copy
           print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          packed = false
           items.each do |dir|
             case dir
             when Pathname
@@ -347,9 +354,49 @@ module Squared
             end
             next unless from && dest&.directory?
 
-            from = path + from
+            if from == :npm
+              begin
+                unless packed
+                  require 'open3'
+                  files = pwd_set do
+                    Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
+                         .first
+                         .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
+                         .map { |item| Pathname.new(item.first) }
+                         .select(&:exist?)
+                  end
+                  .concat(Array(files))
+                  packed = true
+                end
+                to = dest.join(into, npmname)
+                to.mkpath
+                log.info "cp npm:#{npmname} #{to}"
+                subdir = []
+                errors = 0
+                files.each do |file|
+                  s, d = file.is_a?(Array) ? file : [file, file]
+                  dest = to + d
+                  unless subdir.include?((target = dest.dirname).to_s)
+                    target.mkpath
+                    subdir << target.to_s
+                  end
+                  begin
+                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                  rescue StandardError => e
+                    print_error e
+                    errors += 1
+                  end
+                end
+              rescue StandardError => e
+                on_error e, :copy
+              else
+                puts message(to, subdir.size, files.size - errors) if verbose
+              end
+              next
+            end
             glob = Array(glob || '**/*')
             target = []
+            from = path + from
             if workspace
               from.glob('*').each do |entry|
                 next unless entry.directory?
@@ -373,16 +420,14 @@ module Squared
                 end
               end
             else
-              target << [from, dest.join(into, scope || project)]
+              target << [from, dest.join(into, scope || npmname)]
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
               begin
                 copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
               rescue StandardError => e
-                log.error e
-                ret = on :error, :copy, e
-                raise if exception && ret != true
+                on_error e, :copy
               end
             end
           end
@@ -448,19 +493,14 @@ module Squared
             log.info cmd.to_s
             on :first, :outdated
           end
-          banner = format_banner(cmd.temp(dryrun ? ' --dry-run' : nil))
+          banner = format_banner(cmd.temp(dryrun ? '--dry-run' : nil))
           print_item banner if sync
           begin
             data = pwd_set { `#{cmd.temp('--json', '--loglevel=error')}` }
             doc = dependfile.read
             json = JSON.parse(doc)
           rescue StandardError => e
-            log.error e
-            unless dryrun
-              ret = on :error, :outdated, e
-              raise if exception && ret != true
-            end
-            warn log_message(Logger::WARN, e) if warning?
+            on_error(e, :outdated, dryrun: dryrun)
             return
           else
             dep1 = json['dependencies'] || {}
@@ -611,7 +651,7 @@ module Squared
           package('update', from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
           if !version || read_packagemanager(:private)
             warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
@@ -628,7 +668,7 @@ module Squared
             log.info cmd.to_s
           end
           if sync
-            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(project, styles: theme[:active])}")
+            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
             on :first, from
             pwd_set(from: from) do
@@ -746,9 +786,7 @@ module Squared
               raise_error('version not found', hint: dependfile)
             end
           rescue StandardError => e
-            log.debug e
-            ret = on :error, :bump, e
-            raise if exception && ret != true
+            on_error e, :bump
           end
         end
 
@@ -887,7 +925,7 @@ module Squared
         end
 
         def version
-          super || (@version = read_packagemanager(:version))
+          @version ||= read_packagemanager(:version)
         end
 
         def packagename
@@ -913,7 +951,7 @@ module Squared
         else
           if key
             @pm[key]
-          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
+          elsif (ret = @pm[:_]) && !(version && semcmp(ret[(ret.index('@') + 1)..-1], version) == 1)
             ret
           end
         end
@@ -978,6 +1016,10 @@ module Squared
           'package.json' if parent&.has?('outdated', Node.ref)
         end
 
+        def npmname
+          packagename || project
+        end
+
         def npmnotice
           [
             { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },

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

@@ -114,7 +114,7 @@ module Squared
 
           namespace name do
             Python.subtasks do |action, flags|
-              next if @pass.include?(action)
+              next if task_pass?(action)
 
               if flags.nil?
                 case action
@@ -183,7 +183,7 @@ module Squared
                           elsif i || args.empty?
                             readline('Enter command', force: true)
                           else
-                            if (val = command_args(args, prefix: 'python'))
+                            if (val = command_args(args, min: 1, prefix: 'python'))
                               args << val
                             end
                             args.join(' ')
@@ -366,7 +366,11 @@ module Squared
           pwd_set(from: :outdated) do
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
-            IO.popen(runenv || {}, cmd).each do |line|
+            if workspace.windows?
+              (venv ? command(runenv, cmd) : `#{cmd}`).lines
+            else
+              IO.popen(runenv || {}, cmd)
+            end.each do |line|
               next if line.match?(/^[ -]+$/)
 
               if start > 0
@@ -488,7 +492,7 @@ module Squared
             if srcdir
               args = flag == :pdm ? ['d', 'dest'] : ['o', 'output']
               if op.arg?(*args)
-                op.extras << srcdir
+                op.push(srcdir)
               else
                 op << quote_option(args.last, path + srcdir)
               end
@@ -531,7 +535,7 @@ module Squared
           case flag
           when :hatch, :twine
             if op.empty?
-              op.extras << "#{dist.call}/*"
+              op.push("#{dist.call}/*")
             else
               op.map! { |val| path + val }
             end
@@ -655,7 +659,7 @@ module Squared
             if edit
               edit = path + edit unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
-                op.extras << edit
+                op.push(edit)
               else
                 target << quote_option('e', edit)
               end
@@ -851,17 +855,17 @@ module Squared
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
-          @venvopts &&= @venvopts.map { |val| OptionPartition.strip(val) }.flatten
-          venv_create(venv, @venvopts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
+          opts = @venvopts&.map { |val| OptionPartition.strip(val) }&.flatten
+          venv_create(venv, opts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
         end
 
         def venv_create(dir, opts = [], env: nil, banner: true)
           cmd, opts = python_session('-m venv', opts: opts)
           op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
-          op.append(dir, delim: true)
-            .clear(pass: false)
-          status = op.arg?(/\A-v+\z/, 'verbose')
+          status = op.append(dir, delim: true)
+                     .clear(pass: false)
+                     .arg?(/\A-v+\z/, 'verbose')
           run(op, env, exception: true, banner: banner)
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end