squared 0.7.6 → 0.8.0

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require 'logger'
 
 require_relative 'support/class'
 require_relative 'support/utils'
@@ -10,6 +9,7 @@ module Squared
   module Workspace
     module Project
       class Base
+        include Enumerable
         include Comparable
         include Common::Format
         include System
@@ -25,7 +25,7 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependname dependindex theme archive env graph
                      dev prod timeout pass only exclude serve asdf].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?(?:([-.])?(\S+))?\b/.freeze
         URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
         TASK_METADATA = Rake::TaskManager.record_task_metadata
         private_constant :OPTIONS, :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
@@ -343,7 +343,7 @@ module Squared
                           tag ||= if @release
                                     "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
                                   else
-                                    raise_error ArgumentError, "no base uri: #{tag}", hint: ext
+                                    raise ArgumentError, message('no base uri', tag, hint: ext)
                                   end
                         end
                         force = case (digest = args.digest)
@@ -471,10 +471,10 @@ module Squared
             cmd = args.each_with_object([]) do |val, out|
               case val.first
               when Proc
-                instance_exec(*val[1..-1], &val.first)
+                instance_exec(*val.drop(1), &val.first)
                 next
               when Method
-                val.first.call(*val[1..-1])
+                val.first.call(*val.drop(1))
                 next
               end
               a, b, c, d, e = val
@@ -542,7 +542,7 @@ module Squared
                     on_error(e, exception: true)
                   end
                 else
-                  print_error('prereqs', "method: #{meth}", subject: name, hint: 'undefined')
+                  print_error('prereqs', 'method', meth, subject: name, hint: 'undefined')
                 end
               end
             elsif proj.build?
@@ -582,10 +582,10 @@ module Squared
           case @clean
           when Struct
             if (val = instance_eval(&@clean.block) || @clean.run)
-              @clean = @clean.tap do
-                @clean = val
-                clean(*args, sync: sync, pass: true, **kwargs)
-              end
+              cur = @clean
+              @clean = val
+              clean(*args, sync: sync, pass: true, **kwargs)
+              @clean = cur
             end
           when String
             run_s(@clean, sync: sync)
@@ -661,9 +661,10 @@ module Squared
           if !target.exist?
             target.mkpath
           elsif !target.directory?
-            raise_error Errno::EEXIST, target, hint: uri
+            raise Errno::EEXIST, message(target, hint: uri)
           elsif !file && !target.empty?
-            raise_error Errno::EEXIST, target, hint: uri unless force || env('UNPACK_FORCE')
+            raise Errno::EEXIST, message(target, hint: uri) unless force || env('UNPACK_FORCE')
+
             create = true
           end
           if digest
@@ -683,7 +684,7 @@ module Squared
                    when 128, 'sha512'
                      Digest::SHA512
                    else
-                     raise_error "invalid checksum: #{digest}", hint: uri
+                     raise message('invalid checksum', digest, hint: uri)
                    end
           end
           env('HEADERS') do |val|
@@ -701,14 +702,14 @@ module Squared
                 data = f.read
                 if algo && algo.hexdigest(data) != digest
                   data = nil
-                  raise_error "invalid checksum: #{digest}", hint: url if i == uri.size.pred
+                  raise message('invalid checksum', digest, hint: url) if i == uri.size.pred
                 end
                 next if ext && i == 0
 
                 case f.content_type
                 when 'application/zip'
                   ext = 'zip'
-                when %r{application/(?:x-)?gzip}
+                when %r{application/(x-)?gzip}
                   ext = 'tgz'
                 when 'application/x-xz'
                   ext = 'txz'
@@ -719,7 +720,7 @@ module Squared
               break uri = url if data
             end
             unless data && (ext ||= URI.decode_www_form_component(URI.parse(uri).path[/\.([\w%]+)(?:\?|\z)/, 1]))
-              raise_error(data ? TypeError : RuntimeError, "no content#{' type' if data}", hint: uri)
+              raise(data ? TypeError : RuntimeError, message("no content#{' type' if data}", hint: uri))
             end
           end
           ext = ext.downcase
@@ -748,7 +749,7 @@ module Squared
             case ext
             when 'zip', 'aar'
               session 'unzip', shell_quote(file), quote_option('d', target)
-            when 'tar', /\A(?:t|tar\.)?[gx]z\z/
+            when 'tar', /\A(t|tar\.)?[gx]z\z/
               flags = +(silent? ? '' : 'v')
               if ext.end_with?('gz')
                 flags += 'z'
@@ -764,7 +765,7 @@ module Squared
               session 'gem', 'unpack', shell_quote(file), quote_option('target', target)
               depth = 0 unless val
             else
-              raise_error("unsupported format: #{ext}", hint: uri || file)
+              raise message('unsupported format', ext, hint: uri || file)
             end
             run(sync: sync, banner: verbose, from: from)
             while depth > 0 && target.children.size == 1
@@ -1018,13 +1019,13 @@ module Squared
 
         alias apply variable_set
 
-        def enabled?(ref = nil, **)
+        def enabled?(ref: nil, **)
           return false if ref && Array(ref).none? { |val| ref?(val) }
 
           (path.directory? && !path.empty?) || archive?
         end
 
-        def has?(meth, ref = nil, all: false, missing: false)
+        def has?(meth, ref: nil, all: false, missing: false)
           return false if ref && !ref?(ref)
 
           pred = :"#{meth}?"
@@ -1105,8 +1106,8 @@ module Squared
           !@exclude.empty? && has_value?(@exclude, *refs)
         end
 
-        def task_include?(key, ref = nil)
-          workspace.task_include?(self, key, ref) && !@pass.include?(key.to_s)
+        def task_include?(key, ref: nil)
+          workspace.task_include?(self, key, ref: ref) && !@pass.include?(key.to_s)
         end
 
         def version(*)
@@ -1189,6 +1190,20 @@ module Squared
           keys.empty? ? ret : ret.dig(*keys)
         end
 
+        def each(from: :run, ref: nil, accept: nil, &blk)
+          from = from.to_s.split(':').last if from.is_a?(Symbol)
+          items = ref ? children.select { |proj| proj.ref?(ref) } : children
+          if items.empty?
+            print_error("nothing to #{from}", subject: name)
+          elsif accept && !confirm_basic("#{from.capitalize} workspace?", items.map(&:name).join(', '), accept,
+                                         prefix: 'npm')
+            items.clear
+          end
+          return items.to_enum unless block_given?
+
+          items.each(&blk)
+        end
+
         def inspect
           "#<#{self.class}: #{name} => #{self}>"
         end
@@ -1351,7 +1366,7 @@ module Squared
           else
             if series?(obj)
               obj.each(&:call)
-            elsif obj.is_a?(Array) && obj.any? { |val| val.nil? || !val.is_a?(String) }
+            elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
               run_s(*Array(obj), **kwargs)
@@ -1389,7 +1404,7 @@ module Squared
             elsif ws.task_defined?(val = task_join(name, meth)) || (meth.include?(':') && ws.task_defined?(val = meth))
               run(val, var, sync: sync, banner: banner, **kwargs)
             elsif from
-              print_error(from, "method: #{meth}", subject: name, hint: 'undefined')
+              print_error(from, 'method', meth, subject: name, hint: 'undefined')
             end
           end
         end
@@ -1422,11 +1437,7 @@ module Squared
                    when 0
                      f
                    when 1
-                     if items.empty?
-                       "#{d}#{b * 4} #{f}"
-                     else
-                       "#{last ? d : c}#{b * 3}#{e} #{f}"
-                     end
+                     items.empty? ? "#{d}#{b * 4} #{f}" : "#{last ? d : c}#{b * 3}#{e} #{f}"
                    else
                      "#{single ? ' ' : a}#{'   ' * depth.pred}#{last ? d : c}#{b * 3}#{items.empty? ? b : e} #{f}"
                    end
@@ -1490,7 +1501,7 @@ module Squared
                     end
                     run(cmd, sync: false, banner: false)
                     ENV.delete(key) if key
-                  elsif proj.has?(meth, tasks || graph ? nil : workspace.baseref)
+                  elsif proj.has?(meth, ref: (workspace.baseref unless tasks || graph))
                     proj.__send__(meth, sync: sync)
                   end
                 end
@@ -1572,11 +1583,13 @@ module Squared
           end
           cache = @timeout[:_]
           cache[1] ||= workspace.timeout_get(*@ref, group: group)
-          cache[0][ret] = if cmd[1..-1].find { |val| val =~ /\A([A-Za-z][\w-]*)(?<![-_])(?: |\z)/ }
+          cache[0][ret] = if cmd.drop(1).find { |val| val =~ /\A([A-Za-z][\w-]*)(?<![-_])(?: |\z)/ }
                             command = :"#{prefix}_#{$1}"
                             cache[1][command] || @timeout[command]
                           end || cache[1][prefix.to_sym] || @timeout[prefix.to_sym]
