squared 0.4.16 → 0.4.18

data/lib/squared/common/base.rb

@@ -94,7 +94,7 @@ module Squared
       PATH.freeze
       ARG.freeze
       VAR.each_value(&:freeze)
-      VAR[:theme].each_value(&:freeze)
+      VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }
       VAR.freeze
     end
 

data/lib/squared/common/format.rb

@@ -141,11 +141,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] = check_style(v, empty: empty) }
+        set = ->(k, v) { data[k.to_sym] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
           key.each { |k, v| set.call(k, v || args) }
         else
-          set.call(key.to_sym, args)
+          set.call(key, args)
         end
       end
 
@@ -194,7 +194,7 @@ module Squared
         end
       end
 
-      def puts_oe(*args, pipe: 1)
+      def log_console(*args, pipe: 1)
         return if args.first == false && args.size == 1
 
         if pipe.is_a?(Pathname)
@@ -211,6 +211,8 @@ 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

@@ -42,7 +42,7 @@ module Squared
           list.each do |val|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            items << val.chomp
+            items << val.to_s.chomp
             puts "#{items.size.to_s.rjust(2)}. #{val}"
           end
           max = items.size

data/lib/squared/common/shell.rb

@@ -92,10 +92,16 @@ module Squared
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def fill_option(val, double: false)
+      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)
+      end
+
+      def fill_option(val, **kwargs)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
-        shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
+        shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)
       end
 
       def quote_option(flag, val, option: true, double: false, merge: false)

data/lib/squared/common/system.rb

@@ -12,9 +12,9 @@ module Squared
         if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
           e = kwargs[:exception]
           if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
-            Dir.chdir(dir)
+            Dir.chdir dir
             ret = Kernel.send(name, *args)
-            Dir.chdir(pwd)
+            Dir.chdir pwd
           else
             ret = Kernel.send(name, *args)
           end
@@ -24,7 +24,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret if ret || !e
+        return ret unless e && !ret && name == :system
 
         raise $?.to_s
       end
@@ -57,23 +57,24 @@ module Squared
         soft = 0
         subdir.each do |dir, files|
           if link
-            items = files.dup
-            files.clear
-            items.each do |file|
-              if file.exist?
-                if file.symlink?
-                  next unless force
+            files.dup.tap do |items|
+              files.clear
+              items.each do |file|
+                if file.exist?
+                  if file.symlink?
+                    next unless force
+                  else
+                    files << file
+                    next
+                  end
+                end
+                if link == 'hard'
+                  FileUtils.ln(file, dir, force: force, verbose: false)
                 else
-                  files << file
-                  next
+                  FileUtils.ln_s(file, dir, force: force, verbose: false)
                 end
+                soft += 1
               end
-              if link == 'hard'
-                FileUtils.ln(file, dir, force: force, verbose: false)
-              else
-                FileUtils.ln_s(file, dir, force: force, verbose: false)
-              end
-              soft += 1
             end
           end
           next if files.empty?

data/lib/squared/config.rb

@@ -94,10 +94,10 @@ module Squared
       def build
         return unless enabled?
 
-        namespace(ns = task_name(name)) do
+        namespace task_name(name) do |ns|
           @mime.each do |type, items|
             items.each do |command, file, opts|
-              next if Rake::Task.task_defined?("#{ns}:#{command}:#{type}")
+              next if Rake::Task.task_defined?("#{ns.scope.path}:#{command}:#{type}")
 
               namespace command do
                 unless (data = @@mime_obj[type])
@@ -196,7 +196,7 @@ module Squared
       private
 
       def puts(*args)
-        puts_oe(*args, pipe: pipe)
+        log_console(*args, pipe: pipe)
       end
 
       def log

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -26,7 +26,7 @@ module Squared
             next unless base || obj < impl_project
 
             if base
-              @impl_project = obj
+              self.impl_project = obj
               impl_series.base_set(obj)
             else
               kind_project.unshift(obj)
@@ -39,7 +39,7 @@ module Squared
               impl_series.alias(*args)
             end
             if (args = obj.bannerargs)
-              @attr_banner.merge(args)
+              attr_banner.merge(args)
             end
           end
         end
@@ -95,9 +95,15 @@ module Squared
         @kind = Support.hashlist
         @extensions = []
         @envname = env_key(@main).freeze
-        @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
+        @pipe = $DEBUG ? 2 : env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool exception
-        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
+        @verbose = if $VERBOSE.nil?
+                     false
+                   elsif verbose.nil?
+                     @pipe != 0
+                   else
+                     env_bool(verbose, verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
+                   end
         @warning = @verbose != false
         @closed = false
         if common
@@ -423,7 +429,7 @@ module Squared
             ret << proj if proj
           end
         end
-        return (group || ref ? ret : ret[0]) unless block_given?
+        return (group || ref ? ret : ret.first) unless block_given?
 
         ret.each(&blk)
         self
@@ -678,6 +684,10 @@ module Squared
         { exception: exception, warning: warning }
       end
 
+      def size
+        @project.size
+      end
+
       def to_s
         (home? ? home : root).to_s
       end
@@ -691,9 +701,14 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        return unless default && task_defined?(out = task_name(default))
-
-        task Rake.application.default_task_name => out
+        unless task_defined?('squared:version')
+          task 'squared:version' do
+            puts Squared::VERSION
+          end
+        end
+        if default && task_defined?(out = task_name(default))
+          task Rake.application.default_task_name => out
+        end
       end
 
       def __chain__(*)
@@ -795,8 +810,8 @@ module Squared
           format_desc key
           task key do
             unless failed.empty? && group.empty?
-              puts log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
-                               subject: 'failed placement', hint: false)
+              puts(log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
+                               subject: 'failed placement', hint: false), pipe: 2)
             end
             cols = level.flatten(1).map(&:size).max
             level.each_with_index do |grp, n|
@@ -812,8 +827,8 @@ module Squared
         end
       end
 
-      def puts(*args)
-        puts_oe(*args, pipe: pipe)
+      def puts(*args, **kwargs)
+        log_console(*args, pipe: kwargs[:pipe] || pipe)
       end
 
       def script_command(task, val, group, ref, on, &blk)

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

@@ -21,8 +21,8 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass only exclude].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
-        URI_SCHEME = %r{^([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.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 :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
 
@@ -208,7 +208,7 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
+          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
             @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
@@ -313,7 +313,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when 'graph'
-                    next unless graph?
+                    break unless graph?
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
@@ -455,13 +455,13 @@ module Squared
           if args.first.is_a?(Struct)
             f, blk = args.first.to_a
             args[0] = instance_eval(&blk) || f
-            return unless args[0]
+            return unless args.first
           end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
             var = {}
             args.each do |val|
-              next instance_exec(*val[1..-1], &val[0]) if val.first.is_a?(Proc)
+              next instance_exec(*val[1..-1], &val.first) if val.first.is_a?(Proc)
 
               a, b, c, d, e = val
               case b
@@ -662,7 +662,7 @@ module Squared
                    when 128, 'sha512'
                      Digest::SHA512
                    else
-                     raise_error("invalid checksum: #{digest}", hint: name)
+                     raise_error "invalid checksum: #{digest}"
                    end
           end
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
@@ -948,7 +948,7 @@ module Squared
         def log
           return @log unless @log.is_a?(Array)
 
-          @log = Logger.new(enabled? ? @log[0] : nil, **@log[1])
+          @log = Logger.new(enabled? ? @log.first : nil, **@log.last)
         end
 
         def allref
@@ -989,20 +989,18 @@ module Squared
 
         private
 
-        def puts(*args)
-          puts_oe(*args, pipe: pipe)
+        def puts(*args, **kwargs)
+          log_console(*args, pipe: kwargs[:pipe] || pipe)
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
-                interactive: nil, **)
+                interactive: nil, hint: nil, **)
           unless cmd
             warn log_message(Logger::WARN, 'no command given', subject: project, hint: from || 'unknown', pass: true)
             return
           end
-          i = interactive && !(@session && option('y'))
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          cmd = session_done cmd
-          if i
+          if interactive && (!@session || !option('y'))
             title, y = case interactive
                        when Array
                          interactive
@@ -1011,10 +1009,10 @@ module Squared
                        else
                          ['Run', 'Y']
                        end
-            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}] #{y == 'Y' ? '[Y/n]' : '[y/N]'} ", y)
-              exit 1
-            end
+            yn = y == 'Y' ? 'Y/n' : 'y/N'
+            exit 1 unless confirm("#{title}? [#{sub_style(cmd.to_s, styles: theme[:inline])}] [#{yn}] ", y)
           end
+          cmd = session_done cmd
           log&.info cmd
           on :first, from
           begin
@@ -1022,7 +1020,7 @@ module Squared
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync
+              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
               if var != false && (pre = runenv)
                 case pre
                 when Hash
@@ -1231,12 +1229,12 @@ module Squared
         end
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
-          prefix = stripext(prefix.to_s).upcase
-          if path && (val = ENV["PATH_#{prefix}"] || PATH[prefix] || PATH[prefix.to_sym])
+          prefix = stripext prefix.to_s
+          if path && (val = shell_bin(prefix))
             cmd[0] = shell_quote(val, force: false)
           end
           ret = JoinSet.new(cmd.flatten(1))
-          if options && (val = env("#{prefix}_OPTIONS"))
+          if options && (val = env("#{prefix.upcase}_OPTIONS"))
             split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
           end
           main ? @session = ret : ret
@@ -1261,7 +1259,7 @@ module Squared
         def session_done(cmd)
           return cmd unless cmd.respond_to?(:done)
 
-          raise_error('no args added', hint: cmd.first || name) unless cmd.size > 1
+          raise_error('no args added', hint: cmd.first) unless cmd.size > 1
           @session = nil if cmd == @session
           cmd.done
         end
@@ -1420,9 +1418,9 @@ module Squared
           unless items.empty?
             pad = items.size.to_s.size
             items.each_with_index do |val, i|
-              next unless reg.empty? || reg.any? { |pat| val[0].match?(pat) }
+              next unless matchany?(val.first, reg)
 
-              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val[0]}"
+              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val.first}"
             end
           end
           sub = [headerstyle]
@@ -1744,6 +1742,17 @@ module Squared
           files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
+        def matchmap(list, prefix = nil)
+          list.map do |val|
+            if val.is_a?(Regexp)
+              val
+            else
+              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+            end
+          end
+        end
+
         def semver(val)
           return val if val[3]
 
@@ -1762,12 +1771,20 @@ module Squared
         end
 
         def semcmp(val, other)
-          a, b = [val, other].map! { |ver| ver.match(SEM_VER) }
-          return 1 unless a
-          return -1 unless b
-          return 0 if a[0] == b[0]
+          return 0 if val == other
 
-          a, b = [a, b].map! { |c| [c[1], c[3], c[5] || '0'] }
+          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
+          return -1 if b.empty?
+          return 1 if a.empty?
+
+          a, b = [a.first, b.first].map! do |c|
+            begin
+              d = Integer(c[5]).to_s
+            rescue StandardError
+              d = c[5] ? '-1' : '0'
+            end
+            [c[0], c[2], c[4] || '0', d]
+          end
           a.each_with_index do |c, index|
             next if c == (d = b[index])
 
@@ -1776,6 +1793,10 @@ module Squared
           0
         end
 
+        def semgte?(val, other)
+          semcmp(val, other) != 1
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
@@ -1819,7 +1840,7 @@ module Squared
         def on(event, from, *args, **kwargs)
           return unless from && @events.key?(event)
 
-          @events[event][from]&.each do |obj|
+          Array(@events[event][from]).each do |obj|
             target, opts = if obj.is_a?(Array) && obj[1].is_a?(Hash)
                              [obj[0], kwargs.empty? ? obj[1] : obj[1].merge(kwargs)]
                            else
@@ -1849,13 +1870,12 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
               if (path == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
                 ret = yield
               else
-                Dir.chdir(path)
+                Dir.chdir path
                 ret = yield
-                Dir.chdir(pwd)
+                Dir.chdir pwd
               end
             rescue StandardError => e
               on_error(e, from, dryrun: dryrun)
@@ -1878,8 +1898,8 @@ module Squared
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
-          diso = @output[1] == false && !@output[0].nil?
-          dise = @output[2] == false
+          noopt = @output[1] == false && !@output[0].nil?
+          noenv = @output[2] == false
           parse = lambda do |data|
             ret = []
             if data[:command]
@@ -1899,8 +1919,8 @@ module Squared
           case cmd
           when Array
             @output = if cmd.all? { |data| data.is_a?(Hash) }
-                        diso = false
-                        dise = false
+                        noopt = false
+                        noenv = false
                         cmd.map { |data| parse.call(data) }
                       else
                         cmd.dup
@@ -1911,14 +1931,14 @@ module Squared
           else
             @output[0] = cmd
           end
-          unless diso
+          unless noopt
             if opts == false
               @output[1] = false
             elsif opts && opts != true
               @output[1] = opts
             end
           end
-          return if dise
+          return if noenv
 
           if val.is_a?(Hash)
             @output[2] = val
@@ -2021,6 +2041,10 @@ module Squared
           @only ? !@only.include?(key) : @pass.include?(key)
         end
 
+        def matchany?(val, list, empty: true)
+          list.empty? ? empty : list.any? { |pat| val.match?(pat) }
+        end
+
         def projectpath?(val)
           val = Pathname.new(val).cleanpath
           val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))