squared 0.3.10 → 0.4.0

data/lib/squared/common/shell.rb

@@ -8,79 +8,91 @@ module Squared
     module Shell
       module_function
 
-      def shell_escape(val, quote: false, force: false)
-        if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val if !data[2] || (!data[4] && !data[5].match?(/\s/))
-
-          join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
-          if data[4] == data[6]
-            data[4] ? val : join.(data[5])
+      def shell_escape(val, quote: false, force: false, double: false, override: false)
+        if (r = /\A(--?)([^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
+          return val if !r[3] || (!r[5] && r[6].match?(/\s/))
+
+          combine = lambda do |opt|
+            if r[2] =~ /^(["'])(.+)\1$/
+              double = $1 == '"'
+              r[2] = $2
+              override = true
+            end
+            r[1] + r[2] + r[4] + shell_quote(opt, double: double, force: force, override: override)
+          end
+          if r[5] == r[7]
+            r[5] ? val : combine.(r[6])
           else
-            join.(data[4] + data[5] + data[6])
+            force = true
+            combine.(r[5] + r[6] + r[7])
           end
         elsif Rake::Win32.windows?
-          quote ? shell_quote(val, force: force) : val
+          quote ? shell_quote(val, double: double, force: force) : val
         else
-          val.empty? ? '' : Shellwords.escape(val)
+          Shellwords.escape(val)
         end
       end
 
-      def shell_quote(val, force: true)
+      def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
-        return val if !force && !val.include?(' ')
-        return val if option && val =~ /(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m
-
-        Rake::Win32.windows? || ARG[:QUOTE] == '"' ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
-      end
-
-      def shell_split(val, escape: true, quote: false, join: nil)
-        val = Shellwords.split(val)
-        val = val.map { |opt| shell_escape(opt, quote: quote) } if escape
-        return val unless join
+        return val if (!force && !val.include?(' ')) || (option && val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m))
 
-        val.join(join.is_a?(::String) ? join : ' ')
+        if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
+          "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
+        else
+          "'#{val.gsub("'", "'\\\\''")}'"
+        end
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true, force: true)
+      def shell_option(flag, val = nil, escape: true, quote: true, force: true, double: false, override: false,
+                       merge: false)
         flag = flag.to_s
+        if flag =~ /^(["'])(.+)\1$/
+          double = $1 == '"'
+          flag = $2
+          escape = false
+          override = true
+        end
         if flag[0] == '-'
           b = flag[1] == '-' ? '=' : ' '
+        elsif flag.size == 1
+          a = '-'
+          b = merge ? '' : ' '
         else
-          a, b = flag.size == 1 ? ['-', ' '] : ['--', '=']
+          a = '--'
+          b = '='
         end
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
-                                 shell_escape(val, quote: quote)
+                                 shell_escape(val, quote: quote, double: double, override: override)
                                else
-                                 quote ? shell_quote(val, force: force) : val
+                                 quote ? shell_quote(val, force: force, double: double, override: override) : val
                                end}"
                       end}"
       end
 
-      def fill_option(val)
-        return "-#{val}" if val =~ /\A[a-z](?:\d*)\z/i
+      def shell_split(val, escape: true, quote: false, join: nil)
+        ret = Shellwords.split(val)
+        return ret if join == false
 
-        shell_escape(val.start_with?('-') ? val : "--#{val}")
-      end
+        ret = ret.map { |opt| shell_escape(opt, quote: quote) } if escape
+        return ret unless join
 
-      def quote_option(flag, val)
-        shell_option(flag, val, escape: false)
+        ret.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def basic_option(flag, val)
-        shell_option(flag, val, escape: false, force: false)
-      end
+      def fill_option(val, double: false)
+        return "-#{val}" if val.match?(/^[a-z]\d*$/i)
 
-      def single_quote(val)
-        val.gsub("'", "'\\\\''")
+        shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
       end
 
-      def double_quote(val)
-        val.gsub(/(?<!\\)"/, '\\"')
+      def quote_option(flag, val, double: false)
+        shell_option(flag, val, escape: false, double: double)
       end
 
-      def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/)
+      def basic_option(flag, val, merge: false)
+        shell_option(flag, val, escape: false, force: false, merge: merge)
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -8,6 +8,10 @@ module Squared
     module Utils
       module_function
 
+      def split_escape(val, char: ',')
+        val.split(/\s*(?<!\\)#{char}\s*/o)
+      end
+
       def task_invoke(*cmd, args: [], exception: true, warning: true)
         cmd.each { |name| Rake::Task[name].invoke(*args) }
       rescue StandardError => e
@@ -31,8 +35,57 @@ module Squared
         Rake::Task.tasks.any? do |obj|
           next unless obj.already_invoked
 
-          args.any? { |val| val.is_a?(::Regexp) ? obj.name =~ val : val == obj.name }
+          args.any? { |val| val.is_a?(::Regexp) ? obj.name.match?(val) : val == obj.name }
+        end
+      end
+
+      def time_format(epoch, clock: false, pass: [])
+        ss = 1000
+        mm = 60 * ss
+        hh = 60 * mm
+        dd = 24 * hh
+        hm = pass.include?('s')
+        time = []
+        if !clock && (d = epoch / dd) > 0
+          time << "#{d}d"
+          epoch -= d * dd
+        end
+        if (h = epoch / hh) > 0
+          time << (clock ? h.to_s : "#{h}h")
+          epoch -= h * hh
         end
+        if (m = epoch / mm) > 0
+          time << (clock ? m.to_s.rjust(2, '0') : "#{m}m")
+          epoch -= m * mm
+        elsif clock
+          time << '00'
+        end
+        unless hm
+          if (s = epoch / ss) > 0
+            time << (clock ? s.to_s.rjust(2, '0') : "#{s}s")
+            epoch -= s * ss
+          elsif clock
+            time << '00'
+          end
+        end
+        if clock
+          time.join(':')
+        else
+          time << "#{epoch}ms" unless hm || pass.include?('ms')
+          time.join(' ')
+        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 env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
@@ -88,7 +141,7 @@ module Squared
             return ret.to_i
           end
         when ::Numeric
-          return key if key.between?(0, 2)
+          return key if key >= 0 && key <= 2
         end
         default
       end

data/lib/squared/config.rb

@@ -90,7 +90,7 @@ 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

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -173,7 +173,7 @@ module Squared
         when Symbol
           @ref = val
         else
-          raise_error('group{Symbol} | ref{String}', hint: 'missing') if block_given?
+          raise_error 'missing group or ref' if block_given?
         end
         if block_given?
           instance_eval(&blk)
@@ -350,14 +350,14 @@ module Squared
       end
 
       def describe(data)
-        @describe ||= {
+        @describe = {
           alias: {},
           replace: [],
           pattern: {}
         }
         data.each do |key, val|
           key = key.to_s
-          if /\A(\\A|\^)/ =~ key || /(\\z|\$)\z/ =~ key
+          if key.match?(/\A(\\A|\^)/) || key.match?(/(\\z|\$)\z/)
             @describe[:replace] << [Regexp.new(key), val]
           else
             @describe[val.is_a?(Regexp) ? :pattern : :alias][key.to_s] = val
@@ -404,7 +404,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/o, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)
@@ -415,15 +415,14 @@ module Squared
           val = name || task_join(*args)
           found = false
           replace = lambda do |data, out|
-            if (index = data.size) > 0
-              data.to_a.reverse_each { |group| out.sub!("%#{index -= 1}", group) }
-            end
+            index = data.size
+            data.to_a.reverse_each { |group| out.sub!("%#{index -= 1}", group) }
             out
           end
-          @describe[:replace].each do |pat, key|
-            next unless (data = pat.match(val))
+          @describe[:replace].each do |pat, tmpl|
+            next unless val =~ pat
 
-            val = replace.(data, key.dup)
+            val = replace.($~, tmpl.dup)
             found = true
           end
           if (out = @describe[:alias][val])
@@ -431,14 +430,14 @@ module Squared
             found = true
           else
             @describe[:pattern].each do |key, pat|
-              next unless (data = pat.match(val))
+              next unless val =~ pat
 
-              val = replace.(data, key.dup)
+              val = replace.($~, key.dup)
               found = true
               break
             end
           end
-          args = Shell.split_escape(val, char: ':').map! { |s| s.gsub('\\:', ':') } if found
+          args = split_escape(val, char: ':').map! { |s| s.gsub('\\:', ':') } if found
         end
         desc message(*args, **kwargs)
       end
@@ -564,7 +563,7 @@ module Squared
 
           key = task_join(task_localname(obj.name), key)
         end
-        @pass[:pattern].any? { |item| item.is_a?(Regexp) ? key =~ item : key == item }
+        @pass[:pattern].any? { |item| item.is_a?(Regexp) ? key.to_s.match?(item) : key == item }
       end
 
       def task_defined?(*key)
@@ -587,6 +586,10 @@ module Squared
         Rake::Win32.windows?
       end
 
+      def docker?
+        File.exist?('/.dockerenv')
+      end
+
       def rootpath(*args)
         root.join(*args)
       end
@@ -693,7 +696,7 @@ module Squared
         end
         return false if state == :prod && data[:dev] == true && data[:global]
 
-        target && pat.is_a?(Regexp) ? as_a(target).any? { |val| val =~ pat } : pat == true
+        target && pat.is_a?(Regexp) ? as_a(target).any? { |val| val.match?(pat) } : pat == true
       end
 
       def scriptobj