Merge pull request #344 from scarpe-team/warn_vs_warning

Change warning to warn for all log stuff

lacci/lib/shoes/app.rb

@@ -67,7 +67,7 @@ def initialize(
       end
 
       Signal.trap("INT") do
-        @log.warning("App interrupted by signal, stopping...")
+        @log.warn("App interrupted by signal, stopping...")
         puts "\nStopping Shoes app..."
         destroy
       end

lacci/lib/shoes/log.rb

@@ -9,7 +9,7 @@
 # an implementation to be plugged in.
 
 module Shoes
-  LOG_LEVELS = [:debug, :info, :warning, :error, :fatal].freeze
+  LOG_LEVELS = [:debug, :info, :warn, :error, :fatal].freeze
 
   # Include this module to get a @log instance variable to log as your
   # configured component.

lib/scarpe/logger.rb

@@ -21,7 +21,7 @@ def name_to_severity(data)
         :debug
       when "info"
         :info
-      when "warn", "warning"
+      when "warn"
         :warn
       when "err", "error"
         :error
@@ -105,10 +105,6 @@ def configure_logger(log_config)
   end
 end
 
-class Logging::Logger
-  alias_method :warning, :warn
-end
-
 log_config = if ENV["SCARPE_LOG_CONFIG"]
   JSON.load_file(ENV["SCARPE_LOG_CONFIG"])
 else

lib/scarpe/wv/web_wrangler.rb

@@ -216,7 +216,7 @@ def periodic_code(name, interval = heartbeat, &block)
     def js_eventually(code)
       raise "WebWrangler isn't running, eval doesn't work!" unless @is_running
 
-      @log.warning "Deprecated: please do NOT use js_eventually, it's basically never what you want!" unless ENV["CI"]
+      @log.warn "Deprecated: please do NOT use js_eventually, it's basically never what you want!" unless ENV["CI"]
 
       @webview.eval(code)
     end