squared 0.4.8 → 0.4.10

data/lib/squared/common/shell.rb

@@ -8,12 +8,12 @@ module Squared
     module Shell
       module_function
 
-      def shell_escape(val, quote: false, force: false, double: false, override: false)
+      def shell_escape(val, quote: false, force: false, double: false, option: 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/))
+          return val if !r[3] || (!r[5] && !r[6].match?(/\s/))
 
           combine = lambda do |opt|
-            if r[2] =~ /\A(["'])(.+)\1\z/
+            if r[2] =~ /\A(["'])(.+)\1\z/m
               double = $1 == '"'
               r[2] = $2
               override = true
@@ -26,19 +26,28 @@ module Squared
             force = true
             combine.call(r[5] + r[6] + r[7])
           end
-        elsif val.empty?
-          ''
+        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)
+                       else
+                         Rake::Win32.windows? ? $2 : Shellwords.escape($2)
+                       end
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, double: double, force: force) : val
         else
-          Shellwords.escape(val)
+          val.empty? ? '' : Shellwords.escape(val)
         end
       end
 
       def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
-        return val if val.empty? || (!force && !val.include?(' '))
-        return val if option && val.match?(/(?:\A|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
+        return val if (!force && !val.include?(' ')) || val.empty?
+
+        if option && val.match?(/(?:\A|\A[^=\s]+(?:=|\s+)|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
+          return val
+        end
 
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
           "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
@@ -76,18 +85,16 @@ module Squared
                       end}"
       end
 
-      def shell_split(val, escape: true, quote: false, join: nil)
-        ret = Shellwords.split(val)
-        return ret if join == false
-
-        ret.map! { |opt| shell_escape(opt, quote: quote) } if escape
+      def shell_split(val, quote: false, force: false, join: nil)
+        ret = val.shellsplit
+        ret.map! { |opt| shell_escape(opt, quote: quote, force: force, double: true, option: true) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
       def fill_option(val, double: false)
-        return "-#{val}" if val.match?(/^[a-z]\d*$/i)
+        return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
       end

data/lib/squared/common/system.rb

@@ -29,11 +29,11 @@ module Squared
         dest.mkpath if create
         if pass
           exclude = []
-          pass = [pass] unless pass.is_a?(::Array)
-          pass.each { |val| exclude.concat(Dir.glob(src.join(val))) }
+          pass = [pass] unless pass.is_a?(::Enumerable)
+          pass.each { |val| exclude.concat(Dir.glob(src + val)) }
         end
-        (glob.is_a?(::Array) ? glob : [glob]).each do |val|
-          Dir.glob(src.join(val)) do |path|
+        (glob.is_a?(::Enumerable) ? glob : [glob]).each do |val|
+          Dir.glob(src + val) do |path|
             next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
 
             dir = dest.join(path.relative_path_from(src)).dirname
@@ -79,7 +79,7 @@ module Squared
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
           if (path = Pathname.new(dest)).directory?
-            src = [src] unless src.is_a?(::Array)
+            src = [src] unless src.is_a?(::Enumerable)
             src = src.reject { |val| path.join(File.basename(val)).exist? }
             return if src.empty?
           elsif path.exist?
@@ -89,7 +89,7 @@ module Squared
         case link
         when 'hard', 1
           FileUtils.ln(src, dest, force: force, verbose: verbose)
-        when TrueClass, 'soft', 0
+        when ::TrueClass, 'soft', 0
           FileUtils.ln_s(src, dest, force: force, verbose: verbose)
         else
           FileUtils.cp(src, dest, verbose: verbose)

data/lib/squared/common/utils.rb

@@ -159,7 +159,7 @@ module Squared
         end
         begin
           if default.is_a?(::String)
-            default = (root ? Pathname.new(root).join(default) : Pathname.new(default)).realdirpath
+            default = (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
           end
         rescue StandardError => e
           warn e

data/lib/squared/config.rb

@@ -14,7 +14,7 @@ module Squared
       class << self
         def parse(gem, namespace, ext = [pkg])
           require gem
-          obj = eval(namespace)
+          obj = eval namespace
           ext = [ext] unless ext.is_a?(Array)
           ext.each { |val| @@mime_obj[val] = [obj, ext] }
         rescue LoadError, NameError => e
@@ -127,7 +127,7 @@ module Squared
         if enabled?
           if namespace
             require(gem || type)
-            obj = eval(namespace)
+            obj = eval namespace
           else
             as_a(ext).each do |val|
               next unless (data = @@mime_obj[val])
@@ -163,7 +163,7 @@ module Squared
       def also(path, type = nil, name: nil, **kwargs)
         return self if @mime.frozen? || !(file = basepath(path)).exist?
 
-        ext = mimetype(file)
+        ext = mimetype file
         type ||= ext
         name ||= file.basename.to_s.chomp(File.extname(file))
         add(type, ext: ext, command: name, file: file, **kwargs)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -83,7 +83,7 @@ module Squared
         basename = @home.basename.to_s
         if main
           @main = main.to_s.freeze
-          @home = @home.join(@main) unless @main == basename || (windows? && @main.downcase == basename.downcase)
+          @home += @main unless @main == basename || (windows? && @main.downcase == basename.downcase)
         else
           @main = basename.freeze
         end
@@ -96,7 +96,7 @@ module Squared
         @extensions = []
         @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
-        @exception = env_bool(exception)
+        @exception = env_bool exception
         @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
         @warning = @verbose != false
         @closed = false
@@ -274,7 +274,7 @@ module Squared
         data = {} if !command && data[:order].empty?
         if group
           label = :group
-          items = as_a(group)
+          items = as_a group
         else
           label = :ref
           items = ref ? as_a(ref) : [:_]
@@ -299,9 +299,9 @@ module Squared
           kwargs = kwargs.dup unless @withargs
           kwargs[:group] = @group
         end
-        path = rootpath(path)
+        path = root + path
         project = (project || path.basename).to_s
-        name = task_name(project)
+        name = task_name project
         index = 0
         while @project[name]
           index += 1
@@ -463,7 +463,7 @@ module Squared
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
           obj.allref.each do |ref|
-            next unless (data = batch[ref])
+            next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
               if (items = task_resolve(obj, val)).empty?
@@ -482,7 +482,7 @@ module Squared
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
           obj.allref.each do |ref|
-            next unless (alt = data[ref])
+            next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve(obj, alt)
             break unless ret.empty?
@@ -499,7 +499,7 @@ module Squared
       end
 
       def task_sync(key)
-        key = task_name(key)
+        key = task_name key
         task_defined?(ret = task_join(key, 'sync')) ? ret : key
       end
 
@@ -561,7 +561,7 @@ module Squared
       end
 
       def task_include?(obj, key, ref = nil)
-        return false if @series.exclude.include?(key)
+        return false if @series.exclude?(key)
 
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end
@@ -598,7 +598,7 @@ module Squared
       end
 
       def docker?
-        File.exist?('/.dockerenv')
+        !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
       end
 
       def powershell?
@@ -608,7 +608,7 @@ module Squared
         when 'powershell.exe', 'vscode'
           true
         else
-          ENV.fetch('PSModulePath', '').split(';').size > 1
+          ENV.fetch('PSModulePath', '').split(';', 2).size > 1
         end
       end
 
@@ -686,12 +686,8 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group
-          target[:group][group.to_sym]
-        elsif ref.is_a?(Array)
-          ref = ref.each
-        end
-        if ref.instance_of?(Enumerator)
+        target[:group][group.to_sym] if group
+        if ref.is_a?(Enumerable)
           ref.each do |key|
             next unless (ret = target[:ref][key])
 

data/lib/squared/workspace/project/base.rb

@@ -213,7 +213,7 @@ module Squared
             file = val.is_a?(String) ? Time.now.strftime(val) : "#{@name}-#{Date.today}.log"
           end
           if file
-            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home.join(file)
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home + file
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -225,7 +225,7 @@ module Squared
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
-            log[:level] = val.match?(/^\d$/) ? log_sym(val.to_i) : val
+            log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val
           end
           log.delete(:file)
           @log = [file, log]
@@ -240,10 +240,10 @@ module Squared
           unless @output[0] == false || @output[0].is_a?(Array)
             if (val = env('BUILD', suffix: 'OPTS'))
               n = @output[0] ? 1 : 3
-              @output[n] = merge_opts(@output[n], shell_split(val, escape: false))
+              @output[n] = merge_opts(@output[n], shell_split(val))
             end
             if (val = env(ref.to_s.upcase, suffix: 'OPTS'))
-              @output[4] = merge_opts(@output[4], shell_split(val, escape: false))
+              @output[4] = merge_opts(@output[4], shell_split(val))
             end
           end
           @version = val if (val = env('BUILD', suffix: 'VERSION'))
@@ -324,7 +324,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
+                      unpack(path + dir, uri: tag, digest: digest, ext: ext, force: force)
                     end
                   end
                 end
@@ -401,10 +401,10 @@ module Squared
           self
         end
 
-        def build(*args, sync: invoked_sync?('build'), from: @buildtype || :build, **)
+        def build(*args, sync: invoked_sync?('build'), from: :run, **)
           banner = verbose
           if args.empty?
-            return unless from == (@buildtype || :build)
+            return unless from == :run
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
@@ -443,7 +443,7 @@ module Squared
             cmd, opts, var, flags, extra = args
           end
           if cmd
-            cmd = as_get(cmd)
+            cmd = as_get cmd
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -461,6 +461,7 @@ module Squared
             return unless (opts || extra) && respond_to?(:compose)
 
             cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -516,13 +517,13 @@ module Squared
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
               @clean.each do |val|
-                path = basepath(val = val.to_s)
-                if path.directory? && val.match?(%r{[\\/]$})
-                  log&.warn "rm -rf #{path}"
-                  rm_rf(path, verbose: verbose)
+                entry = path + (val = val.to_s)
+                if entry.directory? && val.match?(%r{[\\/]$})
+                  log&.warn "rm -rf #{entry}"
+                  rm_rf(entry, verbose: verbose)
                 else
-                  log&.warn "rm #{path}"
-                  (val.include?('*') ? Dir[path] : [path]).each do |file|
+                  log&.warn "rm #{entry}"
+                  (val.include?('*') ? Dir[entry] : [entry]).each do |file|
                     next unless File.file?(file)
 
                     begin
@@ -571,7 +572,7 @@ module Squared
           end
         end
 
-        def unpack(target, sync: true, uri: nil, digest: nil, ext: nil, force: false, depth: 1, headers: {},
+        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
                    from: :unpack)
           if !target.exist?
             target.mkpath
@@ -685,7 +686,7 @@ module Squared
               break unless entry.directory?
 
               i = 0
-              while (dest = target.join("#{File.basename(file.path)}-#{i}")).exist?
+              while (dest = target + "#{File.basename(file.path)}-#{i}").exist?
                 i += 1
               end
               FileUtils.mv(entry, dest)
@@ -915,7 +916,7 @@ module Squared
             end
             return
           end
-          cmd = session_done(cmd)
+          cmd = session_done cmd
           log&.info cmd
           on :first, from
           begin
@@ -1122,7 +1123,7 @@ module Squared
           end
           ret = JoinSet.new(cmd.flatten(1))
           if options && (val = env("#{prefix}_OPTIONS"))
-            split_escape(val).each { |opt| ret.last(fill_option(opt), /^(--?[^ =]+)[ =].+$/) }
+            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
           end
           main ? @session = ret : ret
         end
@@ -1130,7 +1131,7 @@ module Squared
         def session_delete(*args, target: @session)
           ret = []
           args.each do |val|
-            pat = /^#{Regexp.escape(shell_option(val))}(?: |=|$)/
+            pat = /\A#{Regexp.escape(shell_option(val))}(?: |=|\z)/
             if (key = target.find { |opt| opt.match?(pat) })
               target.delete(key)
               ret << key
@@ -1172,6 +1173,10 @@ module Squared
           OptionPartition.clear(target, opts, styles: theme[:inline], **kwargs)
         end
 
+        def print_success(*)
+          puts 'Success'
+        end
+
         def print_item(*val)
           puts if @@print_order > 0 && stdout?
           @@print_order += 1
@@ -1204,7 +1209,7 @@ module Squared
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
           n = Project.max_width(lines)
-          sub = as_a(sub)
+          sub = as_a sub
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub.each { |h| s = sub_style(s, **h) }
@@ -1471,7 +1476,7 @@ module Squared
           end
         end
 
-        def param_guard(action, flag, args: nil, key: nil, pat: nil, values: nil)
+        def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
@@ -1497,24 +1502,59 @@ module Squared
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
           c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
           e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
+          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d)
         end
 
-        def choice_index(msg, list, values: nil, multiple: false, accept: nil, trim: nil)
-          puts if @@print_order > 0
-          raise_error 'user cancelled' unless (ret = choice(msg, list, multiple: multiple))
+        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
+                         multiple: false, force: true, **kwargs)
+          puts if !series && @@print_order > 0
+          msg = "#{msg} (optional)" unless force
+          unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) || !force
+            raise_error 'user cancelled'
+          end
+          if ret.nil? || ret.empty?
+            return unless force
+
+            exit 1
+          end
           ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
-          exit 1 if accept && !confirm("#{accept} [#{ret.join(', ')}] [y/N] ", 'N', timeout: 60)
+          if column
+            a, b = as_a(column)
+            ret = as_a(ret).map! { |val| val[a, b || 1] }
+            ret = ret.first unless multiple
+          end
+          if accept
+            a = as_a(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
+            accept = as_a(accept).map { |val| as_a(val) }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
+            loop do
+              c = confirm("#{accept.first[0]}#{a ? " [#{a}]" : ''} [y/N] ", 'N', timeout: 60)
+              if accept.shift[1] == true
+                ret << c
+              elsif !c
+                break
+              end
+              a = nil
+              break if accept.empty?
+            end
+            exit 1 unless accept.empty?
+          end
           if values
-            ret = [ret]
+            ret = [ret] unless accept && multiple == -1
             values.each do |val|
-              val, req = val if val.is_a?(Array)
-              val = Readline.readline("#{val} (#{req ? 'required' : 'optional'}): ", true).strip
-              raise_error 'user cancelled' if req && val.empty?
+              if val.is_a?(Array)
+                val, force = val
+              else
+                force = false
+              end
+              val = readline(val, force: force)
               ret << (val.empty? ? nil : val)
             end
           end
-          @@print_order += 1
+          @@print_order += 1 unless series
           ret
         end
 
@@ -1547,7 +1587,7 @@ module Squared
             raise_error 'pathspec not within worktree' unless pass || files.size == proj.size
             files = proj
           end
-          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val)) }
+          files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
         def semver(val)
@@ -1583,7 +1623,7 @@ module Squared
         end
 
         def colormap(val)
-          val.compact.map! { |s| color(s) }.flatten
+          val.compact.flat_map { |s| color(s) }
         end
 
         def epochtime
@@ -1592,7 +1632,7 @@ module Squared
 
         def verbosetype
           case verbose
-          when TrueClasss
+          when TrueClass
             1
           when Numeric
             verbose.succ
@@ -1627,7 +1667,7 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
                 ret = yield
               else
                 Dir.chdir(path)
@@ -1794,6 +1834,10 @@ module Squared
           end
         end
 
+        def success?(ret)
+          ret == true && stdout? && banner?
+        end
+
         def banner?
           ARG[:BANNER] && !env('BANNER', equals: '0')
         end
@@ -1811,14 +1855,14 @@ module Squared
         end
 
         def has_value?(data, val)
-          return data.value?(val) if data.is_a?(::Hash)
-          return data.is_a?(::Enumerable) && data.to_a.include?(val) if !val.is_a?(::Enumerable) || val.is_a?(::Hash)
+          return data.value?(val) if data.is_a?(Hash)
+          return data.is_a?(Enumerable) && data.to_a.include?(val) if !val.is_a?(Enumerable) || val.is_a?(Hash)
 
           val.to_a.any? do |obj|
             case data
-            when ::Hash
+            when Hash
               data.value?(obj)
-            when ::Enumerable
+            when Enumerable
               data.to_a.include?(obj)
             end
           end