action_command 0.1.5 → 0.1.6

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Mon May 16 08:49:39 2016 by
+  Generated on Wed May 25 10:31:52 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-2.2.3).
 </div>

data/lib/action_command/result.rb

@@ -13,11 +13,12 @@ module ActionCommand
     end
     
     # set the logger for this result
-    def logger=(logger)
+    def configure_logger(logger, format)
       return unless logger
       @sequence = SecureRandom.hex 
       @stack = [] 
       @logger = logger
+      @log_format = format
     end
 
     # @return true if logging is enabled.
@@ -29,8 +30,8 @@ module ActionCommand
     # @yield return a message or hash
     def debug(msg = nil)
       if @logger
-        json = build_log(msg || yield, ActionCommand::LOG_KIND_DEBUG)
-        @logger.info(json)
+        msg = build_log(msg || yield, ActionCommand::LOG_KIND_DEBUG)
+        @logger.info(format_log(msg))
       end
     end
   
@@ -38,14 +39,17 @@ module ActionCommand
     # @yield return a message or hash
     def info(msg = nil)
       if @logger
-        json = build_log(msg || yield, ActionCommand::LOG_KIND_INFO)
-        @logger.info(json)
+        msg = build_log(msg || yield, ActionCommand::LOG_KIND_INFO)
+        @logger.info(format_log(msg))
       end
     end
   
     # display an error message to the logger, if there is one.
     def error(msg)
-      @logger.error(build_log(msg, ActionCommand::LOG_KIND_ERROR)) if @logger
+      if @logger
+        msg = build_log(msg, ActionCommand::LOG_KIND_ERROR)
+        @logger.error(format_log(msg))
+      end
     end
   
     # Call this if your command implementation fails.  Sets
@@ -153,7 +157,8 @@ module ActionCommand
 
     def log_info_hash(params, kind)
       return unless @logger
-      @logger.info(build_log(params, kind))
+      msg = build_log(params, kind)
+      @logger.info(format_log(msg))
     end
     
     def build_log(msg, kind)
@@ -166,7 +171,31 @@ module ActionCommand
       out[:key] = cur[:key] if cur[:key]
       out[:kind] = kind
       out[:msg] = msg if msg
-      return JSON.generate(out)
+      return out
+    end
+    
+    def format_log(msg)
+      return JSON.generate(msg) unless @log_format == :human
+
+      depth = msg[:depth]
+      kind = msg[:kind]
+      message = msg[:msg]
+      cmd = msg[:cmd]
+      return format_human_log(depth, cmd, kind, message)
+    end
+    
+    def format_human_log(depth, cmd, kind, msg)
+      base_depth = 2 * depth
+      extra_depth = base_depth + 2
+      if kind == ActionCommand::LOG_KIND_COMMAND_INPUT
+        cmd = "#{cmd}: #{msg}"
+        return cmd.rjust(cmd.length + base_depth)
+      elsif kind == ActionCommand::LOG_KIND_COMMAND_OUTPUT
+        out = "output: #{msg}"
+        return out.rjust(out.length + extra_depth)
+      elsif msg
+        return msg.rjust(msg.to_s.length + extra_depth)
+      end
     end
   end
 end

data/lib/action_command/version.rb

@@ -1,4 +1,4 @@
 module ActionCommand
   # Version of this Gem
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/lib/action_command.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'action_command/version'
 require 'action_command/result'
 require 'action_command/input_output'
@@ -88,6 +89,10 @@ module ActionCommand
       return
     end
     
+    # by default, use human logging if a logger is enabled.
+    args[:logger] = Logger.new(STDOUT) unless args.key?(:logger)
+    args[:log_format] = :human unless args.key?(:log_format)
+    
     result = create_result
     ActionCommand.create_and_execute(cls, io.rake_input(args), CONTEXT_RAKE, result)
     io.print_output(result)
@@ -154,8 +159,11 @@ module ActionCommand
   def self.create_and_execute(cls, params, parent, result)
     check_params(cls, params)
     params[:parent] = parent
-    result.logger = params[:logger] 
-    result.logger = @@logger unless params[:logger]
+    logger = params[:logger]
+    logger = @@logger unless logger
+    log_format = :json
+    log_format = params[:log_format] if params.key?(:log_format)
+    result.configure_logger(logger, log_format) 
     result.root_command(cls) if parent.is_a? Symbol
     action = cls.new(params)
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_command
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler