squared 0.4.18 → 0.5.0

data/lib/squared/common/base.rb

@@ -63,7 +63,6 @@ module Squared
           hash: %i[green black!],
           array: %i[blue black!],
           number: [:magenta],
-          boolean: [:magenta],
           undefined: %i[red italic]
         },
         logger: {
@@ -94,28 +93,28 @@ module Squared
       PATH.freeze
       ARG.freeze
       VAR.each_value(&:freeze)
-      VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }
+      VAR[:theme].each_value(&:freeze)
       VAR.freeze
     end
 
     module_function
 
-    def as_a(obj, meth = nil, flat: nil, compact: false, &blk)
+    def as_a(obj, *meth, flat: nil, compact: false, &blk)
       return [] if obj.nil?
 
       unless obj.is_a?(::Array)
-        obj = if obj.respond_to?(:to_ary)
-                obj.to_ary
-              elsif obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (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 = flat.is_a?(::Numeric) ? obj.flatten(flat) : obj.flatten if flat
+      obj = obj.flatten(flat.is_a?(::Numeric) ? flat : nil) if flat
       obj = obj.compact if compact
-      obj = obj.map(&meth) if meth
-      block_given? ? obj.select(&blk) : obj
+      obj = obj.map(&meth.shift) until meth.empty?
+      return obj unless block_given?
+
+      obj.select(&blk)
     end
   end
 end

data/lib/squared/common/format.rb

@@ -29,19 +29,13 @@ module Squared
         bright_white!: '107'
       }.freeze
       BOX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
-      BOX_BORDER = ['│', '─', '┌', '┐', '┘', '└', '├', '┤', '┬', '┴'].tap do |val|
-        if ENV['TERM']&.end_with?('256color')
-          val.slice!(2, 4)
-          val.insert(2, '╭', '╮', '╯', '╰')
-        end
-        val.freeze
-      end
+      BOX_BORDER = ['│', '─', '╭', '╮', '╯', '╰', '├', '┤', '┬', '┴'].freeze
       TEXT_STYLE = [:bold, :dim, :italic, :underline, :blinking, nil, :inverse, :hidden, :strikethrough].freeze
       private_constant :AIX_TERM, :BOX_GRAPH, :BOX_BORDER, :TEXT_STYLE
 
       def enable_aixterm
         unless (colors = __get__(:colors)).frozen?
-          colors.merge!(AIX_TERM)
+          colors.update(AIX_TERM)
         end
         self
       end
@@ -67,7 +61,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(Array(styles)).flatten.each_with_index do |type, i|
+        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
           next unless type
 
           if index == -1
@@ -141,11 +135,11 @@ module Squared
       def apply_style(data, key, args, empty: true)
         return if data.is_a?(::Symbol) && (data = __get__(:theme)[data]).nil?
 
-        set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
+        set = ->(k, v) { data[k] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
           key.each { |k, v| set.call(k, v || args) }
         else
-          set.call(key, args)
+          set.call(key.to_sym, args)
         end
       end
 
@@ -194,7 +188,7 @@ module Squared
         end
       end
 
-      def log_console(*args, pipe: 1)
+      def puts_oe(*args, pipe: 1)
         return if args.first == false && args.size == 1
 
         if pipe.is_a?(Pathname)
@@ -211,8 +205,6 @@ module Squared
         (pipe == 2 ? $stderr : $stdout).puts(*args)
       end
 
-      alias puts_oe log_console
-
       module_function
 
       def message(*args, hint: nil, empty: false, space: ARG[:SPACE])

data/lib/squared/common/prompt.rb

@@ -11,24 +11,22 @@ module Squared
         agree = /^#{Regexp.escape(agree)}$/i if agree.is_a?(::String)
         cancel = /^#{Regexp.escape(cancel)}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
-          begin
-            while (ch = Readline.readline(msg))
-              ch = ch.chomp
-              case (ch.empty? ? default : ch)
-              when agree
-                return true
-              when cancel
-                return false
-              end
-              attempts -= 1
-              exit 1 unless attempts > 0
+          while (ch = Readline.readline(msg))
+            ch = ch.chomp
+            case (ch.empty? ? default : ch)
+            when agree
+              return true
+            when cancel
+              return false
             end
-          rescue Interrupt
-            puts
-            exit 0
-          else
-            false
+            attempts -= 1
+            exit 1 unless attempts > 0
           end
+        rescue Interrupt
+          puts
+          exit 0
+        else
+          false
         end
       end
 
@@ -37,12 +35,12 @@ module Squared
         require 'readline'
         require 'timeout'
         if list
-          grep &&= Array(grep).map { |val| Regexp.new(val) }
+          grep &&= (grep.is_a?(::Enumerable) ? grep : [grep]).map { |val| Regexp.new(val) }
           items = []
           list.each do |val|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            items << val.to_s.chomp
+            items << val.chomp
             puts "#{items.size.to_s.rjust(2)}. #{val}"
           end
           max = items.size
@@ -56,33 +54,31 @@ module Squared
         end
         valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
-          begin
-            while (ch = Readline.readline(msg))
-              unless (ch = ch.strip).empty?
-                if multiple
-                  a = ch.split(/\s*,\s*/)
-                  b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
-                  next unless a.size == b.size
-                  return b unless items
-                  next if multiple.is_a?(::Numeric) && multiple != b.size
+          while (ch = Readline.readline(msg))
+            unless (ch = ch.strip).empty?
+              if multiple
+                a = ch.split(/\s*,\s*/)
+                b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
+                next unless a.size == b.size
+                return b unless items
+                next if multiple.is_a?(::Numeric) && multiple != b.size
 
-                  return b.map! { |i| items[i - 1] }
-                elsif valid.call(ch)
-                  return items ? items[ch.to_i - 1] : ch.to_i
-                end
+                return b.map! { |i| items[i - 1] }
+              elsif valid.call(ch)
+                return items ? items[ch.to_i - 1] : ch.to_i
               end
-              attempts -= 1
-              next if attempts > 0
-
-              exit 1 if force
-              break
             end
-          rescue Interrupt
-            puts
-            exit 0
-          else
-            multiple ? [] : nil
+            attempts -= 1
+            next if attempts > 0
+            break unless force
+
+            exit 1
           end
+        rescue Interrupt
+          puts
+          exit 0
+        else
+          multiple ? [] : nil
         end
       end
 
@@ -109,7 +105,7 @@ module Squared
                                end
           ret = (prompt.call || '').strip
           multiline.each { |val| break if ret.delete_suffix!(val) } if multiline.is_a?(::Enumerable)
-          exit 1 if force && ret.empty?
+          raise_error 'user cancelled' if force && ret.empty?
           ret
         else
           prompt.call

data/lib/squared/common/shell.rb

@@ -85,17 +85,17 @@ module Squared
                       end}"
       end
 
-      def shell_split(val, quote: false, force: false, join: nil)
-        ret = val.shellsplit.map! { |opt| shell_escape(opt, quote: quote, force: force, double: true, option: true) }
+      def shell_split(val, join: nil, **kwargs)
+        ret = val.shellsplit
+        ret.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def shell_bin(name, env: true)
-        key = name.upcase
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
-                    option: false, force: false)
+      def line_width(lines)
+        ret = [lines.max_by(&:size).size, 80].max
+        [ret, Rake.application.terminal_width].min
       end
 
       def fill_option(val, **kwargs)
@@ -104,12 +104,12 @@ module Squared
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)
       end
 
-      def quote_option(flag, val, option: true, double: false, merge: false)
-        shell_option(flag, val, escape: false, option: option, double: double, merge: merge)
+      def quote_option(flag, val, **kwargs)
+        shell_option(flag, val, escape: false, **kwargs)
       end
 
-      def basic_option(flag, val, merge: false)
-        shell_option(flag, val, escape: false, force: false, merge: merge)
+      def basic_option(flag, val, **kwargs)
+        shell_option(flag, val, escape: false, force: false, **kwargs)
       end
     end
   end

data/lib/squared/common/system.rb

@@ -1,55 +1,49 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'rake'
+require 'fileutils'
 
 module Squared
   module Common
     module System
       module_function
 
-      def shell(*args, name: :system, **kwargs)
-        if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
-          e = kwargs[:exception]
-          if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
-            Dir.chdir dir
-            ret = Kernel.send(name, *args)
-            Dir.chdir pwd
-          else
-            ret = Kernel.send(name, *args)
-          end
-        elsif RUBY_VERSION < '2.6'
-          e = kwargs.delete(:exception)
-          ret = Kernel.send(name, *args, **kwargs)
+      def shell(*args, **kwargs)
+        if RUBY_VERSION < '2.6'
+          exception = kwargs.delete(:exception)
+          ret = Kernel.system(*args, **kwargs)
+          return ret if ret || !exception
+
+          raise $?.to_s
         else
-          return Kernel.send(name, *args, **kwargs)
+          Kernel.system(*args, **kwargs)
         end
-        return ret unless e && !ret && name == :system
-
-        raise $?.to_s
       end
 
-      def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, verbose: true)
-        src = Pathname.new(src)
-        dest = Pathname.new(dest)
-        raise "#{dest.cleanpath} (not found)" if !create && !dest.parent.exist?
+      def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, force: false, pass: nil, hidden: false,
+                   verbose: true)
+        base = Pathname.new(src)
+        target = Pathname.new(dest)
+        raise "#{target.cleanpath} (not found)" if !create && !target.parent.exist?
 
         subdir = {}
-        dest.mkpath if create
+        target.mkpath if create
+        flags = hidden ? [File::FNM_DOTMATCH] : []
         if pass
           exclude = []
-          Array(pass).each { |val| exclude.concat(Dir.glob(src + val)) }
+          pass = [pass] unless pass.is_a?(::Array)
+          pass.each { |val| exclude.concat(Dir.glob(val, *flags, base: base)) }
         end
-        Array(glob).each do |val|
-          Dir.glob(src + val) do |path|
-            next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
+        (glob.is_a?(::Enumerable) ? glob : [glob]).each do |val|
+          Dir.glob(val, *flags, base: base) do |file|
+            next if exclude&.include?(file) || (entry = base + file).directory?
 
-            dir = dest.join(path.relative_path_from(src)).dirname
+            dir = target.join(file).dirname
             if (data = subdir[dir.to_s])
-              data << path
+              data << entry
             else
               dir.mkpath
-              subdir[dir.to_s] = [path]
+              subdir[dir.to_s] = [entry]
             end
           end
         end
@@ -57,7 +51,7 @@ module Squared
         soft = 0
         subdir.each do |dir, files|
           if link
-            files.dup.tap do |items|
+            files.dup.yield_self do |items|
               files.clear
               items.each do |file|
                 if file.exist?
@@ -82,15 +76,17 @@ module Squared
           out = FileUtils.cp(files, dir, verbose: false)
           count += out.size
         end
-        puts [dest.realpath, subdir.size, soft > 0 ? "#{count}+#{soft}" : count].join(' => ') if verbose
+        puts [target.realpath, subdir.size, soft > 0 ? "#{count}+#{soft}" : count].join(' => ') if verbose
       end
 
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
-          if (path = Pathname.new(dest)).directory?
-            src = Array(src).reject { |val| path.join(File.basename(val)).exist? }
+          target = Pathname.new(dest)
+          if target.directory?
+            src = [src] unless src.is_a?(::Enumerable)
+            src = src.reject { |val| target.join(File.basename(val)).exist? }
             return if src.empty?
-          elsif path.exist?
+          elsif target.exist?
             return
           end
         end

data/lib/squared/common/utils.rb

@@ -17,13 +17,13 @@ module Squared
         val = val.strip
         return [val, '', ''] unless (i = val.index('='))
 
-        last = val[(i + 1)..-1].strip
+        last = val[i + 1..-1].strip
         quote = ''
         if last =~ /\A(["'])(.+)\1\z/
           last = $2
           quote = $1
         end
-        [val[0..(i - 1)], last, quote]
+        [val[0..i - 1], last, quote]
       end
 
       def task_invoke(*cmd, args: [], exception: true, warning: true)
@@ -88,41 +88,16 @@ module Squared
         end
       end
 
-      def time_offset(val = nil)
-        val = DateTime.parse(val) if val.is_a?(::String)
-        cur = DateTime.now
-        ret = 0
-        if (r = /^([+-])(\d+):(\d+):(\d+)$/.match((val || cur).strftime('%::z')))
-          ret += (r[1] == '+' ? -1 : 1) * ((r[2].to_i * 60 * 60) + (r[3].to_i * 60) + r[4].to_i) * 1000
-        end
-        return ret unless val
-
-        (cur.strftime('%Q').to_i + time_offset) - (val.strftime('%Q').to_i + ret)
-      end
-
       def time_since(val, ms: true)
         s = ms ? '%s%L' : '%s'
         Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i
       end
 
-      def rand_s(size)
-        if RUBY_VERSION >= '3.1'
-          require 'random/formatter'
-          Random.new.alphanumeric(size)
-        else
-          (0...size).map { rand(97..122).chr }.join
-        end
-      end
-
       def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?
 
-        ret.empty? || (ignore && Array(ignore).any? { |val| val.to_s == ret }) ? default : ret
-      end
-
-      def env_key(*val)
-        val.join('_').gsub(/\W+/, '_').upcase
+        ret.empty? || (ignore && as_a(ignore).any? { |val| val.to_s == ret }) ? default : ret
       end
 
       def env_value(key, default = '', suffix: nil, strict: false)

data/lib/squared/common.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require_relative 'common/base'
-require_relative 'common/class'
 require_relative 'common/format'
 require_relative 'common/prompt'
 require_relative 'common/shell'

data/lib/squared/config.rb

@@ -15,7 +15,8 @@ module Squared
         def parse(gem, namespace, ext = [pkg])
           require gem
           obj = eval namespace
-          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
+          ext = [ext] unless ext.is_a?(Array)
+          ext.each { |val| @@mime_obj[val] = [obj, ext] }
         rescue LoadError, NameError => e
           warn e
           nil
@@ -26,7 +27,7 @@ module Squared
         def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
           return unless project.enabled?
 
-          ret = Viewer.new(main, name, project: project, **kwargs)
+          ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
           ret
         end
@@ -88,16 +89,16 @@ module Squared
                       @required = true
                       project ? [project, 'not found'] : ['name', 'missing']
                     end
-        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
+        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint, pass: true)
       end
 
       def build
         return unless enabled?
 
-        namespace task_name(name) do |ns|
+        namespace(ns = task_name(name)) do
           @mime.each do |type, items|
             items.each do |command, file, opts|
-              next if Rake::Task.task_defined?("#{ns.scope.path}:#{command}:#{type}")
+              next if Rake::Task.task_defined?("#{ns}:#{command}:#{type}")
 
               namespace command do
                 unless (data = @@mime_obj[type])
@@ -128,7 +129,7 @@ module Squared
             require(gem || type)
             obj = eval namespace
           else
-            Array(ext).each do |val|
+            as_a(ext).each do |val|
               next unless (data = @@mime_obj[val])
 
               obj = data.first
@@ -136,7 +137,7 @@ module Squared
             end
           end
           if obj
-            ext << type if (ext = Array(ext)).empty?
+            ext << type if (ext = as_a(ext)).empty?
             if !file && target?
               ext.each do |val|
                 next unless (out = basepath("#{main}.#{val}")).exist?
@@ -169,7 +170,7 @@ module Squared
       end
 
       def style(name, *args)
-        apply_style(theme, name, args)
+        apply_style theme, name, args
         self
       end
 
@@ -196,7 +197,7 @@ module Squared
       private
 
       def puts(*args)
-        log_console(*args, pipe: pipe)
+        puts_oe(*args, pipe: pipe)
       end
 
       def log
@@ -212,7 +213,7 @@ module Squared
             file = nil
             ext[0] = mime
           elsif file
-            keys.unshift(file)
+            keys.prepend(file)
             alt = basepath("#{main}.{#{ext.join(',')}}")
             file = Dir[alt].first
           else
@@ -242,15 +243,14 @@ module Squared
                                               [
                                                 { pat: /\A((?:[^:]|(?<! ):(?! ))+)\z/, styles: theme[:banner] },
                                                 { pat: /\A(.*?)(<[^>]+>)(.+)\z/m, styles: theme[:undefined], index: 2 },
-                                                { pat: /\A(.+)( : (?!undefined).+)\z/m, styles: theme[:key] },
-                                                { pat: /\A(.+ : )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
+                                                { pat: /\A((?~ : ))( : (?!undefined).+)\z/m, styles: theme[:key] },
+                                                { pat: /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
                                                   index: 2 },
-                                                { pat: /\A(.+ : ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
-                                                { pat: /\A(.+ : \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
-                                                { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
-                                                { pat: /\A(.+ : )(true|false)(\s*)\z/m, styles: theme[:boolean],
+                                                { pat: /\A((?~: ): ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
+                                                { pat: /\A((?~: ): \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
+                                                { pat: /\A((?~: ): \[)(.+)(\]\s*)\z/m, styles: theme[:array],
                                                   index: 2 },
-                                                { pat: /\A(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
+                                                { pat: /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
                                             end, border: theme[:border])
@@ -309,7 +309,7 @@ module Squared
         return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
-        args = *name.split(':').push(command, val)
+        args = *name.split(':').append(command, val)
         if project
           project.workspace.task_desc(*args)
         else
@@ -347,7 +347,7 @@ module Squared
       end
 
       def basepath(file)
-        project ? project.basepath(file) : Pathname.new(file).realdirpath
+        project ? project.basepath(file) : Pathname.pwd + file
       end
     end
   end

data/lib/squared/version.rb

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