squared 0.5.26 → 0.6.0

data/lib/squared/common/prompt.rb

@@ -1,12 +1,25 @@
 # frozen_string_literal: true
 
+unless defined?(Readline)
+  if RUBY_ENGINE == 'ruby' && RUBY_VERSION < '2.7'
+    require 'readline'
+  else
+    begin
+      require 'reline'
+      Object.send(:remove_const, :Readline) if Object.const_defined?(:Readline)
+      Readline = Reline
+    rescue LoadError
+      require 'readline'
+    end
+  end
+end
+
 module Squared
   module Common
     module Prompt
       module_function
 
-      def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 30)
-        require 'readline'
+      def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 3, timeout: 60)
         require 'timeout'
         if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(?:Yn|nY|Y/n|y/N)\]})
           case default
@@ -38,9 +51,8 @@ module Squared
         end
       end
 
-      def choice(msg, list = nil, min: 1, max: 1, multiple: false, force: true, grep: nil, auto: true,
-                 attempts: 5, timeout: 0)
-        require 'readline'
+      def choice(msg, list = nil, min: 1, max: 1, multiple: false, index: false, grep: nil, border: nil, auto: true,
+                 force: true, attempts: 3, timeout: 0)
         require 'timeout'
         if list
           grep &&= Array(grep).map { |val| Regexp.new(val) }
@@ -52,40 +64,51 @@ module Squared
             puts '%2d. %s' % [items.size, val]
           end
           max = items.size
-          raise_error 'empty selection list' if max == 0
+          raise ArgumentError, 'empty selection list' if max == 0
+
           min = grep ? 1 : [min, max].min
           if auto
-            msg = "#{msg}: [#{min}-#{max}#{if multiple
-                                             "|,#{multiple.is_a?(::Numeric) ? "{#{multiple}}" : ''}"
-                                           end}] "
+            auto.times { puts } if auto.is_a?(::Numeric)
+            if border == true
+              puts print_footer
+            elsif border
+              puts print_footer(border: border)
+            end
+            msg = "#{msg + (force ? ':' : '?')} [#{min}-#{max}#{if (n = multiple)
+                                                                  "|,#{n.is_a?(::Numeric) ? "{#{n}}" : '*'}"
+                                                                end}] "
           end
         end
-        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max <= min ? Float::INFINITY : max) }
+        between = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
           while (ch = Readline.readline(msg))
             unless (ch = ch.strip).empty?
               if multiple
-                a = ch.split(',')
-                b = a.map do |s|
-                  s.strip!
-                  if s =~ /^(\d+)-(\d+)$/
-                    next unless valid.call($1) && valid.call($2)
+                k = if ch == '*'
+                      (min..max).to_a
+                    else
+                      ch.split(/\s*,\s*/).map! do |s|
+                        if s =~ /^(\d+)-(\d+)$/
+                          next unless between.call($1) && between.call($2)
 
-                    c = $1.to_i
-                    d = $2.to_i
-                    next (c..d).to_a if c < d
-                  elsif valid.call(s)
-                    s.to_i
+                          i = $1.to_i
+                          j = $2.to_i
+                          next (i..j).to_a if i < j
+                        elsif between.call(s)
+                          s.to_i
+                        end
+                      end
+                    end
+                unless k.include?(nil)
+                  k.flatten!
+                  k.uniq!
+                  k.sort!
+                  unless multiple.is_a?(::Numeric) && multiple != k.size
+                    return index || !items ? k : k.map! { |i| items[i.pred] }
                   end
                 end
-                unless b.include?(nil)
-                  b.flatten!
-                  b.uniq!
-                  b.sort!
-                  return items ? b.map! { |i| items[i - 1] } : b unless multiple.is_a?(::Numeric) && multiple != b.size
-                end
-              elsif valid.call(ch)
-                return items ? items[ch.to_i - 1] : ch.to_i
+              elsif between.call(ch)
+                return index || !items ? ch.to_i : items[ch.to_i.pred]
               end
             end
             attempts -= 1
@@ -98,12 +121,11 @@ module Squared
           puts
           exit 0
         else
-          multiple ? [] : nil
+          [] if multiple
         end
       end
 
       def readline(msg, history = false, force: nil, multiline: nil, &blk)
-        require 'readline'
         multiline = if multiline && Readline.respond_to?(:readmultiline)
                       multiline.is_a?(::Enumerable) || block_given? ? multiline : [multiline.to_s]
                     end
@@ -113,20 +135,16 @@ module Squared
           elsif block_given?
             Readline.readmultiline(msg, history, &blk)
           else
-            Readline.readmultiline(msg, history) do |line|
-              next if line.strip.empty?
-
-              multiline.any? { |val| line.split.last.end_with?(val.to_s) }
-            end
+            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val.to_s) } }
           end
         end
         case force
         when ::TrueClass, ::FalseClass
-          msg = "#{msg} %s " % if multiline
-                                 multiline.is_a?(::Enumerable) ? "{#{multiline.to_a.join('|')}}" : multiline
-                               else
-                                 "(#{force ? 'required' : 'optional'}):"
-                               end
+          msg = "#{msg}%s%s " % if multiline
+                                  [' ', multiline.is_a?(::Enumerable) ? "{#{multiline.to_a.join('|')}}" : multiline]
+                                else
+                                  [force ? ':' : '?', '']
+                                end
           ret = (prompt.call || '').strip
           multiline.each { |val| break if ret.delete_suffix!(val.to_s) } if multiline.is_a?(::Enumerable)
           exit 1 if force && ret.empty?

data/lib/squared/common/shell.rb

@@ -6,14 +6,11 @@ require 'shellwords'
 module Squared
   module Common
     module Shell
-      QUOTE_VALUE = /\A(["'])(.*)\1\z/m.freeze
-      private_constant :QUOTE_VALUE
-
       module_function
 
       def shell_escape(val, quote: false, force: false, double: false, option: false, override: false)
-        if (r = /\A(--?)([^=\s]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val = val.to_s))
-          if (data = r[2].match(QUOTE_VALUE))
+        if (r = /\A(--?)([^= ]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val = val.to_s))
+          if (data = r[2].match(/\A(["'])(.+)\1\z/))
             double = data[1] == '"'
             override = true
           elsif !r[3] || r[6]
@@ -28,9 +25,9 @@ module Squared
 
                   r[7]
                 end
-          r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, force: force, double: double, override: override)
-        elsif option && val =~ /\A(-{0,2}[^=\s-][^=\s]*)=(.+)\z/m
-          return val if $2.match?(QUOTE_VALUE)
+          r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, double: double, force: force, override: override)
+        elsif option && val =~ /\A([^=]+)=(.+)\z/m
+          return val if $2.match?(/\A(["']).+\1\z/m)
 
           "#{$1}=%s" % if $2.include?(' ')
                          shell_quote($2, option: false)
@@ -40,7 +37,7 @@ module Squared
                          Shellwords.escape($2)
                        end
         elsif Rake::Win32.windows?
-          quote ? shell_quote(val, force: force, double: double) : val
+          quote ? shell_quote(val, double: double, force: force) : val
         elsif val.empty?
           ''
         else
@@ -48,67 +45,46 @@ module Squared
         end
       end
 
-      def shell_quote(val, option: true, force: true, double: false, preserve: true, pass: false, override: false)
+      def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.empty?
-        return val if option && val.match?(/\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m)
 
-        if val =~ QUOTE_VALUE
-          if pass == '"' || pass == "'"
-            return val if pass == $1
-          elsif pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o))
-            return val
-          end
-          case preserve
-          when false
-            base = $2
-          when '"'
-            base = $2 if $1 == "'"
-          when "'"
-            base = $2 if $1 == '"'
-          end
-        end
-        q = -> { (base || val).gsub("'\\\\''", "'") }
-        if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
-          "\"#{q.call.gsub(/(?<!\\)"/, '\\"')}\""
+        if option && val.match?(/(?:\A|\A[^=\s]+(?:=|\s+)|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/mo)
+          val
+        elsif double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
+          "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
         else
-          "'#{q.call.gsub("'", "'\\\\''")}'"
+          "'#{val.gsub("'", "'\\\\''")}'"
         end
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true, option: true, force: true, double: false,
-                       merge: false, override: false)
+      def shell_option(flag, val = nil, sep: '=', escape: true, quote: true, force: true, double: false, merge: false,
+                       override: false)
         flag = flag.to_s
-        if flag =~ QUOTE_VALUE
+        if flag =~ /\A(["'])(.+)\1\z/
           double = $1 == '"'
           flag = $2
           escape = false
           override = true
         end
-        sep = unless flag.empty?
-                if flag[0] == '-'
-                  if flag[1] == '-'
-                    '='
-                  else
-                    merge ? '' : ' '
-                  end
-                elsif flag.size == 1
-                  pre = '-'
-                  merge ? '' : ' '
-                else
-                  pre = '--'
-                  '='
-                end
-              end
-        "#{pre}#{flag}#{unless val.nil?
-                          "#{sep}#{if escape
-                                     shell_escape(val, quote: quote, double: double, override: override)
-                                   elsif quote
-                                     shell_quote(val, option: option, force: force, double: double, override: override)
-                                   else
-                                     val
-                                   end}"
-                        end}"
+        b = if flag[0] == '-'
+              flag[1] == '-' ? sep : ' '
+            elsif flag.size == 1
+              a = '-'
+              merge ? '' : ' '
+            else
+              a = '--'
+              sep
+            end
+        "#{a}#{flag}#{unless val.nil?
+                        "#{b}#{if escape
+                                 shell_escape(val, quote: quote, double: double, override: override)
+                               elsif quote
+                                 shell_quote(val, option: false, force: force, double: double, override: override)
+                               else
+                                 val
+                               end}"
+                      end}"
       end
 
       def shell_split(val, join: nil, **kwargs)
@@ -118,12 +94,45 @@ module Squared
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
+      def shell_parse(val, escape: false, force: true, **kwargs)
+        a = []
+        b = []
+        c = []
+        d = []
+        e = [a, b]
+        j = -1
+        val.shellsplit.each_with_index do |opt, i|
+          if opt == '--'
+            e = [c, d]
+          elsif opt =~ /\A--?[^=]+(=|\z)/
+            j = $1 == '=' ? -1 : i
+            e[0] << [opt]
+          elsif j >= 0
+            e[0][j] << opt
+          else
+            e[1] << shell_quote(opt, option: false, force: force)
+          end
+        end
+        ret = [[a, b], [], [c, d]].flat_map do |e, f|
+          next '--' unless e
+
+          e.flat_map do |item|
+            if item.size == 1
+              fill_option(item.first)
+            else
+              flag = item.shift
+              item.map! { |s| shell_option(flag, s, escape: escape, force: force, **kwargs) }
+            end
+          end.concat(f)
+        end
+        ret.pop if ret.last == '--'
+        ret
+      end
+
       def shell_bin(name, env: true)
-        require_relative 'base'
-        key = name.to_s.upcase
-        key = File.basename(key, '.*') if Rake::Win32.windows?
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
-                    option: false, force: false, double: true)
+        key = name.upcase
+        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name, option: false, force: false,
+                                                                                          double: true)
       end
 
       def line_width(lines)
@@ -132,7 +141,6 @@ module Squared
       end
 
       def fill_option(val, **kwargs)
-        return val unless val.is_a?(::String)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)

data/lib/squared/common/system.rb

@@ -6,10 +6,28 @@ require 'rake'
 module Squared
   module Common
     module System
+      class << self
+        private
+
+        def parse_link(val)
+          case val
+          when ::TrueClass, 's'
+            1
+          when 'r'
+            2
+          when 'h'
+            3
+          else
+            raise ArgumentError, "unrecognized 'link' flag: #{val}" if val
+
+            0
+          end
+        end
+      end
+
       module_function
 
       def shell(*args, name: :system, **kwargs)
-        kwargs.delete(:exception) unless name == :system
         if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
           e = kwargs[:exception]
           if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
@@ -25,16 +43,16 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret unless e && !ret
+        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, hidden: false,
-                   verbose: true)
+      def copy_dir(src, dest, glob = ['**/*'], create: false, link: nil, preserve: nil, force: false, verbose: true,
+                   pass: nil, hidden: false)
         base = Pathname.new(src)
         target = Pathname.new(dest)
-        raise "#{target.cleanpath} (not found)" if !create && !target.parent.exist?
+        raise Errno::ENOENT, dest.cleanpath.to_s unless create || target.parent.exist?
 
         subdir = {}
         target.mkpath if create
@@ -58,53 +76,67 @@ module Squared
         end
         count = 0
         soft = 0
+        type = System.send :parse_link, link
         subdir.each do |dir, files|
-          if link
-            files.dup.tap do |items|
-              files.clear
-              items.each do |file|
-                if file.exist?
-                  if !file.symlink?
-                    files << file
-                  elsif !force
-                    next
-                  end
-                end
-                if link == 'hard'
-                  FileUtils.ln(file, dir, force: force, verbose: false)
-                else
-                  FileUtils.ln_s(file, dir, force: force, verbose: false)
+          unless type == 0
+            items = files.dup
+            files.clear
+            items.each do |file|
+              if file.exist?
+                if !file.symlink?
+                  files << file
+                elsif !force
+                  next
                 end
-                soft += 1
               end
+              case type
+              when 1
+                FileUtils.ln_s(file, dir, force: force, verbose: false)
+              when 2
+                FileUtils.ln_s(file.relative_path_from(dir), dir, force: force, verbose: false)
+              else
+                FileUtils.ln(file, dir, force: force, verbose: false)
+              end
+              soft += 1
             end
           end
           next if files.empty?
 
-          out = FileUtils.cp(files, dir, verbose: false)
+          out = FileUtils.cp(files, dir, preserve: preserve, verbose: false)
           count += out.size
         end
         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
-          target = Pathname.new(dest)
-          if target.directory?
-            src = Array(src).reject { |val| target.join(File.basename(val)).exist? }
-            return if src.empty?
-          elsif target.exist?
-            return
+      def copy_guard(*src, dest, base: '.', create: false, link: nil, preserve: nil, force: false, verbose: true)
+        src = src.compact.flatten
+        dest = Pathname.new(dest).realdirpath
+        base = Pathname.new(base).realpath
+        dir = if dest.directory?
+                true
+              elsif src.size > 1
+                raise Errno::ENOENT, dest.cleanpath.to_s unless create && !dest.exist?
+
+                dest.mkpath
+                true
+              end
+        targets = src.map! { |file| [base + file, dir ? dest + File.basename(file) : dest] }
+        return if !force && (targets = targets.reject { |to| to[1].exist? }).empty?
+
+        type = System.send :parse_link, link
+        targets.each do |file, to|
+          case type
+          when 0
+            FileUtils.cp(file, to, preserve: preserve, verbose: verbose)
+          when 1
+            FileUtils.ln_s(file, to, force: force, verbose: verbose)
+          when 2
+            FileUtils.ln_s(file.relative_path_from(dir ? to.dirname : to), to, force: force, verbose: verbose)
+          else
+            FileUtils.ln(file, to, force: force, verbose: verbose)
           end
         end
-        case link
-        when 'hard', 1
-          FileUtils.ln(src, dest, force: force, verbose: verbose)
-        when ::TrueClass, 'soft', 0
-          FileUtils.ln_s(src, dest, force: force, verbose: verbose)
-        else
-          FileUtils.cp(src, dest, verbose: verbose)
-        end
+        nil
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -9,21 +9,44 @@ module Squared
     module Utils
       module_function
 
-      def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/)
+      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)
+                  val
+                else
+                  [obj]
+                end
+        end
+        obj = flat.is_a?(::Numeric) ? obj.flatten(flat) : obj.flatten if flat
+        obj = obj.compact if compact
+        obj = obj.map(&meth.shift) until meth.empty?
+        return obj unless block_given?
+
+        obj.select(&blk)
+      end
+
+      def split_escape(val, char: ',', &blk)
+        ret = val.split(/\s*(?<!\\)#{char}\s*/)
+        return ret unless block_given?
+
+        ret.each(&blk)
       end
 
       def split_option(val)
         val = val.strip
         return [val, '', ''] unless (i = val.index('='))
 
-        last = val[(i + 1)..-1].strip
+        last = val[i.succ..-1].strip
         quote = ''
         if last =~ /\A(["'])(.+)\1\z/
           last = $2
           quote = $1
         end
-        [val[0..(i - 1)], last, quote]
+        [val[0..i.pred], last, quote]
       end
 
       def task_invoke(*cmd, args: [], exception: true, warning: true)
@@ -105,15 +128,15 @@ module Squared
         end
       end
 
-      def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
+      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?
+        return Array(equals).any? { |val| val.to_s == ret } unless equals.nil?
 
         ret.empty? || (ignore && Array(ignore).any? { |val| val.to_s == ret }) ? default : ret
       end
 
       def env_key(*val)
-        val.join('_').sub(/\A\d+\W*/, '__').gsub(/\W+/, '_').upcase
+        val.join('_').gsub(/\W+/, '_').upcase
       end
 
       def env_value(key, default = '', suffix: nil, strict: false)
@@ -150,19 +173,11 @@ module Squared
       end
 
       def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
-        out = 1
         case key
         when ::String
           case (ret = env_value(key, suffix: suffix, strict: strict))
           when '0', '1', '2'
             return ret.to_i
-          else
-            out = default if default.is_a?(::Numeric)
-            if ret.include?(File::SEPARATOR)
-              default = ret
-            elsif key.include?(File::SEPARATOR)
-              default = key
-            end
           end
         when ::Numeric
           return key if key.between?(0, 2)
@@ -173,7 +188,7 @@ module Squared
           (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
         rescue StandardError => e
           warn e
-          out
+          1
         end
       end