gratan 0.2.8.beta3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22edc42504e84310b6c42cc258db604b12d2831a
-  data.tar.gz: ca89f0381b6d73f36dc315cc168d4363004284fc
+  metadata.gz: 26d81b1a5184f5c95e9002747d235beaad84f713
+  data.tar.gz: e0b0e91ac5d80e0c8aadbfc5e193b3c80629db08
 SHA512:
-  metadata.gz: 1745cfeaeead547a61bef90ce91ddad3ef7d456d57a95c537614e9653ee61fb606d7f3d3b2b9c6447e3fc26190e29757793a1cd55f1971912425fc7e9e71cdc3
-  data.tar.gz: 065f25f9112d28bfb76ce6ec470e6d3c83ca5642443d764bce7712d3fb8b7d973265c88fdc0c174591b5491820c2de2b6f227bd3dc276cf52a4bd4729390ed57
+  metadata.gz: 856c82cf61377fa8b5c050ba1be616dd195a2c27591aebabadcc60ed190f920d1e50fef0d08b9a518afd456a3e2c45e630f4c09a7dd01f433283a01bab32682c
+  data.tar.gz: ceffb3c590345308b87a92d48f4065c4cebb8d9ea27d4be65d6c344fc611697ce1d6ebe642ecc51f37054c105991a99d05cd4fd47307a5b69b4d754472714a82

data/.gitignore

@@ -15,3 +15,4 @@ mkmf.log
 test.rb
 Grantfile
 *.grant
+/_site/

data/README.md

