squared 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1795e8352e8278c8f4e26ced26ac936ce906ee8e626a9cf2ff2bf6a86412f09c
-  data.tar.gz: '08b8e2538b6316ffb141c15e560187222cbb18e0a37f5c74af6ed5fda87e6dc3'
+  metadata.gz: fad15a8296b3ab7fec1ff1ac0bbe1f92b65b3bd263e8f9ea38cd62e1a8e3460e
+  data.tar.gz: 1ab92094b8d239572ac66a42014aafcca6585f86af1159060715e322d8138503
 SHA512:
-  metadata.gz: a8d6bd537e66b744edd760ead7441aad45961bdc746e9ca81f577e8183893cd6209203f2ba507b5ab608bbf3ebe7a15aeb23aa84005a76bf10d0f3b3704c403d
-  data.tar.gz: 9a29c720ce14050bc604c9b561c376f55437865610827075dd6a2a961ce82b22c1f4b3fd303884186f9c59b1a330ed73ce14ad16169724c3578d8d4e01388bfe
+  metadata.gz: f4b7ecd7671596c8da581f567e43a4968ec7ea2f060a75d92b4369d19d3e1638e2f2c91b70e3c0205bbc77ccd309341d5dbb47c1c774eead07f5c71a0bf13684
+  data.tar.gz: 1c88e0dabe3ef47f17527c604440775fdf5984a5389ad6e6e8ec4a9c8ade34a4c59423bdf0f1277e6ffb88a8484d774da3029f814cc37526b92f1d737257e18b

data/README.ruby.md

@@ -28,9 +28,15 @@ gem install squared
 
 ## Example - Rakefile
 
+Projects from any accessible folder can be added either relative to `REPO_ROOT` or absolutely. The same Rakefile can also manage other similarly cloned repositories remotely by setting the `REPO_ROOT` environment variable to the location. Missing projects will simply be excluded from the task runner.
+
 ```ruby
 require "squared"
 
+# REPO_ROOT = /workspaces
+# REPO_HOME = /workspaces/squared
+# rake      = /workspaces/squared/Rakefile
+
 Repo::Workspace
   .new("squared") # REPO_HOME
   .repo("https://github.com/anpham6/squared-repo", "nightly", run: 'build') # Optional
@@ -40,7 +46,7 @@ Repo::Workspace
   .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", ref: :ruby) # Ruby (with C extensions)
   .add("optparse", doc: "rake rdoc", group: "default") # Uses bundler/gem_tasks (without C extensions)
   .add("logger", copy: { from: "lib", glob: "**/*.rb", gemdir: "~/.rvm/gems/ruby-3.3.5/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true
-  .add("android", "android-docs", run: false, doc: "make html", ref: :python) # task namespace "android" | directory "android-docs"
+  .add("android", "android-docs", run: false, doc: "make html", ref: :python) # Python
   .add("emc", "e-mc", copy: { from: "publish", into: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pir", "pi-r", copy: { from: "publish", into: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("squared", log: { file: "tmp/%Y-%m-%d.log", level: "debug" }, group: "app") # Copy target (main)
@@ -51,6 +57,22 @@ Repo::Workspace
       .style(:banner, "bright_cyan", "bold", "bright_black!")
       .finalize! # Optional
   end
+# pathname  = /workspaces/pathname
+# optparse  = /workspaces/optparse
+# log       = /workspaces/logger
+# android   = /workspaces/android-docs
+# emc       = /workspaces/e-mc
+# pir       = /workspaces/pi-r
+# squared   = /workspaces/squared
+
+Repo::Workspace
+  .new("squared")
+  .group("default", "ruby", run: "rake build", copy: "rake install", clean: "rake clean", pathname: { run: "rake compile" })
+  .build
+# default   = /workspaces/ruby/*
+# pathname  = /workspaces/ruby/pathname
+# optparse  = /workspaces/ruby/optparse
+# logger    = /workspaces/ruby/logger
 ```
 
 **NOTE**: The use of "**ref**" (class name) is only necessary when running `repo:init` for the first time into an empty directory.

data/lib/squared/common/class.rb

@@ -6,7 +6,7 @@ module Squared
   module Common
     class JoinSet < ::Set
       def self.to_s
-        /[^:]+$/.match(super.to_s)[0]
+        super.to_s.match(/[^:]+$/)[0]
       end
 
       def initialize(data = [], delim: ' ')

data/lib/squared/common/format.rb

@@ -66,14 +66,12 @@ module Squared
           yield out
         elsif pipe.respond_to?(:puts)
           pipe.puts out
-        elsif err
-          defined?(__warn__) == 'method' ? __warn__(out) : warn(out)
         else
-          puts out
+          err ? warn(out) : puts(out)
         end
       end
 
-      def sub_style(val, *args, pat: nil, styles: nil, index: 1)
+      def sub_style(val, *args, styles: nil, pat: nil, index: 1)
         return val unless ENV['NO_COLOR'].to_s.empty?
 
         if pat && index != 0

data/lib/squared/common/shell.rb

@@ -3,8 +3,8 @@
 module Squared
   module Common
     module Shell
-      def shell_escape(val)
-        return val if ::Rake::Win32.windows?
+      def shell_escape(val, quote: false)
+        return (quote ? shell_quote(val, force: false) : val) if ::Rake::Win32.windows?
 
         require 'shellwords'
         Shellwords.escape(val)

data/lib/squared/common/task.rb

@@ -16,7 +16,7 @@ module Squared
       rescue StandardError => e
         raise if exception
 
-        defined?(__warn__) == 'method' ? __warn__(e) : warn(e)
+        warn e
       end
 
       def invoked?(name)

data/lib/squared/config.rb

@@ -12,7 +12,7 @@ module Squared
 
       class << self
         def to_s
-          /[^:]+$/.match(super.to_s)[0]
+          super.to_s.match(/[^:]+$/)[0]
         end
       end
 
@@ -176,7 +176,7 @@ module Squared
             raise ArgumentError, message(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", hint: 'not found')
           end
         end
-        project&.info "#{Viewer}(#{type}) => #{file} {#{keys.join(', ')}}"
+        project&.log&.info "#{Viewer}(#{type}) => #{file} {#{keys.join(', ')}}"
         doc = if reader.respond_to?(:load_file)
                 reader.load_file(file, **@mime[type])
               else
@@ -225,7 +225,7 @@ module Squared
               end
             end
           rescue StandardError
-            project&.warn "#{Viewer}(#{type}) => #{file ? "#{file} " : ''}{#{key}: undefined}"
+            project&.log&.warn "#{Viewer}(#{type}) => #{file ? "#{file} " : ''}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"

data/lib/squared/repo/project/base.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'forwardable'
 require 'date'
 
 module Squared
@@ -12,7 +11,6 @@ module Squared
         include Shell
         include Task
         include ::Rake::DSL
-        extend Forwardable
 
         class << self
           include Common::Task
@@ -31,7 +29,7 @@ module Squared
           end
 
           def to_s
-            /[^:]+$/.match(super.to_s)[0]
+            super.to_s.match(/[^:]+$/)[0]
           end
 
           def to_sym
@@ -42,15 +40,9 @@ module Squared
         @@print_order = 0
         @@tasks = {}
 
-        alias __warn__ warn
-
-        attr_reader :name, :project, :workspace, :group, :path, :logger, :theme
+        attr_reader :name, :project, :workspace, :group, :path, :log, :theme
         attr_accessor :warning
 
-        protected :logger
-
-        def_delegators :logger, :log, :<<, :debug, :info, :warn, :error, :fatal, :unknown
-
         def initialize(name, path, workspace, *, group: nil, log: nil, common: true, **kwargs)
           @name = name.to_s
           @path = workspace.root_path(path.to_s)
@@ -63,12 +55,14 @@ module Squared
           @output = [kwargs[:run], nil]
           @copy = kwargs[:copy]
           @clean = kwargs[:clean]
-          @theme = if common
+          @warning = workspace.warning
+          @theme = if !workspace.verbose
+                     {}
+                   elsif common
                      workspace.theme
                    else
                      __get__(:theme)[:project][to_sym] ||= {}
                    end
-          @warning = workspace.warning
           log = { file: log } unless log.is_a?(::Hash)
           if (logfile = env('LOG_FILE')).nil? && (auto = env('LOG_AUTO'))
             logfile = case auto
@@ -87,10 +81,10 @@ module Squared
               logfile.realdirpath
             rescue StandardError => e
               logfile = nil
-              __warn__ e if @warning
+              warn e if @warning
             end
           end
-          @logger = Logger.new(logfile, progname: @name, level: env('LOG_LEVEL') || log[:level] || Logger::INFO)
+          @log = Logger.new(logfile, progname: @name, level: env('LOG_LEVEL') || log[:level] || Logger::INFO)
         end
 
         def initialize_build(ref, **kwargs)
@@ -100,15 +94,13 @@ module Squared
           elsif @script && @output[0] != false
             @output[0] ||= @script[:run]
           end
+          @dev = kwargs.delete(:dev)
           if env('BUILD', suffix: 'DEV', equals: '0')
             @dev = false
-          else
-            @dev = kwargs.delete(:dev)
-            if env('BUILD', suffix: 'DEV')
-              @dev = true
-            elsif @dev.nil?
-              @dev = workspace.dev?
-            end
+          elsif env('BUILD', suffix: 'DEV')
+            @dev = true
+          elsif @dev.nil?
+            @dev = workspace.dev?
           end
         end
 
@@ -125,12 +117,8 @@ module Squared
         def populate(*)
           namespace name do
             workspace.series.each_key do |key|
-              case key
-              when :build, :refresh, :depend, :outdated, :doc, :test, :copy, :clean
-                next unless has?(key)
-              else
-                next unless workspace.task_defined?(self, key)
-              end
+              next unless Workspace::TASK_KEYS.include?(key) ? has?(key) : workspace.task_defined?(self, key)
+
               desc message(name, key)
               task key do
                 __send__(key)
@@ -201,7 +189,7 @@ module Squared
                 dir = base_path(dir) unless dir.absolute?
                 next unless dir.directory?
 
-                warn "rm -rf #{dir}"
+                log.warn "rm -rf #{dir}"
                 dir.rmtree(verbose: true)
               else
                 files = val.include?('*') ? Dir[base_path(val)] : [base_path(val)]
@@ -209,7 +197,7 @@ module Squared
                   begin
                     File.delete(file) if File.file?(file)
                   rescue StandardError => e
-                    error e
+                    log.error e
                   end
                 end
               end
@@ -275,12 +263,12 @@ module Squared
           return if req && !base_path(req).exist?
 
           cmd = close_session(cmd)
-          info cmd
+          log.info cmd
           print_item format_banner(cmd, banner: banner)
           begin
             shell(cmd, chdir: path, exception: exception)
           rescue StandardError => e
-            error e
+            log.error e
             raise
           end
         end
@@ -324,26 +312,40 @@ module Squared
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
-        def print_banner(*lines, styles: nil, pad: 0, first: false)
+        def print_banner(*lines, styles: theme[:banner], border: theme[:border])
+          pad = 0
+          if styles
+            if styles.any? { |s| s.to_s.end_with?('!') }
+              pad = 1
+            elsif styles.size <= 1
+              styles = [:bold] + styles
+            end
+          end
           n = max_width(lines)
           ch = ' ' * pad
           index = -1
           out = lines.map do |val|
             index += 1
             val = ch + val.ljust(n - (pad * 2)) + ch
-            if styles && (!first || index == 0)
+            if styles && (pad == 1 || index == 0)
               sub_style(val, *styles)
             else
               val
             end
           end
-          out << ('-' * n)
+          out << sub_style('-' * n, styles: border)
           out.join("\n")
         end
 
-        def print_footer(*lines)
+        def print_footer(*lines, sub: nil, border: theme[:border])
           n = max_width(lines)
-          ['-' * n, *lines.map { |val| val.ljust(n) }].join("\n")
+          sub = as_a(sub)
+          lines.map! do |val|
+            s = val.ljust(n)
+            sub.each { |h| s = sub_style(s, **h) }
+            s
+          end
+          [sub_style('-' * n, styles: border), *lines].join("\n")
         end
 
         def format_desc(action, flag, opts = nil, req: 'opts*')
@@ -355,20 +357,12 @@ module Squared
           message(name, action, opts ? "#{flag}[#{opts}]" : flag)
         end
 
-        def format_banner(cmd, banner: true, multitask: false)
+        def format_banner(cmd, banner: true, multiple: false)
           return unless banner
 
           if verbose?
-            pad = 0
-            if (args = theme[:banner])
-              if args.any? { |s| s.to_s.end_with?('!') }
-                pad = 1
-              elsif args.size <= 1
-                args = [:bold] + args
-              end
-            end
-            print_banner(cmd.sub(/^\S+/, &:upcase), path.to_s, styles: args, pad: pad, first: pad == 0)
-          elsif multitask && workspace.multitask?
+            print_banner(cmd.sub(/^\S+/, &:upcase), path.to_s)
+          elsif multiple && workspace.multiple?
             "## #{path} ##"
           end
         end
@@ -408,13 +402,13 @@ module Squared
         end
 
         def invoked_sync?(action)
-          return true if invoked?(sync = "#{action}:sync")
+          return true if workspace.sync?("#{action}:sync")
 
           missing = ->(val) { ::Rake::Task.tasks.none? { |item| item.name == val } }
           check = lambda do |val|
             if invoked?(val)
               missing.("#{val}:sync")
-            elsif invoked?("#{val}:sync")
+            elsif workspace.sync?("#{val}:sync")
               true
             end
           end
@@ -426,7 +420,7 @@ module Squared
             ret = check.("#{action}:#{base.to_sym}")
             return ret unless ret.nil?
           end
-          invoked?("#{name}:#{action}") && (!invoked?(action) || missing.(sync))
+          invoked?("#{name}:#{action}") && (!invoked?(action) || missing.("#{action}:sync"))
         end
 
         private

data/lib/squared/repo/project/git.rb

@@ -7,7 +7,9 @@ module Squared
         include Format
 
         REF = :git
-        private_constant :REF
+        OPT_PULL = %w[all tags prune ff-only autostash dry-run].freeze
+        OPT_FETCH = %w[tags prune prune-tags depth=n dry-run].freeze
+        private_constant :REF, :OPT_PULL, :OPT_FETCH
 
         class << self
           def populate(workspace, parallel: [], **)
@@ -49,7 +51,7 @@ module Squared
           diff: %i[head cached branch],
           fetch: %i[all submodules unshallow],
           files: %i[cached modified deleted others],
-          pull: %i[rebase no-rebase commit no-commit submodules],
+          pull: %i[head rebase no-rebase commit no-commit submodules],
           stash: %i[push pop apply list clear],
           refs: %i[heads tags],
           reset: %i[head soft mixed hard merge keep submodules],
@@ -67,13 +69,13 @@ module Squared
                 flags.each do |flag|
                   case action
                   when :pull
-                    desc format_desc(action, flag, %w[all tags prune ff-only autostash dry-run])
+                    desc format_desc(action, flag, OPT_PULL)
                     task flag, [:opts] do |_, args|
                       opts = collect_args(args, :opts)
                       pull(flag, opts: opts)
                     end
                   when :fetch
-                    desc format_desc(action, flag, %w[tags prune prune-tags depth=n dry-run])
+                    desc format_desc(action, flag, OPT_FETCH)
                     task flag, [:opts] do |_, args|
                       opts = collect_args(args, :opts)
                       fetch(flag, opts: opts)
@@ -202,14 +204,8 @@ module Squared
           elsif flag == :commit || option('commit')
             cmd << '--commit'
           end
-          append_submodules flag
-          opts.each do |val|
-            case val
-            when 'all', 'tags', 'prune', 'ff-only', 'autostash', 'dry-run'
-              cmd << "--#{val}"
-            end
-          end
-          source(sync: sync, stderr: true, exception: !workspace.multitask?)
+          append_pull opts, OPT_PULL, flag
+          source(sync: sync, stderr: true, exception: !workspace.multiple?)
         end
 
         def rebase
@@ -219,16 +215,8 @@ module Squared
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
           cmd << '--all' if flag == :all || option('all')
-          append_submodules flag
-          opts.each do |val|
-            case val
-            when 'tags', 'prune', 'prune-tags', 'dry-run'
-              cmd << "--#{val}"
-            else
-              cmd << "--depth=#{$1}" if /^depth=(\d+)$/.match(val)
-            end
-          end
-          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.multitask?)
+          append_pull opts, OPT_FETCH, flag
+          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.multiple?)
         end
 
         def stash(flag = :push, files = [], commit: nil)
@@ -448,9 +436,9 @@ module Squared
 
         def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
           cmd = close_session(cmd)
-          info cmd
+          log.info cmd
           begin
-            banner = format_banner(cmd.gsub(trailing_slash(path), ''), banner: banner, multitask: true)
+            banner = format_banner(cmd.gsub(trailing_slash(path), ''), banner: banner, multiple: true)
             cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitdir)}")
             if io
               [IO.popen(cmd), banner]
@@ -481,7 +469,7 @@ module Squared
               end
             end
           rescue StandardError => e
-            error e
+            log.error e
             raise if exception
 
             emphasize e, message('git', cmd)
@@ -497,7 +485,7 @@ module Squared
             next if grep && !line.match?(grep)
 
             if loglevel
-              log loglevel, line
+              log.add loglevel, line
             else
               sub&.each { |h| line = sub_style(line, **h) }
               if banner
@@ -516,9 +504,10 @@ module Squared
           return unless verbose?
 
           if size > 0
-            args = theme[:banner]&.reject { |s| s.to_s.end_with?('!') } || []
-            args << :bold if args.size <= 1
-            puts print_footer "#{sub_style(size, *args)} #{size == 1 ? type.sub(/s$/, '') : type}"
+            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles << :bold if styles.size <= 1
+            puts print_footer("#{size} #{size == 1 ? type.sub(/s$/, '') : type}",
+                              sub: { styles: styles, pat: /^(\d+)(.+)$/ })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
@@ -529,13 +518,24 @@ module Squared
         end
 
         def source_path?(val)
-          return val.to_s.start_with?("#{path}#{::File::SEPARATOR}") if Pathname.new(val).absolute?
+          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
 
           !val.match?(%r{^\.\.[/\\]})
         end
 
         private
 
+        def append_pull(opts, list, flag = nil)
+          append_submodules flag
+          opts.each do |opt|
+            if list.include?(opt)
+              @session << "--#{opt}"
+            elsif opt.match(/^depth=(\d+)$/)
+              @session << "--depth=#{$1}"
+            end
+          end
+        end
+
         def append_commit(val)
           val = val.to_s.strip
           val.empty? ? 'HEAD' : val

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

@@ -33,6 +33,8 @@ module Squared
           run: nil
         }.freeze
 
+        attr_reader :package
+
         def initialize(name, path, workspace, *, **kwargs)
           super
           initialize_script(REF)
@@ -43,6 +45,7 @@ module Squared
           else
             @output[1] = (@script && @script[:run]) || workspace.script
           end
+          @package = base_path('package.json')
           @dev = workspace.bool_match(env('BUILD', suffix: 'DEV'), kwargs.delete(:dev))
           @prod = workspace.bool_match(env('BUILD', suffix: 'PROD'), kwargs.delete(:prod))
           @pm = {}
@@ -129,7 +132,7 @@ module Squared
 
             from = base_path(from)
             dest = dest.join(subdir, into || project)
-            warn "cp #{from.join(glob)} #{dest}"
+            log.warn "cp #{from.join(glob)} #{dest}"
             copy_d(from, dest, glob: glob, verbose: verbose?)
           end
         end
@@ -200,10 +203,10 @@ module Squared
           require 'json'
           rev ||= prod? ? :patch : :minor
           cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
-          print_item format_banner(message("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}"), multitask: true)
+          print_item format_banner(message("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}"), multiple: true)
           pwd = Dir.pwd
           Dir.chdir(path)
-          info cmd
+          log.info cmd
           data = `#{cmd} --json --loglevel=error`
           Dir.chdir(pwd)
           json = JSON.parse(doc = package.read)
@@ -366,7 +369,7 @@ module Squared
         end
 
         def depend?
-          !!@depend || outdated?
+          outdated? || !!@depend
         end
 
         def copy?
@@ -465,12 +468,6 @@ module Squared
             end
           end
         end
-
-        private
-
-        def package
-          @package ||= base_path('package.json')
-        end
       end
     end
   end

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

@@ -6,7 +6,11 @@ module Squared
       class Python < Git
         REF = :python
         REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
-        private_constant :REF, :REQUIREMENTS
+        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 [v]erbose}.freeze
+        private_constant :REF, :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_UPGRADE, :OPT_GENERAL
 
         class << self
           def populate(*); end
@@ -29,13 +33,17 @@ module Squared
           end
         end
 
+        attr_reader :requirements
+
         def initialize(name, path, workspace, *, **kwargs)
           super
+          @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
+          @requirements = base_path(REQUIREMENTS[@reqindex])
           initialize_build(REF, **kwargs)
         end
 
         @@tasks[REF] = {
-          install: %i[upgrade force]
+          install: %i[user upgrade force]
         }.freeze
 
         def populate(*)
@@ -48,16 +56,15 @@ module Squared
                 flags.each do |flag|
                   case action
                   when :install
-                    options = lambda do |*opts|
-                      opts += %w[pre venv no-cache dry-run]
-                      format_desc(action, flag, opts)
-                    end
-                    case flag
-                    when :upgrade
-                      desc options.('eager')
-                    when :force
-                      desc options.()
-                    end
+                    list = case flag
+                           when :upgrade
+                             OPT_UPGRADE
+                           when :force
+                             OPT_FORCE
+                           else
+                             OPT_USER
+                           end
+                    desc format_desc(action, flag, list + OPT_GENERAL)
                     task flag do |_, args|
                       depend(flag, opts: collect_args(args, :opts), override: true)
                     end
@@ -72,22 +79,21 @@ module Squared
           if @depend && !override
             super
           elsif outdated?
-            case install_type
+            case (type = install_type)
             when 1, 2
               cmd = pip_session 'install'
               case flag
+              when :user
+                cmd << '--user'
+                append_general opts, OPT_USER
               when :upgrade
                 cmd << '--upgrade'
-                cmd << '--upgrade-strategy=eager' if opts.include?('eager')
+                append_general opts, OPT_UPGRADE
               when :force
                 cmd << '--force-reinstall'
+                append_general opts, OPT_FORCE
               end
-              cmd << '--pre' if opts.include?('pre')
-              cmd << '--require-virtualenv' if opts.include?('venv')
-              cmd << '--no-cache-dir' if opts.include?('no-cache')
-              cmd << '--dry-run' if opts.include?('dry-run')
-              append_nocolor
-              cmd << (install_type == 1 ? '-r requirements.txt' : '.')
+              cmd << (type == 1 ? '-r requirements.txt' : '.')
               run(exception: workspace.exception)
             when 3
               run_s "#{@bin} setup.py install"
@@ -98,14 +104,11 @@ module Squared
         def outdated(*); end
 
         def install_type(*)
-          return @requirements if @requirements
-
-          ret = REQUIREMENTS.index { |file| base_path(file).exist? }
-          @requirements = ret ? ret + 1 : 0
+          requirements.exist? ? @reqindex + 1 : 0
         end
 
         def depend?
-          !!@depend || outdated?
+          outdated? || !!@depend
         end
 
         def outdated?
@@ -117,6 +120,30 @@ module Squared
         def pip_session(*cmd)
           session('pip', *cmd)
         end
+
+        def append_general(opts, list = [])
+          list += OPT_GENERAL
+          opts.each do |opt|
+            next unless (v = opt.match(/^v+$/)) || list.include?(opt)
+
+            @session << case opt
+                        when 'eager'
+                          '--upgrade-strategy=eager'
+                        when 'venv'
+                          '--require-virtualenv'
+                        when 'no-cache'
+                          '--no-cache-dir'
+                        else
+                          (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 << "--proxy=#{shell_escape(val, quote: true)}"
+          end
+          append_nocolor
+        end
       end
     end
   end

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

@@ -33,11 +33,15 @@ module Squared
           rake: nil
         }.freeze
 
+        attr_reader :gemfile
+
         def initialize(name, path, workspace, *, **kwargs)
           super
           initialize_build(REF, **kwargs)
           @version = env('BUILD', suffix: 'VERSION', strict: true) || kwargs.delete(:version)
           @autodetect = kwargs.key?(:autodetect) ? kwargs.delete(:autodetect) : false
+          index = GEMFILE.index { |file| base_path(file).exist? } || 0
+          @gemfile = base_path(GEMFILE[index])
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
@@ -51,7 +55,7 @@ module Squared
               break
             end
           rescue StandardError => e
-            error e
+            log.error e
           end
         end
 
@@ -130,14 +134,15 @@ module Squared
                                            val
                                          end}"
               end
-              append_opts opts, OPT_INSTALL
+              append_bundle opts, OPT_INSTALL
             when :'with-g', :'without-g'
               guard_params('install', flag, args: group)
               cmd = gem_session 'install', '-g'
               opt = flag.to_s.sub('-g', '')
-              group.each { |s| cmd << "--#{opt}=#{shell_escape(s)}" }
+              group.each { |s| cmd << "--#{opt}=#{shell_escape(s, quote: true)}" }
             else
               cmd = bundle_session 'install'
+              append_bundle
             end
             run(banner: banner?, exception: workspace.exception)
           end
@@ -160,7 +165,7 @@ module Squared
             a = base_path(val)
             b = dest.join(val)
             c = glob[i] || '**/*'
-            warn "cp #{a.join(c)} #{b}"
+            log.warn "cp #{a.join(c)} #{b}"
             copy_d(a, b, glob: c, verbose: verbose?)
           end
         end
@@ -173,7 +178,7 @@ module Squared
           when :all, :major, :patch, :minor
             cmd << "--#{flag}"
           end
-          append_opts opts, OPT_UPDATE
+          append_bundle opts, OPT_UPDATE
           run(banner: banner?, exception: workspace.exception)
         end
 
@@ -203,7 +208,7 @@ module Squared
         end
 
         def copy?
-          return true if @copy && (@copy.is_a?(::String) || @copy.fetch(:gemdir, nil))
+          return true if @copy.is_a?(::String) || @copy&.fetch(:gemdir, nil)
           return gemdir? if @gemdir
 
           gempath = -> { "gems#{::File::SEPARATOR}#{project}-#{@version}" }
@@ -213,11 +218,11 @@ module Squared
           end
           return false unless @autodetect
 
-          quit = ->(hint) { raise ArgumentError, message('failed to parse', hint: hint) }
+          unsafe = ->(hint) { raise ArgumentError, message('failed to parse', hint: hint) }
           begin
             out = `gem -C #{shell_quote(path)} list --local -d #{project}`
             data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
-            quit.('version') unless data
+            unsafe.('version') unless data
             ver = data[1].split(/\s*,\s*/)
             if @version
               ver.unshift(@version)
@@ -227,14 +232,14 @@ module Squared
               data = /\(#{Regexp.escape(v)}(?:,[^)]+|\b)\):([^\n]+)/.match(out)
               next unless data
 
-              warn "using version #{v} (given #{@version})" if @version && @version != v
+              log.warn "using version #{v} (given #{@version})" if @version && @version != v
               @version = v
               break
             end
-            quit.('path') unless data
+            unsafe.('path') unless data
             @gemdir = Pathname.new(data[1].strip).join(gempath.())
           rescue StandardError => e
-            error e
+            log.error e
             @version = nil
             @gemdir = nil
             @autodetect = false
@@ -244,13 +249,11 @@ module Squared
         end
 
         def depend?
-          !!@depend || outdated?
+          outdated? || !!@depend
         end
 
         def outdated?
-          return @outdated unless @outdated.nil?
-
-          @outdated = GEMFILE.any? { |file| base_path(file).exist? }
+          gemfile.exist?
         end
 
         def dev?
@@ -259,15 +262,18 @@ module Squared
 
         private
 
-        def append_opts(opts, list = [])
+        def append_bundle(opts = nil, list = nil)
           if (val = env('BUNDLE_JOBS')).to_i > 0
             @session << "-j#{val}"
           end
-          list.each do |flag|
-            if opts.include?(flag)
-              @session << "--#{flag}"
-            elsif /^g(?:roup)?=(.+)$/.match(flag)
-              @session << "--group=#{$1}"
+          @session << '--norc' if env('BUNDLE_NORC')
+          return unless opts && list
+
+          opts.each do |opt|
+            if list.include?(opt)
+              @session << "--#{opt}"
+            elsif opt.match(/^g(?:roup)?=(.+)$/)
+              @session << "--group=#{shell_escape($1, quote: true)}"
             end
           end
         end

data/lib/squared/repo/workspace.rb

@@ -11,15 +11,16 @@ module Squared
 
       TASK_NAME = {
         build: [],
-        copy: [],
+        refresh: [],
         depend: [],
         outdated: [],
-        refresh: [],
         doc: [],
         test: [],
+        copy: [],
         clean: []
       }
       TASK_BASE = {}
+      TASK_KEYS = TASK_NAME.keys.freeze
       private_constant :TASK_NAME, :TASK_BASE
 
       class << self
@@ -44,7 +45,7 @@ module Squared
         end
 
         def to_s
-          /[^:]+$/.match(super.to_s)[0]
+          super.to_s.match(/[^:]+$/)[0]
         end
 
         attr_reader :project_kind
@@ -52,7 +53,7 @@ module Squared
 
       @project_kind = []
 
-      attr_reader :main, :root, :home, :series, :theme
+      attr_reader :main, :root, :home, :series, :theme, :sync, :multiple, :parallel
       attr_accessor :manifest, :manifest_url, :exception, :pipe, :verbose, :warning
 
       def initialize(main, *, common: true, **)
@@ -91,7 +92,6 @@ module Squared
                 end
         @root ||= @home.parent
         @series = TASK_NAME.dup
-        @theme = common ? __get__(:theme)[:workspace] : {}
         @project = {}
         @script = {
           group: {},
@@ -103,14 +103,18 @@ module Squared
         @exception = !env('PIPE_FAIL', ignore: '0').nil?
         @pipe = !env('PIPE_OUT', ignore: '0').nil?
         @verbose = !@pipe
-        @warning = !empty?(@root, init: false)
+        @warning = !empty?(@root, repo: false)
+        @sync = []
+        @multiple = []
+        @parallel = []
+        @theme = common && @verbose ? __get__(:theme)[:workspace] : {}
       end
 
       def build(**kwargs)
         return unless enabled?
 
         default = kwargs[:default]
-        parallel = env('REPO_SYNC', ignore: '0') ? [] : (kwargs[:parallel] || []).map!(&:to_sym)
+        multi = env('REPO_SYNC', ignore: '0') ? [] : kwargs.fetch(:parallel, []).map!(&:to_sym)
 
         group = {}
         parent = {}
@@ -182,14 +186,13 @@ module Squared
               parse_opts.(args)
               stage ||= :all
               repo[:sync].invoke
-              # rubocop:disable Style/CombinableLoops
-              @project.each_value { |proj| proj.depend if proj.enabled? }
-              @project.each_value do |proj|
-                next unless proj.enabled? && proj.build?
-
-                proj.has?(:dev) ? proj.refresh : proj.build
+              @project.select do |_, proj|
+                if proj.enabled?
+                  proj.depend
+                  proj.build?
+                end
               end
-              # rubocop:enable Style/CombinableLoops
+              .each_value { |proj| proj.has?(:dev) ? proj.refresh : proj.build }
             end
 
             desc status.("init[manifest?=#{target},{0}]", target)
@@ -235,20 +238,27 @@ module Squared
         series.each do |key, items|
           next if items.empty?
 
-          unless (valid = parallel.include?(key))
-            group = key.to_s
-            valid = parallel.include?(group.split(':').first.to_sym) if group.include?(':')
-          end
-          if valid && items.size > 1
-            desc "#{key} (thread)"
-            multitask key => items
-
-            desc "#{key} (sync)"
-            task "#{key}:sync": items
-          else
-            desc key.to_s
-            task key => items
+          s = key.to_s
+          if items.size > 1
+            multiple << s
+            unless (valid = multi.include?(key))
+              group = key.to_s
+              valid = multi.include?(group.split(':').first.to_sym) if group.include?(':')
+            end
+            if valid
+              desc "#{key} (thread)"
+              multitask key => items
+              parallel << s
+
+              desc "#{key} (sync)"
+              task "#{key}:sync": items
+              sync << "#{key}:sync"
+              multiple << "#{key}:sync"
+              next
+            end
           end
+          desc s
+          task key => items
         end
 
         yield self if block_given?
@@ -259,6 +269,7 @@ module Squared
         @manifest = manifest
         script = case (val = env('REPO_BUILD'))
                  when 'verbose'
+                   @verbose = true
                    run ? "#{run}:verbose" : nil
                  when 'silent'
                    @verbose = false
@@ -273,7 +284,9 @@ module Squared
         when '1'
           @warning = true
         end
-        script ? run(script, dev: bool_match(env('REPO_DEV'), dev), prod: bool_match(env('REPO_DEV'), prod)) : self
+        return self unless script
+
+        run(script, dev: bool_match(env('REPO_DEV'), dev), prod: bool_match(env('REPO_DEV'), prod))
       end
 
       def run(script, group: nil, ref: nil, **kwargs)
@@ -303,9 +316,8 @@ module Squared
         script_command :test, script, group, ref
       end
 
-      def add(name, path = nil, **kwargs)
+      def add(name, path = nil, ref: nil, **kwargs)
         path = root_path((path || name).to_s)
-        ref = kwargs[:ref]
         project = if !ref.is_a?(::Class)
                     Workspace.find(path: path, ref: ref)
                   elsif ref < Project::Base
@@ -317,6 +329,27 @@ module Squared
         self
       end
 
+      def group(name, path, **kwargs)
+        root_path(path).children.map do |ent|
+          next unless (dir = Pathname.new(ent)).directory?
+
+          index = 0
+          basename = dir.basename.to_s.to_sym
+          override = kwargs.delete(basename)
+          while @project[basename]
+            index += 1
+            basename = :"#{basename}-#{index}"
+          end
+          [basename, dir, override]
+        end
+        .each do |basename, dir, override|
+          opts = kwargs.dup
+          opts.merge!(override) if override
+          add(basename, dir, group: name, **opts)
+        end
+        self
+      end
+
       def compose(name, &blk)
         namespace(name, &blk)
         self
@@ -360,8 +393,7 @@ module Squared
 
       def read_manifest(*)
         require 'rexml/document'
-        file = root_path('.repo/manifest.xml')
-        return unless file.exist?
+        return unless (file = root_path('.repo/manifest.xml')).exist?
 
         doc = REXML::Document.new(file.read)
         doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
@@ -408,19 +440,29 @@ module Squared
         !manifest_url.nil? && (empty?(root) || @override)
       end
 
-      def multitask?
-        ::Rake::Task.tasks.any? do |item|
-          next unless item.already_invoked
+      def multiple?(val = nil)
+        return multiple.include?(val) && invoked?(val) if val
 
-          item.name.end_with?(':sync') || (!item.name.include?(':') && !item.name.start_with?('all', 'init'))
-        end
+        ::Rake::Task.tasks.any? { |item| item.already_invoked && multiple.include?(item.name) }
+      end
+
+      def sync?(val = nil)
+        return sync.include?(val) && invoked?(val) if val
+
+        ::Rake::Task.tasks.any? { |item| item.already_invoked && sync.include?(item.name) }
+      end
+
+      def parallel?(val = nil)
+        return parallel.include?(val) && invoked?(val) if val
+
+        ::Rake::Task.tasks.any? { |item| item.already_invoked && parallel.include?(item.name) }
       end
 
-      def empty?(dir, init: true)
-        return true if dir.empty? || (init && dir.join('.repo').directory?)
+      def empty?(dir, repo: true)
+        return true if dir.empty? || (repo && dir.join('.repo').directory?)
         return true if dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__
 
-        dir == root && !env('REPO_ROOT').nil? && root.children.none? do |path|
+        dir.to_s == root.to_s && !env('REPO_ROOT').nil? && root.children.none? do |path|
           path.directory? && !path.basename.to_s.start_with?('.') && path.to_s != home.to_s
         end
       end
@@ -430,7 +472,7 @@ module Squared
       end
 
       def dev?(script: nil, pat: nil, global: nil)
-        with?(:dev, script: script, pat: pat, global: (pat.nil? && global.nil?) || global)
+        with?(:dev, script: script, pat: pat, global: global || (pat.nil? && global.nil?))
       end
 
       def prod?(script: nil, pat: nil, global: false)
@@ -441,7 +483,7 @@ module Squared
 
       protected
 
-      def confirm(msg, agree: 'Y', cancel: 'N', attempts: 5, timeout: 15)
+      def confirm(msg, agree: 'Y', cancel: 'N', default: nil, attempts: 5, timeout: 15)
         require 'readline'
         require 'timeout'
         Timeout.timeout(ENV.fetch('REPO_TIMEOUT', timeout).to_i) do
@@ -454,6 +496,14 @@ module Squared
                 break
               when cancel
                 break
+              when ''
+                case default
+                when agree
+                  ret = true
+                  break
+                when cancel
+                  break
+                end
               end
               attempts -= 1
               exit 1 unless attempts >= 0
@@ -484,15 +534,16 @@ module Squared
       def repo_prompt(path)
         return false unless path.directory?
 
-        confirm "#{log_title(:warn)} \"#{sub_style(path, :bold)}\" is not empty. Continue with installation? [y/N] "
+        confirm("#{log_title(:warn)} \"#{sub_style(path, :bold)}\" is not empty. Continue with installation? [y/N] ",
+                default: 'N')
       end
 
       def with?(state, script: nil, pat: nil, global: false)
-        pat = @script[state] if pat.nil? && global
-        return pat == true unless pat.is_a?(::Regexp)
-        return false if !script && !global
-
-        pat.match?(script || @script[:build])
+        if global
+          pat = @script[state] if pat.nil?
+          script ||= @script[:build]
+        end
+        pat.is_a?(::Regexp) ? pat.match?(script) : pat == true
       end
     end
   end

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
+date: 2024-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake