squared 0.4.7 → 0.4.9

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
@@ -21,22 +21,33 @@ module Squared
             r[1] + r[2] + r[4] + shell_quote(opt, double: double, force: force, override: override)
           end
           if r[5] == r[7]
-            r[5] ? val : combine.(r[6])
+            r[5] ? val : combine.call(r[6])
           else
             force = true
-            combine.(r[5] + r[6] + r[7])
+            combine.call(r[5] + r[6] + r[7])
           end
+        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 !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(/(?<!\\)"/, '\\"')}\""
@@ -45,8 +56,8 @@ module Squared
         end
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true, force: true, double: false, override: false,
-                       merge: false)
+      def shell_option(flag, val = nil, escape: true, quote: true, option: true, force: true, double: false,
+                       merge: false, override: false)
         flag = flag.to_s
         if flag =~ /\A(["'])(.+)\1\z/
           double = $1 == '"'
@@ -66,30 +77,30 @@ module Squared
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote, double: double, override: override)
+                               elsif quote
+                                 shell_quote(val, option: option, force: force, double: double, override: override)
                                else
-                                 quote ? shell_quote(val, force: force, double: double, override: override) : val
+                                 val
                                end}"
                       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
 
-      def quote_option(flag, val, double: false)
-        shell_option(flag, val, escape: false, double: double)
+      def quote_option(flag, val, option: true, double: false, merge: false)
+        shell_option(flag, val, escape: false, option: option, double: double, merge: merge)
       end
 
       def basic_option(flag, val, merge: false)

data/lib/squared/common/system.rb

@@ -30,10 +30,10 @@ module Squared
         if pass
           exclude = []
           pass = [pass] unless pass.is_a?(::Array)
-          pass.each { |val| exclude.concat(Dir.glob(src.join(val))) }
+          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|
+          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
@@ -89,7 +89,7 @@ module Squared
         case link
         when 'hard', 1
           FileUtils.ln(src, dest, force: force, verbose: verbose)
-        when true, '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

@@ -131,7 +131,7 @@ module Squared
 
       def env_bool(key, default = false, suffix: nil, strict: false, index: false)
         case key
-        when nil
+        when ::NilClass
           default
         when ::String
           case (val = env_value(key, suffix: suffix, strict: strict))
@@ -148,14 +148,6 @@ module Squared
       end
 
       def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
-        if default.is_a?(::String)
-          begin
-            default = (root ? Pathname.new(root).join(default) : Pathname.new(default)).realdirpath
-          rescue StandardError => e
-            default = 1
-            warn e
-          end
-        end
         case key
         when ::String
           case (ret = env_value(key, suffix: suffix, strict: strict))
@@ -165,7 +157,16 @@ module Squared
         when ::Numeric
           return key if key.between?(0, 2)
         end
-        default
+        begin
+          if default.is_a?(::String)
+            default = (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
+          end
+        rescue StandardError => e
+          warn e
+          1
+        else
+          default
+        end
       end
 
       def env_match(key, default = nil, suffix: nil, strict: false, options: 0, timeout: nil)

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
@@ -38,7 +38,6 @@ module Squared
       end
 
       @@mime_obj = {}
-      @@task_desc = Rake::TaskManager.record_task_metadata
 
       attr_reader :main, :name, :project, :theme
       attr_accessor :pipe
@@ -128,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])
@@ -164,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)
@@ -306,7 +305,7 @@ module Squared
       end
 
       def task_desc(command, *ext, target: nil)
-        return unless @@task_desc
+        return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
         args = *name.split(':').push(command, val)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -15,7 +15,8 @@ module Squared
         global: false,
         env: false
       }.freeze
-      private_constant :SCRIPT_OBJ
+      TASK_METADATA = Rake::TaskManager.record_task_metadata
+      private_constant :SCRIPT_OBJ, :TASK_METADATA
 
       class << self
         def implement(*objs, base: false)
@@ -51,6 +52,14 @@ module Squared
           end
         end
 
+        def exclude(*args)
+          @task_exclude.merge(args.map!(&:to_sym))
+        end
+
+        def series_wrap(app)
+          impl_series.new(app, exclude: @task_exclude.to_a)
+        end
+
         def baseref
           impl_project.ref
         end
@@ -64,7 +73,7 @@ module Squared
       end
 
       @kind_project = []
-      @@task_desc = Rake::TaskManager.record_task_metadata
+      @task_exclude = SymSet.new
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
@@ -74,20 +83,20 @@ 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
         @home.mkpath rescue nil
         @root = @home.parent
         @prefix = prefix
-        @series = Application.impl_series.new(self)
+        @series = Application.series_wrap(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)
+        @exception = env_bool exception
         @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
         @warning = @verbose != false
         @closed = false
@@ -184,36 +193,36 @@ module Squared
         self
       end
 
-      def run(script, group: @group, ref: @ref, on: nil)
-        script_command :run, script, group, ref, on
+      def run(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :run, script, group, ref, on, &blk
       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
+      def depend(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :depend, script, group, ref, on, &blk
       end
 
       def graph(script, group: @group, ref: @ref, on: nil)
         script_command :graph, as_a(script, :to_s).freeze, group, ref, on
       end
 
-      def clean(script, group: @group, ref: @ref, on: nil)
-        script_command :clean, script, group, ref, on
+      def clean(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :clean, script, group, ref, on, &blk
       end
 
-      def doc(script, group: @group, ref: @ref, on: nil)
-        script_command :doc, script, group, ref, on
+      def doc(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :doc, script, group, ref, on, &blk
       end
 
-      def lint(script, group: @group, ref: @ref, on: nil)
-        script_command :lint, script, group, ref, on
+      def lint(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :lint, script, group, ref, on, &blk
       end
 
-      def test(script, group: @group, ref: @ref, on: nil)
-        script_command :test, script, group, ref, on
+      def test(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :test, script, group, ref, on, &blk
       end
 
       def log(script, group: @group, ref: @ref)
@@ -265,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) : [:_]
@@ -290,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
@@ -408,7 +417,7 @@ module Squared
       end
 
       def task_desc(*args, **kwargs)
-        return unless @@task_desc
+        return unless TASK_METADATA
 
         name = kwargs.delete(:name)
         if @describe
@@ -422,7 +431,7 @@ module Squared
           @describe[:replace].each do |pat, tmpl|
             next unless val =~ pat
 
-            val = replace.($~, tmpl.dup)
+            val = replace.call($~, tmpl.dup)
             found = true
           end
           if (out = @describe[:alias][val])
@@ -432,7 +441,7 @@ module Squared
             @describe[:pattern].each do |key, pat|
               next unless val =~ pat
 
-              val = replace.($~, key.dup)
+              val = replace.call($~, key.dup)
               found = true
               break
             end
@@ -490,12 +499,12 @@ 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
 
       def format_desc(val, opts = nil, arg: 'opts*', before: nil, after: nil, out: false)
-        return unless @@task_desc || out
+        return unless TASK_METADATA || out
 
         val = val.to_s.split(':') if val.is_a?(String)
         if before || after || opts
@@ -552,6 +561,8 @@ module Squared
       end
 
       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)
       end
 
@@ -587,7 +598,7 @@ module Squared
       end
 
       def docker?
-        File.exist?('/.dockerenv')
+        !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
       end
 
       def powershell?
@@ -597,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
 
@@ -643,7 +654,12 @@ module Squared
         puts_oe(*args, pipe: pipe)
       end
 
-      def script_command(task, val, group, ref, on)
+      def script_command(task, val, group, ref, on, &blk)
+        if block_given?
+          val = Struct.new(:run, :block).new(val, blk)
+        elsif !val
+          return self
+        end
         if group
           label = :group
           items = as_a(group, :to_sym)
@@ -670,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])