gratan 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8880a61459d0f5dec955a97b90f921b374b23476c01913a65986956abcdbe1d
-  data.tar.gz: 18e91a08edd239e935d5c2f689b9245d9ce1c974e17b9ab398292d778ffec121
+  metadata.gz: aec8e580145f0a156029a046eadf67c7ef3e944a6713563057aeb7541707069e
+  data.tar.gz: 49a303e016bb7ff1d8f2217a3e6bb5e39158f543afecf39d261b3c7b62b512c4
 SHA512:
-  metadata.gz: 223c54af48a4cb382f786dbacd996c1c1764e25f5ba98bc02603caa82df32c94d0cbfa316d7765cf1d4763d9bc7d3bfaf9da3e118ed139d0ef375738046e07fc
-  data.tar.gz: 0e09f5a45012efbe908daae140e8f2a200254bd523b51f5fa3e62a71acd66be8d69dc278a9298a123787663a6ceda3aad41aa1867d918d0eceae536527b6e729
+  metadata.gz: 66c0b62746e3102edcb2cfac2e4dfbc9e09faa553135192031519736a90f46d2403d4963444569999cdd67559927593a3560006a98f3b8904a7b7758aee6a2c0
+  data.tar.gz: 0e27293d8efca3d6b6fec63a0c84dbd9f349bac00d0b307f0229f7691b49205703fc476b39a97d3546317d13454c8f0fcccda92bc7f5e977d027c3faf22ca292

data/bin/gratan

@@ -35,33 +35,34 @@ options = {
 
 ARGV.options do |opt|
   begin
-    opt.on(''  , '--host HOST')              {|v| mysql_options[:host]             = v             }
-    opt.on(''  , '--port PORT', Integer)     {|v| mysql_options[:port]             = v             }
-    opt.on(''  , '--socket SOCKET')          {|v| mysql_options[:socket]           = v             }
-    opt.on(''  , '--username USERNAME')      {|v| mysql_options[:username]         = v             }
-    opt.on(''  , '--password PASSWORD')      {|v| mysql_options[:password]         = v             }
-    opt.on(''  , '--database DATABASE')      {|v| mysql_options[:database]         = v             }
-    opt.on('-a', '--apply')                  {    mode                             = :apply        }
-    opt.on('-f', '--file FILE')              {|v| file                             = v             }
-    opt.on(''  , '--dry-run')                {    options[:dry_run]                = true          }
-    opt.on('-e', '--export')                 {    mode                             = :export       }
-    opt.on(''  , '--with-identifier')        {    options[:with_identifier]        = true          }
-    opt.on(''  , '--split')                  {    split                            = true          }
-    opt.on(''  , '--chunk-by-user')          {    options[:chunk_by_user]          = true          }
-    opt.on('-o', '--output FILE')            {|v| output_file                      = v             }
-    opt.on(''  , '--ignore-user REGEXP')     {|v| options[:ignore_user]            = Regexp.new(v) }
-    opt.on(''  , '--target-user REGEXP')     {|v| options[:target_user]            = Regexp.new(v) }
-    opt.on(''  , '--ignore-object REGEXP')   {|v| options[:ignore_object]          = Regexp.new(v) }
-    opt.on(''  , '--enable-expired')         {    options[:enable_expired]         = true          }
-    opt.on(''  , '--ignore-not-exist')       {|v| options[:ignore_not_exist]       = true          }
-    opt.on(''  , '--ignore-password-secret') {|v| options[:ignore_password_secret] = true          }
-    opt.on(''  , '--skip-disable-log-bin')   {    options[:skip_disable_log_bin]   = true          }
-    opt.on(''  , '--override-sql-mode')      {    options[:override_sql_mode]      = true          }
-    opt.on(''  , '--use-show-create-user')   {    options[:use_show_create_user]   = true          }
-    opt.on(''  , '--no-color')               {    options[:color]                  = false         }
-    opt.on(''  , '--debug')                  {    options[:debug]                  = true          }
-    opt.on(''  , '--auto-identify OUTPUT')   {|v| options[:identifier] = Gratan::Identifier::Auto.new(v, options) }
-    opt.on(''  , '--csv-identify CSV')       {|v| options[:identifier] = Gratan::Identifier::CSV.new(v, options)  }
+    opt.on(''  , '--host HOST')                    {|v| mysql_options[:host]             = v             }
+    opt.on(''  , '--port PORT', Integer)           {|v| mysql_options[:port]             = v             }
+    opt.on(''  , '--socket SOCKET')                {|v| mysql_options[:socket]           = v             }
+    opt.on(''  , '--username USERNAME')            {|v| mysql_options[:username]         = v             }
+    opt.on(''  , '--password PASSWORD')            {|v| mysql_options[:password]         = v             }
+    opt.on(''  , '--database DATABASE')            {|v| mysql_options[:database]         = v             }
+    opt.on('-a', '--apply')                        {    mode                             = :apply        }
+    opt.on('-f', '--file FILE')                    {|v| file                             = v             }
+    opt.on(''  , '--dry-run')                      {    options[:dry_run]                = true          }
+    opt.on('-e', '--export')                       {    mode                             = :export       }
+    opt.on(''  , '--with-identifier')              {    options[:with_identifier]        = true          }
+    opt.on(''  , '--split')                        {    split                            = true          }
+    opt.on(''  , '--chunk-by-user')                {    options[:chunk_by_user]          = true          }
+    opt.on('-o', '--output FILE')                  {|v| output_file                      = v             }
+    opt.on(''  , '--ignore-user REGEXP')           {|v| options[:ignore_user]            = Regexp.new(v) }
+    opt.on(''  , '--target-user REGEXP')           {|v| options[:target_user]            = Regexp.new(v) }
+    opt.on(''  , '--ignore-object REGEXP')         {|v| options[:ignore_object]          = Regexp.new(v) }
+    opt.on(''  , '--enable-expired')               {    options[:enable_expired]         = true          }
+    opt.on(''  , '--ignore-not-exist')             {|v| options[:ignore_not_exist]       = true          }
+    opt.on(''  , '--ignore-password-secret')       {|v| options[:ignore_password_secret] = true          }
+    opt.on(''  , '--skip-disable-log-bin')         {    options[:skip_disable_log_bin]   = true          }
+    opt.on(''  , '--override-sql-mode')            {    options[:override_sql_mode]      = true          }
+    opt.on(''  , '--use-show-create-user')         {    options[:use_show_create_user]   = true          }
+    opt.on(''  , '--no-color')                     {    options[:color]                  = false         }
+    opt.on(''  , '--debug')                        {    options[:debug]                  = true          }
+    opt.on(''  , '--wait-timeout SECOND', Integer) {|v| options[:wait_timeout]           = v             }
+    opt.on(''  , '--auto-identify OUTPUT')         {|v| options[:identifier] = Gratan::Identifier::Auto.new(v, options) }
+    opt.on(''  , '--csv-identify CSV')             {|v| options[:identifier] = Gratan::Identifier::CSV.new(v, options)  }
 
     opt.on(''  , '--mysql2-options JSON') do |json|
       json = JSON.parse(json)

data/lib/gratan/client.rb

@@ -246,6 +246,7 @@ class Gratan::Client
     begin
       @driver.disable_log_bin_local
       @driver.override_sql_mode
+      @driver.set_wait_timeout
       @updated = false
       yield
       updated = @updated

data/lib/gratan/driver.rb

@@ -215,6 +215,12 @@ class Gratan::Driver
     end
   end
 
+  def set_wait_timeout
+    if @options[:wait_timeout]
+      query("SET @@wait_timeout = #{@options[:wait_timeout]}")
+    end
+  end
+
   private
 
   def query(sql)

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-06 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -209,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Gratan is a tool to manage MySQL permissions using Ruby DSL.