squared 0.5.3 → 0.5.5

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

@@ -143,11 +143,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
 
@@ -196,7 +196,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)
@@ -213,6 +213,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

@@ -48,7 +48,7 @@ module Squared
           list.each do |val|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            items << val.chomp
+            items << val.to_s.chomp
             puts '%2d. %s' % [items.size, val]
           end
           max = items.size

data/lib/squared/common/shell.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'shellwords'
 require 'rake'
+require 'shellwords'
 
 module Squared
   module Common
@@ -31,13 +31,17 @@ module Squared
 
           "#{$1}=%s" % if $2.include?(' ')
                          shell_quote($2, option: false)
+                       elsif Rake::Win32.windows?
+                         $2
                        else
-                         Rake::Win32.windows? ? $2 : Shellwords.escape($2)
+                         Shellwords.escape($2)
                        end
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, double: double, force: force) : val
+        elsif val.empty?
+          ''
         else
-          val.empty? ? '' : Shellwords.escape(val)
+          Shellwords.escape(val)
         end
       end
 
@@ -92,6 +96,12 @@ module Squared
         ret.join(join.is_a?(::String) ? join : ' ')
       end
 
+      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 line_width(lines)
         ret = [lines.max_by(&:size).size, 80].max
         [ret, Rake.application.terminal_width].min

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
@@ -59,7 +59,7 @@ module Squared
         soft = 0
         subdir.each do |dir, files|
           if link
-            files.dup.yield_self do |items|
+            files.dup.tap do |items|
               files.clear
               items.each do |file|
                 if file.exist?

data/lib/squared/config.rb

@@ -41,8 +41,8 @@ module Squared
       attr_reader :main, :name, :project, :theme
       attr_accessor :pipe
 
-      def initialize(main, name = nil, project: nil, prefix: nil, command: nil, dump: nil, opts: {}, auto: true,
-                     common: ARG[:COMMON], pipe: ARG[:PIPE], **)
+      def initialize(main, name = nil, project: nil, command: nil, opts: {}, auto: true,
+                     common: ARG[:COMMON], pipe: ARG[:PIPE], **kwargs)
         if project && (project.respond_to?(:workspace) || (project = __get__(:project)[project.to_s]))
           main = project.basepath(main).to_s
           @project = project
@@ -50,9 +50,9 @@ module Squared
           @required = true
         end
         @name = name || @project&.name
-        @prefix = prefix unless @project
+        @prefix = kwargs[:prefix] unless @project
         @ext = File.extname(main)
-        @dump = dump
+        @dump = kwargs[:dump]
         @mime = {}
         @theme = common ? __get__(:theme)[:viewer] : {}
         @pipe = env_pipe(pipe, @project ? @project.pipe : 1)
@@ -86,7 +86,7 @@ module Squared
                       ['path not found', realpath]
                     else
                       @required = true
-                      project ? [project, 'not found'] : ['name', 'missing']
+                      project ? [project, 'not found'] : %w[name missing]
                     end
         warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
       end
@@ -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.5.3'
+  VERSION = '0.5.5'
 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.prepend(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
@@ -83,7 +83,7 @@ module Squared
         basename = @home.basename.to_s
         if main
           @main = main.to_s.freeze
-          @home += @main unless @main == basename || (windows? && @main.downcase == basename.downcase)
+          @home += @main unless @main == basename || (windows? && @main.casecmp?(basename))
         else
           @main = basename.freeze
         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
@@ -382,7 +388,15 @@ module Squared
             end
           end
         end
-        apply_style(data || theme, obj, args, empty: empty) unless target && !data
+        if obj.is_a?(String)
+          begin
+            obj = JSON.parse(homepath(obj).read, { symbolize_names: true })
+          rescue StandardError => e
+            warn log_message(Logger::ERROR, e)
+            obj = nil
+          end
+        end
+        apply_style(data || theme, obj, args, empty: empty) if obj && (!target || data)
         self
       end
 
@@ -418,7 +432,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
@@ -673,6 +687,10 @@ module Squared
         { exception: exception, warning: warning }
       end
 
+      def size
+        @project.size
+      end
+
       def to_s
         (home? ? home : root).to_s
       end
@@ -686,9 +704,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__(*)
@@ -790,8 +813,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|
@@ -807,8 +830,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)