squared 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867bfab9c2ffade3d9158228c67fca5f0f4675ecd24a3d7201d0b85f42945d8f
-  data.tar.gz: 0ee6b84388949cd03c7a0667e7bd0d8aab8b3b30c597da6ae8b486fa3063d89e
+  metadata.gz: 117c669053bf0539d41840f655c1f7cb9a87af7d90366ded3c19803949184cdc
+  data.tar.gz: 84266b0dd2bc5736eb05b5799692fd4fbed756e8a096343dc85f670e9257ae07
 SHA512:
-  metadata.gz: ce95fe135ead9dec6e92106955e921442f3a9fe73a8a11863a8d3022187065056236b52449b8e40e30cd34bd3a95c949a296817af30932b9edc64032cb255919
-  data.tar.gz: 63d8d2d3e22572d614b3a3d214427a1864cb528c5231e107db984949214955efa804376548b769f90ee7390223dd2b7715fd85ad78d2f15b85e77fe4b48b710e
+  metadata.gz: 862884efb840359442202f1670ba4b8ff032397a3e6e6d5720289f844f63ec3119045bfb60b1f2c41673472d32861228587e7a33ab0fbf87d2c7df5e5fa37cde
+  data.tar.gz: f775903d05491cbe92d80e9db391afa970c866fa4ae885666ffe4e95282d102df5b9faab6f20b17d9368243ff73c6552ff3c56ecf11423d6f68eaeaf4f242288

data/README.md

@@ -81,13 +81,13 @@
 #### Install
 
 ```sh
-mkdir -p ~/.bin
-PATH="${HOME}/.bin:${PATH}"
+mkdir -p ~/bin/repo
+PATH="${HOME}/bin:${PATH}"
 
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
-chmod a+rx ~/.bin/repo
+curl https://storage.googleapis.com/git-repo-downloads/repo > ~/bin/repo
+chmod a+rx ~/bin/repo
 # OR
-scripts/repo-install.sh ~/.bin
+scripts/repo-install.sh ~/bin
 ```
 
 #### Usage

data/README.ruby.md

@@ -4,17 +4,14 @@
 * [manifest](https://github.com/anpham6/squared-repo)
 * [docs](https://squared.readthedocs.io)
 
-## Installation
-
-```sh
-gem install squared
-```
-
 ## Prerequisites
 
 * Ruby 2.4+
-* Python 3.6+
+
+### Optional
+
 * [Repo](https://source.android.com/docs/setup/reference/repo)
+* Python 3.6+
 
 ```sh
 mkdir -p ~/.bin
@@ -23,26 +20,64 @@ curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
 chmod a+rx ~/.bin/repo
 ```
 
+## Installation
+
+```sh
+gem install squared
+```
+
 ## Example - Rakefile
 
 ```ruby
 require "squared"
 
 Repo::Workspace
-  .new("squared")
-  .repo("https://github.com/anpham6/squared-repo", "nightly")
-  .add(:pathname, run: "rake compile", copy: "rake install", clean: "rake clean", ref: :ruby, group: "default") # Ruby
-  .add(:optparse, group: "default")
-  .add(:emc, "e-mc", copy: { from: "publish", into: "@e-mc", also: [:pir] }) # Node
-  .add(:pir, "pi-r", copy: { from: "publish", into: "@pi-r" })
-  .add(:squared)
-  .build(parallel: %i[pull fetch rebase copy clean])
+  .new("squared") # REPO_HOME
+  .repo("https://github.com/anpham6/squared-repo", "nightly") # Optional
+  .run("rake install", ref: :ruby)
+  .clean("rake clean", group: "default") # depend test doc
+  .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) # task namespace "android" | directory "android-docs"
+  .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)
+  .build(default: "status", parallel: ["pull", "fetch", "rebase", "copy", "clean"]) do |workspace|
+    workspace
+      .enable_aixterm
+      .style(:banner, "bright_cyan", "bold", "bright_black!")
+      .finalize! # Optional
+  end
 ```
 
+**NOTE**: The use of "**ref**" (class name) is only necessary when running `repo:init` for the first time into an empty directory.
+
 ## Usage
 
 ```sh
-rake -T
+rake -T           # List tasks
+rake              # rake status (usually "build")
+
+# GIT_OPTIONS=rebase
+rake pull           # All except "default" + "app"
+rake pull:ruby      # pathname + optparse + logger
+rake pull:default   # pathname + optparse
+rake pull:app       # squared
+rake pull:node      # emc + pir + squared
+
+rake build          # All except "android"
+rake doc            # optparse + android
+
+rake build:ruby     # rake compile + rake install + rake install
+
+rake clean          # All except "default" + "app"
+rake clean:ruby     # rake clean + rake clean + ["tmp/"]
+rake clean:default  # rake clean + rake clean + skip
+rake clean:app      # none + skip + ["build/"]
+rake clean:node     # none + ["publish/**/*.js", "tmp/"] + ["build/"]
 ```
 
 ## LICENSE

data/lib/squared/common/class.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Squared
   module Common
     class JoinSet < ::Set
+      def self.to_s
+        /[^:]+$/.match(super.to_s)[0]
+      end
+
       def initialize(data = [], delim: ' ')
         super(data.compact)
         @delim = delim

data/lib/squared/common/format.rb

@@ -3,6 +3,36 @@
 module Squared
   module Common
     module Format
+      include Common
+
+      AIX_TERM = {
+        bright_black: '90',
+        bright_red: '91',
+        bright_green: '92',
+        bright_yellow: '93',
+        bright_blue: '94',
+        bright_magenta: '95',
+        bright_cyan: '96',
+        bright_white: '97',
+        bright_black!: '100',
+        bright_red!: '101',
+        bright_green!: '102',
+        bright_yellow!: '103',
+        bright_blue!: '104',
+        bright_magenta!: '105',
+        bright_cyan!: '106',
+        bright_white!: '107'
+      }.freeze
+      TEXT_STYLE = [:bold, :dim, :italic, :underline, :blinking, nil, :inverse, :hidden, :strikethrough].freeze
+      private_constant :AIX_TERM, :TEXT_STYLE
+
+      def enable_aixterm
+        unless (colors = get!(:colors)).frozen?
+          colors.merge!(AIX_TERM)
+        end
+        block_given? ? yield(self) : self
+      end
+
       def emphasize(val, title: nil, cols: nil, sub: nil)
         n = 0
         if title
@@ -20,21 +50,23 @@ module Squared
           require 'io/console'
           (n = [n, $stdout.winsize[1] - 4].min) rescue nil
         end
+        out = []
         bord = '-' * (n + 4)
-        write = ->(line) { err ? warn(line) : puts(line) }
         sub = as_a(sub)
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| s = sub_style(s, **h) }
           "| #{s} |"
         end
-        write.(bord)
-        if title
-          write.(pr.(title))
-          write.(bord)
+        out << bord
+        out.push(pr.(title), bord) if title
+        lines.each { |line| out << pr.(line) }
+        out << bord
+        if block_given?
+          yield out
+        else
+          err ? Warning.warn(out) : puts(out)
         end
-        lines.each { |line| write.(pr.(line)) }
-        write.(bord)
       end
 
       def sub_style(val, *args, pat: nil, styles: nil, index: 1)
@@ -59,20 +91,25 @@ module Squared
           else
             s = ret
           end
-          case (t = type.to_sym)
-          when :bold
-            s = "\x1B[1m#{s}\x1B[22m"
-          when :italic
-            s = "\x1B[3m#{s}\x1B[23m"
-          when :underline
-            s = "\x1B[4m#{s}\x1B[24m"
+          if type.is_a?(Numeric)
+            f, b = type.to_s.split('.')
+            s = wrap.(s, ['38', '5', f]) if f[0] != '-' && f.to_i <= 255
+            if b
+              b = b[0..2]
+              s = wrap.(s, ['48', '5', b]) unless b.to_i > 255
+            end
           else
-            if (c = get(:colors)[t])
+            t = type.to_sym
+            if (c = get!(:colors)[t])
               if index == -1
                 s = wrap.(s, [c])
               else
                 code << c
               end
+            else
+              next unless (n = TEXT_STYLE.index { |style| style == t })
+
+              s = "\x1B[#{n + 1}m#{s}\x1B[#{n == 0 ? 22 : n + 21}m"
             end
           end
           if index == -1
@@ -99,15 +136,18 @@ module Squared
         out
       end
 
-      def check_style(iter, empty: true)
+      def check_style(*args, empty: true)
         ret = []
-        colors = get(:colors)
-        as_a(iter).each do |val|
-          case (val = val.to_sym)
-          when :bold, :italic, :underline
+        colors = get!(:colors)
+        as_a(args, flat: true).each do |val|
+          if !val.is_a?(Numeric)
+            val = val.to_sym
+            ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
+          elsif val >= 0 && val <= 256
             ret << val
-          else
-            ret << val if colors.key?(val)
+          elsif val < 0 && (b = val.to_s.split('.')[1])
+            b = b[0..2]
+            ret << "-0.#{b}".to_f unless b.to_i > 255
           end
         end
         !empty && ret.empty? ? nil : ret
@@ -132,7 +172,7 @@ module Squared
                 else
                   level.to_s.downcase.to_sym
                 end
-        val = get(:logger)[level] || get(:logger)[level = :unknown]
+        val = get!(:logger)[level] || get!(:logger)[level = :unknown]
         level = +level.to_s.upcase
         case level
         when 'WARN', 'ERROR', 'FATAL'

data/lib/squared/common/shell.rb

@@ -6,16 +6,24 @@ module Squared
       def shell_escape(val)
         return val if ::Rake::Win32.windows?
 
+        require 'shellwords'
         Shellwords.escape(val)
       end
 
       def shell_quote(val, force: true)
         ret = val.to_s.strip
-        return ret if (!force && !ret.include?(' ')) || /(?:^|=)(["']).+\1$/m.match?(ret)
+        return ret if (!force && !ret.include?(' ')) || ret.match?(/(?:^|=)(["']).+\1$/m)
 
         ::Rake::Win32.windows? ? "\"#{double_quote(ret)}\"" : "'#{single_quote(ret)}'"
       end
 
+      def fill_option(val)
+        return "-#{val}" if val.size == 1 || val.match?(/^[a-z]\d+$/i)
+
+        val = "--#{val}" unless val.start_with?('-')
+        shell_escape(val).sub('\\=', '=')
+      end
+
       def single_quote(val)
         val.gsub("'", "'\\\\''")
       end

data/lib/squared/common/system.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Squared
   module Common
     module System
+      include Common
+
       def shell(*cmd, **kwargs)
         if /^2\.[0-5]\./.match?(RUBY_VERSION)
           exception = kwargs.delete(:exception)

data/lib/squared/common.rb

@@ -1,23 +1,13 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'shellwords'
 require 'logger'
-require 'set'
 require 'rake'
 
 module Squared
   module Common
     VAR = {
       project: {},
-      logger: {
-        unknown: %i[cyan],
-        fatal: %i[white bold red!],
-        error: %i[red bold],
-        warn: %i[yellow bold],
-        info: %i[blue],
-        debug: %i[green]
-      },
       colors: {
         black: '30',
         red: '31',
@@ -35,26 +25,43 @@ module Squared
         magenta!: '45',
         cyan!: '46',
         white!: '47'
+      },
+      logger: {
+        unknown: %i[cyan],
+        fatal: %i[white bold red!],
+        error: %i[red bold],
+        warn: %i[yellow bold],
+        info: %i[blue],
+        debug: %i[green]
       }.freeze
-    }
+    }.compare_by_identity
     private_constant :VAR
 
-    def get(key)
+    def get!(key)
       VAR[key.is_a?(::String) ? key.to_sym : key]
     end
 
-    def set(key, val)
+    def set!(key, val)
+      return if VAR.frozen?
+
       VAR[key.is_a?(::String) ? key.to_sym : key] = val
     end
 
+    def finalize!
+      VAR.each_value(&:freeze)
+      VAR.freeze
+    end
+
     def message(*args, hint: nil)
       args.reject(&:empty?).join(' => ') + (hint ? " (#{hint})" : '')
     end
 
-    def as_a(obj)
+    def as_a(obj, flat: nil)
       return [] if obj.nil?
+      return [obj] unless obj.is_a?(::Array)
+      return obj unless flat
 
-      obj.is_a?(::Array) ? obj : [obj]
+      obj.flatten(flat == true ? nil : flat)
     end
   end
 end

data/lib/squared/config.rb

@@ -3,20 +3,20 @@
 module Squared
   module Config
     class Viewer
-      include Common
-      include Format
+      include Common::Format
       include Task
       include ::Rake::DSL
 
       class << self
-        include Common::Format
-
         attr_reader :styles
 
         def style(name, *args)
-          args = check_style(args)
           styles[name.to_sym]&.clear&.concat(args)
         end
+
+        def to_s
+          /[^:]+$/.match(super.to_s)[0]
+        end
       end
 
       @styles = {
@@ -34,13 +34,13 @@ module Squared
 
       def initialize(main = 'package', project: nil, name: nil)
         if project
-          @project = get(:project)[project.to_sym]
+          @project = get!(:project)[project.to_sym]
           @required = true
         end
         @name = (name || @project&.name)&.to_s
         unless @name
           msg, hint = project ? [project, 'not found'] : %w[name missing]
-          warn log_message(:warn, msg, subject: 'Config::Viewer', hint: hint, color: !pipe?)
+          warn log_message(:warn, msg, subject: self.class, hint: hint, color: !pipe?)
           @required = true
         end
         @main = main
@@ -50,9 +50,9 @@ module Squared
       def build
         return unless enabled?
 
-        namespace @name do
+        namespace name do
           namespace :view do
-            if @include['json'] && !::Rake::Task.task_defined?("#{@name}:view:json")
+            if @include['json'] && !::Rake::Task.task_defined?("#{name}:view:json")
               desc format_desc('json')
               task :json, [:keys] do |_, args|
                 require 'json'
@@ -60,7 +60,7 @@ module Squared
               end
             end
 
-            if @include['yaml'] && !::Rake::Task.task_defined?("#{@name}:view:yaml")
+            if @include['yaml'] && !::Rake::Task.task_defined?("#{name}:view:yaml")
               desc format_desc('yaml', 'yml')
               task :yaml, [:keys] do |_, args|
                 require 'yaml'
@@ -69,6 +69,8 @@ module Squared
             end
           end
         end
+
+        yield self if block_given?
       end
 
       def add(type, gem: nil, parse: nil, ext: [], opts: {}, command: nil, file: nil)
@@ -77,7 +79,7 @@ module Squared
           require(gem || type)
           obj = eval(parse)
           ext = as_a(ext)
-          namespace @name do
+          namespace name do
             desc format_desc(ext.first || type, command: command)
             namespace(command || :view) do
               task type, [:keys] do |_, args|
@@ -115,8 +117,16 @@ module Squared
         add(type, gem: gem, parse: parse, ext: ext, opts: opts, command: name, file: file)
       end
 
+      def to_s
+        @include.keys.map { |ext| "#{main}.#{ext}" }.join(',')
+      end
+
+      def inspect
+        "#<#{self.class}: #{name} => #{main} {#{@include.keys.join(', ')}}>"
+      end
+
       def enabled?
-        !@required || !!@project&.enabled?
+        !@required || !!project&.enabled?
       end
 
       protected
@@ -134,20 +144,21 @@ module Squared
             ext[0] = fmt
           else
             keys.unshift(file)
-            alt = "#{@main}.{#{ext.join(',')}}"
-            alt = @project.base_path(alt) if @project
+            alt = "#{main}.{#{ext.join(',')}}"
+            alt = project.base_path(alt) if project
             file = Dir[alt].first
           end
           if !file
             raise ArgumentError, message(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", hint: 'not found')
           end
         end
+        project&.info "#{Viewer}(#{type}) => #{file} {#{keys.join(', ')}}"
         doc = if reader.respond_to?(:load_file)
                 reader.load_file(file, **@include[type])
               else
                 reader.parse(File.read(file), **@include[type])
               end
-        lines = print_keys(type, doc, keys)
+        lines = print_keys(type, doc, keys, file: file)
         return unless lines
 
         title = Pathname.new(file)
@@ -160,18 +171,18 @@ module Squared
                 [
                   { pat: /^([^:]+|(?<! ):(?! ))+$/, styles: Viewer.styles[:banner] },
                   { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: Viewer.styles[:undefined], index: 2 },
-                  { pat: /^(.+)( : (?!undefined))(.+)$/m, styles: Viewer.styles[:key] },
-                  { pat: /^(.+)( : )(-?[\d.]+)(\s*)$/m, styles: Viewer.styles[:number], index: 3 },
-                  { pat: /^(.+)( : ")(.+)("\s*)$/m, styles: Viewer.styles[:string], index: 3 },
-                  { pat: /^(.+)( : \{)(.+)(\}\s*)$/m, styles: Viewer.styles[:hash], index: 3 },
-                  { pat: /^(.+)( : \[)(.+)(\]\s*)$/m, styles: Viewer.styles[:array], index: 3 },
-                  { pat: /^(.+)( : (?!undefined))([^"\[{].*)$/m, styles: Viewer.styles[:value], index: 3 }
+                  { pat: /^(.+)( : (?!undefined).+)$/m, styles: Viewer.styles[:key] },
+                  { pat: /^(.+ : )(-?[\d.]+)(\s*)$/m, styles: Viewer.styles[:number], index: 2 },
+                  { pat: /^(.+ : ")(.+)("\s*)$/m, styles: Viewer.styles[:string], index: 2 },
+                  { pat: /^(.+ : \{)(.+)(\}\s*)$/m, styles: Viewer.styles[:hash], index: 2 },
+                  { pat: /^(.+ : \[)(.+)(\]\s*)$/m, styles: Viewer.styles[:array], index: 2 },
+                  { pat: /^(.+ : (?!undefined))([^"\[{].*)$/m, styles: Viewer.styles[:value], index: 2 }
                 ]
               end
         emphasize(lines, title: title, sub: sub)
       end
 
-      def print_keys(type, data, keys)
+      def print_keys(type, data, keys, file: nil)
         out = []
         pad = 0
         symbolize = @include[type][:symbolize_names]
@@ -189,6 +200,7 @@ module Squared
               end
             end
           rescue StandardError
+            project&.warn "#{Viewer}(#{type}) => #{file ? "#{file} " : ''}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"
@@ -216,11 +228,11 @@ module Squared
       end
 
       def base_path(file)
-        @project ? @project.base_path(file) : Pathname.new(file).realdirpath
+        project ? project.base_path(file) : Pathname.new(file).realdirpath
       end
 
       def format_desc(type, alt = nil, command: nil)
-        message(@name, command || 'view', "#{type}[#{command.nil? ? "file?=#{@main}.#{alt || type}," : ''}keys*]")
+        message(name, command || 'view', "#{type}[#{command.nil? ? "file?=#{main}.#{alt || type}," : ''}keys*]")
       end
 
       def chop_extname(file)
@@ -228,7 +240,7 @@ module Squared
       end
 
       def pipe?
-        return @project.workspace.pipe? if @project
+        return project.workspace.pipe if project
 
         val = ENV['PIPE_OUT']
         !val.nil? && !val.empty? && val != '0'