gratan 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e05682c907c1fe62bbe627e89029656293f73cee
-  data.tar.gz: 4fc1a578ad94f8acbf50bfc006a2187bffb53ec8
+  metadata.gz: 65d0a9808bf9dba9899060c4c7e220beaf8c0d5a
+  data.tar.gz: 355bea40e2a79d9c907ac7ffdc162cda0b2ab5b7
 SHA512:
-  metadata.gz: a3c03ecaa3d3f4d4b17778e1ea324e62ad50eaccad230fb5bacea75b4b9b6e80cabd7e904138db0f227120685ebe2565c01c8c41587921c4b6b592b30f7f239c
-  data.tar.gz: e2b836e3061aeeb482a7e879578670527777b7dd89441020f5b89a4d6503c20f2234a4d28cee1047db390c2e49e857b08502ccfa5198bada0b3b8556cf5e114e
+  metadata.gz: 58003b9ec0af4f3000c3df6f3c7eff440cf4c0672fac07fc486e8afc0b5eb9864fb865c15fd53991beb7e8e4ad0cc2d317d4c2e9caf902d7f2dfccdc73f16eb8
+  data.tar.gz: 8600de836683f357bdd0faf21e5a5ac6bd888c40767fa2413b39b1b1c5b387be177047c081e980516e2e998ba4445bc8d2f92768910916978bbd456b128378cd

data/bin/gratan

@@ -38,6 +38,7 @@ ARGV.options do |opt|
     opt.on('-e', '--export')               {    mode                       = :export       }
     opt.on(''  , '--with-identifier')      {    options[:with_identifier]  = true          }
     opt.on(''  , '--split')                {    split                      = true          }
+    opt.on(''  , '--chunk-by-user')        {    options[:chunk_by_user]    = 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) }

data/gratan.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'mysql2'
-  spec.add_dependency "term-ansicolor"
+  spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'deep_merge'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '>= 3.0.0'

data/lib/gratan.rb

@@ -1,9 +1,11 @@
 require 'logger'
-require 'mysql2'
 require 'singleton'
-require 'term/ansicolor'
 require 'time'
 
+require 'deep_merge'
+require 'mysql2'
+require 'term/ansicolor'
+
 module Gratan; end
 require 'gratan/logger'
 require 'gratan/client'

data/lib/gratan/client.rb

@@ -10,6 +10,10 @@ class Gratan::Client
     options = @options.merge(options)
     exported = Gratan::Exporter.export(@driver, options)
 
+    if options[:chunk_by_user]
+      exported = chunk_by_user(exported)
+    end
+
     if block_given?
       exported.sort_by {|user_host, attrs|
         user_host[0].empty? ? 'root' : user_host[0]
@@ -22,11 +26,33 @@ class Gratan::Client
         yield(user, dsl)
       }
     else
-      exported = Gratan::Exporter.export(@driver, options)
       Gratan::DSL.convert(exported, options)
     end
   end
 
+  def chunk_by_user(exported)
+    chunked = {}
+
+    exported.sort_by {|user_host, attrs|
+      user_host[0]
+    }.chunk {|user_host, attrs|
+      user_host[0]
+    }.each {|user, grants|
+      merged_attrs = {}
+      hosts = []
+
+      grants.each do |user_host, attrs|
+        hosts << user_host[1]
+        merged_attrs.deep_merge!(attrs)
+      end
+
+      user_host = [user, hosts.sort]
+      chunked[user_host] = merged_attrs
+    }
+
+    chunked
+  end
+
   def apply(file, options = {})
     options = @options.merge(options)
 

data/lib/gratan/version.rb

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

data/spec/export/export_chunk_spec.rb

@@ -0,0 +1,62 @@
+describe 'Gratan::Client#export' do
+  context 'when chunked by user' do
+    subject { client(chunk_by_user: true) }
+
+    before do
+      apply(subject) do
+        <<-RUBY
+user "scott", "%" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "test.*" do
+    grant "SELECT"
+  end
+
+  on "test3.*" do
+    grant "UPDATE"
+  end
+end
+
+user "scott", "localhost" do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "test2.*" do
+    grant "INSERT"
+  end
+
+  on "test3.*" do
+    grant "DELETE"
+  end
+end
+        RUBY
+      end
+    end
+
+    it do
+      expect(subject.export.strip).to eq <<-RUBY.strip
+user "scott", ["%", "localhost"] do
+  on "*.*" do
+    grant "USAGE"
+  end
+
+  on "test.*" do
+    grant "SELECT"
+  end
+
+  on "test3.*" do
+    grant "UPDATE"
+    grant "DELETE"
+  end
+
+  on "test2.*" do
+    grant "INSERT"
+  end
+end
+      RUBY
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gratan
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +175,7 @@ files:
 - 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_spec.rb
 - spec/misc/misc_spec.rb
 - spec/misc/require_spec.rb
@@ -185,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Gratan is a tool to manage MySQL permissions using Ruby DSL.
@@ -208,6 +223,7 @@ test_files:
 - 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_spec.rb
 - spec/misc/misc_spec.rb
 - spec/misc/require_spec.rb