squared 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b563863fb21461ec7c629dc01a197485c15c8a26239db170a91970a6cade9a
-  data.tar.gz: f7051ae9101dbced194185f5731c6bd028ccd3e56dfbbab047a7370c220412de
+  metadata.gz: d9b753ae5817f7ddd43ccf1152dde2bd4bc8d37ed2eae1d39d7c118e84c20947
+  data.tar.gz: 910b375d08c1fda296862a22e612832eb0ebbbea505a6d860f2db9e48ff9a2ee
 SHA512:
-  metadata.gz: 74adde082a170b07b65ccc258b94681826c9fdbda9120a39128f9236d4215c904a7dac32451428e92cdfbabd354e6dce810447df03660169b34783d02a808978
-  data.tar.gz: c50ee1d27e5be607e84fd82bd4d15e4d3ec8e4d12acd4619ef1421d2206e313205e8aaf849965e6140d6e5873848001d2c55d00f0335f8274ef6c95213ec7990
+  metadata.gz: 3595a660add974bb7bf69df55aaca30d7fb8bfb47ae21cdfd0b5d978ce36f35acb97e15f746d97204afa1a800c639a028e3835a9431addf63e6eb6402df6f87c
+  data.tar.gz: cda2b5a2aa217354d8f06d307c3136ae25d77358b0a478195c7ad945701f08f1e16450340819bd1a41e958a1a31f5e4b13ce167dee4a0d40630f4a3e9a61ada7

data/README.ruby.md

@@ -36,10 +36,11 @@ require "squared/workspace/repo" # Repo (optional)
 
 # REPO_ROOT = /workspaces
 # REPO_HOME = /workspaces/squared
+# NODE_ENV  = production
 # rake      = /workspaces/squared/Rakefile
 
 Workspace::Application
-  .new("squared") # REPO_HOME
+  .new(main: "squared") # Dir.pwd? (main? is implicitly basename)
   .repo("https://github.com/anpham6/squared-repo", "nightly", run: "build", ref: :node) # Repo (optional)
   .run("rake install", ref: :ruby)
   .depend(false, group: "default")
@@ -48,11 +49,11 @@ Workspace::Application
   .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", ref: :ruby) # Ruby (with C extensions)
   .add("optparse", doc: "rake rdoc", group: "default") # Uses bundler/gem_tasks (without C extensions)
   .add("logger", copy: { from: "lib", glob: "**/*.rb", gemdir: "~/.rvm/gems/ruby-3.3.5/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true
-  .add("android", "android-docs", run: false, doc: "make html", ref: :python) # Python
   .add("emc", "e-mc", copy: { from: "publish", into: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pir", "pi-r", copy: { from: "publish", into: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("squared", log: { file: "tmp/%Y-%m-%d.log", level: "debug" }, group: "app") # Copy target (main)
-  .style(:banner, 255.255) # 256 colors (fg | fg.bg | -0.bg)
+  .add("sqd", "squared/sqd", script: ["build:sqd", "prod:sqd"], depend: false, clean: ["build/sqd/"], exclude: :git) # NPM workspaces
+  .style("banner", 255.255) # 256 colors (fg | fg.bg | -0.bg)
   .build(default: "status", parallel: ["pull", "fetch", "rebase", "copy", "clean"]) do |workspace|
     workspace
       .enable_aixterm
@@ -64,21 +65,32 @@ Workspace::Application
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
 # log       = /workspaces/logger
-# android   = /workspaces/android-docs
 # emc       = /workspaces/e-mc
 # pir       = /workspaces/pi-r
 # squared   = /workspaces/squared
 
 Workspace::Application
-  .new("squared")
-  .group("default", "ruby", run: "rake build", copy: "rake install", clean: "rake clean", override: {
-    pathname: { run: "rake compile" }
+  .new(ENV["SQUARED_DIR"], prefix: "rb", common: false) # Has empty styles
+  .group("default", "ruby", run: "rake build", copy: "rake install", clean: "rake clean", ref: :ruby, override: {
+    pathname: {
+      run: "rake compile"         # rake rb:pathname:build
+    }
   })
+  .with(ref: :python) do            # Python
+    doc("make html")                # rake rb:doc | rb:doc:python
+    run(false)                      # rake rb:build (disabled)
+    exclude(%i[base git])           # superclass
+    add("android", "android-docs")  # rake rb:android:doc
+    add("chrome", "chrome-docs")    # rake rb:chrome:doc
+  end
+  .style("inline", "bold")
   .build
 # default   = /workspaces/ruby/*
 # pathname  = /workspaces/ruby/pathname
 # optparse  = /workspaces/ruby/optparse
 # logger    = /workspaces/ruby/logger
+# android   = /workspaces/android-docs
+# chrome    = /workspaces/chrome-docs
 ```
 
 **NOTE**: The use of "**ref**" (class name) is only necessary when running `repo:init` for the first time into an empty directory.
@@ -124,6 +136,7 @@ rake clean:node     # none + ["publish/**/*.js", "tmp/"] + ["build/"]
 * header
 * active
 * inline
+* major
 
 ## LICENSE
 

data/lib/squared/common/base.rb

@@ -26,7 +26,8 @@ module Squared
         workspace: {
           header: %i[bold],
           active: %i[bold],
-          inline: %i[bold]
+          inline: %i[bold],
+          major: %i[bold]
         },
         project: {},
         viewer: {
@@ -82,16 +83,15 @@ module Squared
       args.reject(&:empty?).join(' => ') + (hint ? " (#{hint})" : '')
     end
 
-    def as_a(obj, flat: nil)
-      if obj.nil?
-        []
-      elsif !obj.is_a?(::Array)
-        [obj]
+    def as_a(obj, meth = nil, flat: nil)
+      return [] if obj.nil?
+
+      if !obj.is_a?(::Array)
+        obj = [obj]
       elsif flat
-        obj.flatten(flat == true ? nil : flat)
-      else
-        obj
+        obj = obj.flatten(flat == true ? nil : flat)
       end
+      meth ? obj.map(&meth) : obj
     end
   end
 end

data/lib/squared/common/format.rb

@@ -201,7 +201,7 @@ module Squared
           "| #{s} |"
         end
         out << bord
-        out.push(pr.(title), bord) if title
+        out << pr.(title) << bord if title
         lines.each { |line| out << pr.(line) }
         out << bord
         if block_given?

data/lib/squared/common/task.rb

@@ -7,12 +7,12 @@ module Squared
     module Task
       module_function
 
-      def invoke(name, *args, exception: true)
+      def invoke(name, *args, exception: true, warning: true)
         ::Rake::Task[name].invoke(*args)
       rescue StandardError => e
         raise if exception
 
-        warn e
+        warn e if warning
       end
 
       def invoked?(name)

data/lib/squared/config.rb

@@ -17,14 +17,15 @@ module Squared
         end
       end
 
-      attr_reader :name, :main, :project, :theme
+      attr_reader :main, :name, :project, :theme
 
-      def initialize(main, name = nil, project: nil, dump: nil, opts: {}, auto: true, common: true)
+      def initialize(main, name = nil, project: nil, prefix: nil, dump: nil, opts: {}, auto: true, common: true)
         if project
           main = @project.base_path(main).to_s if (@project = __get__(:project)[project.to_sym])
           @required = true
         end
         @name = name&.to_s || @project&.name
+        @prefix = prefix
         @ext = File.extname(main)
         @dump = dump
         @mime = {}
@@ -59,18 +60,19 @@ module Squared
 
         params = ->(args) { exist? ? [realpath, [args.keys] + args.extras] : [args.keys, args.extras] }
 
-        namespace name do
+        ns = @prefix ? "#{@prefix}:#{name}" : name
+        namespace ns do
           view = @command && @command != name ? @command : 'view'
           namespace view do
-            if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{name}:#{view}:json"))
-              desc format_desc(view, %w[json])
+            if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:json"))
+              desc format_desc(view, 'json')
               task 'json', [:keys] do |_, args|
                 read_keys(JSON, 'json', *params.(args))
               end
             end
 
-            if @mime['yaml'] && (exist? || !::Rake::Task.task_defined?("#{name}:#{view}:yaml"))
-              desc format_desc(view, %w[yaml yml])
+            if @mime['yaml'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:yaml"))
+              desc format_desc(view, 'yaml', 'yml')
               task 'yaml', [:keys] do |_, args|
                 require 'yaml'
                 read_keys(YAML, 'yaml', *params.(args), ext: %w[yml yaml])
@@ -91,8 +93,9 @@ module Squared
           obj = eval(parse)
           ext << type if (ext = as_a(ext)).empty?
           file = realpath if file.nil? && exist?
-          namespace name do
-            desc format_desc(command, ext, exist: exist)
+
+          namespace(@prefix ? "#{@prefix}:#{name}" : name) do
+            desc format_desc(command, *ext, exist: exist)
             namespace command do
               task type, [:keys] do |_, args|
                 if file
@@ -158,7 +161,7 @@ module Squared
         !@required || (!project.nil? && project.enabled?)
       end
 
-      protected
+      private
 
       def read_keys(reader, type, file, keys, ext: [type])
         if (mime = mime_type(file)) && base_path(file).exist?
@@ -224,7 +227,7 @@ module Squared
               end
             end
           rescue StandardError
-            project&.log&.warn "#{Viewer}(#{type}) => #{file ? "#{file} " : ''}{#{key}: undefined}"
+            project&.log&.warn "#{Viewer}(#{type}) => #{file && "#{file} "}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"
@@ -262,8 +265,9 @@ module Squared
         end
       end
 
-      def format_desc(command, ext, exist: exist?)
-        message(name, command, "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys*]")
+      def format_desc(command, *ext, exist: exist?)
+        message(@prefix || '', *name.split(':'), command,
+                "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys*]")
       end
 
       def realpath
@@ -283,7 +287,7 @@ module Squared
       end
 
       def warning?
-        project && defined?(project.warning) == 'method' ? project.warning : true
+        project ? project.workspace.warning : true
       end
     end
   end

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/squared/workspace/application.rb

@@ -7,58 +7,45 @@ module Squared
       include Format
       include ::Rake::DSL
 
-      TASK_BASE = {
-        build: [],
-        refresh: [],
-        depend: [],
-        outdated: [],
-        doc: [],
-        test: [],
-        copy: [],
-        clean: []
-      }
-      TASK_EXTEND = {}
-      WORKSPACE_KEYS = TASK_BASE.keys.freeze
-      private_constant :TASK_BASE, :TASK_EXTEND
-
       class << self
         def implement(*objs)
           objs.each do |obj|
-            next unless obj < Project::Base
-
-            project_kind.unshift(obj)
-            obj.tasks&.each do |val|
-              TASK_BASE[val] ||= []
-              (TASK_EXTEND[val] ||= []).push(obj)
+            if obj < Project::Base
+              @impl_project.unshift(obj)
+              obj.tasks&.each { |task| @impl_series.add(task, obj) }
+            elsif obj < Workspace::Series
+              @impl_series = obj
             end
           end
         end
 
-        def find(path: nil, ref: nil)
-          if ref.is_a?(::Symbol) || ref.is_a?(::String)
-            ret = project_kind.find { |proj| proj.ref == ref.to_sym }
-            return ret if ret
+        def find(ref = nil, path: nil)
+          if ref && (ret = impl_project.find { |proj| proj.ref == ref.to_sym })
+            ret
+          elsif path
+            impl_project.find { |proj| proj.is_a?(path) }
           end
-          project_kind.find { |proj| proj.is_a?(path) } if path
         end
 
         def to_s
           super.to_s.match(/[^:]+$/)[0]
         end
 
-        attr_reader :project_kind
+        attr_reader :impl_project, :impl_series
       end
 
-      @project_kind = []
+      @impl_project = []
+      @impl_series = Workspace::Series
 
-      attr_reader :main, :root, :home, :series, :theme
+      attr_reader :root, :home, :main, :prefix, :series, :theme
       attr_accessor :exception, :warning, :pipe, :verbose
 
-      def initialize(main, *, exception: false, pipe: false, verbose: nil, **kwargs)
-        @main = main.to_s
-        @home = Pathname.pwd
+      def initialize(home = Dir.pwd, *, main: nil, prefix: nil, exception: false, pipe: false, verbose: nil, **kwargs)
+        @home = (home = Pathname.new(home)).realdirpath
+        @main = (main || home.basename).to_s
         @root = @home.parent
-        @series = Series.new(TASK_BASE)
+        @prefix = prefix
+        @series = Application.impl_series.new(prefix)
         @project = {}
         @extensions = []
         @script = {
@@ -66,42 +53,56 @@ module Squared
           ref: {},
           build: nil,
           dev: nil,
-          prod: nil
+          prod: nil,
+          env: false
         }
-        @theme = kwargs.key?(:common) && !kwargs[:common] ? {} : __get__(:theme)[:workspace]
         @exception = exception.is_a?(String) ? !env(exception, ignore: '0').nil? : exception
         @pipe = pipe.is_a?(String) ? !env(pipe, ignore: '0').nil? : pipe
         @verbose = verbose.nil? ? !@pipe : verbose
         @warning = @verbose
-        __set__(:no_color, true) if @pipe
+        if kwargs.fetch(:common, true)
+          @theme = __get__(:theme)[:workspace]
+          __set__(:no_color, true) if @pipe
+        else
+          @theme = {}
+        end
       end
 
       def build(**kwargs)
+        kwargs[:parallel] = kwargs.fetch(:parallel, []).map(&:to_s)
         return unless enabled?
 
         @project.each_value do |proj|
           next unless proj.enabled?
 
           proj.populate(**kwargs)
-          series.populate(proj)
+          series.__populate__(proj)
         end
 
-        Application.project_kind.each { |obj| obj.populate(self, **kwargs) }
+        Application.impl_project.each { |obj| obj.populate(self, **kwargs) }
         @extensions.each { |ext| __send__(ext, **kwargs) }
 
+        series.__build__(**kwargs)
         __build__(**kwargs)
-        series.build(**kwargs)
 
         yield self if block_given?
       end
 
-      def with(group: nil, ref: nil)
+      def with(group: nil, ref: nil, &blk)
         @group = nil
         @ref = nil
         if group
           @group = group
+          if block_given?
+            instance_eval(&blk)
+            @group = nil
+          end
         elsif ref
           @ref = ref
+          if block_given?
+            instance_eval(&blk)
+            @ref = nil
+          end
         end
         self
       end
@@ -126,6 +127,10 @@ module Squared
         script_command :test, script, group, ref
       end
 
+      def exclude(base, group: @group, ref: @ref)
+        script_command :exclude, as_a(base, :to_sym).freeze, group, ref
+      end
+
       def add(name, path = nil, **kwargs)
         ref = if kwargs.key?(:ref)
                 kwargs.delete(:ref)
@@ -135,10 +140,10 @@ module Squared
         kwargs[:group] = @group if !kwargs.key?(:group) && !@group.is_a?(::Array)
         path = root_path(path || name.to_s)
         proj = ((if !ref.is_a?(::Class)
-                   Application.find(path: path, ref: ref)
+                   Application.find(ref, path: path)
                  elsif ref < Project::Base
                    ref
-                 end) || Project::Base).new(name, path, self, **kwargs)
+                 end) || Project::Base).new(prefix ? "#{prefix}:#{name}" : name, path, self, **kwargs)
         @project[name = name.to_sym] = proj
         __get__(:project)[name] = proj unless kwargs[:private]
         self
@@ -177,31 +182,35 @@ module Squared
       def style(name, *args, target: nil, empty: false)
         data = nil
         if target
-          as_a(target).each_with_index do |val, i|
+          as_a(target).each_with_index do |key, i|
             if i == 0
-              break unless (data = __get__(:theme)[val.to_sym])
+              break unless (data = __get__(:theme)[key.to_sym])
             else
-              data = data[val.to_sym] ||= {}
+              data = data[key.to_sym] ||= {}
             end
           end
-          return unless data
         end
-        apply_style(data || theme, name, *args, empty: empty)
+        apply_style(data || theme, name, *args, empty: empty) unless target && !data
         self
       end
 
-      def script(group: nil, ref: nil)
+      def script(*args, group: nil, ref: nil)
         if group
           @script[:group][group.to_sym]
         elsif ref
           @script[:ref][ref.to_sym]
+        elsif (val = @script[:build])
+          r = @script[:ref][:_]
+          g = @script[:group][:_]
+          args.empty? || (!r && !g) || (r && args.include?(r)) || (g && args.include?(g)) ? [val, @script[:env]] : []
         else
-          @script[:build]
+          []
         end
       end
 
       def env(key, default = nil, equals: nil, ignore: nil)
-        ret = ENV.fetch("#{key}_#{main.gsub(/[^\w]+/, '_').upcase}", ENV[key]).to_s
+        @env ||= main.gsub(/[^\w]+/, '_').upcase
+        ret = ENV.fetch("#{key}_#{@env}", ENV[key]).to_s
         return ret == equals.to_s unless equals.nil?
 
         ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
@@ -216,7 +225,7 @@ module Squared
       end
 
       def find_base(obj)
-        Application.project_kind.find { |proj| obj.instance_of?(proj) }
+        Application.impl_project.find { |proj| obj.instance_of?(proj) }
       end
 
       def to_s
@@ -234,14 +243,14 @@ module Squared
       def task_base?(key, val)
         return val if task_defined?(key)
 
-        val if key == :refresh && series[:build].include?(val = "#{val.split(':').first}:build")
+        val if key == :refresh && series.build.include?(val = "#{val.split(':').first}:build")
       end
 
-      def task_include?(obj, key)
-        TASK_EXTEND.fetch(key, []).any? { |item| obj.is_a?(item) }
+      def task_extend?(obj, key)
+        series.extend?(obj, key)
       end
 
-      def task_defined?(key)
+      def task_defined?(key, *)
         ::Rake::Task.task_defined?(key)
       end
 
@@ -258,45 +267,48 @@ module Squared
       private
 
       def __build__(**kwargs)
-        if !task_defined?('default') && (default = kwargs[:default]) && !series.has?(default)
-          task default: default
+        if !task_defined?('default') && (default = kwargs[:default]) && series.has?(default)
+          task 'default' => default
         end
-        return unless series.has?('build')
+        return unless series.has?(:build)
 
-        if (refresh = series[:refresh]).all? { |val| val.end_with?(':build') }
-          refresh.clear
-        end
-        init = ['depend', dev? && series.has?('refresh') ? 'refresh' : 'build']
+        series.refresh.clear unless series.refresh.any? { |val| val.end_with?(':refresh') }
 
-        task default: init[1] unless task_defined?('default')
+        init = [:depend, dev? && series.has?(:refresh) ? :refresh : :build]
+
+        task 'default' => init[1] unless task_defined?('default')
 
         return if task_defined?('init') || !series.has?(init[0])
 
         desc 'init'
-        task init: init
+        task 'init' => init
       end
 
       def script_command(task, val, group, ref)
         if group
           label = :group
-          items = as_a(group)
+          items = as_a(group, :to_sym)
         else
           label = :ref
-          items = as_a(ref)
+          items = as_a(ref, :to_sym)
         end
-        items.each { |name| (@script[label][name.to_sym] ||= {})[task] = val }
+        items.each { |name| (@script[label][name] ||= {})[task] = val }
         self
       end
 
       def script?(state, script: nil, pat: nil, ref: nil, group: nil, global: false)
-        gr = @script[:ref][:_]
-        gg = @script[:group][:_]
-        if global && ((!ref && !group) || (!gr && !gg) || (ref && ref == gr) || (group && group == gg))
+        r = @script[:ref][:_]
+        g = @script[:group][:_]
+        if global && ((!ref && !group) || (!r && !g) || (ref && contains?(r, ref)) || (group && contains?(g, group)))
           pat = @script[state] if pat.nil?
           script ||= @script[:build]
         end
         pat.is_a?(::Regexp) ? pat.match?(script) : pat == true
       end
+
+      def contains?(data, val)
+        as_a(data).any? { |item| item.to_s == val.to_s }
+      end
     end
   end
 end