posgra 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bd0c913db79c0e2a8dfceec4ef29a7e50d1091
-  data.tar.gz: 608f5d5835f1ef67ed1eec25d13e929115b83819
+  metadata.gz: 5f3f1ccfe695905dd0801589a51ed3f6036b66a6
+  data.tar.gz: b6925f966f8eab343359307709fa42a498fa7629
 SHA512:
-  metadata.gz: 0dee75ac4f30b22324282b739a9c5c9d1da5780f3ac8ae6a6459dfb6928e54d4fd880ea02e5874058f8d66f5404bdf0ee1acd5a86a62f529393017a58bcd1d75
-  data.tar.gz: 7ea2c5b16447487660a6373cba514e385bee0f2b42c0abefb44091e98c975412dd0f4e8f6d3e93e23ba54c114c67f4fb8374e87dd71ee8ab3d89de27216fa7a8
+  metadata.gz: 509de56b2794b4461ef03c9b73680bf4c486c85c5ac1c58e26bd8f75abd1faeb0999a2244e19b6ad2b04938a59acc6dea92ffec0d9930aadfd30679f3c75649c
+  data.tar.gz: cb9f0f79f6d323a14cbe60d46e6d401dd39824a8f48a8ed67befe5b35642e3f1d191c396e4e28bfb8ef53bf80aae50f346548f394549ab3a64224c3480874319

data/README.md

@@ -4,6 +4,7 @@ Posgra is a tool to manage PostgreSQL roles/permissions.
 
 It defines the state of PostgreSQL roles/permissions using Ruby DSL, and updates roles/permissions according to DSL.
 
+[![Gem Version](https://badge.fury.io/rb/posgra.svg)](https://badge.fury.io/rb/posgra)
 [![Build Status](https://travis-ci.org/winebarrel/posgra.svg?branch=master)](https://travis-ci.org/winebarrel/posgra)
 
 ## Installation

data/lib/posgra/cli/grant.rb

@@ -8,6 +8,8 @@ class Posgra::CLI::Grant < Thor
   class_option :'exclude-schema'
   class_option :'include-role'
   class_option :'exclude-role'
+  class_option :'include-object'
+  class_option :'exclude-object'
 
   desc 'apply FILE', 'Apply grants'
   option :'dry-run', :type => :boolean, :default => false

data/lib/posgra/cli/helper.rb

@@ -4,6 +4,8 @@ module Posgra::CLI::Helper
     :exclude_schema,
     :include_role,
     :exclude_role,
+    :include_object,
+    :exclude_object,
   ]
 
   def check_fileanem(file)

data/lib/posgra/driver.rb

@@ -229,9 +229,15 @@ class Posgra::Driver
         AND pg_class.relkind NOT IN ('i')
     SQL
 
-    rs.map do |row|
-      row.fetch('relname')
+    objects = []
+
+    rs.each do |row|
+      relname = row.fetch('relname')
+      next unless matched?(relname, @options[:include_object], @options[:exclude_object])
+      objects << relname
     end
+
+    objects
   end
 
   def describe_users
@@ -293,6 +299,7 @@ class Posgra::Driver
       relacl = row.fetch('relacl')
       usename = row.fetch('usename')
 
+      next unless matched?(relname, @options[:include_object], @options[:exclude_object])
       next unless matched?(nspname, @options[:include_schema], @options[:exclude_schema])
 
       parse_aclitems(relacl, usename).each do |aclitem|
@@ -308,19 +315,6 @@ class Posgra::Driver
     grants_by_role
   end
 
-  def describe_schemas
-    rs = @client.exec <<-SQL
-      SELECT
-        nspname
-      FROM
-        pg_namespace
-    SQL
-
-    rs.map do |row|
-      row.fetch('nspname')
-    end
-  end
-
   private
 
   def parse_aclitems(aclitems, owner)
@@ -341,7 +335,7 @@ class Posgra::Driver
 
   def expand_privileges(privileges)
     options_by_privilege = {}
-p
+
     privileges.scan(/([a-z])(\*)?/i).each do |privilege_type_char,is_grantable|
       privilege_type = PRIVILEGE_TYPES[privilege_type_char]
 

data/lib/posgra/dsl/grants/role/schema.rb

@@ -1,6 +1,7 @@
 class Posgra::DSL::Grants::Role::Schema
   include Posgra::Logger::Helper
   include Posgra::TemplateHelper
+  include Posgra::Utils::Helper
 
   attr_reader :result
 
@@ -15,6 +16,7 @@ class Posgra::DSL::Grants::Role::Schema
   def on(name, options = {}, &block)
     unless name.is_a?(Regexp)
       name = name.to_s
+      return unless matched?(name, @options[:include_object], @options[:exclude_object])
     end
 
     if options[:expired]

data/lib/posgra/version.rb

@@ -1,3 +1,3 @@
 module Posgra
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posgra
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-31 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg