squared 0.0.11 → 0.0.12

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

@@ -14,8 +14,9 @@ module Squared
           def populate(ws, **)
             return if ws.series[:pull].empty?
 
+            name = ws.task_name('all')
             desc ws.task_name('all[git?=rebase|stash]', desc: true)
-            task ws.task_name('all'), [:git] do |_, args|
+            task name, [:git] do |_, args|
               sync = lambda do |key|
                 key = ws.task_name(key)
                 ws.task_defined?(ret = ws.task_join(key, 'sync')) ? ret : key
@@ -30,8 +31,10 @@ module Squared
                        sync.('pull')
                      end]
               cmd << ws.task_name('build')
-              Common::Task.invoke(cmd, **ws.invokeargs)
+              Common::Utils.task_invoke(*cmd, **ws.invokeargs)
             end
+            ws.series.sync << name
+            ws.series.multiple << name
           end
 
           def tasks
@@ -65,7 +68,7 @@ module Squared
 
         def initialize(*, **)
           super
-          initialize_ref(Git.ref) if git_path.exist?
+          initialize_ref(Git.ref) if gitpath.exist?
         end
 
         def ref
@@ -95,8 +98,7 @@ module Squared
                     else
                       desc format_desc(action, flag, 'pathspec+')
                       task flag, [:pathspec] do |_, args|
-                        files = args.to_a
-                        guard_params(action, flag, args: files)
+                        files = guard_params(action, flag, args: args.to_a)
                         __send__(action, flag, files)
                       end
                     end
@@ -138,15 +140,15 @@ module Squared
                     when :branch
                       desc format_desc(action, flag, 'name,pathspec*')
                       task flag, [:name, :pathspec] do |_, args|
-                        guard_params(action, flag, args: args, key: :name)
-                        diff(flag, args.to_a[1..-1], branch: args.name)
+                        branch = guard_params(action, flag, args: args, key: :name)
+                        diff(flag, args.to_a[1..-1] || [], branch: branch)
                       end
                     when :files
                       desc format_desc(action, flag, 'path1,path2')
                       task flag, [:path1, :path2] do |_, args|
-                        guard_params(action, flag, args: args, key: :path1)
-                        guard_params(action, flag, args: args, key: :path2)
-                        diff(flag, [args.path1, args.path2])
+                        path1 = guard_params(action, flag, args: args, key: :path1)
+                        path2 = guard_params(action, flag, args: args, key: :path2)
+                        diff(flag, [path1, path2])
                       end
                     end
                   when :checkout
@@ -154,7 +156,7 @@ module Squared
                     when :branch
                       desc format_desc(action, flag, 'name,create?=b|B,commit?,detach?=d')
                       task flag, [:name, :create, :commit, :detach] do |_, args|
-                        guard_params(action, flag, args: args, key: :name)
+                        branch = guard_params(action, flag, args: args, key: :name)
                         create = args.create
                         if args.commit == 'd'
                           detach = 'd'
@@ -172,7 +174,7 @@ module Squared
                           commit = args.commit
                         end
                         guard_params(action, flag, args: { create: create }, key: :create, pat: /^b$/i) if create
-                        checkout(flag, branch: args.name, create: create, commit: commit, detach: detach)
+                        checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :detach
                       desc format_desc(action, flag, 'branch/commit?')
@@ -187,10 +189,9 @@ module Squared
                     end
                   when :reset
                     if flag == :head
-                      desc format_desc(action, flag, 'ref?=HEAD,pathspec+')
+                      desc format_desc(action, flag, 'ref,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
-                        files = args.to_a[1..-1]
-                        guard_params(action, flag, args: files)
+                        files = guard_params(action, flag, args: args.to_a[1..-1] || [])
                         reset(flag, files, ref: args.ref)
                       end
                     else
@@ -234,7 +235,7 @@ module Squared
         end
 
         def stash(flag = nil, files = [], commit: nil)
-          cmd = git_session 'stash', (flag || 'push').to_s
+          cmd = git_session 'stash', flag || 'push'
           case flag
           when :apply, :pop
             cmd << '--index' if option('index')
@@ -267,15 +268,15 @@ module Squared
             print_item banner
             banner = nil
           end
-          sub = if verbose
-                  [
-                    { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
-                    { pat: /^([A-Z])(.+)$/, styles: :green },
-                    { pat: /^(\?\?)(.+)$/, styles: :red },
-                    { pat: /^(## )(.+)(\.{3})(.+)$/, styles: [nil, :green, nil, :red], index: -1 }
-                  ]
-                end
-          ret = write_lines(out, banner: banner, sub: sub)
+          ret = write_lines(out, banner: banner, sub: if verbose
+                                                        [
+                                                          { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
+                                                          { pat: /^([A-Z])(.+)$/, styles: :green },
+                                                          { pat: /^(\?\?)(.+)$/, styles: :red },
+                                                          { pat: /^(## )(.+)(\.{3})(.+)$/,
+                                                            styles: [nil, :green, nil, :red], index: -1 }
+                                                        ]
+                                                      end)
           list_result(ret, 'files', action: 'modified')
         end
 
@@ -380,7 +381,7 @@ module Squared
             end
           end
           cmd << sha
-          append_pathspec(files, pass: flag == :files)
+          append_pathspec(files, parent: flag == :files)
           source(exception: cmd.include?('--exit-code'))
         end
 
@@ -395,8 +396,7 @@ module Squared
           pathspec = if flag == :all || (amend && files.size == 1 && files.first == '*')
                        '--all'
                      else
-                       files = source_path(as_a(files))
-                       raise_error('commit', 'pathspec', hint: 'missing') if files.empty?
+                       raise_error('commit', 'pathspec', hint: 'missing') if (files = projectmap(files)).empty?
                        "-- #{files.join(' ')}"
                      end
           unless push?
@@ -446,12 +446,11 @@ module Squared
 
         private
 
-        def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false,
-                   banner: ARG[:BANNER])
+        def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true)
           cmd = session_done(cmd)
           log.info cmd
-          banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner, multiple: true)
-          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(git_path)}")
+          banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
+          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitpath)}")
           begin
             if io
               [IO.popen(cmd), banner]
@@ -526,11 +525,6 @@ module Squared
           end
         end
 
-        def source_path(files, pass: false)
-          files = files.select { |val| source_path?(val) } unless pass
-          files.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
-        end
-
         def append_pull(opts, list, flag = nil)
           append_submodules flag
           opts.each do |opt|
@@ -544,18 +538,18 @@ module Squared
 
         def append_commit(val)
           val = val.to_s.strip
-          val.empty? ? 'HEAD' : val
+          @session << (val.empty? ? 'HEAD' : val)
         end
 
-        def append_pathspec(files = [], expect: false, pass: false)
+        def append_pathspec(files = [], expect: false, parent: false)
           if files.empty? && (val = option('pathspec'))
             files = split_escape(val)
           end
-          files = source_path(files, pass: pass)
+          files = projectmap(files, parent: parent)
           if !files.empty?
             @session << "-- #{files.join(' ')}"
           elsif expect
-            raise_error(pass ? 'pathspec not present' : 'pathspec not within worktree', hint: 'invalid')
+            raise_error(parent ? 'pathspec not present' : 'pathspec not within worktree', hint: 'invalid')
           end
         end
 
@@ -591,8 +585,8 @@ module Squared
           session('git', *cmd)
         end
 
-        def git_path
-          base_path('.git')
+        def gitpath
+          basepath('.git')
         end
 
         def push?
@@ -604,7 +598,7 @@ module Squared
         end
 
         def threadargs
-          { stderr: true, exception: !workspace.series.multiple? }
+          { stderr: true, exception: exception || !workspace.series.multiple? }
         end
       end
 

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

@@ -4,8 +4,6 @@ module Squared
   module Workspace
     module Project
       class Node < Git
-        include Common::Prompt
-
         class << self
           def populate(*); end
 
@@ -21,6 +19,10 @@ module Squared
             [ref, { refresh: :build }]
           end
 
+          def bannerargs
+            %i[version dependfile].freeze
+          end
+
           def prod?
             ENV['NODE_ENV'] == 'production'
           end
@@ -39,8 +41,6 @@ module Squared
           run: nil
         }.freeze
 
-        attr_reader :package
-
         def initialize(*, **kwargs)
           super
           if @pass.include?(Node.ref)
@@ -51,7 +51,7 @@ module Squared
             initialize_env(**kwargs)
           end
           @pm = {}
-          @package = base_path('package.json')
+          @dependfile = basepath('package.json')
         end
 
         def ref
@@ -70,45 +70,17 @@ module Squared
                   desc format_desc(action, nil, 'command+|^index|#,pattern*')
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      list = read_scripts
-                      grep = args.extras.map { |val| Regexp.new(val) }
-                      lines = []
-                      if (pad = list.size) > 0
-                        pad = pad.to_s.size
-                        list.each_with_index do |val, i|
-                          next unless grep.empty? || grep.any? { |pat| pat.match?(val[0]) }
-
-                          lines << "#{(i + 1).to_s.rjust(pad)}. #{val[0]}"
-                        end
-                      end
-                      if lines.empty?
-                        lines = ['No scripts were found:', '']
-                        unless args.extras.empty?
-                          i = 0
-                          lines += args.extras.to_a.map { |s| "#{i += 1}. #{s}" }
-                          lines << ''
-                        end
-                        lines << package.to_s
-                        pat = /^(#{Regexp.escape(lines.last)})(.*)$/
-                      else
-                        pat = /^(\s*\d+\.)(.+)$/
-                      end
-                      emphasize(lines, title: task_join(name, 'run[^N]'), border: borderstyle, sub: [
-                        headerstyle,
-                        { pat: pat, styles: theme[:active] }
-                      ])
+                      format_list(read_scripts, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
-                      cmd = args.to_a
-                      guard_params(action, 'command', args: cmd)
-                      list = nil
+                      cmd = guard_params(action, 'command', args: args.to_a)
                       cmd.each do |val|
-                        if (data = /\A\^(\d+)\z/.match(val))
-                          list ||= read_scripts
-                          n = data[1].to_i
+                        if (data = indexdata(val))
+                          n, opts = data
+                          list = read_scripts
                           if (item = list[n - 1])
-                            val = item.first
+                            val = opts ? "#{item.first} #{opts}" : item.first
                           elsif exception
-                            raise_error("requested index #{n}", hint: "total #{list.size}")
+                            indexerror n, list
                           else
                             next log.warn "run script #{n} of #{list.size} (out of range)"
                           end
@@ -145,7 +117,9 @@ module Squared
           end
         end
 
-        def copy(from: 'build', glob: '**/*', into: 'node_modules', scope: nil, also: nil, override: false)
+        def copy(from: 'build', glob: nil, into: 'node_modules', scope: nil, also: nil, override: false)
+          return if @copy == false
+
           if @copy && !override
             return super if runnable?(@copy)
 
@@ -165,36 +139,29 @@ module Squared
             else
               case dir
               when ::String
-                dest = workspace.root_path(dir)
+                dest = workspace.rootpath(dir)
               when ::Symbol
-                dest = Workspace.resolve(dir)&.path
+                dest = workspace.find(name: dir)&.path
+                log.warn message("copy project :#{dir}", hint: 'not found') unless dest
               when ::Hash
-                glob = '**/*'
-                dest = nil
-                scope = nil
-                dir.each do |key, val|
-                  case key.to_sym
-                  when :target
-                    dest = val
-                  when :from
-                    from = val
-                  when :glob
-                    glob = val
-                  when :scope
-                    scope = val
-                  when :into
-                    into = val
-                  end
-                end
+                missing = ->(val) { log.warn message("copy attr :#{val}", hint: 'missing') }
+                glob = dir[:glob]
+                into = dir[:into] if dir.key?(:into)
+                scope = dir[:scope]
+                missing.('target') unless (dest = dir[:target])
+                missing.('from') unless (from = dir[:from])
               when Project::Base
                 dest = dir.path
+              else
+                raise_error("given: #{dir}", hint: 'unknown')
               end
             end
-            next unless dest&.directory?
+            next unless from && dest&.directory?
 
-            from = base_path(from)
+            from = basepath(from)
             dest = dest.join(into, scope || project)
-            (glob = as_a(glob)).each { |val| log.info "cp #{from.join(val)} #{dest}" }
+            glob = as_a(glob || '**/*')
+            glob.each { |val| log.info "cp #{from.join(val)} #{dest}" }
             copy_d(from, dest, glob: glob, verbose: verbose)
           end
         end
@@ -203,7 +170,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            if (yarn = install_type(:yarn)) > 0
+            if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
               if yarn > 1
                 if flag == :dedupe
@@ -272,14 +239,14 @@ module Squared
             dryrun ||= !option('dry-run', prefix: 'npm').nil?
           end
           log.info cmd
-          banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}", multiple: true)
+          banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
           if invoked_sync?('outdated', rev)
             print_item banner
             banner = nil
           end
           data = nil
           pwd_set { data = `#{cmd} --json --loglevel=error` }
-          json = JSON.parse(doc = package.read)
+          json = JSON.parse(doc = dependfile.read)
           dep1 = json['dependencies'] || {}
           dep2 = json['devDependencies'] || {}
           found = []
@@ -312,7 +279,7 @@ module Squared
               d = w[2]
               case rev
               when :major
-                upgrade = a == '0' ? c == '0' : true
+                upgrade = a == '0' ? c == '0' || c == '1' : true
               when :minor
                 upgrade = ch == '^' && (a == '0' ? c == '0' && b == d : a == c)
               when :patch
@@ -357,7 +324,7 @@ module Squared
             col2 = size_col.(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              if inter && (rev != :major || e || semmajor(item[5], item[6])) && !confirm_outdated(a, c, d, e)
+              if inter && (rev != :major || e || semmajor?(item[5], item[6])) && !confirm_outdated(a, c, d, e)
                 cur = -1
               else
                 cur = modified
@@ -389,10 +356,10 @@ module Squared
             if dryrun || (modified == 0 && pending > 0)
               footer.(modified)
             elsif modified > 0
-              File.write(package, doc)
+              File.write(dependfile, doc)
               modified = -1
               footer.()
-              commit(:add, 'package.json', pass: true)
+              commit(:add, ['package.json'], pass: true)
               install if opts.include?('prune')
             end
           elsif !avail.empty?
@@ -459,9 +426,9 @@ module Squared
           end
           unless (out = seg.join) == ver
             begin
-              doc = package.read
+              doc = dependfile.read
               if doc.sub!(/"version"\s*:\s*"#{ver}"/, "\"version\": \"#{out}\"")
-                package.write(doc)
+                dependfile.write(doc)
                 log.info "bump version #{ver} to #{out} (#{flag})"
                 if verbose
                   major = flag == :major
@@ -488,11 +455,11 @@ module Squared
           @pm[:version]
         end
 
-        def install_type(prog = nil)
-          prog ||= yarn? ? :yarn : :pnpm
-          key = :"#{prog}?"
-          __send__(key) if respond_to?(key)
-          @pm[prog] || 0
+        def dependtype(prog)
+          return @pm[prog] if @pm.key?(prog)
+
+          meth = :"#{prog}?"
+          respond_to?(meth) && __send__(meth) ? @pm[prog] : 0
         end
 
         def depend?
@@ -504,12 +471,12 @@ module Squared
         end
 
         def outdated?
-          package.exist?
+          dependfile.exist?
         end
 
         def yarn?
-          (@pm[:yarn] ||= if base_path('yarn.lock', ascend: find_package).exist?
-                            if (rc = base_path('.yarnrc.yml', ascend: find_package)).exist?
+          (@pm[:yarn] ||= if basepath('yarn.lock', ascend: find_package).exist?
+                            if (rc = basepath('.yarnrc.yml', ascend: find_package)).exist?
                               begin
                                 require 'yaml'
                                 doc = YAML.load_file(rc)
@@ -528,10 +495,10 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if base_path('pnpm-lock.yaml', ascend: find_package).exist?
+          (@pm[:pnpm] ||= if basepath('pnpm-lock.yaml', ascend: find_package).exist?
                             begin
                               require 'yaml'
-                              doc = YAML.load_file(base_path('node_modules/.modules.yaml', ascend: find_package))
+                              doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: find_package))
                               @pm[:_] = doc['packageManager']
                               case doc['nodeLinker']
                               when 'hoisted'
@@ -551,7 +518,7 @@ module Squared
 
         def workspaces?
           if pnpm?
-            base_path('pnpm-workspace.yaml').exist?
+            basepath('pnpm-workspace.yaml').exist?
           else
             read_packagemanager
             @pm[:workspaces].is_a?(::Array)
@@ -570,20 +537,18 @@ module Squared
 
         def read_packagemanager(version: nil)
           if @pm[:_].nil?
-            doc = JSON.parse(package.read)
+            doc = JSON.parse(dependfile.read)
             @pm[:_] = (val = doc['packageManager']) ? val[0..(val.index('+') || 0) - 1] : false
             @pm[:scripts] = doc['scripts']
             @pm[:version] = doc['version']
             @pm[:workspaces] = doc['workspaces']
           end
         rescue StandardError => e
-          log.debug e if package.exist?
+          log.debug e if dependfile.exist?
           @pm[:_] = false
           nil
         else
-          return if !@pm[:_] || (version && @pm[:_][@pm[:_].index('@') + 1..-1] < version)
-
-          @pm[:_]
+          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
         end
 
         def read_install
@@ -595,7 +560,7 @@ module Squared
 
         def read_scripts
           read_packagemanager
-          @pm[:scripts].is_a?(Hash) ? @pm[:scripts].to_a : []
+          @pm[:scripts].is_a?(::Hash) ? @pm[:scripts].to_a : []
         end
 
         def append_loglevel
@@ -604,7 +569,7 @@ module Squared
           return unless silent || level
 
           if yarn?
-            if install_type(:yarn) == 1
+            if dependtype(:yarn) == 1
               if silent
                 @session << '--silent'
               elsif level == 'verbose'
@@ -640,18 +605,14 @@ module Squared
                           'PATCH'
                         end, styles: theme[:header])
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
-          c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
+          c, d = rev == 1 || lock ? %w[y/N N] : %w[Y/n Y]
           e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b}#{e} [#{c}] ", d, timeout: 60)
+          Common::Prompt.confirm("Upgrade to #{a}? #{b}#{e} [#{c}] ", d, timeout: 60)
         end
 
         def find_package
           'package.json' if parent&.has?('outdated', Node.ref)
         end
-
-        def headerstyle
-          { pat: /^(\S+)(\s+)$/, styles: theme[:header] }
-        end
       end
 
       Application.implement Node

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

@@ -13,12 +13,15 @@ module Squared
         class << self
           def populate(*); end
           def batchargs(*); end
-          def aliasargs(*); end
 
           def tasks
             %i[outdated].freeze
           end
 
+          def bannerargs
+            %i[dependfile].freeze
+          end
+
           def venv?
             Dir.exist?(ENV.fetch('VIRTUAL_ENV', ''))
           end
@@ -30,8 +33,6 @@ module Squared
           end
         end
 
-        attr_reader :requirements
-
         def initialize(*, **kwargs)
           super
           if @pass.include?(Python.ref)
@@ -41,8 +42,8 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
-          @requirements = base_path(REQUIREMENTS[@reqindex])
+          @dependindex = REQUIREMENTS.index { |file| basepath(file).exist? }
+          @dependfile = basepath(REQUIREMENTS[@dependindex || 0])
         end
 
         @@tasks[ref] = {
@@ -78,8 +79,8 @@ module Squared
                     desc format_desc(action, flag, list, req: req)
                     if flag == :target
                       task flag, [:dir, :opts] do |_, args|
-                        guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: args.dir, opts: args.to_a)
+                        dir = guard_params(action, flag, args: args, key: :dir)
+                        depend(flag, dir: dir, opts: args.to_a[1..-1] || [])
                       end
                     else
                       task flag do |_, args|
@@ -97,7 +98,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            case (type = install_type)
+            case (type = dependtype)
             when 1, 2
               cmd = pip_session 'install'
               case flag
@@ -105,7 +106,7 @@ module Squared
                 cmd << '--user'
                 append_pip opts, OPT_USER
               when :target
-                cmd << "--target=#{shell_escape(base_path(dir).to_s, quote: true)}"
+                cmd << "--target=#{shell_escape(basepath(dir), quote: true)}"
                 append_pip opts, OPT_USER + ['upgrade']
                 append_eager opts
               when :upgrade
@@ -129,17 +130,13 @@ module Squared
           run
         end
 
-        def install_type(*)
-          requirements.exist? ? @reqindex + 1 : 0
-        end
-
         def variable_set(key, *val, **)
           case key
-          when :requirements
-            req = base_path(val.first)
+          when :dependfile
+            req = basepath(*val)
             if (index = REQUIREMENTS.index(req.basename.to_s))
-              @reqindex = index
-              @requirements = req
+              @dependindex = index
+              @dependfile = req
             else
               log.warn "variable_set: @#{key}=#{req} (not supported)"
             end
@@ -153,7 +150,7 @@ module Squared
         end
 
         def outdated?
-          install_type > 0
+          dependtype > 0
         end
 
         private
@@ -179,7 +176,7 @@ module Squared
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
           if (val = option('log', ignore: false))
-            @session << "--log=#{shell_escape(base_path(val).to_s, quote: true)}"
+            @session << "--log=#{shell_escape(basepath(val), quote: true)}"
           end
           append_nocolor option('no-color')
         end