mysql_import 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db72f5a5672da5ee918069f82585950e325cb47
-  data.tar.gz: a5db440198b9b79f3c2fb497abf2dc89c0ebbb6d
+  metadata.gz: 1dc22640b21bf3b9cf9c765dbab33d8c6da11fd1
+  data.tar.gz: 94e4ec0f279005ca04db5b69164db542dc1dcdd9
 SHA512:
-  metadata.gz: f7d95ea5b111c74d41bf02551dd76d7b522a9dc611093452ef6dd64621cb8960a7902578c29738396d35f996a26cdd1a7bdd8cb6929615106e738cb62f25a462
-  data.tar.gz: fea69a70e010fc80136200dd814903892b367a415a6c5298afebe8b2d0eafb4370462782df042b4b59fba4c4dbb9c9fd40bf89d7d12128463bce32fb5baf914a
+  metadata.gz: eff179fed36fd5d1b24818099057ea604cdda72a6c67576c3e261f7e56a5861ab97d55a052ae7cb790fcc017f020b1d948761bf12ad424974adcc1a97756ce75
+  data.tar.gz: 44f5534efac69c3d292170bcb12032ea6b18176945ee04d0e190cd50185e314109c8da4d51ff9ad88e743bc306600a0a058adb5f148474a2cb033707bdd08209

data/lib/mysql_import/logger.rb

@@ -2,17 +2,17 @@ require 'logger'
 
 class MysqlImport
   class Logger < SimpleDelegator
-    def initialize(logger, debug)
-      case logger
+    def initialize(out, debug)
+      case out
       when String
-        obj = ::Logger.new(arg)
+        obj = ::Logger.new(out)
       when NilClass
-        obj = ::Logger.new(STDOUT)
+        obj = ::Logger.new(nil)
+      when STDOUT, STDERR
+        obj = ::Logger.new(out)
         obj.formatter = ->(seveity, datetime, progname, message) { "#{String === message ? message : message.inspect}\n" }
-      when FalseClass
-        obj = ::Logger.new('/dev/null')
       else
-        obj = logger
+        obj = out
       end
 
       obj.level = debug ? ::Logger::DEBUG : ::Logger::INFO
@@ -23,16 +23,7 @@ class MysqlImport
   module Logging
     def initialize(config, opts ={}, sql_opts = {})
       @logger = Logger.new(opts[:log], opts.fetch(:debug, false))
-
-      LoadDataInfile2::Client.class_exec(@logger) do |logger|
-        define_method :build_sql_with_logging do |file, options|
-          options = {} unless options
-          build_sql_without_logging(file, options).tap {|sql| logger.debug("sql: #{sql}") }
-        end
-        alias_method :build_sql_without_logging, :build_sql
-        alias_method :build_sql, :build_sql_with_logging
-      end
-
+      embed_logger
       super
     end
 
@@ -43,7 +34,7 @@ class MysqlImport
       if result.imported.size > 0
         result.imported.sort.each {|t| logger.info("  #{t[0]} (#{t[1]} sec)") }
       else
-        result.logger.info('  nothing...')
+        logger.info('  nothing...')
       end
       if result.skipped.size > 0
         logger.info('Skipped tables:')
@@ -58,13 +49,25 @@ class MysqlImport
     attr_reader :logger
 
     def parallel_opts
-      @_parallel_opts ||= super.merge(
+      @parallel_opts ||= super.merge(
         finish: proc do |item, index, _result|
           logger.debug("parallel_item: #{item.inspect}")
           logger.debug("parallel_index: #{index}")
         end
       )
     end
+
+    def embed_logger
+      unless LoadDataInfile2::Client.instance_methods.include?(:build_sql_with_logging)
+        LoadDataInfile2::Client.class_exec(logger) do |logger|
+          define_method :build_sql_with_logging do |file, options = {}|
+            build_sql_without_logging(file, options).tap {|sql| logger.debug("sql: #{sql}") }
+          end
+          alias_method :build_sql_without_logging, :build_sql
+          alias_method :build_sql, :build_sql_with_logging
+        end
+      end
+    end
   end
 
   prepend Logging

data/lib/mysql_import/version.rb

@@ -1,3 +1,3 @@
 class MysqlImport
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mysql_import
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - nalabjp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: load_data_infile2