squared 0.0.10 → 0.0.11

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

@@ -4,29 +4,38 @@ module Squared
   module Workspace
     module Project
       class Node < Git
+        include Common::Prompt
+
         class << self
           def populate(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
+          end
+
+          def batchargs
+            [ref, { refresh: %i[build copy] }]
+          end
+
+          def aliasargs
+            [ref, { refresh: :build }]
           end
 
           def prod?
             ENV['NODE_ENV'] == 'production'
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              val.join('package.json').exist?
-            else
-              super
-            end
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            val.join('package.json').exist?
           end
         end
 
         @@tasks[ref] = {
-          install: %i[force frozen dedupe],
-          outdated: %i[major minor patch],
+          install: %i[force frozen dedupe].freeze,
+          outdated: %i[major minor patch].freeze,
+          bump: %i[major minor patch].freeze,
           run: nil
         }.freeze
 
@@ -58,11 +67,55 @@ module Squared
               if flags.nil?
                 case action
                 when :run
-                  desc format_desc(action, nil, 'command+')
+                  desc format_desc(action, nil, 'command+|^index|#,pattern*')
                   task action, [:command] do |_, args|
-                    cmd = args.to_a
-                    guard_params(action, 'command', args: cmd)
-                    cmd.each { |val| run_s compose(val) }
+                    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] }
+                      ])
+                    else
+                      cmd = args.to_a
+                      guard_params(action, 'command', args: cmd)
+                      list = nil
+                      cmd.each do |val|
+                        if (data = /\A\^(\d+)\z/.match(val))
+                          list ||= read_scripts
+                          n = data[1].to_i
+                          if (item = list[n - 1])
+                            val = item.first
+                          elsif exception
+                            raise_error("requested index #{n}", hint: "total #{list.size}")
+                          else
+                            next log.warn "run script #{n} of #{list.size} (out of range)"
+                          end
+                        end
+                        run compose(val, script: true)
+                      end
+                    end
                   end
                 end
               else
@@ -75,10 +128,15 @@ module Squared
                         depend(flag)
                       end
                     when :outdated
-                      desc format_desc(action, flag, %w[prune interactive dry-run], arg: 'opts?')
+                      desc format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
                       task flag, [:opts] do |_, args|
                         outdated(flag, opts: args.to_a)
                       end
+                    else
+                      desc format_desc(action, flag)
+                      task flag do
+                        __send__(action, flag)
+                      end
                     end
                   end
                 end
@@ -87,17 +145,17 @@ module Squared
           end
         end
 
-        def copy(from: 'build', glob: '**/*', subdir: 'node_modules', into: nil, also: nil, override: false)
+        def copy(from: 'build', glob: '**/*', into: 'node_modules', scope: nil, also: nil, override: false)
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
-            subdir = @copy[:subdir] if @copy.key?(:subdir)
             into = @copy[:into] if @copy.key?(:into)
+            scope = @copy[:scope] if @copy.key?(:scope)
             also = @copy[:also] if @copy.key?(:also)
           end
-          items = [path == workspace.home ? nil : workspace.home]
+          items = [path != workspace.home && workspace.home? ? workspace.home : nil]
           items += as_a(also) if also
           items.each_with_index do |dir, i|
             if i == 0
@@ -113,7 +171,7 @@ module Squared
               when ::Hash
                 glob = '**/*'
                 dest = nil
-                into = nil
+                scope = nil
                 dir.each do |key, val|
                   case key.to_sym
                   when :target
@@ -122,8 +180,8 @@ module Squared
                     from = val
                   when :glob
                     glob = val
-                  when :subdir
-                    subdir = val
+                  when :scope
+                    scope = val
                   when :into
                     into = val
                   end
@@ -131,18 +189,17 @@ module Squared
               when Project::Base
                 dest = dir.path
               end
-              next unless into
             end
             next unless dest&.directory?
 
             from = base_path(from)
-            dest = dest.join(subdir, into || project)
-            log.warn "cp #{from.join(glob)} #{dest}"
+            dest = dest.join(into, scope || project)
+            (glob = as_a(glob)).each { |val| log.info "cp #{from.join(val)} #{dest}" }
             copy_d(from, dest, glob: glob, verbose: verbose)
           end
         end
 
