simple-cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cca558cbc71212156372b50cbbb96f1852a98f52
-  data.tar.gz: b7015c7ca8d0b8305f57a7927b85920a8940d27c
+  metadata.gz: 8806833d77aa2c4e1c4ba7ed10ac0945e11e9e5f
+  data.tar.gz: 5e444bf139b52082aa7308bdc432eba4037dc2aa
 SHA512:
-  metadata.gz: 7ac446ec3a52cf37763809cca7a8c1cdcf701023527b6871603568679937a92f8e2e830c1169c29243be0157db30631069f9d2c17c3facb7bcd558b694fd77ec
-  data.tar.gz: 4c236b552b914b003e9e40562e3035c21bf727209a0295492cbaf8c560c681e5f7ba84ae1519914bd8652e58fcf113294335717bbf7b823134cbbc6e0f6b2f7b
+  metadata.gz: de98dea9484600fa3cbda2f98c3c9baa6bb6ab7eb48a9c77b886f46146d04c0409157b95cda1404e580ab8a4a0aaef7b80e04c9dfdf783ec1d86271dee7a5519
+  data.tar.gz: 122ac23744b706423991bc0a94f5aa620804ebf06b27ebe374e6814357a6d9177e45ae2191ea962111b18f6bd06dc8e43defb73ccae06823f50841604ec013d1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-cli (0.1.4)
+    simple-cli (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/simple/cli/adapter.rb

@@ -4,4 +4,12 @@ module Simple::CLI::Adapter
 
     Simple::CLI::Runner.run(self, *args)
   end
+
+  def logger=(logger)
+    Simple::CLI.logger = logger
+  end
+
+  def logger
+    Simple::CLI.logger
+  end
 end

data/lib/simple/cli/helpers.rb

@@ -14,6 +14,10 @@ module Simple::CLI::Helpers
     exit 1
   end
 
+  def logger
+    ::Simple::CLI.logger
+  end
+
   def sh!(cmd, *args)
     command = Command.new(cmd, *args)
     result = command.sh

data/lib/simple/cli/logger/adapter.rb

@@ -0,0 +1,36 @@
+class Simple::CLI::Logger::Adapter
+  def initialize(logger)
+    @logger = logger
+  end
+
+  def method_missing(*args, &block)
+    @logger.send *args, &block
+  end
+
+  def success(msg, *args, &block)
+    if @logger.respond_to?(:success)
+      @logger.send :success, msg, *args, &block
+    else
+      info "success: #{msg}", *args, &block
+    end
+  end
+
+  def benchmark(msg, *args, &block)
+    severity = :warn
+    if msg.is_a?(Symbol)
+      severity, msg = msg, args.shift
+    end
+
+    start = Time.now
+    r = yield
+
+    msg += ": #{(1000 * (Time.now - start)).to_i} msecs."
+    send severity, msg, *args
+
+    r
+  rescue StandardError
+    msg += "raises #{$!.class.name} after #{(1000 * (Time.now - start)).to_i} msecs."
+    send severity, msg, *args
+    raise $!
+  end
+end

data/lib/simple/cli/logger/colored_logger.rb

@@ -0,0 +1,97 @@
+module Simple::CLI::Logger::ColoredLogger
+  extend self
+
+  attr :level, true
+
+  COLORS = {
+    clear:      "\e[0m",  # Embed in a String to clear all previous ANSI sequences.
+    bold:       "\e[1m",  # The start of an ANSI bold sequence.
+    black:      "\e[30m", # Set the terminal's foreground ANSI color to black.
+    red:        "\e[31m", # Set the terminal's foreground ANSI color to red.
+    green:      "\e[32m", # Set the terminal's foreground ANSI color to green.
+    yellow:     "\e[33m", # Set the terminal's foreground ANSI color to yellow.
+    blue:       "\e[34m", # Set the terminal's foreground ANSI color to blue.
+    magenta:    "\e[35m", # Set the terminal's foreground ANSI color to magenta.
+    cyan:       "\e[36m", # Set the terminal's foreground ANSI color to cyan.
+    white:      "\e[37m", # Set the terminal's foreground ANSI color to white.
+
+    on_black:   "\e[40m", # Set the terminal's background ANSI color to black.
+    on_red:     "\e[41m", # Set the terminal's background ANSI color to red.
+    on_green:   "\e[42m", # Set the terminal's background ANSI color to green.
+    on_yellow:  "\e[43m", # Set the terminal's background ANSI color to yellow.
+    on_blue:    "\e[44m", # Set the terminal's background ANSI color to blue.
+    on_magenta: "\e[45m", # Set the terminal's background ANSI color to magenta.
+    on_cyan:    "\e[46m", # Set the terminal's background ANSI color to cyan.
+    on_white:   "\e[47m"  # Set the terminal's background ANSI color to white.
+  }
+
+  @@started_at = Time.now
+
+  MESSAGE_COLOR = {
+    :info     => :cyan,
+    :warn     => :yellow,
+    :error    => :red,
+    :success  => :green,
+  }
+
+  def debug(msg, *args)
+    log :debug, msg, *args
+  end
+
+  def info(msg, *args)
+    log :info, msg, *args
+  end
+
+  def warn(msg, *args)
+    log :warn, msg, *args
+  end
+
+  def error(msg, *args)
+    log :error, msg, *args
+  end
+
+  def success(msg, *args)
+    log :success, msg, *args
+  end
+
+  private
+
+  REQUIRED_LOG_LEVELS = {
+    debug:    ::Logger::DEBUG,
+    info:     ::Logger::INFO,
+    warn:     ::Logger::WARN,
+    error:    ::Logger::ERROR,
+    success:  ::Logger::INFO
+  }
+
+  def log(sym, msg, *args)
+    log_level = level
+    required_log_level = REQUIRED_LOG_LEVELS.fetch(sym)
+    return if required_log_level < log_level
+
+    formatted_runtime = "%.3f secs" % (Time.now - @@started_at)
+    msg = "[#{formatted_runtime}] #{msg}"
+    unless args.empty?
+      msg += ": " + args.map(&:inspect).join(", ")
+    end
+
+    msg_length = msg.length
+
+    if color = COLORS[MESSAGE_COLOR[sym]]
+      msg = "#{color}#{msg}#{COLORS[:clear]}"
+    end
+
+    if log_level < Logger::INFO
+      padding = " " * (90 - msg_length) if msg_length < 90
+      msg = "#{msg}#{padding}"
+
+      source = caller[2]
+      source.gsub!( Dir.getwd, "." )
+      source.gsub!( File.expand_path("~"), "~" )
+
+      msg = "#{msg}from #{source}"
+    end
+
+    STDERR.puts msg
+  end
+end

data/lib/simple/cli/logger.rb

@@ -1,22 +1,25 @@
+module Simple::CLI::Logger
+end
+
 require "logger"
 
+require_relative "logger/adapter"
+require_relative "logger/colored_logger"
+
 module Simple::CLI::Logger
-  def logger=(logger)
-    @logger = logger
+  def logger
+    @logger ||= Adapter.new(default_logger)
   end
 
-  def logger
-    @logger ||= build_default_logger
+  def logger=(logger)
+    @logger = Adapter.new(logger)
   end
 
   private
 
-  def build_default_logger
-    logger = Logger.new(STDOUT)
-    logger.formatter = proc do |severity, _datetime, _progname, msg|
-      "#{severity}: #{msg}\n"
-    end
-    logger.level = Logger::INFO
+  def default_logger
+    logger = STDERR.isatty ? ColoredLogger : ::Logger.new(STDERR)
+    logger.level = ::Logger::INFO
     logger
   end
 end

data/lib/simple/cli/pp.rb

@@ -0,0 +1,10 @@
+require "pp"
+
+begin
+  require "awesome_print"
+
+  def pp(*args)
+    ap(*args)
+  end
+rescue LoadError
+end

data/lib/simple/cli/runner.rb

@@ -26,10 +26,8 @@ class Simple::CLI::Runner
   def extract_default_flags!(args)
     args.reject! do |arg|
       case arg
-      when "-v", "--verbose" then
-        logger.level = Logger::DEBUG
-      when "-q", "--quiet" then
-        logger.level = Logger::WARN
+      when "--verbose", "-v" then logger.level = Logger::DEBUG
+      when "--quiet", "-q"   then logger.level = Logger::WARN
       end
     end
   end
@@ -79,7 +77,7 @@ class Simple::CLI::Runner
   end
 
   def on_exception(e)
-    raise(e) if Simple::CLI::DEBUG
+    raise(e) if Simple::CLI.logger.level == Logger::DEBUG
 
     case e
     when ArgumentError

data/lib/simple/cli/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module CLI
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 end

data/lib/simple/cli.rb

@@ -1,26 +1,21 @@
 module Simple; end
 module Simple::CLI; end
 
+require_relative "cli/pp"
+
 require_relative "cli/helpers"
 require_relative "cli/runner"
 require_relative "cli/adapter"
 require_relative "cli/logger"
 
-require "pp"
-
 module Simple::CLI
-  DEBUG = true
+  extend ::Simple::CLI::Logger
 
   def self.included(base)
     base.extend(::Simple::CLI::Adapter)
     base.include(::Simple::CLI::Helpers)
   end
 
-  extend ::Simple::CLI::Logger
-  def logger
-    Simple::CLI::Logger.logger
-  end
-
   # Simple::CLI.run! is called from Runner.run. It is called with a method
   # name, which is derived from the command passed in via the command line,
   # and parsed arguments.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-16 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,6 +84,9 @@ files:
 - lib/simple/cli/adapter.rb
 - lib/simple/cli/helpers.rb
 - lib/simple/cli/logger.rb
+- lib/simple/cli/logger/adapter.rb
+- lib/simple/cli/logger/colored_logger.rb
+- lib/simple/cli/pp.rb
 - lib/simple/cli/runner.rb
 - lib/simple/cli/runner/autocompletion.rb
 - lib/simple/cli/runner/command_help.rb