gratan 0.2.9 → 0.3.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98951da30ecfba75652d74de749bef4b91adcd7a
-  data.tar.gz: f3e9f9df2a22400a79f7106dc2700154cfbf46e0
+  metadata.gz: 9b5841f8e6566f6d2f1f0902a187e585d74b61f3
+  data.tar.gz: 6f1d5b4e0b61102836904955de4328fd46537cf8
 SHA512:
-  metadata.gz: cb22d874f085d3d640d765c0eefdb89ad3a2197de69877ff441e56b49825f5c6c37cadcd38bfed24246388b2b77e654c99d16693259f5dca36ec18c9d5460529
-  data.tar.gz: aa16326bdca0ae05556469fc81149798b13dadfd1989d5154620faf0ff6d89d56da239f65d906edef9f17e76dbe557025fa955f1f015b3c128ab11504cc5e192
+  metadata.gz: 1ce0aa5bf26ccfbe52b8ab489c40ee5aee0c8cec8d29e9ec9c7dd369bd79a164b42017c4421c008fb31d1c916b75e4123ee834206536c1734a0129b552923754
+  data.tar.gz: 0a5de053a1d33126a5c8c24c2e573a7d446be8904fe9bc619e798eb3f2585a16b62de5e47105a1987b34322142dffd8eb0120406b1df5f2b1dd66b2de763521a

data/.travis.yml

@@ -1,7 +1,24 @@
-sudo: false
+sudo: true
 language: ruby
 rvm:
   - 2.0.0
+  - 2.1
+  - 2.2
 script:
   - bundle install
   - bundle exec rake
+env:
+- MYSQL_VERSION=5.6.27
+install:
+  - "sudo apt-get -y remove mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5"
+  - "sudo apt-get -y autoremove"
+  - "sudo apt-get -y install libaio1"
+  - "wget -O mysql-$MYSQL_VERSION.deb http://dev.mysql.com/get/Downloads/MySQL-5.6/mysql-$MYSQL_VERSION-debian6.0-x86_64.deb/from/http://cdn.mysql.com/"
+  - "sudo dpkg -i mysql-$MYSQL_VERSION.deb"
+  - "sudo cp -f /opt/mysql/server-5.6/support-files/mysql.server /etc/init.d/mysql.server"
+  - "sudo ln -sf /opt/mysql/server-5.6/bin/* /usr/bin/"
+  - "sudo sed -i'' 's/table_cache/table_open_cache/' /etc/mysql/my.cnf"
+  - "sudo sed -i'' 's/log_slow_queries/slow_query_log/' /etc/mysql/my.cnf"
+  - "sudo sed -i'' 's/basedir[^=]\\+=.*$/basedir = \\/opt\\/mysql\\/server-5.6/' /etc/mysql/my.cnf"
+  - "sudo sed -i'' 's/^socket *=.*$/socket = \\/tmp\\/mysql.sock/' /etc/mysql/my.cnf"
+  - "sudo /etc/init.d/mysql.server start"

data/README.md

@@ -8,6 +8,11 @@ It defines the state of MySQL permissions using Ruby DSL, and updates permission
 [![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.svg?branch=master)](https://coveralls.io/r/winebarrel/gratan?branch=master)
 
+## Notice
+
+* `>= 0.3.0`
+  * Support template
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -93,6 +98,33 @@ user "scott", ["localhost", "192.168.%"], expired: '2014/10/10' do
 end
 ```
 
+### Use template
+
+```ruby
+template 'all db template' do
+  on '*.*' do
+    grant 'SELECT'
+  end
+end
+
+template 'test db template' do
+  grant context.default
+
+  context.extra.each do |priv|
+    grant priv
+  end
+end
+
+user 'scott', 'localhost', identified: 'tiger' do
+  include_template 'all db template'
+
+  on 'test.*' do
+    context.default = 'SELECT'
+    include_template 'test db template', extra: ['INSERT', 'UPDATE']
+  end
+end
+```
+
 ## Similar tools
 * [Codenize.tools](http://codenize.tools/)
 

data/gratan.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'deep_merge'
+  spec.add_dependency 'hashie'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/lib/gratan.rb

@@ -5,9 +5,11 @@ require 'time'
 require 'deep_merge'
 require 'mysql2'
 require 'term/ansicolor'
+require 'hashie'
 
 module Gratan; end
 require 'gratan/logger'
+require 'gratan/template_helper'
 require 'gratan/client'
 require 'gratan/driver'
 require 'gratan/dsl'

data/lib/gratan/driver.rb

@@ -113,6 +113,25 @@ class Gratan::Driver
     ]
 
     update(sql)
+
+    if (identifier || '').empty?
+      set_password(user, host, identifier)
+    end
+  end
+
+  def set_password(user, host, password, options = {})
+    password ||= ''
+
+    unless options[:hash]
+      password = "PASSWORD('#{escape(password)}')"
+    end
+
+    sql = 'SET PASSWORD FOR %s = %s' % [
+      quote_user(user, host),
+      password,
+    ]
+
+    update(sql)
   end
 
   def set_require(user, host, required)

data/lib/gratan/dsl/context.rb

@@ -1,6 +1,7 @@
 class Gratan::DSL::Context
   include Gratan::DSL::Validator
   include Gratan::Logger::Helper
+  include Gratan::TemplateHelper
 
   def self.eval(dsl, path, options = {})
     self.new(path, options) do
@@ -14,11 +15,22 @@ class Gratan::DSL::Context
     @path = path
     @options = options
     @result = {}
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
   private
 
+  def template(name, &block)
+    @context.templates[name.to_s] = block
+  end
+
   def require(file)
     grantfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
@@ -52,7 +64,7 @@ class Gratan::DSL::Context
       end
 
       @result[[name, host]] = {
-        :objects => Gratan::DSL::Context::User.new(name, host, @options, &block).result,
+        :objects => Gratan::DSL::Context::User.new(@context, name, host, @options, &block).result,
         :options => options,
       }
     end

data/lib/gratan/dsl/context/on.rb

@@ -1,14 +1,16 @@
 class Gratan::DSL::Context::On
   include Gratan::DSL::Validator
+  include Gratan::TemplateHelper
 
   attr_reader :result
 
-  def initialize(user, host, object, options, &block)
+  def initialize(context, user, host, object, options, &block)
     @object_identifier = "User `#{user}@#{host}` on `#{object}`"
     @user = user
     @host = host
     @object = object
     @options = options
+    @context = context.merge(:object => object, :grant_options => options)
     @result = []
     instance_eval(&block)
   end

data/lib/gratan/dsl/context/user.rb

@@ -1,14 +1,16 @@
 class Gratan::DSL::Context::User
   include Gratan::DSL::Validator
   include Gratan::Logger::Helper
+  include Gratan::TemplateHelper
 
   attr_reader :result
 
-  def initialize(user, host, options, &block)
+  def initialize(context, user, host, options, &block)
     @object_identifier = "User `#{user}@#{host}`"
     @user = user
     @host = host
     @options = options
+    @context = context.merge(:user => user, :host => host, :user_options => options)
     @result = {}
     instance_eval(&block)
   end
@@ -29,7 +31,7 @@ class Gratan::DSL::Context::User
       end
     end
 
-    grant = {:privs => Gratan::DSL::Context::On.new(@user, @host, name, @options, &block).result}
+    grant = {:privs => Gratan::DSL::Context::On.new(@context, @user, @host, name, @options, &block).result}
     grant[:with] = options[:with] if options[:with]
     @result[name] = grant
   end

data/lib/gratan/template_helper.rb

@@ -0,0 +1,20 @@
+module Gratan
+  module TemplateHelper
+    def include_template(template_name, context = {})
+      tmplt = @context.templates[template_name.to_s]
+
+      unless tmplt
+        raise "Template `#{template_name}` is not defined"
+      end
+
+      context_orig = @context
+      @context = @context.merge(context)
+      instance_eval(&tmplt)
+      @context = context_orig
+    end
+
+    def context
+      @context
+    end
+  end
+end

data/lib/gratan/version.rb

@@ -1,3 +1,3 @@
 module Gratan
-  VERSION = '0.2.9'
+  VERSION = '0.3.0.beta'
 end

data/spec/create/create_user_with_template_spec.rb

@@ -0,0 +1,41 @@
+describe 'Gratan::Client#apply' do
+  context 'when create user with template' do
+    subject { client }
+
+    it do
+      result = apply(subject) {
+        <<-RUBY
+template 'all db template' do
+  on '*.*' do
+    grant 'SELECT'
+  end
+end
+
+template 'test db template' do
+  grant context.default
+
+  context.extra.each do |priv|
+    grant priv
+  end
+end
+
+user 'scott', 'localhost', identified: 'tiger' do
+  include_template 'all db template'
+
+  on 'test.*' do
+    context.default = 'SELECT'
+    include_template 'test db template', extra: ['INSERT', 'UPDATE']
+  end
+end
+        RUBY
+      }
+
+      expect(result).to be_truthy
+
+      expect(show_grants).to match_array [
+        "GRANT SELECT ON *.* TO 'scott'@'localhost' IDENTIFIED BY PASSWORD '*F2F68D0BB27A773C1D944270E5FAFED515A3FA40'",
+        "GRANT SELECT, INSERT, UPDATE ON `test`.* TO 'scott'@'localhost'",
+      ]
+    end
+  end
+end

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Gratan is a tool to manage MySQL permissions using Ruby DSL.
@@ -130,9 +144,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -156,6 +170,7 @@ files:
 - lib/gratan/identifier/csv.rb
 - lib/gratan/identifier/null.rb
 - lib/gratan/logger.rb
+- lib/gratan/template_helper.rb
 - lib/gratan/version.rb
 - spec/change/change_grants_2_spec.rb
 - spec/change/change_grants_3_spec.rb
@@ -176,6 +191,7 @@ files:
 - 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/create/create_user_with_template_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb
@@ -196,17 +212,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Gratan is a tool to manage MySQL permissions using Ruby DSL.
@@ -230,6 +246,7 @@ test_files:
 - 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/create/create_user_with_template_spec.rb
 - spec/drop/drop_user_2_spec.rb
 - spec/drop/drop_user_spec.rb
 - spec/drop/expire_user_spec.rb