@@ -6,7 +6,7 @@ It defines the state of MySQL permissions using Ruby DSL, and updates permission
 
 [![Gem Version](https://badge.fury.io/rb/gratan.svg)](http://badge.fury.io/rb/gratan)
 [![Build Status](https://travis-ci.org/winebarrel/gratan.svg?branch=master)](https://travis-ci.org/winebarrel/gratan)
-[![Coverage Status](https://coveralls.io/repos/winebarrel/gratan/badge.png?branch=master)](https://coveralls.io/r/winebarrel/gratan?branch=master)
+[![Coverage Status](https://coveralls.io/repos/winebarrel/gratan/badge.svg?branch=master)](https://coveralls.io/r/winebarrel/gratan?branch=master)
 
 ## Installation
 
@@ -56,6 +56,7 @@ Usage: gratan [options]
         --ignore-object REGEXP
         --enable-expired
         --ignore-not-exist
+        --skip-disable-log-bin
         --no-color
         --debug
         --auto-identify OUTPUT
@@ -73,7 +74,7 @@ user "scott", "%" do
     grant "USAGE"
   end
 
-  on "test.*", expired: '2014/10/08' do
+  on "test.*", expired: '2014/10/08', identified: "PASSWORD '*ABCDEF'" do
     grant "SELECT"
     grant "INSERT"
   end

data/lib/gratan/driver.rb

@@ -207,7 +207,14 @@ class Gratan::Driver
   end
 
   def quote_object(object)
-    object.split('.', 2).map {|i| i == '*' ? i : "`#{i}`" }.join('.')
+    if object =~ /\A(FUNCTION|PROCEDURE)\s+/i
+      object_type, object = object.split(/\s+/, 2)
+      object_type << ' '
+    else
+      object_type = ''
+    end
+
+    object_type + object.split('.', 2).map {|i| i == '*' ? i : "`#{i}`" }.join('.')
   end
 
   def quote_identifier(identifier)

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.2.8.beta3'
+  VERSION = '0.2.8'
 end

data/spec/change/change_grants_func_prcd_spec.rb

@@ -0,0 +1,94 @@
+describe 'Gratan::Client#apply' do
+  before(:each) do
+    mysql do |cli|
+      drop_database(cli)
+      create_database(cli)
+      create_function(cli, :my_func)
+      create_procedure(cli, :my_prcd)
+    end
+  end
+
+  context 'when func -> prcd' do
+    subject { client }
+
+    before do
+      apply(subject) {
+        <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "FUNCTION #{TEST_DATABASE}.my_func" do
+    grant "EXECUTE"
+  end
+end
+        RUBY
+      }
+
+    end
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "PROCEDURE #{TEST_DATABASE}.my_prcd" do
+    grant "EXECUTE"
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT USAGE ON *.* TO 'scott'@'%'",
+        "GRANT EXECUTE ON PROCEDURE `#{TEST_DATABASE}`.`my_prcd` TO 'scott'@'%'"
+      ]
+    end
+  end
+
+  context 'when prcd -> func' do
+    subject { client }
+
+    before do
+      apply(subject) {
+        <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "PROCEDURE #{TEST_DATABASE}.my_prcd" do
+    grant "EXECUTE"
+  end
+end
+        RUBY
+      }
+
+    end
+
+    it do
+      apply(subject) {
+        <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "FUNCTION #{TEST_DATABASE}.my_func" do
+    grant "EXECUTE"
+  end
+end
+        RUBY
+      }
+
+      expect(show_grants).to match_array [
+        "GRANT USAGE ON *.* TO 'scott'@'%'",
+        "GRANT EXECUTE ON FUNCTION `#{TEST_DATABASE}`.`my_func` TO 'scott'@'%'"
+      ]
+    end
+  end
+end

data/spec/create/create_user_with_func_prcd_spec.rb

@@ -0,0 +1,59 @@
+describe 'Gratan::Client#apply' do
+  context 'when create user with function' do
+    subject { client }
+
+    it do
+      create_functions(:foo) do
+        result = apply(subject) {
+          <<-RUBY
+  user 'scott', 'localhost' do
+    on '*.*' do
+      grant 'USAGE'
+    end
+
+    on 'FUNCTION #{TEST_DATABASE}.foo' do
+      grant 'EXECUTE'
+    end
+  end
+          RUBY
+        }
+
+        expect(result).to be_truthy
+
+        expect(show_grants).to match_array [
+          "GRANT USAGE ON *.* TO 'scott'@'localhost'",
+          "GRANT EXECUTE ON FUNCTION `#{TEST_DATABASE}`.`foo` TO 'scott'@'localhost'"
+        ]
+      end
+    end
+  end
+
+  context 'when create user with procedure' do
+    subject { client }
+
+    it do
+      create_procedures(:foo) do
+        result = apply(subject) {
+          <<-RUBY
+  user 'scott', 'localhost' do
+    on '*.*' do
+      grant 'USAGE'
+    end
+
+    on 'PROCEDURE #{TEST_DATABASE}.foo' do
+      grant 'EXECUTE'
+    end
+  end
+          RUBY
+        }
+
+        expect(result).to be_truthy
+
+        expect(show_grants).to match_array [
+          "GRANT USAGE ON *.* TO 'scott'@'localhost'",
+          "GRANT EXECUTE ON PROCEDURE `#{TEST_DATABASE}`.`foo` TO 'scott'@'localhost'"
+        ]
+      end
+    end
+  end
+end

data/spec/export/export_func_prcd_spec.rb

@@ -0,0 +1,69 @@
+describe 'Gratan::Client#export' do
+  context 'when function exists' do
+    let(:grantfile) {
+      <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "FUNCTION #{TEST_DATABASE}.my_func" do
+    grant "EXECUTE"
+  end
+end
+      RUBY
+    }
+
+    subject { client }
+
+    before do
+      mysql do |cli|
+        drop_database(cli)
+        create_database(cli)
+        create_function(cli, :my_func)
+      end
+
+      apply(subject) do
+        grantfile
+      end
+    end
+
+    it do
+      expect(subject.export.strip).to eq grantfile.strip
+    end
+  end
+
+  context 'when procedure exists' do
+    let(:grantfile) {
+      <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "PROCEDURE #{TEST_DATABASE}.my_prcd" do
+    grant "EXECUTE"
+  end
+end
+      RUBY
+    }
+
+    subject { client }
+
+    before do
+      mysql do |cli|
+        drop_database(cli)
+        create_database(cli)
+        create_procedure(cli, :my_prcd)
+      end
+
+      apply(subject) do
+        grantfile
+      end
+    end
+
+    it do
+      expect(subject.export.strip).to eq grantfile.strip
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -49,6 +49,14 @@ def create_table(client, table)
   client.query("CREATE TABLE #{TEST_DATABASE}.#{table} (id INT)")
 end
 
+def create_function(client, func)
+  client.query("CREATE FUNCTION #{TEST_DATABASE}.#{func}() RETURNS INT RETURN 1")
+end
+
+def create_procedure(client, prcd)
+  client.query("CREATE PROCEDURE #{TEST_DATABASE}.#{prcd}() SELECT 1")
+end
+
 def create_tables(*tables)
   mysql do |client|
     begin
@@ -62,6 +70,32 @@ def create_tables(*tables)
   end
 end
 
+def create_functions(*funcs)
+  mysql do |client|
+    begin
+      drop_database(client)
+      create_database(client)
+      funcs.each {|i| create_function(client, i) }
+      yield
+    ensure
+      drop_database(client)
+    end
+  end
+end
+
+def create_procedures(*prcds)
+  mysql do |client|
+    begin
+      drop_database(client)
+      create_database(client)
+      prcds.each {|i| create_procedure(client, i) }
+      yield
+    ensure
+      drop_database(client)
+    end
+  end
+end
+
 def select_users(client)
   users = []
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.2.8.beta3
+  version: 0.2.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -161,6 +161,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_func_prcd_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
@@ -173,11 +174,13 @@ files:
 - spec/create/create_user_regexp_spec.rb
 - spec/create/create_user_spec.rb
 - spec/create/create_user_target_spec.rb
+- spec/create/create_user_with_func_prcd_spec.rb
 - spec/create/create_user_with_ignore_object_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb
 - spec/export/export_chunk_spec.rb
+- spec/export/export_func_prcd_spec.rb
 - spec/export/export_spec.rb
 - spec/export/export_with_ignore_object_spec.rb
 - spec/misc/misc_spec.rb
@@ -198,9 +201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14
@@ -212,6 +215,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_func_prcd_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
@@ -224,11 +228,13 @@ test_files:
 - spec/create/create_user_regexp_spec.rb
 - spec/create/create_user_spec.rb
 - spec/create/create_user_target_spec.rb
+- spec/create/create_user_with_func_prcd_spec.rb
 - spec/create/create_user_with_ignore_object_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb
 - spec/export/export_chunk_spec.rb
+- spec/export/export_func_prcd_spec.rb
 - spec/export/export_spec.rb
 - spec/export/export_with_ignore_object_spec.rb
 - spec/misc/misc_spec.rb