gratan 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3652b6032331534d479d99c2b543327ddc15f645
-  data.tar.gz: eb14f74f6d20959b8c1a74b65a8d63df3b13c891
+  metadata.gz: f8629e3700e4f0fe06c6bd8bf9280c9cf02ea02e
+  data.tar.gz: 6f7907b86cd2ce4542fec2fb280fcd9500cc8e58
 SHA512:
-  metadata.gz: 8564bed70a26a922920c115dd4db0dbffeea38c0e54a73b9ebf3931fee3521e95195f5cc93ab92d2c0e0347ae49d5281e6637380f2524f7fb8b9bfa9d1a00769
-  data.tar.gz: f6c014b19e44f3bfd11a0c93bbaa2bb70822d23042a4beaa86e3641b32d6680bcb5501d9f00e60c27622644ddf57fb4eb1f5ef13b1650e1d5eb21690b4b85fc9
+  metadata.gz: 8c3138738f653f0054c5945e2cf59f8797eea7d6a15e0318b286b05a31830346544200f95af02ca1382e23955c050779e69094496ab56521b3b7ec312ad84790
+  data.tar.gz: 9a32dedcd234244f009bf6be01556c68fc7049240444b10745c8c62e0281c82b54441fa8b97613c8e102e7854f4d2de2d42f955ff264d52f98b8b7007feebc1a

data/README.md

@@ -48,10 +48,11 @@ Usage: gratan [options]
         --dry-run
     -e, --export
         --with-identifier
-        --enable-expired
         --split
     -o, --output FILE
         --ignore-user REGEXP
+        --target-user REGEXP
+        --enable-expired
         --no-color
         --debug
         --auto-identify OUTPUT

data/bin/gratan

@@ -26,24 +26,24 @@ 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(''  , '--enable-expired')     {    options[:enable_expired]  = 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(''  , '--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(''  , '--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/client.rb

@@ -43,6 +43,11 @@ class Gratan::Client
 
     expected.each do |user_host, expected_attrs|
       next if user_host[0] =~ options[:ignore_user]
+
+      if options[:target_user]
+        next unless user_host[0] =~ options[:target_user]
+      end
+
       actual_attrs = actual.delete(user_host)
 
       if actual_attrs
@@ -54,6 +59,11 @@ class Gratan::Client
 
     actual.each do |user_host, attrs|
       next if user_host[0] =~ options[:ignore_user]
+
+      if options[:target_user]
+        next unless user_host[0] =~ options[:target_user]
+      end
+
       drop_user(*user_host)
     end
   end

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/spec/change/change_grants_target_spec.rb

@@ -0,0 +1,132 @@
+describe 'Gratan::Client#apply' do
+  before(:each) do
+    apply {
+      <<-RUBY
+user 'scott', 'localhost', identified: 'tiger', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+  end
+
+  on 'test.*' do
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'mysql.user' do
+    grant 'SELECT (user)'
+  end
+end
+
+user 'bob', 'localhost' do
+  on '*.*' do
+    grant 'USAGE'
+  end
+
+  on 'test.*' do
+    grant 'ALL PRIVILEGES'
+  end
+end
+      RUBY
+    }
+  end
+
+  context 'when grant privs with target' do
+    subject { client(target_user: /bob/) }
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user 'scott', 'localhost', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'mysql.user' do
+    grant 'SELECT (user)'
+    grant 'UPDATE (host)'
+  end
+end
+
+user 'bob', 'localhost' do
+  on '*.*' do
+    grant 'USAGE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
+        "GRANT SELECT ON `test`.* TO 'bob'@'localhost'",
+        "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+        "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
+        "GRANT USAGE ON *.* TO 'bob'@'localhost'",
+      ]
+      end
+  end
+
+  context 'when grant privs with target (no change)' do
+    subject { client(target_user: /mary/) }
+
+    it do
+      dsl = <<-RUBY
+user 'scott', 'localhost', required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'mysql.user' do
+    grant 'SELECT (user)'
+    grant 'UPDATE (host)'
+  end
+end
+
+user 'bob', 'localhost' do
+  on '*.*' do
+    grant 'USAGE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+  end
+end
+      RUBY
+
+      result = apply(subject) { dsl }
+      expect(result).to be_falsey
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
+        "GRANT ALL PRIVILEGES ON `test`.* TO 'bob'@'localhost'",
+        "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+        "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
+        "GRANT USAGE ON *.* TO 'bob'@'localhost'",
+      ]
+    end
+  end
+end

data/spec/create/create_user_target_spec.rb

@@ -0,0 +1,81 @@
+describe 'Gratan::Client#apply' do
+  context 'when create user with target' do
+    subject { client(target_user: /scott/) }
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user 'scott', 'localhost', identified: 'tiger' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+end
+
+user 'bob', '%', required: 'SSL' do
+  on '*.*' do
+    grant 'ALL PRIVILEGES'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
+      ]
+    end
+  end
+
+  context 'when create user with target (no change)' do
+    subject { client(target_user: /mary/) }
+
+    it do
+      dsl = <<-RUBY
+user 'scott', 'localhost', identified: 'tiger' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+    grant 'INSERT'
+    grant 'UPDATE'
+    grant 'DELETE'
+  end
+end
+
+user 'bob', '%', required: 'SSL' do
+  on '*.*' do
+    grant 'ALL PRIVILEGES'
+  end
+
+  on 'test.*' do
+    grant 'SELECT'
+  end
+end
+      RUBY
+
+      result = apply(subject) { dsl }
+      expect(result).to be_falsey
+
+      expect(show_grants).to match_array []
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -150,11 +150,13 @@ files:
 - spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_spec.rb
+- spec/change/change_grants_target_spec.rb
 - spec/create/create_user_2_spec.rb
 - spec/create/create_user_3_spec.rb
 - spec/create/create_user_multi_hosts_spec.rb
 - spec/create/create_user_regexp_spec.rb
 - spec/create/create_user_spec.rb
+- spec/create/create_user_target_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb
@@ -194,11 +196,13 @@ test_files:
 - spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_spec.rb
+- spec/change/change_grants_target_spec.rb
 - spec/create/create_user_2_spec.rb
 - spec/create/create_user_3_spec.rb
 - spec/create/create_user_multi_hosts_spec.rb
 - spec/create/create_user_regexp_spec.rb
 - spec/create/create_user_spec.rb
+- spec/create/create_user_target_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb