squared 0.0.9 → 0.0.10

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module Squared
   module Workspace
     module Project
@@ -34,28 +32,17 @@ module Squared
 
         attr_reader :package
 
-        def initialize(*, script: nil, **kwargs)
+        def initialize(*, **kwargs)
           super
-          initialize_script(Node.ref, **kwargs)
-          @dev = kwargs[:dev]
-          @prod = kwargs[:prod]
+          if @pass.include?(Node.ref)
+            initialize_ref(Node.ref)
+            initialize_logger(**kwargs)
+          else
+            initialize_build(Node.ref, prod: prod?, **kwargs)
+            initialize_env(**kwargs)
+          end
           @pm = {}
           @package = base_path('package.json')
-          return if @output[0] == false
-
-          if @output[0].nil?
-            val, ext = @workspace.script(Node.ref, @group)
-            script_set val
-            unless ext
-              if script
-                script_set script
-              elsif (val = @script && @script[:run])
-                @output[0] = val
-                @output[1] = nil
-              end
-            end
-          end
-          @output[@output[0] || val.include?(' ') ? 0 : 1] = val if (val = env('BUILD', strict: true))
         end
 
         def ref
@@ -75,7 +62,7 @@ module Squared
                   task action, [:command] do |_, args|
                     cmd = args.to_a
                     guard_params(action, 'command', args: cmd)
-                    run_script cmd
+                    cmd.each { |val| run_s compose(val) }
                   end
                 end
               else
@@ -100,9 +87,9 @@ module Squared
           end
         end
 
-        def copy(from: 'build', glob: '**/*', subdir: 'node_modules', into: nil, also: [], override: false)
+        def copy(from: 'build', glob: '**/*', subdir: 'node_modules', into: nil, also: nil, override: false)
           if @copy && !override
-            return super if @copy.is_a?(::String)
+            return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:glob] if @copy.key?(:glob)
@@ -110,10 +97,11 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             also = @copy[:also] if @copy.key?(:also)
           end
-          items = [name == workspace.main ? nil : workspace.home].concat(as_a(also))
+          items = [path == workspace.home ? nil : workspace.home]
+          items += as_a(also) if also
           items.each_with_index do |dir, i|
             if i == 0
-              next unless dev? & !doc?
+              next unless dev? && build?
 
               dest = dir
             else
@@ -123,10 +111,13 @@ module Squared
               when ::Symbol
                 dest = Workspace.resolve(dir)&.path
               when ::Hash
+                glob = '**/*'
+                dest = nil
                 into = nil
-                glob = nil
                 dir.each do |key, val|
                   case key.to_sym
+                  when :target
+                    dest = val
                   when :from
                     from = val
                   when :glob
@@ -147,7 +138,7 @@ module Squared
             from = base_path(from)
             dest = dest.join(subdir, into || project)
             log.warn "cp #{from.join(glob)} #{dest}"
-            copy_d(from, dest, glob: glob, verbose: verbose?)
+            copy_d(from, dest, glob: glob, verbose: verbose)
           end
         end
 
@@ -173,7 +164,7 @@ module Squared
                                     elsif flag == :frozen
                                       '--frozen-lockfile'
                                     end
-                cmd << '--production' if prod?
+                cmd << '--production' if flag && prod?
                 cmd << '--ignore-engines' unless env('YARN_IGNORE_ENGINES', equals: '0')
               end
             elsif pnpm?
@@ -187,7 +178,10 @@ module Squared
                                       '--frozen-lockfile'
                                     end
               end
-              cmd << '--prod' if prod?
+              cmd << '--prod' if flag && prod?
+              if (val = env('PNPM_PUBLIC_HOIST_PATTERN'))
+                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
             else
@@ -201,7 +195,7 @@ module Squared
                                       '--package-lock-only'
                                     end
               end
-              cmd << '--omit=dev' if prod?
+              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
@@ -212,49 +206,56 @@ module Squared
         end
 
         def outdated(rev = nil, opts: [])
-          equ = rev || (prod? ? :patch : :minor)
-          cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
+          dryrun = opts.include?('dry-run') || !env('NODE_DRY_RUN').nil?
+          cmd = pnpm? && read_packagemanager(ver: '7.15') ? 'pnpm outdated' : 'npm outdated'
           log.info cmd
-          if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
-            print_item format_banner("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}", multiple: true)
+          banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}", multiple: true)
+          if invoked_sync?('outdated', rev)
+            print_item banner
+            banner = nil
           end
-          data = `#{cmd} --json --loglevel=error`
-          store_pwd true
+          data = nil
+          pwd_set { data = `#{cmd} --json --loglevel=error` }
           json = JSON.parse(doc = package.read)
           dep1 = json['dependencies'] || {}
           dep2 = json['devDependencies'] || {}
           found = []
           avail = []
-          if !data.empty?
+          rev ||= (prod? ? :patch : :minor)
+          inter = opts.include?('interactive')
+          unless data.empty?
             JSON.parse(data).each_pair do |key, val|
-              val = val.find { |item| item['dependent'] == json['name'] } if val.is_a?(Array)
+              val = val.find { |obj| obj['dependent'] == json['name'] } if val.is_a?(::Array)
               next unless val && (file = dep1[key] || dep2[key])
 
+              latest = val['latest']
               ch = file[0]
-              unless ch =~ /[~^]/
-                avail << [key, file, val['latest'], true]
+              if ch =~ /[~^]/
+                file = file[1..-1]
+              elsif inter && rev == :major
+                major = true
+              else
+                avail << [key, file, latest, true]
                 next
               end
