squared 0.7.6 → 0.8.0

data/lib/squared/common/system.rb

@@ -7,10 +7,8 @@ require 'timeout'
 module Squared
   module Common
     module System
-      class << self
-        private
-
-        def parse_link(val)
+      module Internal
+        def self.parse_link(val)
           case val
           when 's', true
             1
@@ -25,26 +23,18 @@ module Squared
           end
         end
       end
+      private_constant :Internal
 
       module_function
 
       def shell(*args, name: :system, **kwargs)
-        kwargs.delete(:exception) unless name == :system
-        if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
-          ex = kwargs[:exception]
-          if (dir = kwargs[:chdir]) && Dir.pwd != dir
-            pwd = Dir.pwd
-            Dir.chdir(dir)
-          end
-          ret = Kernel.send(name, *args)
-          Dir.chdir(pwd) if pwd
+        if name != :system
+          kwargs.delete(:exception)
         elsif RUBY_VERSION < '2.6'
           ex = kwargs.delete(:exception)
-          ret = Kernel.send(name, *args, **kwargs)
-        else
-          return Kernel.send(name, *args, **kwargs)
         end
-        raise $?.to_s if !ret && ex
+        ret = Kernel.send(name, *args, **kwargs)
+        raise $?.to_s if ex && !ret
 
         ret
       end
@@ -86,7 +76,7 @@ module Squared
         end
         count = 0
         soft = 0
-        type = System.send :parse_link, link
+        type = Internal.parse_link(link)
         subdir.each do |dir, files|
           unless type == 0
             items = files.dup
@@ -133,7 +123,7 @@ module Squared
         target.map! { |file| [base + file, dir ? dest + File.basename(file) : dest] }
         return if !force && (target = target.reject { |to| to[1].exist? }).empty?
 
-        type = System.send :parse_link, link
+        type = Internal.parse_link(link)
         target.each do |file, to|
           case type
           when 0

data/lib/squared/common/utils.rb

@@ -11,11 +11,9 @@ module Squared
 
       def env_value(key, default = '', name: @envname, suffix: nil, strict: false)
         if suffix
-          if (ret = ENV[[key, name, suffix].compact.join('_')])
-            return ret
-          elsif strict
-            return default
-          end
+          ret = ENV[[key, name, suffix].compact.join('_')]
+          return ret if ret
+          return default if strict
         end
         if name
           return ret if (ret = ENV["#{key}_#{name}"])
@@ -42,10 +40,10 @@ module Squared
         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)
+          obj = if obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
                   val
+                elsif obj.respond_to?(:to_ary)
+                  obj.to_ary
                 else
                   [obj]
                 end
@@ -65,12 +63,18 @@ module Squared
         ret.each_with_index(&blk)
       end
 
-      def task_invoke(*cmd, args: [], exception: true, warning: true)
-        cmd.each { |name| Rake::Task[name].invoke(*args) }
-      rescue => e
-        raise if exception
+      def task_invoke(*cmd, args: [], sync: true, exception: true, warning: true)
+        cmd.each do |name|
+          if sync
+            Rake::Task[name].invoke(*args)
+          else
+            Rake.application.run_with_threads { Rake::Task[name].invoke(*args) }
+          end
+        rescue => e
+          raise if exception
 
-        warn e if warning
+          warn e if warning
+        end
       end
 
       def task_join(*val)

data/lib/squared/config.rb

@@ -206,7 +206,7 @@ module Squared
 
       def read_keys(reader, type, file, keys, ext: [type], opts: {})
         if file && (mime = mimetype(file)) && basepath(file).exist?
-          raise_error file, mime, hint: 'invalid' unless ext.include?(mime)
+          raise message(file, mime, hint: 'invalid') unless ext.include?(mime)
         else
           if ext.include?(mime)
             alt = file
@@ -218,12 +218,8 @@ module Squared
             file = Dir[alt].first
           else
             alt = main
-            args = { hint: 'no keys' }
-          end
-          unless file
-            args ||= { kind: Errno::ENOENT }
-            raise_error(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", **args)
           end
+          raise Errno::ENOENT, message(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}") unless file
         end
         log&.info "#{Viewer}(#{type}) => #{file} {#{keys.join(', ')}}"
         return puts File.read(file) if keys.last == '*'
@@ -273,11 +269,7 @@ module Squared
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"
-              if $3
-                s
-              else
-                $2 ? ".#{s}" : "#{s}."
-              end
+              $3 ? s : $2 ? ".#{s}" : "#{s}."
             end
             out << [key, stdin? ? JSON.dump(nil) : 'undefined']
           else

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -29,7 +29,7 @@ module Squared
           end
         end
 
-        def find(ref = nil, path: nil)
+        def find(ref: nil, path: nil)
           if ref && (ret = kind_project.find { |proj| proj.ref == ref })
             ret
           elsif path
@@ -109,7 +109,7 @@ module Squared
         @kind = Support.hashlist
         @config = {}
         @extensions = Set.new
-        @finalize = Set.new([:__chain__])
+        @finalize = Set.new(%i[__chain__ __join__])
         @envname = env_key(@main).freeze
         @closed = false
         @stage = Support.hashlist
@@ -127,6 +127,7 @@ module Squared
         @theme = common ? __get__(:theme)[:workspace] : {}
         @chain = Support.hashlist
         @script = Struct::SessionData.new
+        @join = Struct::SessionData.new
         @events = Struct::SessionData.new
         @pass = Struct::SessionData.new
         @banner = Struct::SessionData.new
@@ -226,7 +227,7 @@ module Squared
         when Symbol
           @ref = val
         else
-          raise TypeError, "not a group/ref: #{kind || 'nil'}" if block_given?
+          raise TypeError, message('not a group/ref', hint: kind || 'nil') if block_given?
         end
         if block_given?
           instance_eval(&blk)
@@ -237,6 +238,15 @@ module Squared
         self
       end
 
+      def join(task, *cmd, invoke: nil, args: [], group: @group, ref: @ref, **kwargs, &blk)
+        unless block_given?
+          invoke ||= cmd.shift
+          args = cmd if (args = Array(args)).empty?
+          args.unshift(invoke)
+        end
+        script_command task.to_sym, args, group, ref, @join, kwargs, &blk
+      end
+
       def run(script = nil, group: @group, ref: @ref, on: nil, &blk)
         script_command :run, script, group, ref, on, &blk
       end
@@ -386,7 +396,7 @@ module Squared
         end
         unless ref.is_a?(Symbol) && (proj = @base.find { |item| item.ref == ref })
           proj = if !ref.is_a?(Class)
-                   require_project(ref) || Application.find(ref, path: path)
+                   require_project(ref) || Application.find(ref: ref, path: path)
                  elsif Application.extends(ref)
                    ref
                  end || @kind[name]&.last
@@ -569,10 +579,10 @@ module Squared
       def task_resolve(obj, key)
         tasks = []
         if (base = task_base?(key))
-          tasks << key if obj.has?(key, baseref)
+          tasks << key if obj.has?(key, ref: baseref)
         elsif (batch = series.batch_get(key))
           obj.allref do |ref|
-            next unless obj.has?(key, ref, missing: series.missing?(ref, key)) && (data = batch[ref])
+            next unless obj.has?(key, ref: ref, missing: series.missing?(ref, key)) && (data = batch[ref])
 
             data.each do |val|
               if (items = task_resolve(obj, val)).empty?
@@ -591,7 +601,7 @@ module Squared
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
           obj.allref do |ref|
-            next unless obj.has?(key, ref) && (alt = data[ref])
+            next unless obj.has?(key, ref: ref) && (alt = data[ref])
 
             ret = task_resolve obj, alt
             break unless ret.empty?
@@ -663,11 +673,7 @@ module Squared
         if group && @banner.group.key?(group = group.to_sym)
           @banner.group[group]
         else
-          ref.reverse_each do |val|
-            next unless @banner.ref.key?(val)
-
-            return @banner.ref[val]
-          end
+          ref.reverse_each { |val| return @banner.ref[val] if @banner.ref.key?(val) }
           @banner.ref[:_] if @banner.ref.key?(:_)
         end
       end
@@ -695,10 +701,10 @@ module Squared
         series.extend?(obj, key)
       end
 
-      def task_include?(obj, key, ref = nil)
+      def task_include?(obj, key, ref: nil)
         return false if series.exclude?(key)
 
-        task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
+        task_base?(key) ? obj.has?(key, ref: ref || baseref) : task_extend?(obj, key)
       end
 
       def task_exclude?(key, obj = nil)
@@ -736,14 +742,6 @@ module Squared
         RUBY_ENGINE == 'ruby'
       end
 
-      def jruby?
-        RUBY_ENGINE == 'jruby'
-      end
-
-      def truffleruby?
-        RUBY_ENGINE == 'truffleruby'
-      end
-
       def docker?
         !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
       end
@@ -777,7 +775,7 @@ module Squared
       end
 
       def invokeargs
-        { exception: exception, warning: warning }
+        { exception: exception?, warning: warning }
       end
 
       def size
@@ -946,14 +944,75 @@ module Squared
         self.closed = 'chain:end'
       end
 
+      def __join__(*)
+        group = @join.group
+        ref = @join.ref
+        return if group.empty? && ref.empty?
+
+        self.closed = 'join:begin'
+        [group, ref].each do |with|
+          with.each do |target, data|
+            items = if with == group
+                      target = target.to_s
+                      store = @join.store[:group]
+                      select { |proj| proj.group == target }
+                    else
+                      store = @join.store[:ref]
+                      select { |proj| proj.ref == target }
+                    end.sort
+            next if items.empty?
+
+            data.each do |name, args|
+              key = task_name(task_join(name, target))
+              sync = true
+              exception = exception?
+              if store && (kwargs = store["#{target}:#{name}"])
+                sync = kwargs[:sync] if kwargs.key?(:sync)
+                exception = kwargs[:exception] if kwargs.key?(:exception)
+              end
+              case args
+              when Struct
+                format_desc key
+                task key do
+                  items.each do |proj|
+                    if sync
+                      proj.instance_eval(&args.block)
+                    else
+                      Rake.application.run_with_threads { proj.instance_eval(&args.block) }
+                    end
+                  rescue => e
+                    raise if exception
+
+                    warn log_message(Logger::ERROR, e, subject: proj.name, hint: key)
+                  end
+                end
+              when Array
+                cmd = args.first
+                cmd = items.map { |proj| "#{proj.name}:#{cmd}" }
+                           .select { |val| task_defined?(val) }
+                next if cmd.empty?
+
+                args = args.drop(1)
+                format_desc(args.empty? ? key : "#{key}[#{args.join(',')}]")
+                task key do
+                  opts = ENV["#{target.upcase}_ARGS"]
+                  task_invoke(*cmd, args: opts ? split_escape(opts) : args, sync: sync, exception: exception)
+                end
+              end
+            end
+          end
+        end
+        self.closed = 'join:end'
+      end
+
       def puts(*args, **kwargs)
         log_console(*args, pipe: kwargs[:pipe] || pipe)
       end
 
-      def script_command(task, val, group, ref, on = nil, &blk)
+      def script_command(task, val, group, ref, on = nil, store = nil, &blk)
         if block_given?
           val = Struct::RunData.new(val, blk)
-        elsif !val
+        elsif !val || (val.is_a?(Array) && val.empty?)
           return self
         end
         if group
@@ -963,8 +1022,15 @@ module Squared
           label = :ref
           as_a(ref || :_, :to_sym)
         end.each do |name|
-          @script[label][name][task] = val
-          @events[label][name][task] = on if on.is_a?(Hash)
+          data = @script
+          case on
+          when Struct
+            data = on
+          when Hash
+            @events[label][name][task] = on
+          end
+          data[label][name][task] = val
+          (data.store[label] ||= {})["#{name}:#{task}"] = store if store
         end
         self
       end
@@ -1002,8 +1068,8 @@ module Squared
       end
 
       def data_get(*args, target:, group: nil, ref: nil)
-        if group && target[:group].key?(key = group.to_sym)
-          target[:group][key]
+        if group && target[:group].key?(g = group.to_sym)
+          target[:group][g]
         elsif ref.is_a?(Enumerable)
           ref.each do |key|
             next unless target[:ref].key?(key)
@@ -1057,6 +1123,10 @@ module Squared
         target && pat.is_a?(Regexp) ? Array(target).any?(pat) : pat == true
       end
 
+      def exception?
+        exception != false && exception != Logger::INFO
+      end
+
       def banner_include?(val)
         Application.attr_banner.include?(val) || @banner.items.include?(val)
       end