squared 0.4.11 → 0.4.12

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

@@ -11,10 +11,12 @@ module Squared
           install_no: %w[audit bin-links fund package-lock].freeze,
           install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
                          save-peer S|save-prod].freeze,
+          run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
           pack: %w[json ignore-scripts pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
           common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
+          filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
           install: %w[fix-lockfile force ignore-pnpmfile ignore-workspace lockfile-only merge-git-branch-lockfiles
                       no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only shamefully-hoist
                       side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
@@ -23,28 +25,31 @@ module Squared
                       reporter=b].freeze,
           install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
-          install_as: %w[D|dev fail-if-no-match global-dir no-optional P|prod r|recursive
-                         changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
+          install_as: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
           update: %w[global interactive latest depth=i].freeze,
           dedupe: %w[check].freeze,
+          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from sequential
+                  stream use-stderr].freeze,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
         OPT_YARN = {
-          common: %w[no-default-rc s|silent verbose cwd=p use-yarnrc=p].freeze,
+          common: %w[check-files disable-pnp enable-pnp flat focus force frozen-lockfile json har ignore-engines
+                     ignore-optional ignore-platform ignore-scripts link-duplicates no-bin-links no-default-rc
+                     no-lockfile no-node-version-check no-progress non-interactive offline pnp prefer-offline prod
+                     pure-lockfile s|silent skip-integrity-check strict-semver verbose cache-folder=p cwd=p emoji=b?
+                     global-folder=p https-proxy=q link-folder=p modules-folder=p mutex=q network-concurrency=i
+                     network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q update-checksums
+                     use-yarnrc=p].freeze,
           install: %w[A|audit g|global S|save D|save-dev E|save-exact P|save-peer O|save-optional T|save-tilde].freeze,
-          install_base: %w[check-files disable-pnp enable-pnp flat focus force frozen-lockfile har ignore-platform
-                           ignore-engines ignore-optional ignore-scripts json link-duplicates no-bin-links no-lockfile
-                           no-node-version-check no-progress non-interactive offline pnp prefer-offline prod
-                           pure-lockfile skip-integrity-check strict-semver update-checksums cache-folder=p emoji=b?
-                           global-folder=p https-proxy=q link-folder=p modules-folder=p mutex=q network-concurrency=i
-                           network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q].freeze,
-          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze
+          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze,
+          run: %w[scripts-prepend-node-path=b?].freeze
         }.freeze
         OPT_BERRY = {
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
                       mode=b].freeze,
           update: %w[C|caret E|exact F|fixed interactive T|tilde R|recursive mode=b].freeze,
           dedupe: %w[check json mode=b strategy=b].freeze,
+          run: %w[B|binaries-only inspect inspect-brk T|top-level require=q].freeze,
           pack: %w[n|dry-run install-if-needed json o|out=p].freeze
         }.freeze
         private_constant :OPT_NPM, :OPT_PNPM, :OPT_YARN, :OPT_BERRY
@@ -137,24 +142,40 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, 'command+|^index|#,pattern*'
-                  task action, [:command] do |_, args|
-                    if args.command == '#'
+                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
+                  task action, [:script] do |_, args|
+                    if args.script == '#'
                       format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
-                      cmd = param_guard(action, 'command', args: args.to_a)
-                      cmd.each do |val|
-                        if (n, opts = indexitem(val))
+                      args = param_guard(action, 'script', args: args.to_a)
+                      opts = []
+                      args.each do |val|
+                        if (n, extra = indexitem(val))
                           if (item = list[n - 1])
-                            val = opts ? "#{item.first} #{opts}" : item.first
+                            val = extra ? "#{item.first} #{extra}" : item.first
                           elsif exception
                             indexerror n, list
                           else
                             next log.warn "run script #{n} of #{list.size} (out of range)"
                           end
+                          run compose(val, script: true)
+                        else
+                          opts << val
                         end
-                        run compose(val, script: true)
                       end
+                      next if opts.empty?
+
+                      list = if (yarn = dependtype(:yarn)) > 0
+                               yarn == 1 ? OPT_YARN[:run] + OPT_YARN[:common] : OPT_BERRY[:run]
+                             elsif pnpm?
+                               OPT_PNPM[:run] + OPT_PNPM[:filter] + OPT_PNPM[:common]
+                             else
+                               OPT_NPM[:run] + OPT_NPM[:common]
+                             end
+                      op = OptionPartition.new(opts, list, session(dependbin, 'run'), project: self)
+                      op << op.extras.shift
+                      op.append(delim: true, quote: false)
+                      run(from: :run)
                     end
                   end
                 when 'pack'
@@ -372,7 +393,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          dryrun = opts.include?('dry-run')
+          dryrun = opts.include?('dry-run') || opts.include?('d')
           if pnpm? && read_packagemanager(version: '7.15', update: true)
             cmd = session 'pnpm', 'outdated'
             dryrun ||= dryrun?('pnpm')
@@ -406,7 +427,7 @@ module Squared
           found = []
           avail = []
           rev = flag || (prod? ? :patch : :minor)
-          inter = opts.include?('interactive')
+          inter = opts.include?('interactive') || opts.include?('i')
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
               val = val.find { |obj| obj['dependent'] == target } if val.is_a?(Array)
@@ -446,7 +467,7 @@ module Squared
                 found << [key, file, want, if a != c
                                              1
                                            elsif b != d
-                                             3
+                                             a == '0' ? 1 : 3
                                            else
                                              5
                                            end, major, f, w]
@@ -479,8 +500,8 @@ module Squared
             col2 = size_col.call(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              inter &&= rev != :major || e || semmajor?(item[5], item[6])
-              if inter && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
+              f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
                 cur = -1
               else
                 cur = modified
@@ -518,7 +539,7 @@ module Squared
               footer.call(0, found.size)
               File.write(dependfile, doc)
               commit(:add, refs: ['package.json'], pass: true)
-              install if opts.include?('prune')
+              install if opts.include?('prune') || opts.include?('p')
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -596,47 +617,47 @@ module Squared
                                     flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
-                                             OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                             OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
                                            else
                                              OPT_BERRY[flag]
                                            end, cmd, project: self)
             op.clear
             append_loglevel
-            run(from: :"package:#{flag}")
-            return
-          elsif pnpm?
-            cmd = session 'pnpm', flag
-            list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
-            list.concat(OPT_PNPM[:install_as]) unless flag == :dedupe
-            no = OPT_PNPM[:"#{flag}_no"]
           else
-            cmd = session 'npm', flag
-            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]
-          end
-          op = OptionPartition.new(opts, list, cmd, no: no, project: self)
-          op.each do |opt|
-            if opt =~ op.values
-              case $1
-              when 'w', 'workspace'
-                op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+            if pnpm?
+              cmd = session 'pnpm', flag
+              list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
+              list.concat(OPT_PNPM[:install_as] + OPT_PNPM[:filter]) unless flag == :dedupe
+              no = OPT_PNPM[:"#{flag}_no"]
+            else
+              cmd = session 'npm', flag
+              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]
+            end
+            op = OptionPartition.new(opts, list, cmd, no: no, project: self)
+            op.each do |opt|
+              if opt =~ op.values
+                case $1
+                when 'w', 'workspace'
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                end
+              elsif opt.include?('=')
+                op.errors << opt
+              else
+                op.found << opt
               end
-            elsif opt.include?('=')
-              op.errors << opt
+            end
+            op.swap
+            append_nocolor
+            append_loglevel
+            if flag == :dedupe
+              op.clear
             else
-              op.found << opt
+              op.append(escape: true)
             end
+            op.clear(errors: true)
           end
-          op.swap
-          append_nocolor
-          append_loglevel
-          if flag == :dedupe
-            op.clear
-          else
-            op.append(escape: true)
-          end
-          op.clear(errors: true)
           run(from: :"package:#{flag}")
         end
 

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

@@ -120,20 +120,14 @@ module Squared
                       format_desc action, flag, 'dir,opts*'
                       task flag, [:dir] do |_, args|
                         dir = path + param_guard(action, flag, args: args, key: :dir)
-                        cmd, opts = python_session('-m venv', opts: args.extras)
-                        op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
-                        op.append(dir, delim: true)
-                          .clear(pass: false)
-                        v = op.arg?(/\A-v+\z/, 'verbose')
-                        run(exception: true)
-                        puts(dir.directory? ? "Success: #{dir}" : 'Failed') unless v
+                        venv_create dir, args.extras
                       end
                     elsif venv
                       case flag
                       when :remove
                         next unless projectpath?(venv)
 
-                        format_desc action, flag, 'c|reate?,d|epend?'
+                        format_desc action, flag, 'c|create?,d|depend?'
                         task flag do |_, args|
                           rm_rf(venv, verbose: true)
                           venv_init if has_value?(%w[c create], args.to_a)
@@ -598,6 +592,10 @@ module Squared
         end
 
         def venv_set(val)
+          if val.is_a?(Array)
+            val, *opts = val
+            @venvopts = opts
+          end
           @venv = Pathname.new(val)
           @venv = @path + @venv unless @venv.absolute?
           if projectpath?(@venv)
@@ -617,11 +615,21 @@ module Squared
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
-          cmd = session 'python', '-m venv', shell_option('prompt', name), '--upgrade-deps', shell_quote(venv)
-          run(cmd, false, exception: true, banner: false)
+          @venvopts &&= @venvopts.map { |val| OptionPartition.strip(val) }.flatten
+          venv_create(venv, @venvopts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
         end
 
+        def venv_create(dir, opts = [], env: nil, banner: true)
+          cmd, opts = python_session('-m venv', opts: opts)
+          op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
+          op.append(dir, delim: true)
+            .clear(pass: false)
+          status = op.arg?(/\A-v+\z/, 'verbose')
+          run(op, env, exception: true, banner: banner)
+          puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
+        end
+
         def requirements?
           dependtype == 5
         end

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

@@ -374,8 +374,7 @@ module Squared
                       found += 1
                     end
                     if theme[:current]
-                      line = sub_style(line, styles: theme[:current], pat: /^(.+)(#{Regexp.escape(c)})(.+)$/,
-                                             index: 2)
+                      line = sub_style(line, styles: theme[:current], pat: /^(.+)(#{Regexp.escape(c)})(.+)$/, index: 2)
                     end
                     line = sub_style(line, *colormap(styles), pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/,
                                                               index: 2)
@@ -757,7 +756,9 @@ module Squared
 
         def irb(name, opts = [], path: @path + 'lib', load: nil)
           op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
-          as_a(name).each { |val| op << shell_option('r', val, merge: true) }
+          r = as_a name
+          r.unshift('bundler/setup') unless load
+          r.each { |val| op << shell_option('r', val, merge: true) }
           as_a(path).each { |val| op << quote_option('I', val, merge: true) }
           if load
             op << '--' << load

data/lib/squared/workspace/project/support/class.rb

@@ -44,7 +44,7 @@ module Squared
               return [] unless val
 
               val = shell_split(val) if val.is_a?(String)
-              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/mi, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
+              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/i, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
             end
 
             def arg?(target, *args, value: false)
@@ -60,9 +60,9 @@ module Squared
           attr_reader :target, :extras, :found, :errors, :values, :project, :path
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
-                         :merge, :delete, :delete?, :grep, :inspect, :to_a, :to_s
-          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :first, :last, :shift, :pop, :push,
-                         :join, :map, :map!, :dup, :size
+                         :merge, :delete, :delete?, :delete_if, :grep, :inspect, :to_a, :to_s
+          def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
+                         :pop, :push, :join, :map, :map!, :select, :reject, :size
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
             @target = target.is_a?(Set) ? target : Set.new(target)

data/lib/squared/workspace/project.rb

@@ -7,13 +7,8 @@ module Squared
         attr_accessor :line_width
 
         def max_width(lines)
-          win = 0
-          if $stdout.tty?
-            require 'io/console'
-            win = $stdout.winsize[1] rescue nil
-          end
-          n = [lines.max_by(&:size).size, line_width].max
-          [n, win > 0 ? win : ::Float::INFINITY].min
+          n = [lines.max_by(&:size).size, 80].max
+          [n, Rake.application.terminal_width].min
         end
       end
 

data/lib/squared/workspace/series.rb

@@ -76,6 +76,7 @@ module Squared
         @sync = []
         @multiple = []
         @parallel = []
+        @chain = {}
         @exclude = exclude.freeze
         @session = {
           group: {},
@@ -139,6 +140,26 @@ module Squared
         @multiple.concat(sync)
       end
 
+      def chain(key, level, sync: [])
+        return if level.empty?
+
+        index = 0
+        prereqs = level.map do |tasks|
+          task_join(key, index += 1).tap do |subkey|
+            if sync.include?(tasks) || (tasks.size == 1 && (sync << tasks))
+              task subkey => tasks
+            else
+              multitask subkey => tasks
+            end
+          end
+        end
+        @chain[key] = level.freeze
+        parallel << key
+
+        format_desc key, level.map(&:size).join('-')
+        task key => prereqs
+      end
+
       def name_get(key)
         (TASK_NAME[key] || key).to_s
       end
@@ -187,6 +208,19 @@ module Squared
         data.keys.any? { |ref| obj.ref?(ref) }
       end
 
+      def chain?(val)
+        @chain.each_value do |tasks|
+          tasks.flatten(1).each do |task|
+            next unless Rake::Task[task].already_invoked
+
+            if val == task || Rake::Task[task].prerequisites.any? { |pr| pr == val && Rake::Task[val].already_invoked }
+              return true
+            end
+          end
+        end
+        false
+      end
+
       def multiple?(val = nil)
         already_invoked?(multiple, val)
       end

data/lib/squared/workspace/support/data.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Squared
+  module Workspace
+    module Support
+      RunData = Struct.new(:run, :block)
+      ChainData = Struct.new(:action, :step, :with, :before, :after, :sync)
+    end
+  end
+end

data/lib/squared/workspace/support.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'support/data'

data/lib/squared/workspace.rb

@@ -36,6 +36,7 @@ module Squared
   end
 end
 
+require_relative 'workspace/support'
 require_relative 'workspace/application'
 require_relative 'workspace/series'
 require_relative 'workspace/project'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - An Pham
@@ -101,6 +101,8 @@ files:
 - lib/squared/workspace/project/support/class.rb
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
+- lib/squared/workspace/support.rb
+- lib/squared/workspace/support/data.rb
 - squared.gemspec
 homepage: https://github.com/anpham6/squared
 licenses: