squared 0.0.7 → 0.0.9

data/lib/squared/workspace/repo.rb

@@ -7,8 +7,6 @@ module Squared
       include Format
       include System
 
-      attr_accessor :warning
-
       def repo(url, manifest = 'latest', run: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   home = Pathname.new(val)
@@ -34,11 +32,18 @@ module Squared
                   end
                   @root.join(main).realdirpath
                 else
-                  install?(pwd = Pathname.pwd) ? pwd.join(main) : pwd
+                  install?(pwd = @home) ? pwd.join(main) : pwd
                 end
         @root = @home.parent
         @manifest_url = url
         @manifest = manifest
+        set_ref = lambda do
+          if group
+            @script[:group][:_] = group.to_s
+          elsif ref
+            @script[:ref][:_] = ref.to_sym
+          end
+        end
         if repo?
           @script[:build] = case (val = env('REPO_BUILD'))
                             when 'verbose'
@@ -53,8 +58,15 @@ module Squared
                             end
           @script[:dev] = bool_match(env('REPO_DEV'), dev)
           @script[:prod] = bool_match(env('REPO_PROD'), prod)
-          @script[:ref][:_] = env('REPO_REF', ref)
-          @script[:group][:_] = env('REPO_GROUP', group)
+          if (val = env('REPO_GROUP'))
+            @script[:group][:_] = val.to_s
+            @script[:env] = true
+          elsif (val = env('REPO_REF'))
+            @script[:ref][:_] = val.to_sym
+            @script[:env] = true
+          else
+            set_ref
+          end
           @warning = case env('REPO_WARN')
                      when '0'
                        false
@@ -68,22 +80,11 @@ module Squared
           @script[:build] = run
           @script[:dev] = dev
           @script[:prod] = prod
-          @script[:ref][:_] = ref
-          @script[:group][:_] = group
+          set_ref
         end
         self
       end
 
-      protected
-
-      def repo?
-        !@manifest_url.nil? && (install? || !!@override)
-      end
-
-      def empty?(dir)
-        dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
-      end
-
       private
 
       def __repo__(**kwargs)
@@ -115,17 +116,21 @@ module Squared
         end
         status = lambda do |val, alt = nil|
           ver = branch || alt
-          ver ? message('repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver) : 'inactive'
+          if ver
+            message(@prefix || '', 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
+          else
+            'inactive'
+          end
         end
 
-        namespace 'repo' do |repo|
+        namespace task_name('repo') do |repo|
           desc status.('all[{0}]')
           task 'all', [:opts] do |_, args|
             parse_opts.(args)
             stage ||= 'all'
             repo['sync'].invoke
             @project.select do |_, proj|
-              next unless proj.enabled?
+              next false unless proj.enabled? && proj.ref?(Project::Base.ref)
 
               proj.depend if proj.depend?
               proj.build?
@@ -144,8 +149,9 @@ module Squared
 
           desc status.('sync[{0}]')
           task 'sync', [:opts] do |_, args|
-            raise_error('repo is not initialized', 'rake repo:init', kind: LoadError) unless branch || stage == 'init'
-
+            unless branch || stage == 'init'
+              raise_error('repo is not initialized', "rake #{task_name('repo:init')}", kind: LoadError)
+            end
             parse_opts.(args)
             cmd << "-j#{ENV.fetch('REPO_JOBS', ::Rake::CpuCounter.count)}"
             cmd << '--fail-fast' if failfast
@@ -153,7 +159,7 @@ module Squared
             begin
               shell("repo sync #{cmd.join(' ')}", chdir: root, exception: failfast)
             rescue StandardError => e
-              emphasize(e, title: "rake stash repo:#{stage || 'sync'}")
+              emphasize(e, title: "rake stash #{task_name("repo:#{stage || 'sync'}")}")
               raise
             end
           end
@@ -192,6 +198,14 @@ module Squared
         end
       end
 
+      def repo?
+        !@manifest_url.nil? && (install? || !!@override)
+      end
+
+      def empty?(dir)
+        dir.empty? || (dir.children.size == 1 && dir.join(dir.children.first).to_s == __FILE__)
+      end
+
       def install?(dir = root)
         return true if empty?(dir) || dir.join('.repo').directory?
         return false unless dir == root && env('REPO_HOME').nil? && !env('REPO_ROOT').nil?

data/lib/squared/workspace/series.rb

@@ -8,18 +8,31 @@ module Squared
       include ::Rake::DSL
       extend Forwardable
 
+      TASK_BASE = %i[build refresh depend outdated doc test copy clean].freeze
+      TASK_ALIAS = {
+        refresh: :build
+      }
+      TASK_KEYS = TASK_BASE.dup
+      TASK_EXTEND = {}
+      private_constant :TASK_BASE, :TASK_ALIAS, :TASK_KEYS, :TASK_EXTEND
+
+      class << self
+        def add(task, obj)
+          TASK_KEYS << task unless TASK_KEYS.include?(task)
+          (TASK_EXTEND[task] ||= []).push(obj)
+        end
+
+        def alias(key, task)
+          TASK_ALIAS[key.to_sym] = task.to_sym
+        end
+      end
+
       attr_reader :sync, :multiple, :parallel
 
       def_delegators :@data, :[], :each, :each_key, :keys, :fetch, :to_a, :to_s, :inspect, :merge!, :key?
 
-      def initialize(tasks, keys: Workspace::Application::WORKSPACE_KEYS)
-        if tasks.is_a?(Array)
-          @data = {}
-          tasks.each { |key| __set__ key }
-        else
-          @data = tasks.dup
-        end
-        @keys = keys
+      def initialize(workspace)
+        @workspace = workspace
         @sync = []
         @multiple = []
         @parallel = []
@@ -28,75 +41,84 @@ module Squared
           parent: {},
           id: []
         }
+        @data = {}
+        TASK_KEYS.each { |key| @data[key] = [] }
       end
 
       def __set__(key)
         self[key.to_sym] ||= []
       end
 
-      def populate(proj)
+      def __populate__(proj)
         return unless @session
 
         group, parent, id = @session.values
-        workspace = proj.workspace
+        ws = proj.workspace
         each do |key, items|
-          target = "#{proj.name}:#{key}"
-          if @keys.include?(key)
-            next unless proj.has?(key) || (target = workspace.task_base?(key, target))
-          else
-            next unless workspace.task_include?(proj, key)
+          task = "#{proj.name}:#{key}"
+          unless include?(key) ? proj.has?(key) || ws.task_defined?(key) : ws.task_extend?(proj, key)
+            alt = TASK_ALIAS[key]
+            next unless alt && (task = "#{proj.name}:#{alt}") && self[alt].include?(task)
           end
-          next unless workspace.task_defined?(target)
+          next unless ws.task_defined?(task)
 
           if (g = proj.group)
             id << g
-            (group[:"#{key}:#{g}"] ||= []).push(target)
+            (group[:"#{key}:#{g}"] ||= []).push(task)
           else
-            items << target
+            items << task
           end
-          next unless (b = find_base(proj)) && (name = b.ref.to_s) != g
+          next unless (b = ws.find_base(proj)) && (name = b.ref.to_s) != g
 
           id << name
-          (parent[:"#{key}:#{name}"] ||= []).push(target)
+          (parent[:"#{key}:#{name}"] ||= []).push(task)
         end
       end
 
-      def build(**kwargs)
-        thread = kwargs.fetch(:parallel, []).map(&:to_s)
+      def __build__(parallel: [], **)
         group, parent, id = @session.values
         merge!(parent) if id.uniq.size > 1
         merge!(group)
         each do |key, items|
           next if items.empty?
 
-          key = key.to_s
+          key = @workspace.task_name(name = key.to_s)
+          val = @workspace.task_name(name, desc: true)
           if items.size > 1
-            multiple << key
-            if thread.include?(key) || (key.include?(':') && thread.include?(key.split(':').first.to_sym))
-              desc "#{key} (thread)"
+            @multiple << key
+            if parallel.include?(name) || ((ns = @workspace.task_namespace(name)) && parallel.include?(ns))
+              desc "#{val} (thread)"
               multitask key => items
-              parallel << key
+              @parallel << key
 
-              desc "#{key} (sync)"
-              task "#{key}:sync": items
-              sync << "#{key}:sync"
-              multiple << "#{key}:sync"
+              desc "#{val} (sync)"
+              task "#{key}:sync" => items
+              @sync << "#{key}:sync"
               next
             end
           end
 
-          desc key
+          desc val
           task key => items
         end
+        TASK_ALIAS.each_key do |key|
+          suf = ":#{key}"
+          self[key].clear unless self[key].any? { |val| val.end_with?(suf) }
+        end
+        @multiple += sync
         @session = nil
       end
 
-      def method_missing(key, *)
-        self[key]
+      def some?(key)
+        !key.nil? && key?(key = key.to_sym) && !self[key].empty?
       end
 
-      def has?(key)
-        !key.nil? && key?(key = key.to_sym) && !self[key].empty?
+      def include?(key)
+        TASK_BASE.include?(key)
+      end
+
+      def extend?(obj, key)
+        TASK_EXTEND.fetch(key, []).any? { |kind| obj.is_a?(kind) && obj.ref?(kind.ref) }
       end
 
       def multiple?(val = nil)
@@ -111,12 +133,14 @@ module Squared
         already_invoked?(parallel, val)
       end
 
-      def respond_to_missing?(key, *)
-        key?(key)
-      end
-
       private
 
+      def method_missing(key, *)
+        raise NoMethodError, key unless key?(key)
+
+        self[key]
+      end
+
       def already_invoked?(list, val)
         return list.include?(val) && Common::Task.invoked?(val) if val
 

data/lib/squared/workspace.rb

@@ -12,7 +12,7 @@ module Squared
           if id.is_a?(::Symbol)
             project id
           else
-            (id = Pathname.new(id).realdirpath.to_s) rescue nil if id.is_a?(::String)
+            id = dirpath(id) if id.is_a?(::String)
             __get__(:project).find { |_, val| val.path.to_s == id.to_s }
           end
         end
@@ -26,6 +26,12 @@ module Squared
         raise NoMethodError, message('project is not initialized', hint: name)
       end
 
+      def dirpath(val, absolute: true)
+        Pathname.new(val).realdirpath
+      rescue StandardError
+        absolute ? Pathname.pwd.join(val) : Pathname.new(val)
+      end
+
       def project?(name)
         !!project(name)&.enabled?
       end
@@ -39,6 +45,6 @@ module Squared
   end
 end
 
-require_relative 'workspace/application'
 require_relative 'workspace/series'
+require_relative 'workspace/application'
 require_relative 'workspace/project'

data/squared.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rake"
   spec.add_dependency "logger"
+  spec.add_dependency "rexml"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2024-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake task generator for managing multi-language workspaces.
 email:
 - anpham6@gmail.com