squared 0.1.1 → 0.1.3

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

@@ -7,9 +7,9 @@ module Squared
         VAR_SET = %i[version autodetect].freeze
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         RUBY_DIR = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
-        OPT_INSTALL = %w[no-cache force].freeze
-        OPT_UPDATE = %w[redownload local strict conservative group=s].freeze
-        OPT_OUTDATED = %w[local strict pre only-explicit group=s].freeze
+        OPT_INSTALL = %w[system frozen no-cache no-prune].freeze
+        OPT_UPDATE = %w[all redownload conservative local strict group=s].freeze
+        OPT_OUTDATED = %w[pre only-explicit local strict group=s].freeze
         private_constant :VAR_SET, :GEMFILE, :RUBY_DIR, :OPT_INSTALL, :OPT_UPDATE, :OPT_OUTDATED
 
         class << self
@@ -103,9 +103,10 @@ module Squared
                       elsif exception
                         indexerror n, list
                       else
-                        next log.warn "rake task #{n} of #{list.size} (out of range)"
+                        log.warn "rake task #{n} of #{list.size} (out of range)"
+                        next
                       end
-                      rake(args.extras.empty? ? cmd : "#{cmd}[#{args.extras.join(',')}]")
+                      rake(args.extras.empty? ? cmd : "#{cmd}#{shell_escape("[#{args.extras.join(',')}]")}")
                     else
                       rake(*args.to_a)
                     end
@@ -177,25 +178,25 @@ module Squared
               gem_session 'install'
               append_value opts
             when :with, :without
-              gem_session 'install'
+              bundle_session 'install'
               append_repeat flag, opts
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
               if (val = option('trust-policy', ignore: false))
-                cmd << "--trust-policy=#{case val
-                                         when '0'
-                                           'NoSecurity'
-                                         when '1'
-                                           'AlmostNoSecurity'
-                                         when '2'
-                                           'LowSecurity'
-                                         when '3'
-                                           'MediumSecurity'
-                                         when '4'
-                                           'HighSecurity'
-                                         else
-                                           val
-                                         end}"
+                cmd << shell_option('trust-policy', case val
+                                                    when '0'
+                                                      'NoSecurity'
+                                                    when '1'
+                                                      'AlmostNoSecurity'
+                                                    when '2'
+                                                      'LowSecurity'
+                                                    when '3'
+                                                      'MediumSecurity'
+                                                    when '4'
+                                                      'HighSecurity'
+                                                    else
+                                                      val
+                                                    end, escape: false)
               end
               append_bundle opts, OPT_INSTALL
             else
@@ -218,7 +219,7 @@ module Squared
           return unless into
 
           dest = Pathname.new(into).realpath
-          print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
+          print_item unless @output[0] || task_invoked?(/\Acopy(?::#{Ruby.ref}|\z)/)
           glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
@@ -235,14 +236,13 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
-          if sync
-            print_item banner
-            banner = nil
-          end
+          print_item banner if sync
           start = 0
           found = 0
           major = 0
           pwd_set do
+            buffer = []
+            out = ->(val) { sync ? puts(val) : buffer << val }
             IO.popen("#{cmd} --no-color").each do |line|
               if start > 0
                 unless stdin?
@@ -302,24 +302,24 @@ module Squared
                     when :yellow
                       found += 1
                     end
-                    styles = styles.compact
-                                   .map { |s| s == :green || s == :yellow ? color(s) : s }
-                                   .flatten
-                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, styles: styles,
-                                           index: 2)
+                    styles = styles.compact.map { |s| color(s) }.flatten
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, index: 2, styles: styles)
                   end
                 end
-                puts "#{start.to_s.rjust(2)}. #{line}"
+                out.("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
               elsif line =~ /^Gem /
-                print_item banner if banner
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub])
+                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
                 start += 1
               end
             end
+            unless sync
+              print_item banner
+              puts buffer
+            end
             if found > 0
               begin
                 if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(dependfile.read))
@@ -353,7 +353,7 @@ module Squared
             cmd << '--all'
             append_repeat 'skip', opts
           when :version
-            cmd << project << "--version=#{shell_escape(version)}"
+            cmd << project << shell_option('version', version)
           end
           run_rb
         end
@@ -364,11 +364,11 @@ module Squared
         end
 
         def rake(*cmd)
-          file = shell_quote(Rake.application.rakefile)
+          rakefile = shell_option('rakefile', Rake.application.rakefile, quote: true, escape: false)
           if cmd.empty?
-            run_s("rake --rakefile=#{file}", chdir: workspace.pwd)
+            run_s("rake #{rakefile}", chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| "rake --rakefile=#{file} #{val}" }, chdir: workspace.pwd, banner: false)
+            run_s(*cmd.map { |val| "rake #{rakefile} #{val}" }, chdir: workspace.pwd, banner: false)
           end
         end
 
@@ -429,7 +429,7 @@ module Squared
             if list.include?(opt)
               @session << "--#{opt}"
             elsif opt.match(/^g(?:roup)?=(.+)$/)
-              @session << "--group=#{shell_escape($1)}"
+              @session << shell_option('group', $1)
             end
           end
         end
@@ -437,7 +437,7 @@ module Squared
         def gem_session(*cmd)
           ret = session('gem', *cmd)
           if (val = option('config-file', ignore: false))
-            ret << "--config-file=#{shell_escape(basepath(val), quote: true)}"
+            ret << shell_option('config-file', basepath(val), quote: true)
           end
           ret << '--norc' if option('norc')
           ret
@@ -456,7 +456,7 @@ module Squared
           pass = Rake::VERSION >= '13.0.4'
           pwd_set(pass: pass) do
             IO.popen("rake#{pass ? " -C #{shell_quote(path)}" : ''} -AT").each do |line|
-              next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+              next unless (data = /\Arake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
 
               ret << [data[1], data[2]]
             end

data/lib/squared/workspace/repo.rb

@@ -33,11 +33,11 @@ module Squared
 
       def repo(url, manifest = 'latest', run: nil, script: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
-                  home = Pathname.new(val)
-                  if main == home.basename.to_s
-                    @root = home.parent
-                    if home.exist?
-                      @root = nil unless home.directory?
+                  path = Pathname.new(val)
+                  if main == path.basename.to_s
+                    @root = path.parent
+                    if path.exist?
+                      @root = nil unless path.directory?
                     elsif !@root.exist?
                       @root.mkpath
                     elsif !repo_install?
@@ -45,7 +45,7 @@ module Squared
                     end
                   end
                   raise_error('REPO_HOME', val, hint: 'invalid') unless @root
-                  home.realdirpath
+                  path.realdirpath
                 elsif (val = env('REPO_ROOT'))
                   @root = Pathname.new(val).realdirpath
                   if !@root.exist?
@@ -54,12 +54,12 @@ module Squared
                     raise_error('REPO_ROOT', val, hint: 'exist') unless repo_confirm
                   end
                   @root.join(main).realdirpath
+                elsif repo_install?(parent: true) && (!@home.exist? || @root.join(main) == @home)
+                  @home
                 elsif repo_install?(@home)
                   @home.join(main)
-                elsif @home != pwd && repo_install?(pwd)
-                  pwd.join(main)
                 else
-                  @home
+                  (path = pwd) == @home || !repo_install?(path) ? @home : path.join(main)
                 end
         @root = @home.parent
         @manifest_url = url
@@ -106,7 +106,7 @@ module Squared
             found = true
           end
           script_set(data, group: group, ref: ref) unless found
-          @warning = env_match('REPO_WARN', @warning && !Repo.empty?(@root), suffix: @envname) != false
+          @warning = env_match('REPO_WARN', @warning && !root?(@root, pass: ['.repo']), suffix: @envname) != false
           @extensions << :__repo__
         elsif script || run
           if script
@@ -153,7 +153,7 @@ module Squared
         status = lambda do |val, alt = nil|
           return 'inactive' unless (ver = branch || alt)
 
-          message(@prefix, 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver, empty: true)
+          message(task_name('repo'), val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
         end
 
         namespace(name = task_name('repo')) do |repo|
@@ -230,7 +230,7 @@ module Squared
       end
 
       def repo_install?(dir = root, parent: false)
-        return true if Repo.empty?(dir) || dir.join('.repo').directory?
+        return true if root?(dir, pass: ['.repo']) || dir.join('.repo').directory?
 
         parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent != home }
       end

data/lib/squared/workspace/series.rb

@@ -97,8 +97,9 @@ module Squared
             items.concat(tasks)
           end
           if tasks.size > 1 && (data = batch_get(key)) && data.keys.any? { |ref| proj.ref?(ref) }
-            desc ws.task_name(t = ws.task_join(proj.name, key), desc: true)
-            task ws.task_name(t) => tasks
+            t = ws.task_join(proj.name, key)
+            desc Common::Format.message(*t.split(':'))
+            task t => tasks
           end
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - An Pham
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +92,6 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared
   source_code_uri: https://github.com/anpham6/squared
   documentation_uri: https://squared.readthedocs.io
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []