squared 0.0.9 → 0.0.11

data/lib/squared/common/shell.rb

@@ -11,16 +11,29 @@ module Squared
       def shell_escape(val, quote: false)
         return Shellwords.escape(val) unless ::Rake::Win32.windows?
 
-        quote ? shell_quote(val, force: false) : val
+        quote ? shell_quote(opt, force: false) : opt
       end
 
       def shell_quote(val, force: true)
         ret = val.to_s.strip
-        return ret if (!force && !ret.include?(' ')) || ret =~ /(?:^|=)(["']).+\1$/m
+        return ret if (!force && !ret.include?(' ')) || ret =~ /(?:^|\S=|[^=]\s+)(["']).+\1$/m
 
         ::Rake::Win32.windows? ? "\"#{double_quote(ret)}\"" : "'#{single_quote(ret)}'"
       end
 
+      def shell_split(val, quote: false, join: false)
+        ret = Shellwords.split(val).map do |opt|
+          if (data = /^(--?[^= ]+)(=|\s+)?(["'])?(.+?)\3?$/m.match(opt))
+            next opt unless data[2] && !data[3]
+
+            data[1] + data[2] + shell_quote(data[4], force: !::Rake::Win32.windows?)
+          else
+            shell_escape(opt, quote: quote)
+          end
+        end
+        join ? ret.join(' ') : ret
+      end
+
       def fill_option(val)
         return "-#{val}" if val.size == 1 || val =~ /^[a-z]\d+$/i
 
@@ -37,11 +50,7 @@ module Squared
       end
 
       def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/)
-      end
-
-      def sanitize_args(*opts)
-        opts.map { |val| val.include?(' ') ? shell_quote(val) : shell_escape(val) }.join(' ')
+        val.split(/\s*(?<!\\)#{char}\s*/o)
       end
     end
   end

data/lib/squared/common/system.rb

@@ -8,43 +8,15 @@ module Squared
     module System
       module_function
 
-      def shell(*cmd, **kwargs)
+      def shell(*args, **kwargs)
         if RUBY_VERSION =~ /^2\.[0-5]\./
           exception = kwargs.delete(:exception)
-          ret = system(*cmd, **kwargs)
+          ret = system(*args, **kwargs)
           raise $?.to_s if !ret && exception
 
           ret
         else
-          system(*cmd, **kwargs)
-        end
-      end
-
-      def confirm(msg, agree: 'Y', cancel: 'N', default: nil, attempts: 5, timeout: 15)
-        require 'readline'
-        require 'timeout'
-        agree = /^#{agree}$/i if agree.is_a?(String)
-        cancel = /^#{cancel}$/i if cancel.is_a?(String)
-        Timeout.timeout(timeout) do
-          begin
-            while (ch = Readline.readline(msg, true))
-              ch = ch.chomp
-              ch = default if ch.empty?
-              case ch
-              when agree
-                return true
-              when cancel
-                return false
-              end
-              attempts -= 1
-              exit 1 unless attempts >= 0
-            end
-          rescue Interrupt
-            puts
-            exit 0
-          else
-            false
-          end
+          system(*args, **kwargs)
         end
       end
 
@@ -56,15 +28,14 @@ module Squared
         subdir = []
         files = 0
         dest.mkpath if create
-        glob = [glob] unless glob.is_a?(::Array)
-        glob.each do |val|
+        (glob.is_a?(::Array) ? glob : [glob]).each do |val|
           Dir.glob(src.join(val)) do |path|
             ent = Pathname.new(path)
             next if ent.directory?
 
             target = dest.join(ent.relative_path_from(src))
             dir = target.dirname
-            if !subdir.include?(dir.to_s)
+            unless subdir.include?(dir.to_s)
               dir.mkpath
               subdir << dir.to_s
             end
@@ -72,13 +43,12 @@ module Squared
             files += 1
           end
         end
-        puts [dest.realpath, subdir.size.to_s, files.to_s].join(' => ') if verbose
+        puts [dest.realpath, subdir.size.to_s, files.to_s].join(Common::ARG[:SPACE]) if verbose
       end
 
       def copy_f(src, dest, overwrite: true, verbose: false)
-        if !overwrite
-          path = Pathname.new(dest)
-          if path.directory?
+        unless overwrite
+          if (path = Pathname.new(dest)).directory?
             src = [src] unless src.is_a?(::Array)
             src = src.reject { |val| path.join(File.basename(val)).exist? }
           elsif path.exist?

data/lib/squared/common/task.rb

@@ -16,8 +16,9 @@ module Squared
         warn e if warning
       end
 
-      def invoked?(name)
-        ::Rake::Task.tasks.any? { |item| item.already_invoked && item.name == name.to_s }
+      def invoked?(*name)
+        val = name.size > 1 ? name.join(':') : name.first.to_s
+        ::Rake::Task.tasks.any? { |obj| obj.already_invoked && obj.name == val }
       end
     end
   end

data/lib/squared/common/utils.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Squared
+  module Common
+    module Utils
+      module_function
+
+      def env(key, default = nil, suffix: @envname, equals: nil, ignore: nil)
+        ret = env_value(key, suffix: suffix)
+        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)
+      end
+
+      def env_bool(key, default = false, suffix: nil)
+        if key.is_a?(::String)
+          case env_value(key, suffix: suffix)
+          when ''
+            default
+          when '0', 'false'
+            false
+          else
+            true
+          end
+        else
+          key.nil? ? default : key
+        end
+      end
+
+      def env_pipe(key, default = 1, suffix: nil, root: nil)
+        if default.is_a?(String)
+          begin
+            default = (root ? 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))
+          when '0', '1', '2'
+            return ret.to_i
+          end
+        when ::Numeric
+          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))
+        when ''
+          default
+        when '0'
+          false
+        when '1'
+          true
+        else
+          Regexp.new(ret, options, timeout: timeout)
+        end
+      end
+    end
+  end
+end

data/lib/squared/common.rb

@@ -6,6 +6,8 @@ require 'rake'
 require_relative 'common/base'
 require_relative 'common/class'
 require_relative 'common/format'
+require_relative 'common/prompt'
 require_relative 'common/shell'
 require_relative 'common/system'
 require_relative 'common/task'
+require_relative 'common/utils'

data/lib/squared/config.rb

@@ -2,13 +2,12 @@
 
 require 'json'
 
-require_relative 'common'
-
 module Squared
   module Config
     class Viewer
       include Common
       include Format
+      include Utils
       include ::Rake::DSL
 
       class << self
@@ -18,8 +17,10 @@ module Squared
       end
 
       attr_reader :main, :name, :project, :theme
+      attr_accessor :pipe
 
-      def initialize(main, name = nil, project: nil, prefix: nil, dump: nil, opts: {}, auto: true, common: true)
+      def initialize(main, name = nil, project: nil, prefix: nil, dump: nil, opts: {}, auto: true,
+                     common: ARG[:COMMON], pipe: ARG[:PIPE], **)
         if project
           main = @project.base_path(main).to_s if (@project = __get__(:project)[project.to_sym])
           @required = true
@@ -30,6 +31,7 @@ module Squared
         @dump = dump
         @mime = {}
         @theme = common ? __get__(:theme)[:viewer] : {}
+        @pipe = env_pipe(pipe, @project ? @project.pipe : 1)
         if exist?
           @main = main.chomp(@ext)
           @name = @main unless @name || @required
@@ -58,10 +60,10 @@ module Squared
       def build
         return unless enabled?
 
-        params = ->(args) { exist? ? [realpath, [args.keys] + args.extras] : [args.keys, args.extras] }
-
         namespace(ns = task_name(name)) do
           view = @command && @command != name ? @command : 'view'
+          params = ->(args) { exist? ? [realpath, [args.keys] + args.extras] : [args.keys, args.extras] }
+
           namespace view do
             if @mime['json'] && (exist? || !::Rake::Task.task_defined?("#{ns}:#{view}:json"))
               desc format_desc(view, 'json')
@@ -91,7 +93,7 @@ module Squared
           require(gem || type)
           obj = eval(parse)
           ext << type if (ext = as_a(ext)).empty?
-          file = realpath if file.nil? && exist?
+          file = realpath if !file && exist?
 
           namespace task_name(name) do
             desc format_desc(command, *ext, exist: exist)
@@ -106,7 +108,8 @@ module Squared
             end
           end
         end
-      rescue LoadError, NameError
+      rescue LoadError, NameError => e
+        project&.log&.warn e
         self
       else
         @mime[type] = opts
@@ -122,7 +125,7 @@ module Squared
 
         ext = mime_type(file)
         type = type&.to_s || ext
-        if !parse
+        unless parse
           case type
           when 'json'
             parse = 'JSON'
@@ -136,7 +139,7 @@ module Squared
       end
 
       def style(name, *args)
-        apply_style(theme, name, *args)
+        apply_style(theme, name, args)
         self
       end
 
@@ -157,11 +160,15 @@ module Squared
       def enabled?
         return File.exist?(realpath) if exist?
 
-        !@required || (!project.nil? && project.enabled?)
+        !@required || !!project&.enabled?
       end
 
       private
 
+      def puts(*args)
+        puts_oe(*args, pipe: pipe)
+      end
+
       def read_keys(reader, type, file, keys, ext: [type])
         if (mime = mime_type(file)) && base_path(file).exist?
           raise_error(file, mime, hint: 'invalid') unless ext.include?(mime)
@@ -190,7 +197,7 @@ module Squared
                         .realpath
                         .to_s
                         .sub(Regexp.new("^#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
-        sub = if !pipe?
+        sub = unless stdin?
                 [
                   { pat: /^((?:[^:]|(?<! ):(?! ))+)$/, styles: theme[:banner] },
                   { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: theme[:undefined], index: 2 },
@@ -233,13 +240,13 @@ module Squared
                 $2 ? ".#{s}" : "#{s}."
               end
             end
-            out << [key, pipe? ? JSON.dump(nil) : 'undefined']
+            out << [key, stdin? ? JSON.dump(nil) : 'undefined']
           else
-            out << [key, @dump == 'json' || pipe? ? JSON.dump(val) : val.inspect]
+            out << [key, @dump == 'json' || stdin? ? JSON.dump(val) : val.inspect]
           end
           pad = [pad, key.size].max
         end
-        if pipe?
+        if stdin?
           puts out.map(&:last).join("\n")
         else
           out.map { |item| "#{item[0].ljust(pad)} : #{item[1]}" }
@@ -260,35 +267,33 @@ module Squared
           'yaml'
         when 'js'
           'json'
+        when ''
+          nil
         else
-          ret.empty? ? nil : ret
+          ret
         end
       end
 
       def format_desc(command, *ext, exist: exist?)
-        message(@prefix || '', *name.split(':'), command,
-                "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys*]")
+        val = "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
+        message(@prefix, *name.split(':'), command, val, empty: true)
       end
 
       def realpath
-        file = main + @ext
-        Pathname.new(file).realdirpath.to_s rescue file
+        base_path(file = main + @ext).to_s rescue file
       end
 
       def exist?
         !@ext.empty? && (!@required || !project.nil?)
       end
 
-      def pipe?
-        return project.workspace.pipe if project
-
-        val = ENV['PIPE_OUT']
-        !val.nil? && !val.empty? && val != '0'
-      end
-
       def warning?
         project ? project.workspace.warning : true
       end
+
+      def stdin?
+        pipe == 0
+      end
     end
   end
 end

data/lib/squared/version.rb

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