log_magic 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9abdbd914641860a5b7e2be230902f925bf0095
-  data.tar.gz: 99afd230f8c3023a9e5cdaed8b900ee214f7885e
+  metadata.gz: e299670152c7d651a2f1720a1727c50aba82cdbe
+  data.tar.gz: cc43f159e7fc1e3cc53695f74a4e788b3f46e57d
 SHA512:
-  metadata.gz: aa4fc3271f0babc80b2d3180369100d81fbb343e3db85557be58a3273c5688225afc501c4eabe0a719aec0fdc1f55dd16c00643e8ea8fc6ed414a7167ba1a55c
-  data.tar.gz: 5527270c00d24bfbeecf3ac47f365f955a1e000059ab0fb1810ebbff1f036533270aac2bb24b5d15c34a6758f3b7b11190eedb24af10f19caece5ee48b5c5cf8
+  metadata.gz: c819bc1d62d6ed760ba3b9f1d5845c9094644308f0f4d2bfdb272a40dfa823a9a5bb7583f536e5b4df5240b41e5ff6d949039888f98b0d50815a783c3f9ebe26
+  data.tar.gz: a7adfac933522bdf12fd13be573db120851919b4c6fccb8b6b1d1fa34dd94e3c821515fc65b5ed276d3af353ad4497b751405fceca6bcdea91749d088a3172c1

data/bin/log_magic

@@ -2,25 +2,32 @@
 
 require 'log_magic'
 
+unless LogMagic::PortUtils.port_open?('127.0.0.1', 6379)
+  redis_server_pid = fork do
+    `redis-server`
+  end
+  Process.detach(redis_server_pid)
+end
+
 begin
   log_magic = LogMagic.new(ARGV[0])
 
-  searchkick_server = fork do
-    explainer_server = LogMagic::SearchkickExplainer.new
-    explainer_server.start
+  searchkick_server_pid = fork do
+    explainer_server_instance = LogMagic::SearchkickExplainer.new
+    explainer_server_instance.start
   end
-  Process.detach(searchkick_server)
+  Process.detach(searchkick_server_pid)
 
-  mysql_server = fork do
-    explainer_server = LogMagic::MySqlExplainer.new
-    explainer_server.start
+  mysql_server_pid = fork do
+    explainer_server_instance = LogMagic::MySqlExplainer.new
+    explainer_server_instance.start
   end
-  Process.detach(mysql_server)
+  Process.detach(mysql_server_pid)
 
   log_magic.initialize_listener
   log_magic.start
 ensure
-  [mysql_server, searchkick_server].each do |server|
+  [mysql_server_pid, searchkick_server_pid].each do |server|
     `kill -9 #{server}` unless server.nil?
   end
 end

data/lib/log_magic.rb

@@ -53,6 +53,7 @@ require 'active_support/all'
 
 require 'log_magic/utils/json_utils'
 require 'log_magic/utils/templating_utils'
+require 'log_magic/utils/port_utils'
 
 require 'log_magic/log_listener'
 

data/lib/log_magic/explainer_templates/mysql/IS NULL.haml

@@ -0,0 +1,2 @@
+%a{href: 'https://www.techonthenet.com/mysql/is_null.php' }
+   IS NULL

data/lib/log_magic/explainer_templates/mysql/ORDER BY.haml

@@ -0,0 +1,2 @@
+%a{href: 'http://www.w3schools.com/sql/sql_orderby.asp'}
+  ORDER BY

data/lib/log_magic/explainers/mysql/is_null_explainer.rb

@@ -0,0 +1,7 @@
+class LogMagic::MySqlExplainer::IsNullExplainerSection
+  include ::LogMagic::TemplatingUtils
+
+  def term_name
+    'IS NULL'
+  end
+end

data/lib/log_magic/explainers/mysql/ordery_by_explainer.rb

@@ -0,0 +1,7 @@
+class LogMagic::MySqlExplainer::OrderByExplainerSection
+  include ::LogMagic::TemplatingUtils
+
+  def term_name
+    'ORDER BY'
+  end
+end

data/lib/log_magic/explainers/mysql/query_explainer.rb

@@ -16,6 +16,8 @@ class LogMagic::MySqlExplainer::QueryExplainerSection
 
   def explainer_section_classes
     [
+      ::LogMagic::MySqlExplainer::IsNullExplainerSection,
+      ::LogMagic::MySqlExplainer::OrderByExplainerSection,
       ::LogMagic::MySqlExplainer::WhereExplainerSection,
       ::LogMagic::MySqlExplainer::SelectExplainerSection
     ]

data/lib/log_magic/utils/port_utils.rb

@@ -0,0 +1,24 @@
+require 'socket'
+require 'timeout'
+
+class LogMagic
+  module PortUtils
+    # copied from http://stackoverflow.com/questions/517219/ruby-see-if-a-port-is-open
+    def self.port_open?(ip, port)
+      begin
+        Timeout::timeout(1) do
+          begin
+            s = TCPSocket.new(ip, port)
+            s.close
+            return true
+          rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
+            return false
+          end
+        end
+      rescue Timeout::Error
+      end
+
+      return false
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_magic
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Manuel Korfmann
@@ -134,6 +134,8 @@ files:
 - bin/rebuild
 - lib/log_magic.rb
 - lib/log_magic/explainer_templates/mysql.haml
+- lib/log_magic/explainer_templates/mysql/IS NULL.haml
+- lib/log_magic/explainer_templates/mysql/ORDER BY.haml
 - lib/log_magic/explainer_templates/mysql/SELECT.haml
 - lib/log_magic/explainer_templates/mysql/WHERE.haml
 - lib/log_magic/explainer_templates/mysql/query.haml
@@ -148,6 +150,8 @@ files:
 - lib/log_magic/explainer_templates/searchkick/query.haml
 - lib/log_magic/explainer_templates/searchkick/settings.haml
 - lib/log_magic/explainers/base_explainer.rb
+- lib/log_magic/explainers/mysql/is_null_explainer.rb
+- lib/log_magic/explainers/mysql/ordery_by_explainer.rb
 - lib/log_magic/explainers/mysql/query_explainer.rb
 - lib/log_magic/explainers/mysql/select_explainer.rb
 - lib/log_magic/explainers/mysql/where_explainer.rb
@@ -173,6 +177,7 @@ files:
 - lib/log_magic/renderers/hover_renderer.rb
 - lib/log_magic/util_templates/hovering.haml
 - lib/log_magic/utils/json_utils.rb
+- lib/log_magic/utils/port_utils.rb
 - lib/log_magic/utils/templating_utils.rb
 homepage: https://github.com/ManuelArno/log_magic
 licenses: