gratan 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b16a0819678637c70a910cc85b7a450853239d
-  data.tar.gz: 0eb1f57a76e0140c4f70aa53f906f38ecf8cc65d
+  metadata.gz: 2c3510ebf4368b03f36389baa49df8f7e85c1b86
+  data.tar.gz: 79e2f1a39804c36d0fcd0d7d7baf87c70dec0d44
 SHA512:
-  metadata.gz: 537ea65c2251efe9ff66072c97afdcb296cd3f006ea7880c502d3b589a84a6508b8a6852c2ba1ddae7c3ce994a5658bf813415c42093e50ed7c7828207c45cd0
-  data.tar.gz: 784f2b1e29012d458e16293bdbc0e4ba5e5d43fd115cff6cb1725514464cd333c2cd8281246b6beedb8aa5da25e29bae9de8a366d5e4f2d3ebfc8f885ac6edca
+  metadata.gz: 571d09776900638414956154e14cc65055262092958e52af3524b772f8b3479bbc8ea1071030a781f181a8c9066446062ef36c4b0fd08b2422c491b0f47ac92e
+  data.tar.gz: 4ff0f03f09744d1e2ae66d3cc440c445f66bce0dcb9023e1b599fd54daeb96ea89a19a43cfcc358e3fb13d89d7c8e486efbea6da3bcf763345fe37797b094857

data/lib/gratan/driver.rb

@@ -132,17 +132,17 @@ class Gratan::Driver
   private
 
   def query(sql)
-    log(:debug, sql)
+    log(:debug, sql, :dry_run => false)
     @client.query(sql)
   end
 
   def update(sql)
-    log(:info, sql, :green)
+    log(:info, sql, :color => :green)
     @client.query(sql) unless @options[:dry_run]
   end
 
   def delete(sql)
-    log(:info, sql, :red)
+    log(:info, sql, :color => :red)
     @client.query(sql) unless @options[:dry_run]
   end
 

data/lib/gratan/dsl/context.rb

@@ -44,7 +44,7 @@ class Gratan::DSL::Context
       expired = Time.parse(expired)
 
       if Time.new >= expired
-        log(:warn, "User `#{name}@#{host}` has expired", :yellow)
+        log(:warn, "User `#{name}@#{host}` has expired", :color => :yellow)
         return
       end
     end

data/lib/gratan/identifier/csv.rb

@@ -17,7 +17,7 @@ class Gratan::Identifier::CSV
     password = @passwords[user_host]
 
     unless password
-      log(:warn, "password for `#{user_host}` can not be found", :yellow)
+      log(:warn, "password for `#{user_host}` can not be found", :color => :yellow)
     end
 
     password

data/lib/gratan/logger.rb

@@ -16,12 +16,16 @@ class Gratan::Logger < ::Logger
   end
 
   module Helper
-    def log(level, message, color = nil)
-      options = @options || {}
+    def log(level, message, options = {})
+      global_options = @options || {}
       message = "[#{level.to_s.upcase}] #{message}" unless level == :info
-      message << ' (dry-run)' if options[:dry_run]
-      message = message.send(color) if color
-      logger = options[:logger] || Gratan::Logger.instance
+
+      if global_options[:dry_run] and options[:dry_run] != false
+        message << ' (dry-run)' if global_options[:dry_run]
+      end
+
+      message = message.send(options[:color]) if options[:color]
+      logger = global_options[:logger] || Gratan::Logger.instance
       logger.send(level, message)
     end
   end

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara