squared 0.0.11 → 0.0.12

data/lib/squared/workspace/application.rb

@@ -3,8 +3,8 @@
 module Squared
   module Workspace
     class Application
-      include Common
-      include Format
+      include Common::Format
+      include Utils
       include ::Rake::DSL
 
       SCRIPT_OBJ = {
@@ -20,9 +20,9 @@ module Squared
       class << self
         def implement(*objs)
           objs.each do |obj|
-            next unless obj < base_project
+            next unless obj < impl_project
 
-            impl_project.unshift(obj)
+            kind_project.unshift(obj)
             obj.tasks&.each { |task| impl_series.add(task, obj) }
             if (args = obj.batchargs)
               impl_series.batch(*args)
@@ -30,36 +30,38 @@ module Squared
             if (args = obj.aliasargs)
               impl_series.alias(*args)
             end
+            if (args = obj.bannerargs)
+              @attr_banner += args
+            end
           end
         end
 
         def find(ref = nil, path: nil)
-          if ref && (ret = impl_project.find { |proj| proj.ref == ref.to_sym })
+          if ref && (ret = kind_project.find { |proj| proj.ref == ref })
             ret
           elsif path
-            impl_project.find { |proj| proj.config?(path) }
+            kind_project.find { |proj| proj.config?(path) }
           end
         end
 
         def baseref
-          base_project.ref
+          impl_project.ref
         end
 
         def to_s
-          super.to_s.match(/[^:]+$/)[0]
+          super.match(/[^:]+$/)[0]
         end
 
-        attr_reader :impl_project, :attr_banner
-        attr_accessor :impl_series, :base_project
+        attr_reader :kind_project
+        attr_accessor :impl_series, :impl_project, :attr_banner
       end
 
-      @impl_project = []
-      @attr_banner = SymSet.new(%i[name project path ref group parent version])
+      @kind_project = []
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
-      def initialize(home = Dir.pwd, *, main: nil, prefix: nil, verbose: nil,
-                     common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
+      def initialize(home = Dir.pwd, *, main: nil, prefix: nil,
+                     verbose: ARG[:VERBOSE], common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
         @home = Pathname.new(home).realdirpath
         @root = @home.parent
         @main = (main || @home.basename).to_s.freeze
@@ -69,7 +71,7 @@ module Squared
         @extensions = []
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool(exception)
-        @verbose = verbose.nil? ? @pipe != 0 : verbose
+        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(::String) ? @pipe != 0 : verbose)
         @warning = @verbose != false
         @closed = false
         if common
@@ -100,9 +102,9 @@ module Squared
       end
 
       def build(parallel: [], **kwargs)
-        kwargs[:parallel] = parallel.map(&:to_s)
-        return if @closed || !enabled?
+        return self unless enabled? && !@closed
 
+        kwargs[:parallel] = parallel.map(&:to_s)
         @project.each_value do |proj|
           next unless proj.enabled?
 
@@ -110,7 +112,7 @@ module Squared
           series.populate(proj)
         end
 
-        Application.impl_project.each { |obj| obj.populate(self, **kwargs) }
+        Application.kind_project.each { |obj| obj.populate(self, **kwargs) }
         @extensions.each { |ext| __send__(ext, **kwargs) }
 
         series.build(**kwargs)
@@ -118,13 +120,14 @@ module Squared
 
         yield self if block_given?
         @closed = true
+        self
       end
 
       def with(*val, group: nil, **kwargs, &blk)
         @group = nil
         @ref = nil
         @withargs = kwargs.empty? ? nil : kwargs
-        val = [group || kwargs[:ref]].compact.flatten if val.empty?
+        val = as_a(group || kwargs[:ref], flat: true, compact: true) if val.empty?
         kind = val.first
         val = kind if val.size == 1
         case kind
@@ -152,6 +155,10 @@ module Squared
         script_command :depend, script, group, ref
       end
 
+      def graph(script, group: @group, ref: @ref)
+        script_command :graph, as_a(script, :to_s).freeze, group, ref
+      end
+
       def clean(script, group: @group, ref: @ref)
         script_command :clean, script, group, ref
       end
@@ -211,7 +218,7 @@ module Squared
         self
       end
 
-      def add(path, val = nil, **kwargs, &blk)
+      def add(path, project = nil, **kwargs, &blk)
         if @withargs
           data = @withargs.dup
           data.merge!(kwargs)
@@ -227,19 +234,19 @@ module Squared
           kwargs = kwargs.dup unless @withargs
           kwargs[:group] = @group
         end
-        path = root_path(path)
-        val = (val || path.basename).to_s
-        name = val.to_sym
+        path = rootpath(path)
+        project = (project || path.basename).to_s
+        name = task_name(project)
         index = 0
         while @project[name]
           index += 1
-          name = :"#{val}-#{index}"
+          name = "#{project}-#{index}"
         end
         proj = ((if !ref.is_a?(::Class)
                    Application.find(ref, path: path)
                  elsif ref < Project::Base
                    ref
-                 end) || Project::Base).new(self, path, task_name(name), **kwargs)
+                 end) || Project::Base).new(self, path, name, **kwargs)
         @project[name] = proj
         __get__(:project)[name] = proj unless kwargs[:private]
         proj.instance_eval(&blk) if block_given?
@@ -247,11 +254,11 @@ module Squared
       end
 
       def group(path, val, override: {}, **kwargs, &blk)
-        root_path(path).children.map do |dir|
+        rootpath(path).children.map do |dir|
           next unless dir.directory?
 
-          basename = dir.basename.to_s.to_sym
-          [dir, basename, override[basename]]
+          basename = dir.basename.to_s
+          [dir, basename, override[basename.to_sym]]
         end
         .each do |dir, basename, opts|
           args = kwargs.dup
@@ -271,7 +278,7 @@ module Squared
         self
       end
 
-      def style(name, *args, target: nil, empty: false)
+      def style(obj, *args, target: nil, empty: false)
         data = nil
         if target
           as_a(target).each_with_index do |key, i|
@@ -282,13 +289,14 @@ module Squared
             end
           end
         end
-        apply_style(data || theme, name, args, empty: empty) unless target && !data
+        apply_style(data || theme, obj, args, empty: empty) unless target && !data
         self
       end
 
       def find(path = nil, name: nil)
-        path = root_path(path) if path
-        ret = @project.find { |_, item| (path && item.path == path) || (name && item.name == name.to_s) }&.last
+        path &&= rootpath(path)
+        name &&= name.to_s
+        ret = @project.find { |_, item| (path && item.path == path) || (name && item.name == name) }&.last
         return ret unless block_given?
 
         yield ret if ret
@@ -296,7 +304,7 @@ module Squared
       end
 
       def find_base(obj)
-        Application.impl_project.find { |proj| obj.instance_of?(proj) }
+        Application.kind_project.find { |proj| obj.instance_of?(proj) }
       end
 
       def task_name(val, desc: false)
@@ -310,10 +318,6 @@ module Squared
         first ? ret.first : task_join(*ret[0..-2])
       end
 
-      def task_join(*val)
-        val.join(':')
-      end
-
       def task_resolve(obj, key)
         tasks = []
         if (base = task_base?(key))
@@ -355,14 +359,6 @@ module Squared
         ret
       end
 
-      def root_path(*args)
-        root.join(*args)
-      end
-
-      def home_path(*args)
-        home.join(*args)
-      end
-
       def script_find(*args)
         args.reverse_each do |val|
           next unless val && (ret = val.is_a?(::Symbol) ? @script[:ref!][val] : @script[:group!][val.to_sym])
@@ -428,6 +424,14 @@ module Squared
         !(proj = find(home)).nil? && proj.enabled?
       end
 
+      def rootpath(*args)
+        root.join(*args)
+      end
+
+      def homepath(*args)
+        home.join(*args)
+      end
+
       def baseref
         Application.baseref
       end
@@ -436,6 +440,8 @@ module Squared
         { exception: exception, warning: warning }
       end
 
+      public :task_join
+
       private
 
       def __build__(default: nil, **)