squared 0.3.14 → 0.4.0

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

@@ -7,31 +7,31 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_BUNDLE = {
-          common: %w[no-color V|verbose retry=i].freeze,
+          common: %w[no-color V verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system path=p binstubs=p? standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
           install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre redownload ruby strict bundler=e? g|group=q source=e].freeze,
+          update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
-                       update-strict g|group=q source=e].freeze,
+                       update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
           check: %w[dry-run gemfile=p].freeze
         }.freeze
         OPT_GEM = {
           common: %w[backtrace debug q|quiet no-verbose norc silent V|verbose config-file=p].freeze,
-          install: %w[version=e].freeze,
-          update: %w[system=e?].freeze,
+          install: %w[version=b].freeze,
+          update: %w[system=b?].freeze,
           outdated: %w[b|both clear-sources l|local no-http-proxy r|remote B|bulk-threshold=i p|http-proxy=q?
                        platform=q source=q].freeze,
-          push: %w[no-http-proxy attestation=p host=q key=e otp=e p|http-proxy=q?].freeze,
+          push: %w[no-http-proxy attestation=p host=q key=b otp=b p|http-proxy=q?].freeze,
           build: %w[force strict o|output=p platform=q].freeze,
-          exec: %w[conservative prerelease no-prerelease g|gem=v version=e].freeze,
+          exec: %w[conservative prerelease no-prerelease g|gem=b version=b].freeze,
           pristine: %w[all env-shebang extensions no-env-shebang no-extensions only-executables only-missing-extensions
-                       only-plugins n|bindir=p i|install-dir=p skip=e v|version=e].freeze,
+                       only-plugins n|bindir=p i|install-dir=p skip=b v|version=b].freeze,
           shared: %w[f b|both clear-sources conservative default development development-all E|explain
                      ignore-dependencies l|local N|no-document r|remote w|vendor n|bindir=p build-root=p
                      bulk-threshold=i document=b? g|file=p? p|http-proxy=q i|install-dir=p platform=q s|source=q
-                     target-rbconfig=p? P|trust-policy=b without=e].freeze,
+                     target-rbconfig=p? P|trust-policy=b without=b].freeze,
           shared_no: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message
                         prerelease suggestions user-install wrappers].freeze
         }.freeze
@@ -70,7 +70,7 @@ module Squared
         def initialize(*, autodetect: false, **kwargs)
           super
           if @pass.include?(Ruby.ref)
-            initialize_ref(Ruby.ref)
+            initialize_ref Ruby.ref
             initialize_logger(**kwargs)
           else
             initialize_build(Ruby.ref, **kwargs)
@@ -83,7 +83,7 @@ module Squared
 
           begin
             File.foreach(file) do |line|
-              next unless line =~ %r{\brequire\s+(["'])bundler/gem_tasks\1}
+              next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
               cmd = bundle_output('exec', 'rake').to_s
               @output[0] = "#{cmd} build"
@@ -121,11 +121,11 @@ module Squared
                 when 'rake'
                   next unless rakefile
 
-                  format_desc action, nil, "command*|#{indexchar}index,args*|#,pattern*"
+                  format_desc action, nil, 'command*|^index,args*|#,pattern*'
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile.to_s,
-                                                                                 each: ->(val) { val[0] + val[1].to_s })
+                      format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
+                                                                      each: ->(val) { val[0] + val[1].to_s })
                     elsif (data = indexitem(args.command))
                       n, opts = data
                       list = read_rakefile
@@ -155,10 +155,7 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated, :build, :push, :exec
-                        format_desc(action, flag, 'opts*', before: case flag
-                                                                   when :exec then 'command+'
-                                                                   when :push then 'file'
-                                                                   end)
+                        format_desc action, flag, 'opts*'
                         task flag do |_, args|
                           gemx flag, args.to_a
                         end
@@ -181,6 +178,7 @@ module Squared
           if @depend
             super
           elsif outdated?
+            workspace.rev_clear name
             cmd = bundle_session 'install'
             if (n = option('jobs')).to_i > 0
               cmd << "-j#{n}"
@@ -189,15 +187,13 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
-          glob = kwargs[:include]
-          pass = kwargs[:exclude]
+        def copy(from: 'lib', include: nil, exclude: nil, into: @gemdir, override: false)
           if @copy && !override
-            return super if runnable?(@copy)
+            return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            pass = @copy[:exclude] if @copy.key?(:exclude)
+            exclude = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
@@ -209,10 +205,10 @@ module Squared
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || glob.first
+            c = glob[i] || glob[0]
             log.info "cp #{a.join(c)} #{b}"
             begin
-              copy_dir(a, b, c, pass: pass, verbose: verbose)
+              copy_dir(a, b, c, pass: exclude, verbose: verbose)
             rescue StandardError => e
               log.error e
               ret = on(:error, :copy, e)
@@ -306,7 +302,7 @@ module Squared
                   end
                 end
                 out.("#{start.to_s.rjust(2)}. #{line}")
-              elsif line =~ /^Gem /
+              elsif line.start_with?('Gem')
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
                   out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
@@ -347,8 +343,7 @@ module Squared
 
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
-          append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag != :all)
+          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common]
           run_rb(from: :update)
         end
 
@@ -361,8 +356,7 @@ module Squared
             end
             cmd << flag
           when :push
-            raise_error('gem not found', hint: flag) if opts.empty? || !(file = path + opts.shift).exist?
-            cmd << flag << shell_quote(file)
+            cmd << flag << project
           when :'user-install'
             cmd << 'install' << '--user-install'
           else
@@ -373,17 +367,14 @@ module Squared
           when :install, :'user-install', :update
             list += OPT_GEM[:shared]
             no = OPT_GEM[:shared_no]
-            first = true
-          when :pristine
-            first = true
           end
-          opts, pat = option_sanitize(opts, list, no: no, first: first)
+          opts, pat = option_sanitize(opts, list, no: no, first: true)
           out = []
           opts.each do |opt|
             if opt =~ pat
               case $1
               when 'g', 'gem'
-                cmd << (flag == :exec ? basic_option($1, $2) : quote_option($1, basepath($2)))
+                cmd << (flag == :exec ? shell_option($1, $2) : quote_option($1, basepath($2)))
               end
             else
               out << opt
@@ -398,14 +389,14 @@ module Squared
             pwd_set(pass: !pwd.nil?, from: from) do
               items = [[%w[Gem Current Latest], nil]]
               IO.popen(cmd.done).each do |line|
-                if (data = line.match(/^(\S+) \((\S+) < ([^)]+)\)$/))
-                  cur = semscan(data[2])
-                  lat = semscan(data[3])
-                  items << [data.to_a.drop(1), if semmajor?(cur, lat)
-                                                 %i[green bold]
-                                               else
-                                                 cur[2] == lat[2] ? [:yellow] : [:green]
-                                               end]
+                if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
+                  cur = semscan($2)
+                  lat = semscan($3)
+                  items << [$~.to_a.drop(1), if semmajor?(cur, lat)
+                                               %i[green bold]
+                                             else
+                                               cur[2] == lat[2] ? [:yellow] : [:green]
+                                             end]
                 else
                   puts line
                 end
@@ -437,7 +428,7 @@ module Squared
                       line = sub_style(line, pat: /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, styles: theme[:header], index: 2)
                     end
                     puts line
-                    puts '-' * n
+                    puts sub_style(ARG[:BORDER][1] * n, styles: borderstyle)
                   else
                     styles = item.last
                     a = a.ljust(d)
@@ -471,33 +462,30 @@ module Squared
           when :build, :push
             if !out.empty?
               if flag == :build && out.size == 1
-                cmd << basepath(out.first)
+                cmd << shell_quote(basepath(out.first))
               else
-                raise_error('gem', flag, out.join(', '), hint: 'unrecognized option')
+                raise_error("unknown args: #{out.join(', ')}", hint: flag)
               end
             elsif flag == :build
               cmd << "#{project}.gemspec"
             end
           when :exec
-            raise_error('gem', flag, hint: 'no command given') if out.empty?
-            cmd << basic_option('gem', project) unless session_arg?('g', 'gem')
+            raise_error('no command given', hint: flag) if out.empty?
             cmd << out.join(' ')
           else
-            if out.empty? && cmd.none? { |val| val =~ /^--system(?:=|$)/ }
-              raise_error('gem', flag, hint: 'no gemname given')
-            end
+            raise_error('no gemname given', hint: flag) if out.empty? && !session_arg?('system')
             if flag == :pristine
               if session_arg?('all')
                 append_repeat 'skip', out
                 out.clear
-              elsif (n = out.first =~ /@/)
+              elsif (n = out.first.index('@'))
                 name = out.first
                 if n == 0
                   cmd << project
                   version = name[1..-1]
                 else
                   cmd << shell_escape(name[0, n])
-                  version = name[(n + 1)..-1]
+                  version = name[n + 1..-1]
                 end
                 cmd << shell_option('version', version)
                 out.clear
@@ -513,16 +501,16 @@ module Squared
           cmd = bundle_session flag
           case flag
           when 'exec', 'check'
-            args = option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common], args: flag == :exec).first
+            args = option_sanitize(args, OPT_BUNDLE[flag.to_sym] + OPT_BUNDLE[:common]).first
           end
-          raise_error('bundle', flag, hint: 'no command given') unless !args.empty? || flag == 'check'
+          raise_error('no command given', hint: flag) unless !args.empty? || flag == 'check'
           cmd.merge(args)
           run(from: :"bundle:#{flag}")
         end
 
         def rake(*cmd)
           if cmd.empty?
-            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd, banner: false)
+            run_s(rake_output(rakeapp), from: :rake, chdir: workspace.pwd)
           else
             cmd = cmd.flatten.map { |val| rake_output(rakeapp, val) }
             run_s(cmd, from: :rake, chdir: workspace.pwd, banner: false)
@@ -579,7 +567,7 @@ module Squared
             end
             pwd_set { parse.(`#{bundle_output('show', project)}`) } unless @gemdir
           end
-          raise_error('failed to parse', hint: @version || 'path') unless @gemdir
+          raise_error('parse failed', hint: @version || 'path') unless @gemdir
         rescue StandardError => e
           log.error e
           @version = nil
@@ -599,13 +587,9 @@ module Squared
           run(banner: !@session.include?('--quiet'), **kwargs)
         end
 
-        def append_bundle(opts, list, target: @session, append: false)
+        def append_bundle(opts, list, target: @session)
           out = option_sanitize(opts, list, target: target).first
-          if append
-            append_value(out, target: target, escape: true)
-          else
-            option_clear(out, target: target)
-          end
+          option_clear(out, target: target)
         end
 
         def gem_session(*cmd, **kwargs)
@@ -616,7 +600,7 @@ module Squared
 
         def bundle_session(*cmd, **kwargs)
           ret = session('bundle', *cmd, **kwargs)
-          append_nocolor(target: ret)
+          append_nocolor
           ret
         end
 
@@ -662,23 +646,23 @@ module Squared
         def rakefile
           return unless (file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? })
 
-          basepath(file)
+          basepath file
         end
 
         def rakeapp
-          quote_option 'f', rakefile
+          quote_option 'rakefile', Rake.application.rakefile
         end
 
         def rakepwd
           return unless Rake::VERSION >= '13.0.4'
 
-          quote_option('C', path)
+          quote_option 'C', path
         end
 
         def gempwd
           return unless Gem::VERSION >= '3.4.2'
 
-          quote_option('C', path)
+          quote_option 'C', path
         end
 
         def gempath(val = @version)

data/lib/squared/workspace/project.rb

@@ -7,7 +7,13 @@ module Squared
         attr_accessor :line_width
 
         def max_width(lines)
-          [lines.max_by(&:size).size, line_width].max
+          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
         end
       end
 

data/lib/squared/workspace/repo.rb

@@ -3,6 +3,8 @@
 module Squared
   module Workspace
     module Repo
+      include Common::Format
+
       class << self
         def read_manifest(path)
           require 'rexml/document'
@@ -29,14 +31,14 @@ module Squared
                       @root = nil unless repo_confirm
                     end
                   end
-                  raise_error('REPO_HOME', val, hint: 'invalid') unless @root
+                  raise_error("path invalid: #{val}", hint: 'REPO_HOME') unless @root
                   path.realdirpath
                 elsif (val = env('REPO_ROOT'))
                   @root = Pathname.new(val).realdirpath
                   if !@root.exist?
                     @root.mkpath
                   elsif !repo_install?(parent: true)
-                    raise_error('REPO_ROOT', val, hint: 'exist') unless repo_confirm
+                    raise_error("path does not exist: #{val}", hint: 'REPO_ROOT') unless repo_confirm
                   end
                   @root.join(main).realdirpath
                 elsif repo_install?(parent: true) && (!@home.exist? || @root.join(main) == @home)
@@ -152,11 +154,13 @@ module Squared
             parse_opts.(args)
             stage ||= 'all'
             repo['sync'].invoke
+            next if env('REPO_DRYRUN', equals: '2')
+
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref)
 
               proj.depend(sync: true) if proj.depend?
-              proj.build?
+              proj.build? unless env('REPO_DRYRUN', ignore: '0')
             end
             .each_value do |proj|
               proj.build(sync: true)
@@ -175,14 +179,14 @@ module Squared
             parse_opts.(args)
             stage = 'init'
             puts if newline
-            Common::System.shell("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
+            system("repo init -u #{manifest_url} -m #{args.manifest || target}.xml", chdir: root)
             repo['all'].invoke
           end
 
           desc.('sync[{0}]')
           task 'sync', [:opts] do |_, args|
             unless branch || stage == 'init'
-              raise_error('repo is not initialized', "rake #{task_name('repo:init')}", kind: LoadError)
+              raise_error('repo not initialized', hint: task_name('repo:init'), kind: LoadError)
             end
             parse_opts.(args)
             cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
@@ -190,6 +194,9 @@ module Squared
             puts if newline && stage != 'init'
             begin
               Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
+            rescue Errno::ENOENT => e
+              emphasize(e, title: root)
+              raise
             rescue StandardError => e
               emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
               raise

data/lib/squared/workspace/series.rb

@@ -119,7 +119,7 @@ module Squared
           val = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(t) || pattern.any? { |pat| t =~ pat } || subcheck.(t)
+            if parallel.include?(t) || pattern.any? { |pat| t.match?(pat) } || subcheck.(t)
               task_desc("#{val} (thread)", name: key)
               multitask key => items
               @parallel << key

data/squared.gemspec

@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-version = File.read(File.join(__dir__, "lib/squared/version.rb"))[/\bVERSION = '(.+)'$/, 1]
+require_relative "lib/squared/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "squared"
-  spec.version       = version
+  spec.version       = Squared::VERSION
   spec.authors       = ["An Pham"]
   spec.email         = ["anpham6@gmail.com"]
 
   spec.summary       = %q{Rake task generator for managing multi-language workspaces.}
   spec.description   = %q{Rake task generator for managing multi-language workspaces.}
-  spec.homepage      = "https://github.com/anpham6/squared-ruby"
+  spec.homepage      = "https://github.com/anpham6/squared"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
   spec.licenses      = ["BSD-3-Clause"]
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata["documentation_uri"] = "https://squared.readthedocs.io"
 
   spec.files         = Dir["lib/**/*"] +
-                       %w[CHANGELOG.md LICENSE README.md squared.gemspec]
+                       %w[CHANGELOG.md LICENSE README.md README.ruby.md squared.gemspec]
   spec.bindir        = "exe"
   spec.executables   = []
   spec.require_paths = ["lib"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.3.14
+  version: 0.4.0
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,6 +75,7 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- README.ruby.md
 - lib/squared.rb
 - lib/squared/app.rb
 - lib/squared/common.rb
@@ -91,6 +92,7 @@ files:
 - lib/squared/workspace/application.rb
 - lib/squared/workspace/project.rb
 - lib/squared/workspace/project/base.rb
+- lib/squared/workspace/project/docker.rb
 - lib/squared/workspace/project/git.rb
 - lib/squared/workspace/project/node.rb
 - lib/squared/workspace/project/python.rb
@@ -98,12 +100,12 @@ files:
 - lib/squared/workspace/repo.rb
 - lib/squared/workspace/series.rb
 - squared.gemspec
-homepage: https://github.com/anpham6/squared-ruby
+homepage: https://github.com/anpham6/squared
 licenses:
 - BSD-3-Clause
 metadata:
-  homepage_uri: https://github.com/anpham6/squared-ruby
-  source_code_uri: https://github.com/anpham6/squared-ruby
+  homepage_uri: https://github.com/anpham6/squared
+  source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
 rdoc_options: []
 require_paths:
@@ -119,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []