squared 0.2.14 → 0.3.0

data/lib/squared/common/shell.rb

@@ -10,38 +10,36 @@ module Squared
 
       def shell_escape(val, quote: false, force: false)
         if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val if !data[2] || (!data[4] && !data[5].match?(/\s/))
+          return val unless data[2]
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
             data[4] ? val : join.(data[5])
           else
-            join.("#{data[4]}#{data[5]}#{data[6]}")
+            join.(data[4] + data[5] + data[6])
           end
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, force: force) : val
         else
-          val.empty? ? '' : Shellwords.escape(val)
+          Shellwords.escape(val)
         end
       end
 
       def shell_quote(val, force: true)
         val = val.to_s
-        return val if !force && !val.include?(' ')
-        return val if option && val =~ /(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m
+        return val if (!force && !val.include?(' ')) || val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m)
 
-        Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
+        Rake::Win32.windows? || ARG[:QUOTE] == '"' ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
-      def shell_split(val, escape: true, quote: false, join: nil)
-        val = Shellwords.split(val)
-        val = val.map { |opt| shell_escape(opt, quote: quote) } if escape
+      def shell_split(val, quote: false, join: nil)
+        val = Shellwords.split(val).map { |opt| shell_escape(opt, quote: quote) }
         return val unless join
 
         val.join(join.is_a?(::String) ? join : ' ')
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true)
+      def shell_option(flag, val = nil, escape: true, quote: true, force: true)
         flag = flag.to_s
         if flag[0] == '-'
           b = flag[1] == '-' ? '=' : ' '
@@ -52,7 +50,7 @@ module Squared
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote)
                                else
-                                 quote ? shell_quote(val) : val
+                                 quote ? shell_quote(val, force: force) : val
                                end}"
                       end}"
       end
@@ -68,7 +66,7 @@ module Squared
       end
 
       def basic_option(flag, val)
-        shell_option(flag, val, escape: false, quote: false)
+        shell_option(flag, val, escape: false, force: false)
       end
 
       def single_quote(val)
@@ -80,7 +78,7 @@ module Squared
       end
 
       def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/)
+        val.split(/\s*(?<!\\)#{char}\s*/o)
       end
     end
   end

data/lib/squared/common/system.rb

@@ -1,32 +1,23 @@
 # frozen_string_literal: true
 
 require 'pathname'
-require 'rake'
+require 'fileutils'
 
 module Squared
   module Common
     module System
       module_function
 
-      def shell(*args, name: :system, **kwargs)
-        if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
-          e = kwargs[:exception]
-          if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
-            Dir.chdir(dir)
-            ret = Kernel.send(name, *args)
-            Dir.chdir(pwd)
-          else
-            ret = Kernel.send(name, *args)
-          end
-        elsif RUBY_VERSION < '2.6'
-          e = kwargs.delete(:exception)
-          ret = Kernel.send(name, *args, **kwargs)
+      def shell(*args, **kwargs)
+        if RUBY_VERSION < '2.6'
+          exception = kwargs.delete(:exception)
+          ret = system(*args, **kwargs)
+          return ret if ret || !exception
+
+          raise $?.to_s
         else
-          return Kernel.send(name, *args, **kwargs)
+          system(*args, **kwargs)
         end
-        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, verbose: true)
@@ -38,9 +29,10 @@ module Squared
         dest.mkpath if create
         if pass
           exclude = []
-          Array(pass).each { |val| exclude += Dir.glob(src.join(val)) }
+          pass = [pass] unless pass.is_a?(::Array)
+          pass.each { |val| exclude += Dir.glob(src.join(val)) }
         end
-        Array(glob).each do |val|
+        (glob.is_a?(::Array) ? glob : [glob]).each do |val|
           Dir.glob(src.join(val)) do |path|
             next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
 
@@ -87,7 +79,8 @@ module Squared
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
           if (path = Pathname.new(dest)).directory?
-            src = Array(src).reject { |val| path.join(File.basename(val)).exist? }
+            src = [src] unless src.is_a?(::Array)
+            src = src.reject { |val| path.join(File.basename(val)).exist? }
             return if src.empty?
           elsif path.exist?
             return

data/lib/squared/common/utils.rb

@@ -35,33 +35,44 @@ module Squared
         end
       end
 
-      def env(key, default = nil, suffix: @envname, equals: nil, ignore: nil)
-        ret = env_value(key, suffix: suffix)
+      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?
 
         ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
       end
 
-      def env_value(key, default = '', suffix: nil)
-        suffix && (ret = ENV["#{key}_#{suffix}"]) ? ret : ENV.fetch(key, default)
+      def env_value(key, default = '', suffix: nil, strict: false)
+        if suffix
+          if (ret = ENV["#{key}#{@envname ? "_#{@envname}" : ''}_#{suffix}"])
+            return ret
+          elsif strict
+            return default
+          end
+        end
+        if @envname
+          return ret if (ret = ENV["#{key}_#{@envname}"])
+          return default if strict
+        end
+        ENV.fetch(key, default)
       end
 
-      def env_bool(key, default = false, suffix: nil)
+      def env_bool(key, default = false, suffix: nil, strict: false, index: false)
         if key.is_a?(::String)
-          case env_value(key, suffix: suffix)
+          case (val = env_value(key, suffix: suffix, strict: strict))
           when ''
             default
           when '0', 'false'
             false
           else
-            true
+            index && val.to_i > 0 ? val.to_i : true
           end
         else
           key.nil? ? default : key
         end
       end
 
-      def env_pipe(key, default = 1, suffix: nil, root: nil)
+      def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
         if default.is_a?(::String)
           begin
             default = (root ? root.join(default) : Pathname.new(default)).realdirpath
@@ -72,18 +83,18 @@ module Squared
         end
         case key
         when ::String
-          case (ret = env_value(key, suffix: suffix))
+          case (ret = env_value(key, suffix: suffix, strict: strict))
           when '0', '1', '2'
             return ret.to_i
           end
         when ::Numeric
-          return key if key.between?(0, 2)
+          return key if key >= 0 && key <= 2
         end
         default
       end
 
-      def env_match(key, default = nil, suffix: nil, options: 0, timeout: nil)
-        case (ret = env_value(key, suffix: suffix))
+      def env_match(key, default = nil, suffix: nil, strict: false, options: 0, timeout: nil)
+        case (val = env_value(key, suffix: suffix, strict: strict))
         when ''
           default
         when '0'
@@ -91,7 +102,7 @@ module Squared
         when '1'
           true
         else
-          Regexp.new(ret, options, timeout: timeout)
+          Regexp.new(val, options, timeout: timeout)
         end
       end
     end

data/lib/squared/config.rb

@@ -33,7 +33,7 @@ module Squared
         end
 
         def to_s
-          super.match(/[^:]+\z/)[0]
+          super[/[^:]+\z/, 0]
         end
       end
 
@@ -48,6 +48,7 @@ module Squared
         if project && (project.respond_to?(:workspace) || (project = __get__(:project)[project.to_s]))
           main = project.basepath(main).to_s
           @project = project
+          @envname = project.instance_variable_get(:@envname)
           @required = true
         end
         @name = name || @project&.name
@@ -89,7 +90,7 @@ module Squared
                       @required = true
                       project ? [project, 'not found'] : ['name', 'missing']
                     end
-        warn log_message(:warn, msg, subject: self.class, hint: hint)
+        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
       end
 
       def build
@@ -238,7 +239,7 @@ module Squared
         title = Pathname.new(file)
                         .realpath
                         .to_s
-                        .sub(Regexp.new("\\A#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
+                        .sub(/\A#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
                                                 { pat: /\A((?:[^:]|(?<! ):(?! ))+)\z/, styles: theme[:banner] },
@@ -249,8 +250,6 @@ module Squared
                                                 { pat: /\A(.+ : ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
                                                 { pat: /\A(.+ : \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
                                                 { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
-                                                { pat: /\A(.+ : )(true|false)(\s*)\z/m, styles: theme[:boolean],
-                                                  index: 2 },
                                                 { pat: /\A(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -56,7 +56,7 @@ module Squared
         end
 
         def to_s
-          super.match(/[^:]+\z/)[0]
+          super[/[^:]+\z/, 0]
         end
 
         attr_reader :kind_project
@@ -68,7 +68,7 @@ module Squared
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
-      def initialize(home = Dir.pwd, *, main: nil, prefix: nil,
+      def initialize(home = (ARG[:HOME] && ENV[ARG[:HOME]]) || Dir.pwd, *, main: nil, prefix: nil,
                      verbose: ARG[:VERBOSE], common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
         @home = Pathname.new(home).realdirpath
         basename = @home.basename.to_s
@@ -78,15 +78,17 @@ module Squared
         else
           @main = basename.freeze
         end
+        @home.mkpath rescue nil
         @root = @home.parent
         @prefix = prefix
         @series = Application.impl_series.new(self)
         @project = {}
         @kind = {}
         @extensions = []
+        @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
         @pipe = 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)
+        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
         @warning = @verbose != false
         @closed = false
         if common
@@ -105,6 +107,12 @@ module Squared
           group: {},
           ref: {}
         }.freeze
+        @pass = {
+          group: {},
+          ref: {},
+          global: {},
+          pattern: []
+        }.freeze
         @banner = {
           group: {},
           ref: {}
@@ -113,14 +121,13 @@ module Squared
       end
 
       def initialize_session
-        @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
         return unless @pipe.is_a?(Pathname)
 
         bord = '#' * Project.line_width
         puts bord, format('Session started on %s by %s', Time.now.to_s, @main), bord
       end
 
-      def build(parallel: [], **kwargs)
+      def build(parallel: [], pass: nil, **kwargs)
         return self unless enabled? && !@closed
 
         if kwargs[:pattern].is_a?(Array)
@@ -130,6 +137,7 @@ module Squared
           kwargs[:parallel] = parallel.reject { |val| val.is_a?(Regexp) && (kwargs[:pattern] << val) }
                                       .map(&:to_s)
         end
+        @pass[:pattern].concat(pass.map { |val| val.is_a?(Regexp) ? val : val.to_s }) if pass
         @project.each_value do |proj|
           if proj.enabled?
             proj.populate(series.keys.dup, **kwargs)
@@ -138,7 +146,7 @@ module Squared
           else
             next
           end
-          series.populate(proj)
+          series.populate(proj, **kwargs)
         end
 
         Application.kind_project.each { |obj| obj.populate(self, **kwargs) }
@@ -180,6 +188,10 @@ module Squared
         script_command :run, script, group, ref, on
       end
 
+      def script(script, group: @group, ref: @ref, on: nil)
+        script_command :script, script, group, ref, on
+      end
+
       def depend(script, group: @group, ref: @ref, on: nil)
         script_command :depend, script, group, ref, on
       end
@@ -196,6 +208,10 @@ module Squared
         script_command :doc, script, group, ref, on
       end
 
+      def lint(script, group: @group, ref: @ref, on: nil)
+        script_command :lint, script, group, ref, on
+      end
+
       def test(script, group: @group, ref: @ref, on: nil)
         script_command :test, script, group, ref, on
       end
@@ -208,6 +224,18 @@ module Squared
         script_command :exclude, as_a(base, :to_sym).freeze, group, ref
       end
 
+      def pass(name, group: @group, ref: @ref, &blk)
+        data = if group
+                 @pass[:group][group] ||= {}
+               elsif ref
+                 @pass[:ref][ref] ||= {}
+               else
+                 @pass[:global]
+               end
+        data[name.to_sym] = blk
+        self
+      end
+
       def banner(*args, command: true, styles: nil, border: nil, group: @group, ref: @ref)
         data = { command: command, order: [], styles: check_style(styles, empty: false), border: check_style(border) }
         args.each do |meth|
@@ -268,7 +296,7 @@ module Squared
         index = 0
         while @project[name]
           index += 1
-          name = task_name "#{project}-#{index}"
+          name = "#{project}-#{index}"
         end
         proj = ((if !ref.is_a?(Class)
                    Application.find(ref, path: path)
@@ -322,7 +350,7 @@ module Squared
       end
 
       def describe(data)
-        @describe ||= {
+        @describe = {
           alias: {},
           replace: [],
           pattern: {}
@@ -376,7 +404,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/o, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)
@@ -427,7 +455,7 @@ module Squared
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
           obj.allref.each do |ref|
-            next unless obj.has?(key, ref) && (data = batch[ref])
+            next unless (data = batch[ref])
 
             data.each do |val|
               if (items = task_resolve(obj, val)).empty?
@@ -446,7 +474,7 @@ module Squared
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
           obj.allref.each do |ref|
-            next unless obj.has?(key, ref) && (alt = data[ref])
+            next unless (alt = data[ref])
 
             ret = task_resolve(obj, alt)
             break unless ret.empty?
@@ -528,6 +556,17 @@ module Squared
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end
 
+      def task_exclude?(key, obj = nil)
+        if obj
+          data = obj.group ? @pass[:group][obj.group] : @pass[:ref][obj.ref]
+          blk = (data && data[key.to_sym]) || @pass[:global][key.to_sym]
+          return true if blk && obj.instance_eval(&blk)
+
+          key = task_join(task_localname(obj.name), key)
+        end
+        @pass[:pattern].any? { |item| item.is_a?(Regexp) ? key =~ item : key == item }
+      end
+
       def task_defined?(*key)
         Rake::Task.task_defined?(key.size == 1 ? key.first : task_join(*key))
       end
@@ -548,14 +587,6 @@ module Squared
         Rake::Win32.windows?
       end
 
-      def jruby?
-        RUBY_ENGINE == 'jruby'
-      end
-
-      def jruby_win?
-        jruby? && windows?
-      end
-
       def rootpath(*args)
         root.join(*args)
       end
@@ -589,14 +620,9 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        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
+        return unless default && task_defined?(out = task_name(default))
+
+        task Rake.application.default_task_name => out
       end
 
       def puts(*args)
@@ -613,9 +639,7 @@ module Squared
         end
         items.each do |name|
           (@script[label][name] ||= {})[task] = val
-          next unless on.is_a?(Hash)
-
-          (@events[label][name] ||= {})[task] = on
+          (@events[label][name] ||= {})[task] = on if on.is_a?(Hash)
         end
         self
       end
@@ -632,34 +656,33 @@ module Squared
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group && (ret = target[:group][group.to_sym])
-          ret
-        elsif ref
-          if ref.is_a?(Enumerable)
-            ref.each do |key|
-              next unless (ret = target[:ref][key])
+        if group
+          target[:group][group.to_sym]
+        elsif ref.is_a?(Array)
+          ref = ref.each
+        end
+        if ref.instance_of?(Enumerator)
+          ref.each do |key|
+            next unless (ret = target[:ref][key])
 
-              return ret if args.empty? || args.any? { |val| ret.key?(val) }
-            end
-            nil
-          else
-            target[:ref][ref]
+            return ret if args.empty? || args.any? { |val| ret.key?(val) }
           end
+          nil
+        elsif ref
+          target[:ref][ref]
         end
       end
 
       def root?(path, pass: [])
         return false unless path.directory?
 
-        case path.children.size
-        when 0
-          true
-        when 1
-          target = path.children.first
-          target.to_s == __FILE__ || pass.any? { |val| val == target.basename.to_s }
-        else
-          false
+        path.children.each do |c|
+          name = c.basename.to_s
+          next if c.to_s == __FILE__ || (@main == name && c.directory? && c.empty?) || pass.any? { |val| val == name }
+
+          return false
         end
+        true
       end
 
       def script?(state, target: nil, pat: nil, group: nil, ref: baseref, global: false)