squared 0.4.14 → 0.5.0

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

@@ -94,6 +94,7 @@ module Squared
           'add' => nil,
           'run' => nil,
           'exec' => nil,
+          'nvm' => nil,
           'pack' => nil
         })
 
@@ -134,7 +135,7 @@ module Squared
                     end
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.extras
+                      packages = args.to_a.drop(1)
                     else
                       save = 'prod'
                       packages = args.to_a
@@ -145,10 +146,10 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
+                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -185,7 +186,7 @@ module Squared
                   format_desc action, nil, 'pkg/cmd,opts*,args*'
                   task action, [:package] do |_, args|
                     if (package = args.package)
-                      args = args.extras
+                      args = args.to_a.drop(1)
                       if pnpm?
                         pre = ->(ch) { "-#{ch}" if (ch = args.delete(ch)) }
                         cmd = session 'pnpm', pre.call('r'), pre.call('c'), 'exec'
@@ -210,6 +211,17 @@ module Squared
                     end
                     run(from: :exec)
                   end
+                when 'nvm'
+                  next unless ENV['NVM_DIR']
+
+                  format_desc action, nil, 'version,args*'
+                  task action, [:version] do |_, args|
+                    version = param_guard(action, 'version', args: args, key: :version)
+                    args = args.to_a.drop(1)
+                    args << readline('Enter command', force: true) if args.empty?
+                    args.prepend(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
+                  end
                 when 'pack'
                   format_desc action, nil, 'opts*'
                   task action do |_, args|
@@ -226,7 +238,7 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'name*')
+                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'names*')
                       task flag do |_, args|
                         package flag, args.to_a
                       end
@@ -247,7 +259,7 @@ module Squared
                       format_desc(action, flag, 'otp?,dry-run?,public|restricted?', before: flag == :tag ? 'tag' : nil)
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('true') || args.delete('d')
+                        dryrun = true if args.delete('dry-run') || args.delete('d')
                         if args.delete('public') || args.delete('p')
                           access = 'public'
                         elsif args.delete('restricted') || args.delete('r')
@@ -336,15 +348,15 @@ module Squared
             next unless from && dest&.directory?
 
             from = path + from
-            glob = Array(glob || '**/*')
+            glob = as_a(glob || '**/*')
             target = []
             if workspace
-              Dir.glob(from + '*').each do |path|
-                next unless (path = Pathname.new(path)).directory?
+              from.glob('*').each do |entry|
+                next unless entry.directory?
 
-                sub = if (proj = @workspace.find(path))
+                sub = if (proj = @workspace.find(entry))
                         proj.packagename
-                      elsif (file = path + 'package.json').exist?
+                      elsif (file = entry + 'package.json').exist?
                         begin
                           doc = JSON.parse(file.read)
                         rescue StandardError => e
@@ -355,9 +367,9 @@ module Squared
                         end
                       end
                 if sub
-                  target << [path, dest.join(into, sub)]
+                  target << [entry, dest.join(into, sub)]
                 else
-                  log.debug message("package.json in \"#{path}\"", hint: 'not found')
+                  log.debug message("package.json in \"#{entry}\"", hint: 'not found')
                 end
               end
             else
@@ -402,7 +414,7 @@ module Squared
               else
                 cmd << 'install'
               end
-              if (val = option('public-hoist-pattern', ignore: false))
+              option('public-hoist-pattern', ignore: false) do |val|
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
@@ -448,7 +460,7 @@ module Squared
               ret = on(:error, :outdated, e)
               raise if exception && ret != true
             end
-            warn log_message(Logger::WARN, e) if warning?
+            warn log_message(Logger::WARN, e, pass: true) if warning?
             return
           else
             dep1 = json['dependencies'] || {}
@@ -532,7 +544,7 @@ module Squared
             found.each_with_index do |item, i|
               a, b, c, d, e = item
               f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col1: col1)
                 cur = -1
               else
                 cur = modified
@@ -596,43 +608,49 @@ module Squared
         end
 
         def update(*)
-          package('update', from: :update)
+          package 'update'
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+          if read_packagemanager(:private)
+            if warning?
+              warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private', pass: true)
+            end
             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')
-          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 }
-                ])
+          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) do
+                require 'open3'
+                banner = format_banner cmd.to_s
+                Open3.popen2e(cmd.done) do |_, out|
+                  write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
+                                   banner: banner)
+                end
               end
+              on :last, :publish unless dryrun
+              return
             end
-            on :last, from
+          elsif dryrun
+            return
           end
+          run(from: :publish, sync: sync)
         end
 
-        def package(flag, opts = [], from: nil)
+        def package(flag, opts = [])
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
@@ -658,7 +676,6 @@ 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|
@@ -683,7 +700,7 @@ module Squared
             end
             op.clear(errors: true)
           end
-          run(from: from || :"package:#{flag}")
+          run(from: :"package:#{flag}")
         end
 
         def bump(flag, val = nil)
@@ -774,9 +791,9 @@ module Squared
           if script
             ret = session dependbin, 'run'
             raise_error("#{dependbin} run: given #{target}", hint: from) unless append_any(target, build: true)
-            append_any opts if opts
+            append_any opts
             append_loglevel
-            append_any(args, delim: true) if args
+            append_any(args, delim: true)
             ret
           else
             case target
@@ -900,11 +917,9 @@ module Squared
           @pm[:_] = false
           nil
         else
-          if key
-            @pm[key]
-          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
-            ret
-          end
+          return @pm[key] if key
+
+          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
         end
 
         def read_install
@@ -920,7 +935,7 @@ module Squared
         end
 
         def append_loglevel(target: @session)
-          level = env('NODE_LOGLEVEL')
+          level = env 'NODE_LOGLEVEL'
           silent = !verbose || level == 'silent'
           return unless silent || level