-        def depend(flag = nil)
+        def depend(flag = nil, sync: invoked_sync?('depend', flag))
           if @depend && !flag
             super
           elsif outdated?
@@ -165,7 +222,7 @@ module Squared
                                       '--frozen-lockfile'
                                     end
                 cmd << '--production' if flag && prod?
-                cmd << '--ignore-engines' unless env('YARN_IGNORE_ENGINES', equals: '0')
+                cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
               end
             elsif pnpm?
               cmd = session 'pnpm'
@@ -179,11 +236,11 @@ module Squared
                                     end
               end
               cmd << '--prod' if flag && prod?
-              if (val = env('PNPM_PUBLIC_HOIST_PATTERN'))
+              if (val = option('public-hoist-pattern', ignore: false))
                 split_escape(val).each { |opt| cmd << "--public-hoist-pattern=#{shell_escape(opt, quote: true)}" }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
-              append_nocolor
+              append_nocolor option('no-color')
             else
               cmd = session 'npm'
               if flag == :dedupe
@@ -197,17 +254,23 @@ module Squared
               end
               cmd << '--omit=dev' if flag && prod?
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
-              cmd << '--package-lock=false' if env('NPM_PACKAGE_LOCK', equals: '0')
-              append_nocolor
+              cmd << '--package-lock=false' if option('package-lock', equals: '0')
+              append_nocolor option('no-color')
             end
             append_loglevel
-            run(sync: invoked_sync?('depend', flag))
+            run(sync: sync)
           end
         end
 
         def outdated(rev = nil, opts: [])
-          dryrun = opts.include?('dry-run') || !env('NODE_DRY_RUN').nil?
-          cmd = pnpm? && read_packagemanager(ver: '7.15') ? 'pnpm outdated' : 'npm outdated'
+          dryrun = opts.include?('dry-run')
+          if pnpm? && read_packagemanager(version: '7.15')
+            cmd = 'pnpm outdated'
+            dryrun ||= !option('dry-run', prefix: 'pnpm').nil?
+          else
+            cmd = 'npm outdated'
+            dryrun ||= !option('dry-run', prefix: 'npm').nil?
+          end
           log.info cmd
           banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}", multiple: true)
           if invoked_sync?('outdated', rev)
@@ -226,7 +289,7 @@ module Squared
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
               val = val.find { |obj| obj['dependent'] == json['name'] } if val.is_a?(::Array)
-              next unless val && (file = dep1[key] || dep2[key])
+              next unless val && (file = dep1[key] || dep2[key]) && file != '*'
 
               latest = val['latest']
               ch = file[0]
@@ -238,11 +301,11 @@ module Squared
                 avail << [key, file, latest, true]
                 next
               end
-              want = rev == :major && latest.match(SEM_VER) && !Regexp.last_match(6) ? latest : val['wanted']
+              want = rev == :major && (ver = latest.match(SEM_VER)) && !ver[6] ? latest : val['wanted']
               next unless (val['current'] != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
-              f = semver(file.scan(SEM_VER)).first
-              w = semver(want.scan(SEM_VER)).first
+              f = semver(semscan(file))
+              w = semver(semscan(want))
               a = f[0]
               b = f[2]
               c = w[0]
@@ -294,7 +357,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)
+              if inter && (rev != :major || e || semmajor(item[5], item[6])) && !confirm_outdated(a, c, d, e)
                 cur = -1
               else
                 cur = modified
@@ -354,12 +417,14 @@ module Squared
           end
         end
 
-        def compose(opts)
+        def compose(opts, flags = nil, script: false)
+          return unless opts && script
+
           ret = session (if yarn?
                            'yarn'
                          else
                            pnpm? ? 'pnpm' : 'npm'
-                         end), 'run'
+                         end), 'run', flags
           append_loglevel
           case opts
           when ::Enumerable
@@ -372,6 +437,57 @@ module Squared
           ret
         end
 
+        def bump(flag)
+          return unless (ver = version)
+
+          seg = semscan(ver)
+          case flag
+          when :major
+            if seg[0] != '0' || seg[2].nil?
+              seg[0] = seg[0].succ
+            else
+              seg[2] = seg[2].succ
+            end
+          when :minor
+            if seg[0] == '0'
+              seg[4] &&= seg[4].succ
+            else
+              seg[2] = seg[2].succ
+            end
+          when :patch
+            seg[4] &&= seg[4].succ
+          end
+          unless (out = seg.join) == ver
+            begin
+              doc = package.read
+              if doc.sub!(/"version"\s*:\s*"#{ver}"/, "\"version\": \"#{out}\"")
+                package.write(doc)
+                log.info "bump version #{ver} to #{out} (#{flag})"
+                if verbose
+                  major = flag == :major
+                  emphasize("version: #{out}", title: name, border: borderstyle, sub: [
+                    headerstyle,
+                    { pat: /^(version:)( )(\S+)(.*)$/, styles: color(major ? :green : :yellow), index: 3 },
+                    { pat: /^(version:)(.*)$/, styles: theme[major ? :major : :active] }
+                  ])
+                elsif stdin?
+                  puts out
+                end
+              else
+                raise_error('not found', hint: 'version')
+              end
+            rescue StandardError => e
+              log.debug e
+              raise
+            end
+          end
+        end
+
+        def version
+          read_packagemanager
+          @pm[:version]
+        end
+
         def install_type(prog = nil)
           prog ||= yarn? ? :yarn : :pnpm
           key = :"#{prog}?"
@@ -379,6 +495,10 @@ module Squared
           @pm[prog] || 0
         end
 
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def copy?
           super || @copy.is_a?(::Hash)
         end
@@ -388,8 +508,8 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if base_path('yarn.lock').exist?
-                            if (rc = base_path('.yarnrc.yml')).exist?
+          (@pm[:yarn] ||= if base_path('yarn.lock', ascend: find_package).exist?
+                            if (rc = base_path('.yarnrc.yml', ascend: find_package)).exist?
                               begin
                                 require 'yaml'
                                 doc = YAML.load_file(rc)
@@ -408,10 +528,10 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if base_path('pnpm-lock.yaml').exist?
+          (@pm[:pnpm] ||= if base_path('pnpm-lock.yaml', ascend: find_package).exist?
                             begin
                               require 'yaml'
-                              doc = YAML.load_file(base_path('node_modules/.modules.yaml'))
+                              doc = YAML.load_file(base_path('node_modules/.modules.yaml', ascend: find_package))
                               @pm[:_] = doc['packageManager']
                               case doc['nodeLinker']
                               when 'hoisted'
@@ -429,6 +549,15 @@ module Squared
                           end) > 0
         end
 
+        def workspaces?
+          if pnpm?
+            base_path('pnpm-workspace.yaml').exist?
+          else
+            read_packagemanager
+            @pm[:workspaces].is_a?(::Array)
+          end
+        end
+
         def dev?
           !Node.prod? && super
         end
@@ -439,6 +568,36 @@ module Squared
 
         private
 
+        def read_packagemanager(version: nil)
+          if @pm[:_].nil?
+            doc = JSON.parse(package.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?
+          @pm[:_] = false
+          nil
+        else
+          return if !@pm[:_] || (version && @pm[:_][@pm[:_].index('@') + 1..-1] < version)
+
+          @pm[:_]
+        end
+
+        def read_install
+          return unless (ret = env('NODE_INSTALL'))
+
+          @pm[:_] ||= ret if ret.include?('@')
+          ret
+        end
+
+        def read_scripts
+          read_packagemanager
+          @pm[:scripts].is_a?(Hash) ? @pm[:scripts].to_a : []
+        end
+
         def append_loglevel
           level = env('NODE_LOGLEVEL')
           silent = !verbose || level == 'silent'
@@ -471,43 +630,31 @@ module Squared
           end
         end
 
-        def confirm_outdated(pkg, ver, rev)
-          rev = case rev
-                when 1
-                  'MAJOR'
-                when 3
-                  'MINOR'
-                else
-                  'PATCH'
-                end
-          a = sub_style(rev, styles: theme[:header])
+        def confirm_outdated(pkg, ver, rev, lock)
+          a = sub_style(case rev
+                        when 1
+                          'MAJOR'
+                        when 3
+                          'MINOR'
+                        else
+                          'PATCH'
+                        end, styles: theme[:header])
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
-          c, d = rev == 'MAJOR' ? ['y/N', 'N'] : ['Y/n', 'Y']
-          confirm("Upgrade to #{a}? #{b} [#{c}] ", d, timeout: 60)
+          c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
+          e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
+          confirm("Upgrade to #{a}? #{b}#{e} [#{c}] ", d, timeout: 60)
         end
 
-        def read_packagemanager(ver: nil)
-          if @pm[:_].nil?
-            doc = JSON.parse(package.read)
-            @pm[:_] = (val = doc['packageManager']) ? val[0..(val.index('+') || 0) - 1] : false
-          end
-        rescue StandardError => e
-          log.warn e if package.exist?
-          @pm[:_] = false
-          nil
-        else
-          return unless @pm[:_]
-
-          ver ? @pm[:_][@pm[:_].index('@') + 1..-1] >= ver : @pm[:_]
+        def find_package
+          'package.json' if parent&.has?('outdated', Node.ref)
         end
 
-        def read_install
-          return unless (ret = env('NODE_INSTALL'))
-
-          @pm[:_] ||= ret if ret.include?('@')
-          ret
+        def headerstyle
+          { pat: /^(\S+)(\s+)$/, styles: theme[:header] }
         end
       end
+
+      Application.implement Node
     end
   end
 end

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

@@ -12,21 +12,21 @@ module Squared
 
         class << self
           def populate(*); end
+          def batchargs(*); end
+          def aliasargs(*); end
 
           def tasks
-            nil
+            %i[outdated].freeze
           end
 
           def venv?
             Dir.exist?(ENV.fetch('VIRTUAL_ENV', ''))
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              REQUIREMENTS.any? { |file| val.join(file).exist? }
-            else
-              super
-            end
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            REQUIREMENTS.any? { |file| val.join(file).exist? }
           end
         end
 
@@ -46,7 +46,7 @@ module Squared
         end
 
         @@tasks[ref] = {
-          install: %i[user target upgrade force]
+          install: %i[user target upgrade force].freeze
         }.freeze
 
         def ref
@@ -74,7 +74,8 @@ module Squared
                            else
                              OPT_USER
                            end
-                    desc format_desc(action, flag, list + OPT_GENERAL, req: req)
+                    list += OPT_GENERAL
+                    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)
@@ -92,11 +93,10 @@ module Squared
           end
         end
 
-        def depend(flag = nil, dir: nil, opts: [])
+        def depend(flag = nil, dir: nil, opts: [], sync: invoked_sync?('depend', flag))
           if @depend && !flag
             super
           elsif outdated?
-            sync = invoked_sync?('depend', flag)
             case (type = install_type)
             when 1, 2
               cmd = pip_session 'install'
@@ -148,6 +148,10 @@ module Squared
           end
         end
 
+        def depend?
+          @depend != false && (!@depend.nil? || outdated?)
+        end
+
         def outdated?
           install_type > 0
         end
@@ -169,21 +173,23 @@ module Squared
                           (v ? "-#{v[0]}" : "--#{opt}")
                         end
           end
-          @session << '--user' if env('PIP_USER')
-          @session << '--no-input' if env('PIP_NO_INPUT')
-          if (val = env('PIP_PROXY'))
+          @session << '--user' if option('user')
+          @session << '--no-input' if option('no-input')
+          if (val = option('proxy', ignore: false))
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
-          if (val = env('PIP_LOG'))
+          if (val = option('log', ignore: false))
             @session << "--log=#{shell_escape(base_path(val).to_s, quote: true)}"
           end
-          append_nocolor
+          append_nocolor option('no-color')
         end
 
         def append_eager(opts)
           @session << '--upgrade-strategy=eager' if opts.include?('eager')
         end
       end
+
+      Application.implement Python
     end
   end
 end