squared 0.1.0 → 0.1.2

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

@@ -80,7 +80,7 @@ module Squared
                     if flag == :target
                       task flag, [:dir, :opts] do |_, args|
                         dir = guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: dir, opts: args.to_a[1..-1] || [])
+                        depend(flag, dir: dir, opts: args.to_a.drop(1))
                       end
                     else
                       task flag do |_, args|
@@ -106,7 +106,7 @@ module Squared
                 cmd << '--user'
                 append_pip opts, OPT_USER
               when :target
-                cmd << "--target=#{shell_escape(basepath(dir), quote: true)}"
+                cmd << shell_option('target', basepath(dir), quote: true)
                 append_pip opts, OPT_USER + ['upgrade']
                 append_eager opts
               when :upgrade
@@ -127,10 +127,10 @@ module Squared
           end
         end
 
-        def outdated(*)
+        def outdated(*, sync: invoked_sync?('outdated'))
           pip_session 'list', '--outdated'
           append_pip
-          run
+          run(sync: sync)
         end
 
         def variable_set(key, *val, **)
@@ -164,21 +164,20 @@ module Squared
 
         def append_pip(opts = [], list = [])
           opts.each do |opt|
-            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
+            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^verbose|(v+)$/))
 
             @session << case opt
                         when 'venv'
                           '--require-virtualenv'
                         else
-                          (v ? "-#{v[0]}" : "--#{opt}")
+                          (v && v[1] ? "-#{v[1]}" : "--#{opt}")
                         end
           end
-          if (val = option('proxy', ignore: false))
-            @session << "--proxy=#{shell_escape(val, quote: true)}"
-          end
-          @session << "--python=#{shell_escape(basepath(val), quote: true)}" if (val = option('python', ignore: false))
-          @session << "--log=#{shell_escape(basepath(val), quote: true)}" if (val = option('log', ignore: false))
-          @session << '--user' if option('user')
+          val = nil
+          @session << shell_option('proxy', val, quote: true) if (val = option('proxy'))
+          @session << shell_option('python', basepath(val), quote: true) if (val = option('python'))
+          @session << shell_option('log', basepath(val), quote: true) if (val = option('log', ignore: false))
+          @session << '--user' if !list.empty? && option('user')
           @session << '--no-input' if option('no-input')
           append_nocolor option('no-color')
         end

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

@@ -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
@@ -182,20 +183,20 @@ module Squared
             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
@@ -212,37 +213,36 @@ module Squared
 
             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
 
           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)
             b = dest.join(val)
             c = glob[i] || glob[0]
             log.info "cp #{a.join(c)} #{b}"
-            copy_d(a, b, glob: c, pass: pass, verbose: verbose)
+            copy_d(a, b, glob: c, pass: exclude, verbose: verbose)
           end
         end
 
-        def outdated(rev = nil, opts: [])
+        def outdated(rev = nil, opts: [], sync: invoked_sync?('outdated', rev))
           cmd = bundle_session 'outdated', rev && "--#{rev}"
           append_bundle opts, OPT_OUTDATED
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
-          if invoked_sync?('outdated', rev)
-            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,10 +364,11 @@ module Squared
         end
 
         def rake(*cmd)
+          rakefile = shell_option('rakefile', Rake.application.rakefile, quote: true, escape: false)
           if cmd.empty?
-            run_s 'rake'
+            run_s("rake #{rakefile}", chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| "rake #{val}" }, banner: false)
+            run_s(*cmd.map { |val| "rake #{rakefile} #{val}" }, chdir: workspace.pwd, banner: false)
           end
         end
 
@@ -386,9 +387,8 @@ module Squared
           return false unless @autodetect
 
           unsafe = ->(hint) { raise_error('failed to parse', hint: hint) }
-          out = `gem -C #{shell_quote(path)} list --local -d #{project}`
-          data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out)
-          unsafe.('version') unless data
+          out = pwd_set { `gem list --local -d #{project}` }
+          unsafe.('version') unless (data = /#{Regexp.escape(project)} \(([^)]+)\)/.match(out))
           ver = data[1].split(/\s*,\s*/)
           ver.unshift(@version).uniq! if @version
           ver.each do |v|
@@ -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
@@ -453,10 +453,13 @@ module Squared
           return @rakelist if @rakelist
 
           ret = []
-          IO.popen("rake -C #{shell_quote(path)} -AT").each do |line|
-            next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+          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 = /\Arake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
 
-            ret << [data[1], data[2]]
+              ret << [data[1], data[2]]
+            end
           end
           @rakelist = ret
         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

@@ -8,13 +8,13 @@ module Squared
       include Rake::DSL
       extend Forwardable
 
-      TASK_BASE = %i[build depend graph doc test copy clean]
+      TASK_BASE = []
       TASK_BATCH = {}
       TASK_EXTEND = {}
-      TASK_KEYS = TASK_BASE + TASK_BATCH.keys
+      TASK_KEYS = []
       TASK_ALIAS = {}
       TASK_NAME = {}
-      private_constant :TASK_BASE, :TASK_BATCH, :TASK_KEYS, :TASK_NAME, :TASK_EXTEND
+      private_constant :TASK_BASE, :TASK_BATCH, :TASK_EXTEND, :TASK_KEYS, :TASK_ALIAS, :TASK_NAME
 
       class << self
         def add(task, obj)
@@ -47,6 +47,15 @@ module Squared
           TASK_NAME[key.to_sym] = task.to_sym
         end
 
+        def base_set(obj)
+          TASK_BASE.clear
+                   .concat((if TASK_KEYS.empty?
+                              obj.tasks.dup
+                            else
+                              obj.tasks.reject { |val| TASK_KEYS.include?(val) }
+                            end).freeze)
+        end
+
         private
 
         def key_set(val)
@@ -72,7 +81,7 @@ module Squared
           id: []
         }
         @data = {}
-        TASK_KEYS.each { |key| @data[key] = [] }
+        (TASK_BASE + TASK_KEYS).each { |key| @data[key] = [] }
       end
 
       def populate(proj)
@@ -88,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
 
@@ -154,7 +164,21 @@ module Squared
       end
 
       def extend?(obj, key)
-        TASK_EXTEND.fetch(key, []).any? { |kind| obj.is_a?(kind) && obj.ref?(kind.ref) }
+        return false unless (items = TASK_EXTEND[key]) && !(items = items.select { |kind| obj.is_a?(kind) }).empty?
+
+        meth = :"#{key}?"
+        allref = obj.allref.to_a
+        ret = false
+        items.each do |kind|
+          if kind.instance_methods.include?(meth)
+            out = obj.__send__(meth)
+            return true if out == 1
+            return out if obj.ref?(kind.ref)
+          elsif allref.include?(kind.ref)
+            ret = true
+          end
+        end
+        ret
       end
 
       def multiple?(val = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-08 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake