squared 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e2da1ce8ec4439d4180db0c0f806d9984046ef5f12b34008563edd7b40b938
-  data.tar.gz: 6eb7ef1c8273d10747cb79c1a113dae53210cebd167969f4a1546a9fc07162f0
+  metadata.gz: d9b753ae5817f7ddd43ccf1152dde2bd4bc8d37ed2eae1d39d7c118e84c20947
+  data.tar.gz: 910b375d08c1fda296862a22e612832eb0ebbbea505a6d860f2db9e48ff9a2ee
 SHA512:
-  metadata.gz: 75f989753670bd5854a8dccc6a3bf8d3d7397d2a373a50d46eaa7add861ff8d1f24cffb1c9ac00d48756d89abb50728c35368beb62649b3d704f3d7b059b449a
-  data.tar.gz: 6387222860eb65bd57cd14ba86b77b39d47a64d5a03940a5b6f6ac0ccea6368f0ab8df0a1886d5f6e6eec83f89887397b72f57a647a4ad06efa632020c1a5938
+  metadata.gz: 3595a660add974bb7bf69df55aaca30d7fb8bfb47ae21cdfd0b5d978ce36f35acb97e15f746d97204afa1a800c639a028e3835a9431addf63e6eb6402df6f87c
+  data.tar.gz: cda2b5a2aa217354d8f06d307c3136ae25d77358b0a478195c7ad945701f08f1e16450340819bd1a41e958a1a31f5e4b13ce167dee4a0d40630f4a3e9a61ada7

data/README.ruby.md

@@ -6,12 +6,12 @@
 
 ## Prerequisites
 
-* Ruby 2.4+
+* Ruby 2.4
 
 ### Optional
 
 * [Repo](https://source.android.com/docs/setup/reference/repo)
-* Python 3.6+
+* Python 3.6
 
 ```sh
 mkdir -p ~/.bin
@@ -36,44 +36,61 @@ 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
-  .repo("https://github.com/anpham6/squared-repo", "nightly", run: "build") # Repo (optional)
+  .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)
-  .clean("rake clean", group: "default") # depend test doc
+  .depend(false, group: "default")
+  .clean("rake clean", group: "default")
   .clean(["build/"], group: "app")
   .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
-      .style(:banner, "bright_cyan", "bold", "bright_black!")
-      .finalize! # Optional
+      .style({
+        banner: ["bright_cyan", "bold", "bright_black!"],
+        border: "bright_white"
+      })
   end
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
 # log       = /workspaces/logger
-# android   = /workspaces/android-docs
 # emc       = /workspaces/e-mc
 # pir       = /workspaces/pi-r
 # squared   = /workspaces/squared
 
-Repo::Workspace
-  .new("squared")
-  .group("default", "ruby", run: "rake build", copy: "rake install", clean: "rake clean", pathname: { run: "rake compile" })
+Workspace::Application
+  .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.
@@ -93,6 +110,7 @@ rake pull:node      # emc + pir + squared
 
 rake build          # All except "android"
 rake doc            # optparse + android
+rake depend         # All except "default"
 
 rake build:ruby     # rake compile + rake install + rake install
 
@@ -103,6 +121,23 @@ rake clean:app      # none + skip + ["build/"]
 rake clean:node     # none + ["publish/**/*.js", "tmp/"] + ["build/"]
 ```
 
+## Commands
+
+* run
+* depend
+* test
+* doc
+* clean
+
+## Styles
+
+* banner
+* border
+* header
+* active
+* inline
+* major
+
 ## LICENSE
 
 BSD 3-Clause

data/lib/squared/common/base.rb

@@ -23,7 +23,12 @@ module Squared
         white!: '47'
       },
       theme: {
-        workspace: {},
+        workspace: {
+          header: %i[bold],
+          active: %i[bold],
+          inline: %i[bold],
+          major: %i[bold]
+        },
         project: {},
         viewer: {
           banner: %i[blue bold],
@@ -59,7 +64,15 @@ module Squared
       VAR[key.is_a?(::String) ? key.to_sym : key] = val
     end
 
-    def env(key, equals: nil, ignore: nil, default: nil, **)
+    def __freeze__
+      VAR.each_value(&:freeze)
+      VAR[:theme].each_value(&:freeze)
+      VAR.freeze
+    end
+
+    module_function
+
+    def env(key, default = nil, equals: nil, ignore: nil, **)
       ret = ENV.fetch(key, '')
       return ret == equals.to_s unless equals.nil?
 
@@ -70,22 +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
-    end
-
-    def finalize!
-      VAR.each_value(&:freeze)
-      VAR[:theme].each_value(&:freeze)
-      VAR.freeze
+      meth ? obj.map(&meth) : obj
     end
   end
 end

data/lib/squared/common/class.rb

@@ -15,10 +15,14 @@ module Squared
       end
 
       def done
-        ret = to_a.map!(&:to_s).reject(&:empty?).join(@delim)
+        ret = to_s
         clear
         ret
       end
+
+      def to_s
+        to_a.map!(&:to_s).reject(&:empty?).join(@delim)
+      end
     end
   end
 end

data/lib/squared/common/format.rb

@@ -39,46 +39,8 @@ module Squared
 
       private
 
-      def emphasize(val, title: nil, cols: nil, sub: nil, pipe: nil)
-        n = 0
-        if title
-          title = title.to_s
-          n = title.size
-        end
-        if val.is_a?(::Array)
-          lines = val
-        else
-          lines = val.to_s.lines.map(&:chomp)
-          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
-        end
-        n = cols || [n, lines.max_by(&:size).size].max
-        if $stdout.tty?
-          require 'io/console'
-          (n = [n, $stdout.winsize[1] - 4].min) rescue nil
-        end
-        out = []
-        bord = '-' * (n + 4)
-        sub = as_a(sub)
-        pr = lambda do |line|
-          s = line.ljust(n)
-          sub.each { |h| s = sub_style(s, **h) }
-          "| #{s} |"
-        end
-        out << bord
-        out.push(pr.(title), bord) if title
-        lines.each { |line| out << pr.(line) }
-        out << bord
-        if block_given?
-          yield out
-        elsif pipe.respond_to?(:puts)
-          pipe.puts out
-        else
-          err ? warn(out) : puts(out)
-        end
-      end
-
       def sub_style(val, *args, styles: nil, pat: nil, index: 1)
-        return val unless ENV['NO_COLOR'].to_s.empty?
+        return val unless ENV.fetch('NO_COLOR', '').empty? && !__get__(:no_color)
 
         if pat && index != 0
           return val unless (data = pat.match(val))
@@ -158,11 +120,12 @@ module Squared
             ret << "-0.#{b}".to_f unless b.to_i > 255
           end
         end
-        !empty && ret.empty? ? nil : ret
+        ret if empty || !ret.empty?
       end
 
       def apply_style(data, key, *args, empty: true)
-        return unless !data.is_a?(Symbol) || (data = __get__(:theme)[data])
+        data = __get__(:theme)[data] if data.is_a?(Symbol)
+        return unless data
 
         set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
         if key.is_a?(Hash)
@@ -172,10 +135,6 @@ module Squared
         end
       end
 
-      def raise_error(*args, hint: nil, kind: ArgumentError)
-        raise kind, message(*args, hint: hint)
-      end
-
       def log_title(level, color: true)
         level = if level.is_a?(::Numeric)
                   case level
@@ -209,6 +168,50 @@ module Squared
         msg << (color ? sub_style(subject, :underline) : subject) if subject
         message(msg.join(' '), *args, hint: hint)
       end
+
+      def raise_error(*args, hint: nil, kind: ArgumentError)
+        raise kind, message(*args, hint: hint)
+      end
+
+      module_function
+
+      def emphasize(val, title: nil, cols: nil, sub: nil, pipe: nil)
+        n = 0
+        if title
+          title = title.to_s
+          n = title.size
+        end
+        if val.is_a?(::Array)
+          lines = val
+        else
+          lines = val.to_s.lines.map(&:chomp)
+          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
+        end
+        n = cols || [n, lines.max_by(&:size).size].max
+        if $stdout.tty?
+          require 'io/console'
+          (n = [n, $stdout.winsize[1] - 4].min) rescue nil
+        end
+        out = []
+        bord = '-' * (n + 4)
+        sub = [sub] if sub && !sub.is_a?(::Array)
+        pr = lambda do |line|
+          s = line.ljust(n)
+          sub&.each { |h| s = sub_style(s, **h) }
+          "| #{s} |"
+        end
+        out << bord
+        out << pr.(title) << bord if title
+        lines.each { |line| out << pr.(line) }
+        out << bord
+        if block_given?
+          yield out
+        elsif pipe.respond_to?(:puts)
+          pipe.puts out
+        else
+          err ? warn(out) : puts(out)
+        end
+      end
     end
   end
 end

data/lib/squared/common/shell.rb

@@ -6,12 +6,12 @@ require 'rake'
 module Squared
   module Common
     module Shell
-      private
+      module_function
 
       def shell_escape(val, quote: false)
-        return (quote ? shell_quote(val, force: false) : val) if ::Rake::Win32.windows?
+        return Shellwords.escape(val) unless ::Rake::Win32.windows?
 
-        Shellwords.escape(val)
+        quote ? shell_quote(val, force: false) : val
       end
 
       def shell_quote(val, force: true)

data/lib/squared/common/system.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 module Squared
   module Common
     module System
-      private
+      module_function
 
       def shell(*cmd, **kwargs)
         if RUBY_VERSION =~ /^2\.[0-5]\./
@@ -20,13 +20,44 @@ module Squared
         end
       end
 
+      def confirm(msg, agree: 'Y', cancel: 'N', default: nil, attempts: 5, timeout: 15)
+        require 'readline'
+        require 'timeout'
+        agree = /^#{agree}$/i if agree.is_a?(String)
+        cancel = /^#{cancel}$/i if cancel.is_a?(String)
+        Timeout.timeout(timeout) do
+          begin
+            while (ch = Readline.readline(msg, true))
+              ch = ch.chomp
+              ch = default if ch.empty?
+              case ch
+              when agree
+                return true
+              when cancel
+                return false
+              end
+              attempts -= 1
+              exit 1 unless attempts >= 0
+            end
+          rescue Interrupt
+            puts
+            exit 0
+          else
+            false
+          end
+        end
+      end
+
       def copy_d(src, dest, glob: ['**/*'], create: false, verbose: true)
+        src = Pathname.new(src)
+        dest = Pathname.new(dest)
         raise "#{dest} (not found)" if !create && !dest.exist?
 
         subdir = []
         files = 0
         dest.mkpath if create
-        as_a(glob).each do |val|
+        glob = [glob] unless glob.is_a?(::Array)
+        glob.each do |val|
           Dir.glob(src.join(val)) do |path|
             ent = Pathname.new(path)
             next if ent.directory?
@@ -48,7 +79,8 @@ module Squared
         if !overwrite
           path = Pathname.new(dest)
           if path.directory?
-            src = as_a(src).reject { |val| path.join(File.basename(val)).exist? }
+            src = [src] unless src.is_a?(::Array)
+            src = src.reject { |val| path.join(File.basename(val)).exist? }
           elsif path.exist?
             return
           end

data/lib/squared/common/task.rb

@@ -5,22 +5,14 @@ require 'rake'
 module Squared
   module Common
     module Task
-      private
+      module_function
 
-      def collect_args(args, *keys)
-        ret = []
-        return ret unless args.is_a?(::Rake::TaskArguments)
-
-        keys.each { |key| ret << args.fetch(key) if args.key?(key) }
-        ret += args.extras
-      end
-
-      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

@@ -9,7 +9,6 @@ module Squared
     class Viewer
       include Common
       include Format
-      include Task
       include ::Rake::DSL
 
       class << self
@@ -18,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 = {}
@@ -52,7 +52,7 @@ module Squared
                       @required = true
                       project ? [project, 'not found'] : %w[name missing]
                     end
-        warn log_message(:warn, msg, subject: self.class, hint: hint, color: !pipe?)
+        warn log_message(:warn, msg, subject: self.class, hint: hint)
       end
 
       def build
@@ -60,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])
@@ -92,12 +93,13 @@ 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
-                  read_keys(obj, type, file.to_s, collect_args(args, :keys), ext: ext)
+                  read_keys(obj, type, file.to_s, args.to_a, ext: ext)
                 else
                   read_keys(obj, type, args.keys, args.extras, ext: ext)
                 end
@@ -159,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?
@@ -188,7 +190,7 @@ module Squared
         title = Pathname.new(file)
                         .realpath
                         .to_s
-                        .sub(/^#{Regexp.escape(Dir.pwd + ::File::SEPARATOR)}/, '')
+                        .sub(Regexp.new("^#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
         sub = if pipe?
                 nil
               else
@@ -225,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}>"
@@ -263,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
@@ -284,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.6'
+  VERSION = '0.0.8'
 end