squared 0.0.11 → 0.0.12

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

@@ -15,12 +15,15 @@ module Squared
         class << self
           def populate(*); end
           def batchargs(*); end
-          def aliasargs(*); end
 
           def tasks
             %i[outdated].freeze
           end
 
+          def bannerargs
+            %i[dependfile].freeze
+          end
+
           def config?(val)
             return false unless (val = as_path(val))
 
@@ -38,8 +41,6 @@ module Squared
           rake: nil
         }.freeze
 
-        attr_reader :gemfile
-
         def initialize(*, version: nil, autodetect: false, **kwargs)
           super
           if @pass.include?(Ruby.ref)
@@ -51,8 +52,8 @@ module Squared
           end
           @version = env('BUILD', version, suffix: 'VERSION')
           @autodetect = autodetect
-          index = GEMFILE.index { |file| base_path(file).exist? } || 0
-          @gemfile = base_path(GEMFILE[index])
+          @dependindex = GEMFILE.index { |file| basepath(file).exist? }
+          @dependfile = basepath(GEMFILE[@dependindex || 0])
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
@@ -89,9 +90,25 @@ module Squared
                 when :rake
                   next unless rakefile
 
-                  desc format_desc(action, nil, 'command*')
+                  desc format_desc(action, nil, 'command*|^index,args*|#,pattern*')
                   task action, [:command] do |_, args|
-                    rake(*args.to_a)
+                    if args.command == '#'
+                      format_list(read_rakefile, 'rake[^N]', 'tasks', grep: args.extras, from: rakefile.to_s,
+                                                                      each: ->(val) { val[0] + val[1].to_s })
+                    elsif (data = indexdata(args.command))
+                      n, opts = data
+                      list = read_rakefile
+                      if (item = list[n - 1])
+                        cmd = opts ? "#{opts} #{item.first}" : item.first
+                      elsif exception
+                        indexerror n, list
+                      else
+                        next log.warn "rake task #{n} of #{list.size} (out of range)"
+                      end
+                      rake(args.extras.empty? ? cmd : "#{cmd}[#{args.extras.join(',')}]")
+                    else
+                      rake(*args.to_a)
+                    end
                   end
                 end
               else
@@ -103,16 +120,14 @@ module Squared
                       when :gem
                         desc format_desc(action, flag, 'name+')
                         task flag, [:name] do |_, args|
-                          name = args.to_a
-                          guard_params(action, flag, args: name)
-                          depend(flag, opts: name)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          depend(flag, opts: opts)
                         end
                       when :with, :without
                         desc format_desc(action, flag, 'group+')
                         task flag, [:group] do |_, args|
-                          group = args.to_a
-                          guard_params(action, flag, args: group)
-                          depend(flag, opts: group)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          depend(flag, opts: opts)
                         end
                       else
                         desc format_desc(action, flag, OPT_INSTALL)
@@ -130,9 +145,8 @@ module Squared
                       when :gem
                         desc format_desc(action, flag, 'name+')
                         task flag, [:name] do |_, args|
-                          name = args.to_a
-                          guard_params(action, flag, args: name)
-                          pristine(flag, opts: name)
+                          opts = guard_params(action, flag, args: args.to_a)
+                          pristine(flag, opts: opts)
                         end
                       when :all
                         desc format_desc(action, flag, 'skip*')
@@ -142,8 +156,8 @@ module Squared
                       when :version
                         desc format_desc(action, flag, 'version?')
                         task flag, [:version] do |_, args|
-                          guard_params(action, flag, args: args, key: :version)
-                          pristine(flag, version: args.version)
+                          version = guard_params(action, flag, args: args, key: :version)
+                          pristine(flag, version: version)
                         end
                       end
                     end
@@ -192,7 +206,7 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', glob: '**/*', into: @gemdir, override: false)
+        def copy(from: 'lib', glob: nil, into: @gemdir, override: false)
           if @copy && !override
             return super if runnable?(@copy)
 
@@ -204,11 +218,11 @@ module Squared
 
           dest = Pathname.new(into).realpath
           print_item unless @output[0]
-          glob = as_a(glob)
+          glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
-            a = base_path(val)
+            a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || '**/*'
+            c = glob[i] || glob[0]
             log.info "cp #{a.join(c)} #{b}"
             copy_d(a, b, glob: c, verbose: verbose)
           end
@@ -245,7 +259,7 @@ module Squared
                   end
                   minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
                   if data.empty?
-                    semmajor(cur, lat) ? major_set.() : minor_set.()
+                    semmajor?(cur, lat) ? major_set.() : minor_set.()
                   else
                     data.each do |val|
                       break unless (req = /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/.match(line))
@@ -253,10 +267,10 @@ module Squared
                       v = semver(val).join
                       case req[1]
                       when '>', '>='
-                        semmajor(cur, lat) ? major_set.() : minor_set.()
+                        semmajor?(cur, lat) ? major_set.() : minor_set.()
                       when '<', '<='
                         if c <= v
-                          if semmajor(cur, lat)
+                          if semmajor?(cur, lat)
                             major_set.()
                           else
                             styles[0] = :yellow
@@ -269,9 +283,9 @@ module Squared
                           styles[1] = :bold
                         end
                       when '~>'
-                        if c < v && cur[0] == val[0] && !semmajor(cur, val)
+                        if c < v && cur[0] == val[0] && !semmajor?(cur, val)
                           styles[0] = :yellow
-                        elsif semmajor(val, lat)
+                        elsif semmajor?(val, lat)
                           styles[1] = :underline
                         else
                           styles[1] = :bold
@@ -307,7 +321,7 @@ module Squared
             end
             if found > 0
               begin
-                if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(@gemfile.read))
+                if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(dependfile.read))
                   status = (data[2] || data[3]).chomp('/')
                   right = true
                 end
@@ -349,28 +363,13 @@ module Squared
         end
 
         def rake(*cmd)
-          run_s(cmd.empty? ? 'rake' : cmd.map { |val| "rake #{val}" })
-        end
-
-        def rakefile
-          file = ::Rake::Application::DEFAULT_RAKEFILES.find { |val| base_path(val).exist? }
-          base_path(file) if file
-        end
-
-        def variable_set(key, *val, **)
-          case key
-          when :gemfile
-            @gemfile = base_path(val.first)
+          if cmd.empty?
+            run_s 'rake'
           else
-            super
+            run_s(*cmd.map { |val| "rake #{val}" }, banner: false)
           end
         end
 
-        def variables
-          ret = super + VAR_SET
-          ret.freeze
-        end
-
         def depend?
           @depend != false && (!@depend.nil? || outdated?)
         end
@@ -410,11 +409,16 @@ module Squared
         end
 
         def outdated?
-          gemfile.exist?
+          dependtype > 0
         end
 
         private
 
+        def variables
+          ret = super + VAR_SET
+          ret.freeze
+        end
+
         def run_rb(sync: true)
           run(sync: sync, banner: !@session.include?('--quiet'))
         end
@@ -437,7 +441,7 @@ module Squared
         def gem_session(*cmd)
           ret = session('gem', *cmd)
           if (val = option('config-file', ignore: false))
-            ret << "--config-file=#{shell_escape(base_path(val).to_s, quote: true)}"
+            ret << "--config-file=#{shell_escape(basepath(val), quote: true)}"
           end
           ret << '--norc' if option('norc')
           ret
@@ -449,6 +453,23 @@ module Squared
           @session
         end
 
+        def read_rakefile
+          return @rakelist if @rakelist
+
+          ret = []
+          IO.popen("rake -C #{shell_quote(path)} -AT").each do |line|
+            next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+
+            ret << [data[1], data[2]]
+          end
+          @rakelist = ret
+        end
+
+        def rakefile
+          file = ::Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
+          basepath(file) if file
+        end
+
         def gempath
           File.join('gems', "#{project}-#{@version}")
         end

data/lib/squared/workspace/repo.rb

@@ -5,11 +5,7 @@ require 'rexml/document'
 module Squared
   module Workspace
     module Repo
-      include Common
-      include Format
-      include Prompt
-      include System
-      include Utils
+      include Common::Format
 
       class << self
         def read_manifest(path)
@@ -147,7 +143,7 @@ module Squared
           message(@prefix, 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver, empty: true)
         end
 
-        namespace task_name('repo') do |repo|
+        namespace(name = task_name('repo')) do |repo|
           desc status.('all[{0}]')
           task 'all', [:opts] do |_, args|
             parse_opts.(args)
@@ -161,10 +157,10 @@ module Squared
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next unless proj.has?('dev') && proj.copy?
+              next unless proj.dev? && proj.copy?
 
-              if (ws = proj.workspace).task_defined?(target = ws.task_name(proj.name, 'copy'))
-                Common::Task.invoke(target, **ws.invokeargs)
+              if (ws = proj.workspace).task_defined?(target = ws.task_name(task_join(proj.name, 'copy')))
+                task_invoke(target, **ws.invokeargs)
               else
                 proj.copy(sync: true)
               end
@@ -190,20 +186,25 @@ module Squared
             cmd << '--fail-fast' if failfast
             puts if newline && stage != 'init'
             begin
-              shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
+              Common::System.shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
             rescue StandardError => e
               emphasize(e, title: "rake stash #{task_name(task_join('repo', stage || 'sync'))}")
               raise
             end
           end
         end
+        series.sync.push(
+          task_join(name, 'all'),
+          task_join(name, 'init'),
+          task_join(name, 'sync')
+        )
       end
 
       def repo_confirm
         return false unless root.directory?
 
         path = sub_style(root, styles: theme[:inline])
-        @repo_override = confirm(
+        @repo_override = Common::Prompt.confirm(
           "#{log_title(:warn)} \"#{path}\" is not empty. Continue with installation? [y/N] ",
           'N',
           timeout: env('REPO_TIMEOUT', 15, ignore: '0')

data/lib/squared/workspace/series.rb

@@ -8,10 +8,10 @@ module Squared
       include ::Rake::DSL
       extend Forwardable
 
-      TASK_BASE = %i[build depend doc test copy clean]
+      TASK_BASE = %i[build depend graph doc test copy clean]
       TASK_BATCH = {}
       TASK_EXTEND = {}
-      TASK_KEYS = TASK_BASE.dup
+      TASK_KEYS = TASK_BASE.dup + TASK_BATCH.keys
       TASK_ALIAS = {}
       TASK_NAME = {}
       private_constant :TASK_BASE, :TASK_BATCH, :TASK_KEYS, :TASK_NAME, :TASK_EXTEND
@@ -22,23 +22,24 @@ module Squared
           (TASK_EXTEND[task] ||= []).push(obj)
         end
 
-        def batch(ref, obj)
+        def batch(*args, obj)
           if obj.is_a?(::Hash)
             obj.each do |key, val|
               key_set key
               data = TASK_BATCH[key] ||= {}
-              (data[ref] ||= []).concat(val)
+              args.each { |ref| (data[ref] ||= []).concat(val) }
             end
-          elsif (data = TASK_BATCH[obj]) && data.delete(ref) && data.empty?
-            TASK_KEYS.delete(obj)
+          elsif (data = TASK_BATCH[obj])
+            args.each { |ref| data.delete(ref) }
+            TASK_KEYS.delete(obj) if data.empty?
           end
         end
 
         def alias(ref, obj)
           if obj.is_a?(::Hash)
             obj.each { |key, val| (TASK_ALIAS[key] ||= {})[ref] = val }
-          elsif (data = TASK_ALIAS[obj])
-            data.delete(ref)
+          else
+            TASK_ALIAS[obj]&.delete(ref)
           end
         end
 
@@ -76,13 +77,13 @@ module Squared
 
       def populate(proj)
         group, parent, id = @session.values
+        ws = proj.workspace
         @data.each do |key, items|
-          ws = proj.workspace
           next if (tasks = ws.task_resolve(proj, key)).empty?
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).push(*tasks)
+            (group[:"#{key}:#{g}"] ||= []).concat(tasks)
           else
             items.concat(tasks)
           end
@@ -90,10 +91,10 @@ module Squared
             desc ws.task_name(t = ws.task_join(proj.name, key), desc: true)
             task ws.task_name(t) => tasks
           end
-          next unless (b = ws.find_base(proj)) && (name = b.ref.to_s) != g
+          next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 
-          id << name
-          (parent[:"#{key}:#{name}"] ||= []).push(*tasks)
+          id << n
+          (parent[:"#{key}:#{n}"] ||= []).concat(tasks)
         end
       end
 
@@ -170,7 +171,7 @@ module Squared
       private
 
       def already_invoked?(list, val)
-        return false unless val && !list.include?(val)
+        return false if val && !list.include?(val)
 
         ::Rake::Task.tasks.any? { |obj| obj.already_invoked && (val ? val == obj.name : list.include?(obj.name)) }
       end

data/lib/squared/workspace.rb

@@ -37,7 +37,7 @@ module Squared
       private
 
       def project(name)
-        __get__(:project)[name.to_sym]
+        __get__(:project)[name.to_s]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2024-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,7 +71,6 @@ files:
 - lib/squared/common/prompt.rb
 - lib/squared/common/shell.rb
 - lib/squared/common/system.rb
-- lib/squared/common/task.rb
 - lib/squared/common/utils.rb
 - lib/squared/config.rb
 - lib/squared/version.rb

data/lib/squared/common/task.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'rake'
-
-module Squared
-  module Common
-    module Task
-      module_function
-
-      def invoke(series, *args, exception: true, warning: true)
-        series = [series] unless series.is_a?(::Array)
-        series.each { |name| ::Rake::Task[name].invoke(*args) }
-      rescue StandardError => e
-        raise if exception
-
-        warn e if warning
-      end
-
-      def invoked?(*name)
-        val = name.size > 1 ? name.join(':') : name.first.to_s
-        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && obj.name == val }
-      end
-    end
-  end
-end