gratan 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2b2f0b324787b466435a74790f4c028e32578c
-  data.tar.gz: 6cc2d13824a99016c8845ba5ed4b6eb231695d65
+  metadata.gz: e05682c907c1fe62bbe627e89029656293f73cee
+  data.tar.gz: 4fc1a578ad94f8acbf50bfc006a2187bffb53ec8
 SHA512:
-  metadata.gz: 93faec5b23265a98288d318efca14aea6a226713c96af145238b8bfb5f405f24c5741894f7a7547b83ed423f49086aa967e7f16c53c7461d99962218511d161b
-  data.tar.gz: 65964c219ade408dd5d1d4435aa4ab9d297874c844462f50b7de727ef7d8a216659101d0675be60c5942043142faaabc2f4abcd47752d33c9cad8f47cfd43f3a
+  metadata.gz: a3c03ecaa3d3f4d4b17778e1ea324e62ad50eaccad230fb5bacea75b4b9b6e80cabd7e904138db0f227120685ebe2565c01c8c41587921c4b6b592b30f7f239c
+  data.tar.gz: e2b836e3061aeeb482a7e879578670527777b7dd89441020f5b89a4d6503c20f2234a4d28cee1047db390c2e49e857b08502ccfa5198bada0b3b8556cf5e114e

data/README.md

@@ -53,6 +53,7 @@ Usage: gratan [options]
         --ignore-user REGEXP
         --target-user REGEXP
         --enable-expired
+        --ignore-not-exist
         --no-color
         --debug
         --auto-identify OUTPUT

data/bin/gratan

@@ -26,24 +26,25 @@ 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('-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(''  , '--enable-expired')       {    options[:enable_expired]  = true          }
-    opt.on(''  , '--no-color')             {    options[:color]           = false         }
-    opt.on(''  , '--debug')                {    options[:debug]           = true          }
+    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('-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(''  , '--enable-expired')       {    options[:enable_expired]   = true          }
+    opt.on(''  , '--ignore-not-exist')     {|v| options[:ignore_not_exist] = 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)  }
 

data/lib/gratan/driver.rb

@@ -1,6 +1,8 @@
 class Gratan::Driver
   include Gratan::Logger::Helper
 
+  ER_NO_SUCH_TABLE = 1146
+
   def initialize(client, options = {})
     @client = client
     @options = options
@@ -84,7 +86,15 @@ class Gratan::Driver
     sql << " REQUIRE #{required}" if required
     sql << " WITH #{with_option}" if with_option
 
-    update(sql)
+    begin
+      update(sql)
+    rescue Mysql2::Error => e
+      if @options[:ignore_not_exist] and e.error_number == ER_NO_SUCH_TABLE
+        log(:warn, e.message, :color => :yellow)
+      else
+        raise e
+      end
+    end
   end
 
   def identify(user, host, identifier)

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/change/change_grants_ignore_not_exist_spec.rb

@@ -0,0 +1,96 @@
+describe 'Gratan::Client#apply' do
+  context 'when grant privs (ignore_not_exist: true)' do
+    let(:logger) do
+      logger = Logger.new('/dev/null')
+      expect(logger).to receive(:warn).with("[WARN] Table 'yamada.taro' doesn't exist")
+      logger
+    end
+
+    subject do
+      client(
+        ignore_not_exist: true,
+        logger: logger
+      )
+    end
+
+    before do
+      apply {
+        <<-RUBY
+user 'scott', 'localhost', identified: 'tiger', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+  end
+end
+        RUBY
+      }
+    end
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user 'scott', 'localhost', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'yamada.taro' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+      ]
+    end
+  end
+
+  context 'when grant privs (ignore_not_exist: false)' do
+    subject { client(ignore_not_exist: false) }
+
+    before do
+      apply {
+        <<-RUBY
+user 'scott', 'localhost', identified: 'tiger', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+  end
+end
+        RUBY
+      }
+    end
+
+    it do
+      dsl = <<-RUBY
+user 'scott', 'localhost', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'yamada.taro' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+end
+      RUBY
+
+      expect {
+        apply(subject) { dsl }
+      }.to raise_error("Table 'yamada.taro' doesn't exist")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -147,6 +147,7 @@ files:
 - spec/change/change_grants_3_spec.rb
 - spec/change/change_grants_4_spec.rb
 - spec/change/change_grants_expired_spec.rb
+- spec/change/change_grants_ignore_not_exist_spec.rb
 - spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_spec.rb
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Gratan is a tool to manage MySQL permissions using Ruby DSL.
@@ -193,6 +194,7 @@ test_files:
 - spec/change/change_grants_3_spec.rb
 - spec/change/change_grants_4_spec.rb
 - spec/change/change_grants_expired_spec.rb
+- spec/change/change_grants_ignore_not_exist_spec.rb
 - spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_spec.rb