squared 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d000551aa00185dae3ea1bc7e3a61c64af96dce7d717339483d8cb572ca12d43
-  data.tar.gz: 229f06052512ee06d16e43688602753a867025e8cf39b6b1c6dfafa69805fdbc
+  metadata.gz: 2d9e8c772c9f4d0ce5c54dbeb1b9583d2e477f155036faf34cfc547659c34ec4
+  data.tar.gz: 87de412a78c0071eabd4b26713cbf84978a92fca6ea1a6dfe18653ddf22c90ee
 SHA512:
-  metadata.gz: 5efe60578369457075929b95ba8ea628d39d7324d40f84c397e07606c8c5fe48f07f797b940d7ca34a80321bb3f1435494c36afcd95432cbe8924e4353099f56
-  data.tar.gz: daf832c4fbcf0e80459317be7b91781cfea9b653b3368cdbc090101d67ca59aff8b38940c2803100e322ca14bd25f45ccf37ef27bb348312b724c45babeb3393
+  metadata.gz: '08475f426b15c41dab20fbead5d7c1ead70f5d80384e0a0772cbe7b101512a4402a1bb1231b2550f7da16aac2796f8411f6a6e3e570ae728d59b03f88fea5960'
+  data.tar.gz: 5c0334640b20dda82641925cd94b41d76be4cd4e603355fef593a5cd69731ac926febab67f3ffa494267291ec9d89efba2f8a9ac4dde978ab2814a0f8a481a67

data/README.ruby.md

@@ -59,7 +59,7 @@ require "squared/app"                      # All workspace related modules
 
 Workspace::Application
   .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
-  .banner("group", "project", styles: %i[yellow black], border: "bold") # name | project | path | ref | group? | parent? | version?
+  .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
   .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "build:prod"], ref: :node) # Repo (optional)
   .run("rake install", ref: :ruby)
   .depend(false, group: "default")
@@ -112,7 +112,7 @@ Workspace::Application
     }
   })
   .with(:python) do                                      # ref=Symbol | group=String
-    banner([:name, ': ', :version], "path")              # chrome-docs: 0.1.0 | /workspaces/chrome-docs
+    banner([:name, ": ", :version], "path")              # chrome-docs: 0.1.0 | /workspaces/chrome-docs
     doc("make html")                                     # rake rb:doc:python
     run(false)                                           # rake rb:build:python (disabled)
     exclude(%i[base git])                                # Project::Git.ref (superclass)
@@ -125,6 +125,58 @@ Workspace::Application
 
 **NOTE**: The use of "**ref**" (class name) is only necessary when initializing an empty directory (e.g. *rake repo:init*).
 
+### Graph
+
+```ruby
+Workspace::Application
+  .new(main: "squared")
+  .with(:python) do
+    add("android-docs", "android")
+    add("chrome-docs", "chrome", graph: "android")
+  end
+  .with(:node) do
+    graph(["build", "copy"]) # Optional
+    add("e-mc", "emc")
+    add("pi-r", "pir", graph: "emc")
+    add("squared-express", "express", graph: "pir")
+    add("squared", graph: ["chrome", "express"])
+  end
+  .with(:ruby) do
+    add("pathname")
+    add("fileutils", graph: "pathname")
+    add("optparse")
+    add("rake", graph: ["fileutils", "optparse"])
+  end
+  .build
+```
+
+```sh
+rake pir:graph      # emc + pir
+rake express:graph  # emc + pir + express
+rake chrome:graph   # android + chrome
+rake graph:python   # same
+rake squared:graph  # android + chrome + emc + pir + express + squared
+rake graph:node     # same
+rake rake:graph     # pathname + fileutils + optparse + rake
+rake graph:ruby     # same
+rake graph          # graph:node + graph:ruby
+```
+
+### Batch
+
+```ruby
+Workspace::Series.batch(:ruby, :node, {
+  stage: %i[graph test],
+  reset: %i[stash pull]
+})
+```
+
+### Rename
+
+```ruby
+Workspace::Series.rename("depend", "install")
+```
+
 ## Usage
 
 ```sh
@@ -165,6 +217,7 @@ Task:
 
 * run
 * depend
+* graph
 * test
 * doc
 * clean

data/lib/squared/common/base.rb

@@ -5,10 +5,12 @@ module Squared
     ARG = {
       PIPE: 1,
       OUT: nil,
+      VERBOSE: nil,
       FAIL: false,
       COMMON: true,
       BANNER: true,
       SPACE: ' => ',
+      GRAPH: ['│', '─', '├', '└', '┬'],
       COLOR: ENV.fetch('NO_COLOR', '').empty?
     }
     VAR = {
@@ -86,15 +88,15 @@ module Squared
       return [] if obj.nil?
 
       unless obj.is_a?(::Array)
-        obj = if !obj.is_a?(::Hash) && obj.respond_to?(:to_a) && (val = obj.to_a).is_a?(::Array)
+        obj = if obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
                 val
               else
                 [obj]
               end
       end
       obj = obj.flatten(flat.is_a?(::Numeric) ? flat : nil) if flat
-      obj = obj.map(&meth) if meth
-      compact ? obj.compact : obj
+      obj = obj.compact if compact
+      meth ? obj.map(&meth) : obj
     end
   end
 end

data/lib/squared/common/class.rb

@@ -8,10 +8,14 @@ module Squared
     class SymSet
       extend Forwardable
 
-      def_delegators :@data, :each, :each_with_index, :entries, :to_a, :include?
+      def self.to_s
+        super.match(/[^:]+$/)[0]
+      end
+
+      def_delegators :@data, :+, :each, :each_with_index, :entries, :to_a, :include?
 
       def initialize(data = [])
-        @data = Set.new(data)
+        @data = ::Set.new(data)
       end
 
       def add(val)
@@ -26,6 +30,10 @@ module Squared
     end
 
     class JoinSet < ::Set
+      def self.to_s
+        super.match(/[^:]+$/)[0]
+      end
+
       def initialize(data = [], delim: ' ')
         super(data.compact)
         @delim = delim

data/lib/squared/common/format.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'pathname'
 require 'logger'
 
 require_relative 'base'
@@ -137,15 +138,15 @@ module Squared
       def log_sym(level)
         if level.is_a?(::Numeric)
           case level
-          when Logger::DEBUG
+          when ::Logger::DEBUG
             :debug
-          when Logger::INFO
+          when ::Logger::INFO
             :info
-          when Logger::WARN
+          when ::Logger::WARN
             :warn
-          when Logger::ERROR
+          when ::Logger::ERROR
             :error
-          when Logger::FATAL
+          when ::Logger::FATAL
             :fatal
           else
             :unknown
@@ -186,8 +187,8 @@ module Squared
       def puts_oe(*args, pipe: 1)
         if pipe.is_a?(::Pathname)
           begin
-            File.open(pipe, 'a') do |f|
-              br = File::SEPARATOR == '\\' ? "\r\n" : "\n"
+            ::File.open(pipe, 'a') do |f|
+              br = ::File::SEPARATOR == '\\' ? "\r\n" : "\n"
               args.flatten.each { |val| f.write("#{strip_style(val.chomp)}#{br}") }
             end
             return
@@ -204,22 +205,23 @@ module Squared
         (empty ? args.reject { |val| val.nil? || val.empty? } : args).join(ARG[:SPACE]) + (hint ? " (#{hint})" : '')
       end
 
-      def emphasize(val, title: nil, footer: nil, cols: nil, sub: nil, border: nil, pipe: nil)
+      def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, border: nil, pipe: nil)
         n = 0
-        set = lambda do |l|
-          ret = as_a(l, :to_s)
-          n = ret.max_by(&:size).size
+        max = ->(v) { n = [n, v.max_by(&:size).size].max }
+        set = lambda do |v|
+          ret = as_a(v, :to_s)
+          max.(ret)
           ret
         end
-        title = set.(title) if title
-        footer = set.(footer) if footer
+        title &&= set.(title)
+        footer &&= set.(footer)
         if val.is_a?(::Array)
           lines = val.map(&:to_s)
         else
           lines = val.to_s.lines.map(&:chomp)
-          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
+          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(StandardError))
         end
-        n = cols || [n, lines.max_by(&:size).size].max
+        n = cols || max.(lines)
         if $stdout.tty?
           require 'io/console'
           (n = [n, $stdout.winsize[1] - 4].min) rescue nil
@@ -227,10 +229,10 @@ module Squared
         out = []
         bord = '-' * (n + 4)
         bord = sub_style(bord, styles: border) if border
-        sub = [sub] if sub && !sub.is_a?(::Array)
+        sub = as_a(sub)
         pr = lambda do |line|
           s = line.ljust(n)
-          sub&.each { |h| s = sub_style(s, **h) }
+          sub.each { |h| s = sub_style(s, **h) }
           s = "| #{s} |"
           if border
             s = sub_style(s, pat: /^(\|)(.+)$/m, styles: border)
@@ -245,7 +247,16 @@ module Squared
         end
         lines.each { |line| out << pr.(line) }
         out << bord
-        out += footer if footer
+        if footer
+          unless sub.empty? && !right
+            footer.map! do |s|
+              s = s.rjust(n + 4) if right
+              sub.each { |h| s = sub_style(s, **h) }
+              s
+            end
+          end
+          out += footer
+        end
         if block_given?
           yield out
         elsif pipe

data/lib/squared/common/prompt.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
-require 'readline'
-
 module Squared
   module Common
     module Prompt
       module_function
 
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 15)
+        require 'readline'
         require 'timeout'
         agree = /^#{agree}$/i if agree.is_a?(::String)
         cancel = /^#{cancel}$/i if cancel.is_a?(::String)
@@ -15,8 +14,7 @@ module Squared
           begin
             while (ch = Readline.readline(msg, true))
               ch = ch.chomp
-              ch = default if ch.empty?
-              case ch
+              case (ch.empty? ? default : ch)
               when agree
                 return true
               when cancel

data/lib/squared/common/shell.rb

@@ -9,9 +9,10 @@ module Squared
       module_function
 
       def shell_escape(val, quote: false)
-        return Shellwords.escape(val) unless ::Rake::Win32.windows?
+        val = val.to_s
+        return ::Shellwords.escape(val) unless ::Rake::Win32.windows?
 
-        quote ? shell_quote(opt, force: false) : opt
+        quote ? shell_quote(val, force: false) : val
       end
 
       def shell_quote(val, force: true)
@@ -22,7 +23,7 @@ module Squared
       end
 
       def shell_split(val, quote: false, join: false)
-        ret = Shellwords.split(val).map do |opt|
+        ret = ::Shellwords.split(val).map do |opt|
           if (data = /^(--?[^= ]+)(=|\s+)?(["'])?(.+?)\3?$/m.match(opt))
             next opt unless data[2] && !data[3]
 

data/lib/squared/common/system.rb

@@ -12,50 +12,48 @@ module Squared
         if RUBY_VERSION =~ /^2\.[0-5]\./
           exception = kwargs.delete(:exception)
           ret = system(*args, **kwargs)
-          raise $?.to_s if !ret && exception
+          return ret if ret || !exception
 
-          ret
+          raise $?.to_s
         else
           system(*args, **kwargs)
         end
       end
 
       def copy_d(src, dest, glob: ['**/*'], create: false, verbose: true)
-        src = Pathname.new(src)
-        dest = Pathname.new(dest)
+        src = ::Pathname.new(src)
+        dest = ::Pathname.new(dest)
         raise "#{dest} (not found)" if !create && !dest.exist?
 
         subdir = []
         files = 0
         dest.mkpath if create
         (glob.is_a?(::Array) ? glob : [glob]).each do |val|
-          Dir.glob(src.join(val)) do |path|
-            ent = Pathname.new(path)
-            next if ent.directory?
+          ::Dir.glob(src.join(val)) do |path|
+            next if (path = ::Pathname.new(path)).directory?
 
-            target = dest.join(ent.relative_path_from(src))
+            target = dest.join(path.relative_path_from(src))
             dir = target.dirname
             unless subdir.include?(dir.to_s)
               dir.mkpath
               subdir << dir.to_s
             end
-            copy_f ent, target
+            copy_f path, target
             files += 1
           end
         end
-        puts [dest.realpath, subdir.size.to_s, files.to_s].join(Common::ARG[:SPACE]) if verbose
+        puts [dest.realpath, subdir.size.to_s, files.to_s].join(' => ') if verbose
       end
 
       def copy_f(src, dest, overwrite: true, verbose: false)
         unless overwrite
-          if (path = Pathname.new(dest)).directory?
-            src = [src] unless src.is_a?(::Array)
-            src = src.reject { |val| path.join(File.basename(val)).exist? }
+          if (path = ::Pathname.new(dest)).directory?
+            src = (src.is_a?(::Array) ? src : [src]).reject { |val| path.join(::File.basename(val)).exist? }
           elsif path.exist?
             return
           end
         end
-        FileUtils.cp(src, dest, verbose: verbose)
+        ::FileUtils.cp(src, dest, verbose: verbose)
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -1,10 +1,36 @@
 # frozen_string_literal: true
 
+require 'pathname'
+require 'rake'
+
 module Squared
   module Common
     module Utils
       module_function
 
+      def task_invoke(*cmd, args: [], exception: true, warning: true)
+        cmd.each { |name| ::Rake::Task[name].invoke(*args) }
+      rescue StandardError => e
+        raise if exception
+
+        warn e if warning
+      end
+
+      def task_join(*val)
+        case val.size
+        when 1
+          val[0].to_s
+        when 2
+          "#{val[0]}:#{val[1]}"
+        else
+          val.join(':')
+        end
+      end
+
+      def task_invoked?(name)
+        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && obj.name == name }
+      end
+
       def env(key, default = nil, suffix: @envname, equals: nil, ignore: nil)
         ret = env_value(key, suffix: suffix)
         return ret == equals.to_s unless equals.nil?
@@ -32,9 +58,9 @@ module Squared
       end
 
       def env_pipe(key, default = 1, suffix: nil, root: nil)
-        if default.is_a?(String)
+        if default.is_a?(::String)
           begin
-            default = (root ? root.join(default) : Pathname.new(default)).realdirpath
+            default = (root ? root.join(default) : ::Pathname.new(default)).realdirpath
           rescue StandardError => e
             default = 1
             warn e
@@ -61,7 +87,7 @@ module Squared
         when '1'
           true
         else
-          Regexp.new(ret, options, timeout: timeout)
+          ::Regexp.new(ret, options, timeout: timeout)
         end
       end
     end

data/lib/squared/common.rb

@@ -1,13 +1,9 @@
 # frozen_string_literal: true
 
-require 'pathname'
-require 'rake'
-
 require_relative 'common/base'
 require_relative 'common/class'
 require_relative 'common/format'
 require_relative 'common/prompt'
 require_relative 'common/shell'
 require_relative 'common/system'
-require_relative 'common/task'
 require_relative 'common/utils'

data/lib/squared/config.rb

@@ -2,18 +2,17 @@
 
 require 'json'
 
+require_relative 'common'
+
 module Squared
   module Config
     class Viewer
-      include Common
-      include Format
+      include Common::Format
       include Utils
       include ::Rake::DSL
 
-      class << self
-        def to_s
-          super.to_s.match(/[^:]+$/)[0]
-        end
+      def self.to_s
+        super.match(/[^:]+$/)[0]
       end
 
       attr_reader :main, :name, :project, :theme
@@ -22,12 +21,12 @@ module Squared
       def initialize(main, name = nil, project: nil, prefix: nil, dump: nil, opts: {}, auto: true,
                      common: ARG[:COMMON], pipe: ARG[:PIPE], **)
         if project
-          main = @project.base_path(main).to_s if (@project = __get__(:project)[project.to_sym])
+          main = @project.basepath(main).to_s if (@project = __get__(:project)[project.to_s])
           @required = true
         end
         @name = name&.to_s || @project&.name
         @prefix = prefix
-        @ext = File.extname(main)
+        @ext = File.extname(main).downcase
         @dump = dump
         @mime = {}
         @theme = common ? __get__(:theme)[:viewer] : {}
@@ -63,7 +62,6 @@ module Squared
         namespace(ns = task_name(name)) do
           view = @command && @command != name ? @command : 'view'
           params = ->(args) { exist? ? [realpath, [args.keys] + args.extras] : [args.keys, args.extras] }
-
           namespace view do
             if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:json"))
               desc format_desc(view, 'json')
@@ -81,7 +79,6 @@ module Squared
             end
           end
         end
-
         yield self if block_given?
       end
 
@@ -96,8 +93,8 @@ module Squared
           file = realpath if !file && exist?
 
           namespace task_name(name) do
-            desc format_desc(command, *ext, exist: exist)
             namespace command do
+              desc format_desc(command, *ext, exist: exist)
               task type, [:keys] do |_, args|
                 if file
                   read_keys(obj, type, file.to_s, args.to_a, ext: ext)
@@ -121,7 +118,7 @@ module Squared
       end
 
       def also(path, type = nil, name: nil, gem: nil, parse: nil, opts: {})
-        return self if @mime.frozen? || !(file = base_path(path)).exist?
+        return self if @mime.frozen? || !(file = basepath(path)).exist?
 
         ext = mime_type(file)
         type = type&.to_s || ext
@@ -170,19 +167,25 @@ module Squared
       end
 
       def read_keys(reader, type, file, keys, ext: [type])
-        if (mime = mime_type(file)) && base_path(file).exist?
+        if file && (mime = mime_type(file)) && basepath(file).exist?
           raise_error(file, mime, hint: 'invalid') unless ext.include?(mime)
         else
           if ext.include?(mime)
             alt = file
             file = nil
             ext[0] = mime
-          else
+          elsif file
             keys.unshift(file)
-            alt = base_path("#{main}.{#{ext.join(',')}}")
+            alt = basepath("#{main}.{#{ext.join(',')}}")
             file = Dir[alt].first
+          else
+            alt = main
+            args = { hint: 'no keys' }
+          end
+          unless file
+            args ||= { hint: 'not found', kind: LoadError }
+            raise_error(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", **args)
           end
-          raise_error(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", hint: 'not found') unless file
         end
         project&.log&.info "#{Viewer}(#{type}) => #{file} {#{keys.join(', ')}}"
         doc = if reader.respond_to?(:load_file)
@@ -197,19 +200,19 @@ module Squared
                         .realpath
                         .to_s
                         .sub(Regexp.new("^#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
-        sub = unless stdin?
-                [
-                  { pat: /^((?:[^:]|(?<! ):(?! ))+)$/, styles: theme[:banner] },
-                  { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: theme[:undefined], index: 2 },
-                  { pat: /^(.+)( : (?!undefined).+)$/m, styles: theme[:key] },
-                  { pat: /^(.+ : )(-?[\d.]+)(\s*)$/m, styles: theme[:number], index: 2 },
-                  { pat: /^(.+ : ")(.+)("\s*)$/m, styles: theme[:string], index: 2 },
-                  { pat: /^(.+ : \{)(.+)(\}\s*)$/m, styles: theme[:hash], index: 2 },
-                  { pat: /^(.+ : \[)(.+)(\]\s*)$/m, styles: theme[:array], index: 2 },
-                  { pat: /^(.+ : (?!undefined))([^"\[{].*)$/m, styles: theme[:value], index: 2 }
-                ]
-              end
-        emphasize(lines, title: title, sub: sub)
+        emphasize(lines, title: title, sub: unless stdin?
+                                              [
+                                                { pat: /^((?:[^:]|(?<! ):(?! ))+)$/, styles: theme[:banner] },
+                                                { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: theme[:undefined], index: 2 },
+                                                { pat: /^(.+)( : (?!undefined).+)$/m, styles: theme[:key] },
+                                                { pat: /^(.+ : )(-?[\d.]+)(\s*)$/m, styles: theme[:number], index: 2 },
+                                                { pat: /^(.+ : ")(.+)("\s*)$/m, styles: theme[:string], index: 2 },
+                                                { pat: /^(.+ : \{)(.+)(\}\s*)$/m, styles: theme[:hash], index: 2 },
+                                                { pat: /^(.+ : \[)(.+)(\]\s*)$/m, styles: theme[:array], index: 2 },
+                                                { pat: /^(.+ : (?!undefined))([^"\[{].*)$/m, styles: theme[:value],
+                                                  index: 2 }
+                                              ]
+                                            end)
       end
 
       def print_keys(type, data, keys, file: nil)
@@ -253,8 +256,8 @@ module Squared
         end
       end
 
-      def base_path(file)
-        project ? project.base_path(file) : Pathname.new(file).realdirpath
+      def basepath(file)
+        project ? project.basepath(file) : Pathname.new(file).realdirpath
       end
 
       def task_name(val)
@@ -280,7 +283,7 @@ module Squared
       end
 
       def realpath
-        base_path(file = main + @ext).to_s rescue file
+        basepath(file = main + @ext).to_s rescue file
       end
 
       def exist?

data/lib/squared/version.rb

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