squared 0.0.7 → 0.0.9

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Squared
   module Workspace
     module Project
@@ -25,31 +27,44 @@ module Squared
         end
 
         @@tasks[ref] = {
-          install: %i[force dedupe frozen],
+          install: %i[force frozen dedupe],
           outdated: %i[major minor patch],
           run: nil
         }.freeze
 
         attr_reader :package
 
-        def initialize(*, **kwargs)
+        def initialize(*, script: nil, **kwargs)
           super
           initialize_script(Node.ref, **kwargs)
-          if (opts = env('BUILD', strict: true))
-            raise_error("BUILD_#{@name.upcase}", opts) if @output[0].is_a?(::Array)
-            @output[1] = opts
-          else
-            @output[1] = (@script && @script[:run]) || @workspace.script
-          end
           @dev = kwargs[:dev]
           @prod = kwargs[:prod]
           @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
+          Node.ref
         end
 
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Node.ref)
+          return unless outdated? && ref?(Node.ref)
 
           namespace name do
             @@tasks[Node.ref].each do |action, flags|
@@ -70,10 +85,10 @@ module Squared
                     when :install
                       desc format_desc(action, flag)
                       task flag do
-                        depend(flag, override: true)
+                        depend(flag)
                       end
                     when :outdated
-                      desc format_desc(action, flag, %w[prune interactive dry-run], req: 'opts?')
+                      desc format_desc(action, flag, %w[prune interactive dry-run], arg: 'opts?')
                       task flag, [:opts] do |_, args|
                         outdated(flag, opts: args.to_a)
                       end
@@ -95,32 +110,35 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             also = @copy[:also] if @copy.key?(:also)
           end
-          items = [project == workspace.main ? nil : workspace.home].concat(as_a(also))
+          items = [name == workspace.main ? nil : workspace.home].concat(as_a(also))
           items.each_with_index do |dir, i|
             if i == 0
               next unless dev? & !doc?
 
               dest = dir
-            elsif dir.is_a?(::String)
-              dest = workspace.root_path(dir)
-            elsif dir.is_a?(::Symbol)
-              dest = Workspace.resolve(dir)&.path
-            elsif dir.is_a?(Project)
-              dest = dir.path
-            elsif dir.is_a?(::Hash)
-              into = nil
-              glob = nil
-              dir.each do |key, val|
-                case key.to_sym
-                when :from
-                  from = val
-                when :glob
-                  glob = val
-                when :subdir
-                  subdir = val
-                when :into
-                  into = val
+            else
+              case dir
+              when ::String
+                dest = workspace.root_path(dir)
+              when ::Symbol
+                dest = Workspace.resolve(dir)&.path
+              when ::Hash
+                into = nil
+                glob = nil
+                dir.each do |key, val|
+                  case key.to_sym
+                  when :from
+                    from = val
+                  when :glob
+                    glob = val
+                  when :subdir
+                    subdir = val
+                  when :into
+                    into = val
+                  end
                 end
+              when Project::Base
+                dest = dir.path
               end
               next unless into
             end
@@ -133,57 +151,55 @@ module Squared
           end
         end
 
-        def depend(flag = nil, override: false)
-          if @depend && !override
+        def depend(flag = nil)
+          if @depend && !flag
             super
           elsif outdated?
-            frozen = flag == :frozen
-            force = flag == :force
-            dedupe = flag == :dedupe
             if (yarn = install_type(:yarn)) > 0
               cmd = session 'yarn'
               if yarn > 1
-                if dedupe
+                if flag == :dedupe
                   cmd << 'dedupe'
                 else
-                  cmd << 'install'
-                  if force
-                    cmd << '--check-cache'
-                  elsif frozen
-                    cmd << '--immutable'
-                  end
+                  cmd << 'install' << if flag == :force
+                                        '--check-cache'
+                                      elsif flag == :frozen
+                                        '--immutable'
+                                      end
                 end
               else
-                cmd << 'install'
-                if force
-                  cmd << '--force'
-                elsif frozen
-                  cmd << '--frozen-lockfile'
-                end
+                cmd << 'install' << if flag == :force
+                                      '--force'
+                                    elsif flag == :frozen
+                                      '--frozen-lockfile'
+                                    end
                 cmd << '--production' if prod?
                 cmd << '--ignore-engines' unless env('YARN_IGNORE_ENGINES', equals: '0')
               end
             elsif pnpm?
               cmd = session 'pnpm'
-              if dedupe
+              if flag == :dedupe
                 cmd << 'dedupe'
               else
-                cmd << 'install'
-                if force
-                  cmd << '--force'
-                elsif frozen
-                  cmd << '--frozen-lockfile'
-                end
+                cmd << 'install' << if flag == :force
+                                      '--force'
+                                    elsif flag == :frozen
+                                      '--frozen-lockfile'
+                                    end
               end
               cmd << '--prod' if prod?
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
               append_nocolor
             else
-              cmd = session 'npm', dedupe ? 'dedupe' : 'install'
-              if force
-                cmd << '--force'
-              elsif frozen
-                cmd << '--package-lock-only'
+              cmd = session 'npm'
+              if flag == :dedupe
+                cmd << 'dedupe'
+              else
+                cmd << 'install' << if flag == :force
+                                      '--force'
+                                    elsif flag == :frozen
+                                      '--package-lock-only'
+                                    end
               end
               cmd << '--omit=dev' if prod?
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
@@ -191,16 +207,15 @@ module Squared
               append_nocolor
             end
             append_loglevel
-            run(sync: invoked_sync?('depend'))
+            run(sync: invoked_sync?('depend', flag))
           end
         end
 
         def outdated(rev = nil, opts: [])
-          require 'json'
           equ = rev || (prod? ? :patch : :minor)
           cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
           log.info cmd
-          if store_pwd || invoked_sync?("outdated#{rev ? ":#{rev}" : ''}")
+          if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
             print_item format_banner("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}", multiple: true)
           end
           data = `#{cmd} --json --loglevel=error`
@@ -300,10 +315,10 @@ module Squared
                   elsif modified == cur
                     'FAIL'
                   elsif d == 1
-                    a = sub_style(a, styles: theme[:active])
+                    a = sub_style(a, styles: theme[:major])
                     sub_style(c, :green, :bold)
                   else
-                    sub_style(c, :green, :bold, pat: SEM_VER, index: d)
+                    sub_style(c, :green, pat: SEM_VER, index: d)
                   end
               puts "#{pad_ord.(i, found)}. #{a}#{b.ljust(col2)}#{c}"
             end
@@ -339,10 +354,6 @@ module Squared
           end
         end
 
-        def run_script(cmd)
-          cmd.each { |val| run_s compose(val) }
-        end
-
         def compose(args)
           args ||= @output[1]
           cmd = [if yarn?
@@ -394,13 +405,10 @@ module Squared
                             else
                               1
                             end
+                          elsif (ver = read_packagemanager || env('NODE_INSTALL')) && ver.start_with?('yarn')
+                            ver == 'yarn' || ver.include?('@1') ? 1 : 3
                           else
-                            ver = env('NODE_INSTALL')
-                            if ver&.start_with?('yarn')
-                              ver.include?('@1') ? 1 : 3
-                            else
-                              0
-                            end
+                            0
                           end) > 0
         end
 
@@ -421,19 +429,23 @@ module Squared
                               4
                             end
                           else
-                            env('NODE_INSTALL')&.start_with?('pnpm') ? 4 : 0
+                            (read_packagemanager || env('NODE_INSTALL'))&.start_with?('pnpm') ? 4 : 0
                           end) > 0
         end
 
         def dev?
-          !Node.prod? && workspace.dev?(script: @output[1], pat: @dev, **runargs)
+          !Node.prod? && workspace.dev?(pat: @dev, **runargs)
         end
 
         def prod?
-          Node.prod? || workspace.prod?(script: @output[1], pat: @prod, **runargs)
+          Node.prod? || workspace.prod?(pat: @prod, **runargs)
         end
 
-        protected
+        private
+
+        def run_script(cmd)
+          cmd.each { |val| run_s compose(val) }
+        end
 
         def append_loglevel(cmd = @session)
           return unless (level = env('NODE_LOGLEVEL'))
@@ -466,16 +478,35 @@ module Squared
           end
         end
 
-        private
-
         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)
         end
 
+        def read_packagemanager
+          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
+          @pm[:_] || nil
+        end
+
+        def script_set(val)
+          @output[1] = if val.is_a?(::Array)
+                         val[Node.prod? ? 1 : 0]
+                       else
+                         val
+                       end
+        end
+
         def runargs
-          { ref: Node.ref, group: group, global: !@script || @script[:run].nil? }
+          { script: @output[1], ref: Node.ref, group: group, global: @output[0].nil? && !(@script && @script[:run]) }
         end
       end
     end

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

@@ -7,9 +7,8 @@ module Squared
         REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
         OPT_USER = %w[pre dry-run].freeze
         OPT_FORCE = [*OPT_USER, 'user'].freeze
-        OPT_UPGRADE = [*OPT_FORCE, 'eager'].freeze
         OPT_GENERAL = %w{venv isolated no-cache-dir [v]erbose}.freeze
-        private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_UPGRADE, :OPT_GENERAL
+        private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_GENERAL
 
         class << self
           def populate(*); end
@@ -42,12 +41,16 @@ module Squared
         end
 
         @@tasks[ref] = {
-          install: %i[user upgrade force]
+          install: %i[user target upgrade force]
         }.freeze
 
+        def ref
+          Python.ref
+        end
+
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Python.ref)
+          return unless outdated? && ref?(Python.ref)
 
           namespace name do
             @@tasks[Python.ref].each do |action, flags|
@@ -56,16 +59,26 @@ module Squared
                   case action
                   when :install
                     list = case flag
+                           when :target
+                             req = 'dir'
+                             OPT_USER + %w[upgrade eager]
                            when :upgrade
-                             OPT_UPGRADE
+                             OPT_FORCE + ['eager']
                            when :force
                              OPT_FORCE
                            else
                              OPT_USER
                            end
-                    desc format_desc(action, flag, list + OPT_GENERAL)
-                    task flag do |_, args|
-                      depend(flag, opts: args.to_a, override: true)
+                    desc format_desc(action, flag, list + OPT_GENERAL, 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)
+                      end
+                    else
+                      task flag do |_, args|
+                        depend(flag, opts: args.to_a)
+                      end
                     end
                   end
                 end
@@ -74,33 +87,42 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], override: false)
-          if @depend && !override
+        def depend(flag = nil, dir: nil, opts: [])
+          if @depend && !flag
             super
           elsif outdated?
+            sync = invoked_sync?('depend', flag)
             case (type = install_type)
             when 1, 2
               cmd = pip_session 'install'
               case flag
               when :user
                 cmd << '--user'
-                append_general opts, OPT_USER
+                append_pip opts, OPT_USER
+              when :target
+                cmd << "--target=#{shell_escape(base_path(dir).to_s, quote: true)}"
+                append_pip opts, OPT_USER + ['upgrade']
+                append_eager opts
               when :upgrade
                 cmd << '--upgrade'
-                append_general opts, OPT_UPGRADE
+                append_pip opts, OPT_FORCE
+                append_eager opts
               when :force
                 cmd << '--force-reinstall'
-                append_general opts, OPT_FORCE
+                append_pip opts, OPT_FORCE
               end
               cmd << (type == 1 ? '-r requirements.txt' : '.')
-              run(sync: invoked_sync?('depend'))
+              run(sync: sync)
             when 3
-              run_s("#{@bin} setup.py install", sync: invoked_sync?('depend'))
+              run_s("#{@bin} setup.py install", sync: sync)
             end
           end
         end
 
-        def outdated(*); end
+        def outdated(*)
+          pip_session 'list', '--outdated'
+          run
+        end
 
         def install_type(*)
           requirements.exist? ? @reqindex + 1 : 0
@@ -116,14 +138,11 @@ module Squared
           session('pip', *cmd)
         end
 
-        def append_general(opts, list = [])
-          list += OPT_GENERAL
+        def append_pip(opts, list = [])
           opts.each do |opt|
-            next unless (v = opt.match(/^v+$/)) || list.include?(opt)
+            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
 
             @session << case opt
-                        when 'eager'
-                          '--upgrade-strategy=eager'
                         when 'venv'
                           '--require-virtualenv'
                         else
@@ -135,8 +154,15 @@ module Squared
           if (val = env('PIP_PROXY'))
             @session << "--proxy=#{shell_escape(val, quote: true)}"
           end
+          if (val = env('PIP_LOG'))
+            @session << "--log=#{shell_escape(base_path(val).to_s, quote: true)}"
+          end
           append_nocolor
         end
+
+        def append_eager(opts)
+          @session << '--upgrade-strategy=eager' if opts.include?('eager')
+        end
       end
     end
   end

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

@@ -61,9 +61,13 @@ module Squared
           end
         end
 
+        def ref
+          Ruby.ref
+        end
+
         def populate(*)
           super
-          return unless outdated? && !@exclude.include?(Ruby.ref)
+          return unless outdated? && ref?(Ruby.ref)
 
           namespace name do
             @@tasks[Ruby.ref].each do |action, flags|
@@ -93,19 +97,19 @@ module Squared
                         task flag, [:name] do |_, args|
                           name = args.to_a
                           guard_params(action, flag, args: name)
-                          depend(flag, opts: name, override: true)
+                          depend(flag, opts: name)
                         end
                       when :with, :without
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
                           group = args.to_a
                           guard_params(action, flag, args: group)
-                          depend(flag, opts: group, override: true)
+                          depend(flag, opts: group)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
                         task flag, [:opts] do |_, args|
-                          depend(flag, opts: args.to_a, override: true)
+                          depend(flag, opts: args.to_a)
                         end
                       end
                     when :update, :outdated
@@ -142,11 +146,17 @@ module Squared
           end
         end
 
-        def depend(flag = nil, opts: [], override: false)
-          if @depend && !override
+        def depend(flag = nil, opts: [])
+          if @depend && !flag
             super
           elsif outdated?
             case flag
+            when :gem
+              gem_session 'install'
+              append_value opts
+            when :with, :without
+              gem_session 'install'
+              append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
               if (val = env('BUNDLE_TRUST_POLICY'))
@@ -166,17 +176,11 @@ module Squared
                                          end}"
               end
               append_bundle opts, OPT_INSTALL
-            when :gem
-              gem_session 'install'
-              append_value opts
-            when :with, :without
-              gem_session 'install'
-              append_repeat flag, opts
             else
               bundle_session 'install'
               append_bundle
             end
-            run_rb
+            run_rb(sync: invoked_sync?('depend', flag))
           end
         end
 
@@ -207,7 +211,7 @@ module Squared
           append_bundle opts, OPT_OUTDATED
           cmd = cmd.done
           log.info cmd
-          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev ? ":#{rev}" : ''}")
+          print_item format_banner(cmd) if store_pwd || invoked_sync?("outdated#{rev && ":#{rev}"}")
           start = 0
           found = 0
           major = 0
@@ -224,41 +228,29 @@ module Squared
                   l = lat.join
                   styles = []
                   data.each do |val|
-                    break unless styles && (req = /(>?=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
+                    break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
 
                     v = semver(val).join
                     case req[1]
                     when '>', '>='
-                      if c == l
-                        styles = nil
-                      elsif l < v
-                        styles = %i[red underline]
-                        break
-                      elsif semmajor(cur, lat)
-                        styles = %i[green underline]
-                        major += 1
-                      elsif cur[3] != lat[3]
+                      if semmajor(cur, lat)
                         styles = %i[green bold]
+                        major += 1
                       else
-                        styles[0] = :green
+                        styles[0] = cur[2] == lat[2] ? :yellow : :green
                       end
                     when '<', '<='
                       if c <= v
                         if semmajor(cur, lat)
-                          styles = %i[green underline]
+                          styles = %i[green bold]
                           major += 1
                         else
                           styles[0] = :yellow
                         end
-                      elsif l >= v
-                        styles = nil
                       end
                     when '!='
-                      if c == v
-                        styles = %i[red underline]
-                        break
-                      elsif l == v
-                        styles = nil
+                      if c == l
+                        styles.clear
                       else
                         styles[1] = :bold
                       end
@@ -266,27 +258,23 @@ module Squared
                       if c < v && cur[0] == val[0] && !semmajor(cur, val)
                         styles[0] = :yellow
                       elsif semmajor(lat, val)
-                        styles = nil
-                      else
-                        styles[1] = :bold
-                      end
-                    when '='
-                      if c == v
                         styles[1] = :underline
                       else
-                        styles[0] = :red
+                        styles[1] = :bold
                       end
                     end
                   end
-                  next unless styles && !styles.empty?
-
-                  case styles[0]
-                  when :yellow, :green
-                    line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[:active])
-                    found += 1
+                  unless styles.empty?
+                    case styles[0]
+                    when :green
+                      line = sub_style(line, pat: /^(\S+)(.+)$/, styles: theme[styles[1] == :bold ? :major : :active])
+                      found += 1
+                    when :yellow
+                      found += 1
+                    end
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
+                                           styles: styles.compact, index: 2)
                   end
-                  line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.+)$/,
-                                         styles: styles.compact, index: 2)
                 end
               end
               puts "#{start.to_s.rjust(2)}. #{line}"
@@ -393,8 +381,8 @@ module Squared
 
         private
 
-        def run_rb
-          run(banner: !@session.include?('--quiet'))
+        def run_rb(sync: true)
+          run(sync: sync, banner: !@session.include?('--quiet'))
         end
 
         def append_bundle(opts = nil, list = nil)
@@ -413,7 +401,7 @@ module Squared
         end
 
         def append_repeat(flag, opts)
-          opts.each { |val| @session << "--#{flag}=#{shell_escape(val)}" }
+          opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
         end
 
         def append_value(opts)