gratan 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3451238bb0c3d7aa0d0069c56329a421a7250bc0
-  data.tar.gz: ccd1281b0e7207b22bd92fbaf8179d463b3f6df3
+  metadata.gz: 594f050aa91a09ebe859fee36bee875f22461540
+  data.tar.gz: 9fd38fa478da13932a4d5d07621e870d8a51f559
 SHA512:
-  metadata.gz: 6c3a808d92306537c82650686ed9fe35bace9892ae1b43ef7774ba22dbfc11b56f78c8c6eec09d498d1f89ea9680354a2f6e554d0dec3d81a0d003636fe4623c
-  data.tar.gz: 80b1e1816218d55a88680eb2627a028b2a21d782784e913875bd43adcd7bc0d65d092144fdcb094b1d7a700385ce3a8e61f39f6f7ee807fdd9275a68a0ec8636
+  metadata.gz: 0e924bbca853d1ba2d5c49523aa508f2cd02ba476e6484734eb1fee5f05b5b91db6442c91046b133f3d9aa80ac25a7045c2a118e46a869e639e877c87f41bbae
+  data.tar.gz: 0a490b3b1941baa49d2592e6d0acfb54f4a95dbb952f2922c922b123d0a1559855784ef678460533081ab3bf349deec757c6092249d7a72a6d2618f0e8cd8dcd

data/README.md

@@ -80,7 +80,7 @@ user "scott", "%" do
   end
 end
 
-user "scott", "localhost", expired: '2014/10/10' do
+user "scott", ["localhost", "192.168.%"], expired: '2014/10/10' do
   on "*.*", with: 'GRANT OPTION' do
     grant "ALL PRIVILEGES"
   end
@@ -89,4 +89,4 @@ end
 
 ## What does "Gratan" mean?
 
-[![](http://i.gyazo.com/c37d934ba0a61f760603ce4c56401e60.png)](https://www.google.co.jp/search?q=gratin&tbm=isch)
+[![](http://i.gyazo.com/c37d934ba0a61f760603ce4c56401e60.png)](https://www.google.com/search?q=gratin&tbm=isch)

data/lib/gratan/dsl/context.rb

@@ -31,27 +31,30 @@ class Gratan::DSL::Context
     end
   end
 
-  def user(name, host, options = {}, &block)
+  def user(name, host_or_array, options = {}, &block)
     name = name.to_s
-    host = host.to_s
-    options ||= {}
+    hosts = [host_or_array].flatten.map {|i| i.to_s }
 
-    __validate("User `#{name}@#{host}` is already defined") do
-      not @result.has_key?([name, host])
-    end
+    hosts.each do |host|
+      options ||= {}
+
+      __validate("User `#{name}@#{host}` is already defined") do
+        not @result.has_key?([name, host])
+      end
 
-    if @options[:enable_expired] and (expired = options.delete(:expired))
-      expired = Time.parse(expired)
+      if @options[:enable_expired] and (expired = options.delete(:expired))
+        expired = Time.parse(expired)
 
-      if Time.new >= expired
-        log(:warn, "User `#{name}@#{host}` has expired", :color => :yellow)
-        return
+        if Time.new >= expired
+          log(:warn, "User `#{name}@#{host}` has expired", :color => :yellow)
+          return
+        end
       end
-    end
 
-    @result[[name, host]] = {
-      :objects => Gratan::DSL::Context::User.new(name, host, &block).result,
-      :options => options,
-    }
+      @result[[name, host]] = {
+        :objects => Gratan::DSL::Context::User.new(name, host, &block).result,
+        :options => options,
+      }
+    end
   end
 end

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.1.5'
+  VERSION = '0.1.6'
 end

data/spec/change/change_grants_multi_hosts_spec.rb

@@ -0,0 +1,145 @@
+describe 'Gratan::Client#apply' do
+  context 'when change privs (multi hosts)' 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 'scott', '%', 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
+        RUBY
+      }
+    end
+
+    subject { client }
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user 'scott', ['localhost', '%', '127.0.0.1'], required: 'SSL' do
+  on '*.*' do
+    grant 'SELECT'
+    grant 'DELETE'
+  end
+
+  on 'test.*' do
+    grant 'UPDATE'
+    grant 'INSERT'
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT INSERT, UPDATE ON `test`.* TO 'scott'@'%'",
+        "GRANT INSERT, UPDATE ON `test`.* TO 'scott'@'127.0.0.1'",
+        "GRANT INSERT, UPDATE ON `test`.* TO 'scott'@'localhost'",
+        "GRANT SELECT, DELETE ON *.* TO 'scott'@'%' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+        "GRANT SELECT, DELETE ON *.* TO 'scott'@'127.0.0.1' REQUIRE SSL",
+        "GRANT SELECT, DELETE ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+      ]
+    end
+  end
+
+  context 'when no change privs (multi hosts)' 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 'scott', '%', 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
+        RUBY
+      }
+    end
+
+    subject { client }
+
+    it do
+      result = apply(subject) {
+        <<-RUBY
+user 'scott', ['localhost', '%'], 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
+        RUBY
+      }
+
+      expect(result).to be_falsey
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'%'",
+        "GRANT SELECT (user) ON `mysql`.`user` TO 'scott'@'localhost'",
+        "GRANT SELECT, INSERT ON *.* TO 'scott'@'%' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+        "GRANT SELECT, INSERT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40' REQUIRE SSL",
+        "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'%'",
+        "GRANT UPDATE, DELETE ON `test`.* TO 'scott'@'localhost'",
+      ]
+    end
+  end
+end

data/spec/create/create_user_multi_hosts_spec.rb

@@ -0,0 +1,36 @@
+describe 'Gratan::Client#apply' do
+  context 'when create user (multi hosts)' do
+    subject { client }
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user 'scott', ['localhost', '127.0.0.1', '192.168.%'], 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
+        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'",
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'127.0.0.1' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'127.0.0.1'",
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON *.* TO 'scott'@'192.168.%' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
+        "GRANT SELECT, INSERT, UPDATE, DELETE ON `test`.* TO 'scott'@'192.168.%'",
+      ]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Genki Sugawara
@@ -146,10 +146,12 @@ files:
 - spec/change/change_grants_2_spec.rb
 - spec/change/change_grants_3_spec.rb
 - spec/change/change_grants_4_spec.rb
+- spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_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/drop/drop_user_2_spec.rb
@@ -187,10 +189,12 @@ test_files:
 - spec/change/change_grants_2_spec.rb
 - spec/change/change_grants_3_spec.rb
 - spec/change/change_grants_4_spec.rb
+- spec/change/change_grants_multi_hosts_spec.rb
 - spec/change/change_grants_regexp_spec.rb
 - spec/change/change_grants_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/drop/drop_user_2_spec.rb