-              file = file[1..-1]
-              cur = val['current']
-              want = if equ == :major && val['latest'] =~ SEM_VER
-                       [val['latest'], val['wanted']].max { |a, b| a <=> b }
-                     else
-                       val['wanted']
-                     end
-              next unless (cur != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
-
-              a, b = file.split('.')
-              c, d, e = want.split('.')
-              case equ
+              want = rev == :major && latest.match(SEM_VER) && !Regexp.last_match(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
+              a = f[0]
+              b = f[2]
+              c = w[0]
+              d = w[2]
+              case rev
               when :major
                 upgrade = a == '0' ? c == '0' : true
               when :minor
                 upgrade = ch == '^' && (a == '0' ? c == '0' && b == d : a == c)
               when :patch
-                upgrade = a == c && b == d && !e.nil?
+                upgrade = a == c && b == d && f[4] != w[4]
               end
-              if upgrade
+              if upgrade && !w[5]
                 next if file == want
 
                 index = if a != c
@@ -264,9 +265,9 @@ module Squared
                         else
                           5
                         end
-                found << [key, file, want, index]
-              else
-                avail << [key, file, val['latest'], false]
+                found << [key, file, want, index, major, f, w]
+              elsif !major
+                avail << [key, file, latest, false]
               end
             end
           end
@@ -278,7 +279,7 @@ module Squared
             ord.size > 9 ? ret.rjust(ord.size.to_s.size) : ret
           end
           footer = lambda do |val = 0|
-            next unless verbose?
+            next unless verbose
 
             msg, hint = if modified == -1
                           ['Packages were updated', 'more possible']
@@ -287,25 +288,24 @@ module Squared
                         end
             puts print_footer(empty_status(msg, hint, pending + val))
           end
+          print_item banner if banner
           if !found.empty?
             col1 = size_col.(found, 0) + 4
             col2 = size_col.(found, 1) + 4
-            inter = opts.include?('interactive')
             found.each_with_index do |item, i|
-              a, b, c, d = item
-              prompt = inter && (equ != :major || semmajor(semver(b.scan(SEM_VER)[0]), semver(c.scan(SEM_VER)[0])))
-              if prompt && !confirm_outdated(equ.upcase, a, c)
+              a, b, c, d, e = item
+              if inter && (rev != :major || e || semmajor(item[5], item[6])) && !confirm_outdated(a, c, d)
                 cur = -1
               else
                 cur = modified
-                doc.sub!(/("#{Regexp.escape(a)}"\s*:\s*)"([~^])#{Regexp.escape(b)}"/) do |capture|
-                  if $2 == '~' && equ != :patch
+                doc.sub!(/("#{Regexp.escape(a)}"\s*:\s*)"([~^])#{e ? '?' : ''}#{Regexp.escape(b)}"/) do |capture|
+                  if $2 == '~' && rev != :patch
                     cur = -1
                     pending += 1
                     capture
                   else
                     modified += 1
-                    "#{$1}\"#{$2 || ''}#{c}\""
+                    "#{$1}\"#{$2 || (d == 1 && e ? '^' : '')}#{c}\""
                   end
                 end
               end
@@ -316,14 +316,14 @@ module Squared
                     'FAIL'
                   elsif d == 1
                     a = sub_style(a, styles: theme[:major])
-                    sub_style(c, :green, :bold)
+                    sub_style(c, :bold, styles: color(:green))
                   else
-                    sub_style(c, :green, pat: SEM_VER, index: d)
+                    sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
                   end
               puts "#{pad_ord.(i, found)}. #{a}#{b.ljust(col2)}#{c}"
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
-            if opts.include?('dry-run') || (modified == 0 && pending > 0)
+            if dryrun || (modified == 0 && pending > 0)
               footer.(modified)
             elsif modified > 0
               File.write(package, doc)
@@ -339,11 +339,11 @@ module Squared
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
-              b = sub_style(b.ljust(col2), d ? :red : :yellow)
+              b = sub_style(b.ljust(col2), styles: color(d ? :red : :yellow))
               c = c.ljust(col3)
               unless d
                 a = sub_style(a, styles: theme[:active])
-                c = sub_style(c, :green)
+                c = sub_style(c, styles: color(:green))
                 pending += 1
               end
               puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
@@ -354,23 +354,22 @@ module Squared
           end
         end
 
-        def compose(args)
-          args ||= @output[1]
-          cmd = [if yarn?
-                   'yarn'
-                 else
-                   pnpm? ? 'pnpm' : 'npm'
-                 end]
-          cmd << 'run'
-          append_loglevel cmd
-          if args.is_a?(::Array)
-            cmd += args
-          elsif args.is_a?(::String)
-            cmd << args
+        def compose(opts)
+          ret = session (if yarn?
+                           'yarn'
+                         else
+                           pnpm? ? 'pnpm' : 'npm'
+                         end), 'run'
+          append_loglevel
+          case opts
+          when ::Enumerable
+            ret += opts.to_a
+          when ::String
+            ret << opts
           else
-            raise_error("#{cmd.first} script name", hint: args.nil? ? 'missing' : 'invalid')
+            raise_error("#{ret.first} script name", hint: opts.nil? ? 'missing' : 'invalid')
           end
-          cmd.join(' ')
+          ret
         end
 
         def install_type(prog = nil)
@@ -380,12 +379,8 @@ module Squared
           @pm[prog] || 0
         end
 
-        def build?
-          @output[0] != false && (!@output[0].nil? || !@output[1].nil?)
-        end
-
         def copy?
-          !!@copy
+          super || @copy.is_a?(::Hash)
         end
 
         def outdated?
@@ -393,8 +388,8 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if File.exist?(base_path('yarn.lock'))
-                            if File.exist?(rc = base_path('.yarnrc.yml'))
+          (@pm[:yarn] ||= if base_path('yarn.lock').exist?
+                            if (rc = base_path('.yarnrc.yml')).exist?
                               begin
                                 require 'yaml'
                                 doc = YAML.load_file(rc)
@@ -405,7 +400,7 @@ module Squared
                             else
                               1
                             end
-                          elsif (ver = read_packagemanager || env('NODE_INSTALL')) && ver.start_with?('yarn')
+                          elsif (ver = read_packagemanager || read_install) && ver.start_with?('yarn')
                             ver == 'yarn' || ver.include?('@1') ? 1 : 3
                           else
                             0
@@ -413,10 +408,11 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if File.exist?(base_path('pnpm-lock.yaml'))
+          (@pm[:pnpm] ||= if base_path('pnpm-lock.yaml').exist?
                             begin
                               require 'yaml'
                               doc = YAML.load_file(base_path('node_modules/.modules.yaml'))
+                              @pm[:_] = doc['packageManager']
                               case doc['nodeLinker']
                               when 'hoisted'
                                 1
@@ -429,62 +425,68 @@ module Squared
                               4
                             end
                           else
-                            (read_packagemanager || env('NODE_INSTALL'))&.start_with?('pnpm') ? 4 : 0
+                            (read_packagemanager || read_install)&.start_with?('pnpm') ? 4 : 0
                           end) > 0
         end
 
         def dev?
-          !Node.prod? && workspace.dev?(pat: @dev, **runargs)
+          !Node.prod? && super
         end
 
         def prod?
-          Node.prod? || workspace.prod?(pat: @prod, **runargs)
+          @prod != false && (Node.prod? || super)
         end
 
         private
 
-        def run_script(cmd)
-          cmd.each { |val| run_s compose(val) }
-        end
-
-        def append_loglevel(cmd = @session)
-          return unless (level = env('NODE_LOGLEVEL'))
+        def append_loglevel
+          level = env('NODE_LOGLEVEL')
+          silent = !verbose || level == 'silent'
+          return unless silent || level
 
-          silent = !workspace.verbose || level == 'silent'
           if yarn?
             if install_type(:yarn) == 1
               if silent
-                cmd << '--silent'
+                @session << '--silent'
               elsif level == 'verbose'
-                cmd << '--verbose'
+                @session << '--verbose'
               end
             end
           elsif pnpm?
             if silent
-              cmd << '--reporter=silent'
+              @session << '--reporter=silent'
               level ||= 'error'
             end
             case level
             when 'debug', 'info', 'warn', 'error'
-              cmd << "--loglevel=#{level}"
+              @session << "--loglevel=#{level}"
             end
           elsif silent
-            cmd << '--loglevel=silent'
+            @session << '--loglevel=silent'
           else
             case level
             when 'error', 'warn', 'notice', 'http', 'info', 'verbose', 'silly'
-              cmd << "--loglevel=#{level}"
+              @session << "--loglevel=#{level}"
             end
           end
         end
 
-        def confirm_outdated(rev, pkg, ver)
-          m = ver == :major
-          confirm("Upgrade to #{rev}? #{sub_style("#{pkg} #{ver}", styles: theme[:inline])} [#{m ? 'y/N' : 'Y/n'}] ",
-                  default: m ? 'N' : 'Y', timeout: 60)
+        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])
+          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)
         end
 
-        def read_packagemanager
+        def read_packagemanager(ver: nil)
           if @pm[:_].nil?
             doc = JSON.parse(package.read)
             @pm[:_] = (val = doc['packageManager']) ? val[0..(val.index('+') || 0) - 1] : false
@@ -494,19 +496,16 @@ module Squared
           @pm[:_] = false
           nil
         else
-          @pm[:_] || nil
-        end
+          return unless @pm[:_]
 
-        def script_set(val)
-          @output[1] = if val.is_a?(::Array)
-                         val[Node.prod? ? 1 : 0]
-                       else
-                         val
-                       end
+          ver ? @pm[:_][@pm[:_].index('@') + 1..-1] >= ver : @pm[:_]
         end
 
-        def runargs
-          { script: @output[1], ref: Node.ref, group: group, global: @output[0].nil? && !(@script && @script[:run]) }
+        def read_install
+          return unless (ret = env('NODE_INSTALL'))
+
+          @pm[:_] ||= ret if ret.include?('@')
+          ret
         end
       end
     end

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

@@ -18,8 +18,7 @@ module Squared
           end
 
           def venv?
-            val = ENV['VIRTUAL_ENV']
-            !val.nil? && Dir.exist?(val)
+            Dir.exist?(ENV.fetch('VIRTUAL_ENV', ''))
           end
 
           def is_a?(val)
@@ -35,9 +34,15 @@ module Squared
 
         def initialize(*, **kwargs)
           super
+          if @pass.include?(Python.ref)
+            initialize_ref(Python.ref)
+            initialize_logger(**kwargs)
+          else
+            initialize_build(Python.ref, **kwargs)
+            initialize_env(**kwargs)
+          end
           @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
           @requirements = base_path(REQUIREMENTS[@reqindex])
-          initialize_build(Python.ref, **kwargs)
         end
 
         @@tasks[ref] = {
@@ -128,6 +133,21 @@ module Squared
           requirements.exist? ? @reqindex + 1 : 0
         end
 
+        def variable_set(key, *val, **)
+          case key
+          when :requirements
+            req = base_path(val.first)
+            if (index = REQUIREMENTS.index(req.basename.to_s))
+              @reqindex = index
+              @requirements = req
+            else
+              log.warn "variable_set: @#{key}=#{req} (not supported)"
+            end
+          else
+            super
+          end
+        end
+
         def outdated?
           install_type > 0
         end