-          main ? @session = ret : ret
+          return ret unless main
+
+          @session = ret
         end
 
         def session_timeout(cmd)
@@ -1636,9 +1649,9 @@ module Squared
 
         def session_done(cmd)
           return cmd.to_s unless cmd.respond_to?(:done)
+          raise message('no command added', hint: cmd.first) unless cmd.size > 1
 
-          raise_error 'no command added', hint: cmd.first unless cmd.size > 1
-          @session = nil if cmd == @session
+          @session = nil if cmd.equal?(@session)
           cmd.done
         end
 
@@ -1655,12 +1668,14 @@ module Squared
           args.each do |key|
             next unless (ret = env(env_key(prefix.to_s.stripext, key), **kwargs)) && (!pat || ret.match?(pat))
 
-            if path
-              target << quote_option(key, basepath(ret))
-            elsif quote
-              target << quote_option(key, ret)
-            elsif escape
-              target << shell_option(key, ret)
+            if target
+              if path
+                target << quote_option(key, basepath(ret))
+              elsif quote
+                target << quote_option(key, ret)
+              elsif escape
+                target << shell_option(key, ret)
+              end
             end
             return block_given? ? yield(ret) : ret
           end
@@ -1668,7 +1683,7 @@ module Squared
         end
 
         def write_lines(data, grep: [], prefix: nil, sub: nil, banner: nil, loglevel: nil, pass: false, first: false)
-          grep = (matchmap(grep, prefix) unless grep.empty?)
+          grep = (matchmap(grep, prefix: prefix) unless grep.empty?)
           sub = (as_a(sub) unless stdin?)
           ret = 0
           lines = data.each_with_object([]) do |line, out|
@@ -1804,15 +1819,15 @@ module Squared
             out = []
             if data.command
               if command
-                if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))( |\z)/
+                if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))(?: |\z)/
                   arg = $3 || $2 || $1
                   cmd = cmd.sub(arg, data.command == 0 ? arg.stripext : arg.stripext.upcase)
                 end
                 if strip || (strip.nil? && data.order.include?(:path))
-                  cmd = cmd.gsub(/(?:#{s = Regexp.escape(File.join(path, ''))}?(?=["'])|#{s})/, '')
-                           .gsub(/(?: -[^ ])? (?:""|'')/, '')
+                  s = Regexp.escape(File.join(path, ''))
+                  cmd = cmd.gsub(/(#{s}?(?=["'])|#{s})/, '').gsub(/( -[^ ])? (""|'')/, '')
                 end
-                cmd.gsub!(/(?<= )(["'])([\w.-]+)\1(?= |\z)/, '\2') unless quote
+                cmd = cmd.gsub(/(?<= )(["'])([\w.-]+)\1(?= |\z)/, '\2') unless quote
               end
               out << cmd.subhint(hint)
             end
@@ -1829,7 +1844,7 @@ module Squared
                     __send__ meth
                   end
                 end
-                val = val.compact.join(s)
+                val = val.reject { |item| !item || item == true }.join(s)
                 next unless found && !val.empty?
               elsif (val = __send__(val)).nil?
                 next
@@ -2034,11 +2049,6 @@ module Squared
           end
         end
 
-        def collect_hash(data, pass: [])
-          data = data.reject { |key,| pass.include?(key) } unless pass.empty?
-          data.values.flatten
-        end
-
         def replace_bin(val)
           a, b = val.split(' ', 2)
           return val if val.start_with?(/["']/) || a.include?(File::Separator)
@@ -2048,7 +2058,7 @@ module Squared
 
         def parse_json(val, kind: Hash, key: nil, hint: nil, &blk)
           ret = JSON.parse(val)
-          raise_error 'invalid JSON'.subhint(kind.name), val, hint: hint if kind && !ret.is_a?(kind)
+          raise message('invalid JSON', kind.name, hint: hint) if kind && !ret.is_a?(kind)
           return ret unless key
 
           block_given? ? ret.fetch(key, &blk) : ret[key]
@@ -2068,18 +2078,18 @@ module Squared
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
 
             @session = nil
-            raise_error(action, "#{flag}[#{key}]", hint: val.nil? ? 'missing' : 'invalid')
+            raise message(action, "#{flag}[#{key}]", hint: val.nil? ? 'missing' : 'invalid')
           elsif args.is_a?(Array) && args.empty?
             @session = nil
-            raise_error action, "#{flag}+", hint: 'empty'
+            raise message(action, "#{flag}+", hint: 'empty')
           end
           args
         end
 
-        def confirm_basic(msg, hint, default = 'Y', style: :inline, target: @session, prefix: nil, **kwargs)
+        def confirm_basic(msg, hint, accept = 'Y', style: :inline, target: @session, prefix: nil, **kwargs)
           return true if prefix ? option('y', prefix: prefix) : target && option('y', target: target)
 
-          confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
+          confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", accept, **kwargs)
         end
 
         def confirm_semver(msg, type, style: (type == 1 && theme[:major]) || :inline, timeout: 0, **kwargs)
@@ -2139,12 +2149,8 @@ module Squared
           ret
         end
 
-        def accept_b(val, yes = false)
-          [val, true, yes]
-        end
-
-        def accept_y(val, bool = false)
-          [val, bool, true]
+        def accept_b(val, ret: true, yes: false)
+          [val, ret, yes]
         end
 
         def command_args(args, min: 0, force: false, **kwargs)
@@ -2205,10 +2211,6 @@ module Squared
           end
         end
 
-        def symjoin(*args, char: ':')
-          args.join(char).to_sym
-        end
-
         def semver(val)
           return val if val[3]
 
@@ -2233,9 +2235,9 @@ module Squared
 
           a, b = [a.first, b.first].map do |c|
             d = begin
-              Integer(c[5]).to_s
+              Integer(c[6]).to_s
             rescue
-              c[5] ? '-1' : '0'
+              c[6] ? '-1' : '0'
             end
             [c[0], c[2], c[4] || '0', d]
           end
@@ -2250,7 +2252,7 @@ module Squared
         def sembump(val, flag = :patch, join: true)
           ret = semscan(val, fill: false)
           case flag
-          when :major
+          when :major, :premajor
             ret[2] = if ret[0] != '0' || ret[2].nil?
                        ret[0] = ret[0].succ
                        '0'
@@ -2258,16 +2260,29 @@ module Squared
                        ret[2].succ
                      end
             ret[4] = '0'
-          when :minor
+          when :minor, :preminor
             if ret[0] == '0'
               ret[4] &&= ret[4].succ
             else
               ret[2] = ret[2].succ
               ret[4] &&= '0'
             end
-          when :patch
+          when :patch, :prepatch
             ret[4] &&= ret[4].succ
           end
+          case flag
+          when :premajor, :preminor, :prepatch
+            ret[5] ||= '-'
+            ret[6] = '0'
+          when :prerelease
+            if !ret[6]
+              ret[5] = '-'
+              ret[6] = '0'
+            elsif ret[6].match?(/^\d+$/)
+              ret[5] ||= '-'
+              ret[6] = ret[6].succ
+            end
+          end
           join ? ret.join : ret
         end
 
@@ -2278,7 +2293,7 @@ module Squared
         end
 
         def semmajor?(cur, want)
-          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[5]
+          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[6]
         end
 
         def semgte?(val, other = nil)
@@ -2294,7 +2309,7 @@ module Squared
         end
 
         def indexerror(val, list = nil)
-          raise_error IndexError, "requested index #{val}", hint: ("of #{list.size}" if list)
+          raise IndexError, message("requested index #{val}", hint: ("of #{list.size}" if list))
         end
 
         def indexchar
@@ -2406,11 +2421,7 @@ module Squared
             yield
           end
         rescue Timeout::Error => e
-          if cmd
-            print_error(Logger::ERROR, cmd, subject: name, hint: e)
-          else
-            print_error(Logger::ERROR, e, subject: name)
-          end
+          print_error(Logger::ERROR, e, subject: name, hint: cmd)
           exit 1 unless exception?(Logger::DEBUG, Logger::INFO)
         rescue => e
           on_error(e, from, **kwargs)
@@ -2673,7 +2684,7 @@ module Squared
                 when true, false
                   run
                 else
-                  $?.success?
+                  $?&.success?
                 end
           if cond.none? { |val| val == false }
             if block_given?
@@ -2698,7 +2709,7 @@ module Squared
         end
 
         def stdout?
-          !!verbose && !stdin?
+          !silent? && !stdin?
         end
 
         def verbose?
@@ -2714,8 +2725,10 @@ module Squared
         end
 
         def exception?(*level)
-          ex = exception
-          level.empty? ? ex != false && ex != Logger::INFO : ex.is_a?(Numeric) && level.include?(ex)
+          ret = exception
+          return ret unless ret.is_a?(Numeric)
+
+          level.empty? ? ret != Logger::INFO : level.include?(ret)
         end
 
         def strict?