squared 0.1.3 → 0.2.0

data/lib/squared/workspace/repo.rb

@@ -13,20 +13,6 @@ module Squared
           doc = REXML::Document.new(file.read)
           doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
         end
-
-        def empty?(dir)
-          return false unless dir.exist?
-
-          case dir.children.size
-          when 0
-            true
-          when 1
-            file = dir.children.first
-            file.to_s == __FILE__ || (file.directory? && file.basename.to_s == '.repo')
-          else
-            false
-          end
-        end
       end
 
       attr_reader :manifest_url, :manifest
@@ -126,38 +112,41 @@ module Squared
       def __repo__(**kwargs)
         kwargs.delete(:parallel) if env('REPO_SYNC', ignore: '0')
 
-        branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
-        target = branch || manifest
-        stage = nil
-        failfast = true
-        cmd = []
-        newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
-        parse_opts = lambda do |args|
-          args.to_a.each do |val|
-            case val
-            when 'no-fail'
-              failfast = false
-            when 'force'
-              cmd << '--force-checkout'
-            when 'rebase'
-              cmd << '--rebase'
-            when 'detach'
-              cmd << '--detach'
-            when 'gc'
-              cmd << '--auto-gc'
-            when 'no-update'
-              cmd << '--no-manifest-update'
+        namespace(name = task_name('repo')) do |repo|
+          branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
+          target = branch || manifest
+          stage = nil
+          failfast = true
+          cmd = []
+          newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
+          parse_opts = lambda do |args|
+            args.to_a.each do |val|
+              case val
+              when 'no-fail'
+                failfast = false
+              when 'force'
+                cmd << '--force-checkout'
+              when 'rebase'
+                cmd << '--rebase'
+              when 'detach'
+                cmd << '--detach'
+              when 'gc'
+                cmd << '--auto-gc'
+              when 'no-update'
+                cmd << '--no-manifest-update'
+              end
+            end
+          end
+          desc = lambda do |val, alt = nil|
+            if (ver = branch || alt)
+              val = val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail')
+              task_desc(task_name('repo'), val, ver)
+            else
+              task_desc 'inactive'
             end
           end
-        end
-        status = lambda do |val, alt = nil|
-          return 'inactive' unless (ver = branch || alt)
-
-          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|
-          desc status.('all[{0}]')
+          desc.('all[{0}]')
           task 'all', [:opts] do |_, args|
             parse_opts.(args)
             stage ||= 'all'
@@ -172,7 +161,7 @@ module Squared
               proj.build(sync: true)
               next unless proj.dev? && proj.copy?
 
-              if (ws = proj.workspace).task_defined?(target = ws.task_name(task_join(proj.name, 'copy')))
+              if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
               else
                 proj.copy
@@ -180,7 +169,7 @@ module Squared
             end
           end
 
-          desc status.("init[manifest?=#{target},{0}]", target)
+          desc.("init[manifest?=#{target},{0}]", target)
           task 'init', [:manifest, :opts] do |_, args|
             parse_opts.(args)
             stage = 'init'
@@ -189,7 +178,7 @@ module Squared
             repo['all'].invoke
           end
 
-          desc status.('sync[{0}]')
+          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)

data/lib/squared/workspace/series.rb

@@ -50,7 +50,7 @@ module Squared
         def base_set(obj)
           TASK_BASE.clear
                    .concat((if TASK_KEYS.empty?
-                              obj.tasks.dup
+                              obj.tasks
                             else
                               obj.tasks.reject { |val| TASK_KEYS.include?(val) }
                             end).freeze)
@@ -69,6 +69,7 @@ module Squared
       attr_reader :sync, :multiple, :parallel
 
       def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
+      def_delegators :@workspace, :task_desc, :task_name, :task_namespace, :task_join, :format_desc
 
       def initialize(workspace)
         @workspace = workspace
@@ -97,8 +98,7 @@ module Squared
             items.concat(tasks)
           end
           if tasks.size > 1 && (data = batch_get(key)) && data.keys.any? { |ref| proj.ref?(ref) }
-            t = ws.task_join(proj.name, key)
-            desc Common::Format.message(*t.split(':'))
+            ws.task_desc(t = ws.task_join(proj.name, key))
             task t => tasks
           end
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
@@ -109,30 +109,30 @@ module Squared
       end
 
       def build(parallel: [], pattern: [], **)
-        subcheck = ->(val) { (ns = @workspace.task_namespace(val)) && parallel.include?(ns) }
+        subcheck = ->(val) { (ns = task_namespace(val)) && parallel.include?(ns) }
         @data.merge!(@session[:parent]) if @session[:id].uniq.size > 1
         @data.merge!(@session[:group])
         @data.each do |key, items|
           next if items.empty?
 
-          key = @workspace.task_name(t = name_get(key))
-          val = @workspace.task_name(t, desc: true)
+          key = task_name(t = name_get(key))
+          val = format_desc(key, out: true)
           if items.size > 1
             @multiple << key
-            if parallel.include?(t) || pattern.any? { |pat| pat.match?(t) } || subcheck.(t)
-              desc "#{val} (thread)"
+            if parallel.include?(t) || pattern.any? { |pat| t =~ pat } || subcheck.(t)
+              task_desc("#{val} (thread)", name: key)
               multitask key => items
               @parallel << key
 
-              s = @workspace.task_join(key, 'sync')
-              desc "#{val} (sync)"
+              s = task_join(key, 'sync')
+              task_desc("#{val} (sync)", name: s)
               task s => items
               @sync << s
               next
             end
           end
 
-          desc val
+          task_desc(val, name: key)
           task key => items
         end
         @multiple += sync
@@ -196,9 +196,11 @@ module Squared
       private
 
       def already_invoked?(list, val)
-        return false if val && !list.include?(val)
-
-        Rake::Task.tasks.any? { |obj| obj.already_invoked && (val ? val == obj.name : list.include?(obj.name)) }
+        if val
+          list.include?(val) && Rake::Task[val].already_invoked
+        else
+          Rake::Task.tasks.any? { |obj| obj.already_invoked && list.include?(obj.name) }
+        end
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake