posgra 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af082dbe487f54a35c23d4c39947c58b12f403d
-  data.tar.gz: 9cb68ff5f9e321277c31246d6b2631bbfb0d67ce
+  metadata.gz: e7699e01200f7d2fbdcfa86475e043006232704b
+  data.tar.gz: ba40659f955f5ecbad1d7bdf2c77a2ddd0fc0c22
 SHA512:
-  metadata.gz: e48736a442d4592ea2310dae9884ab1dac1d1de688596517f08504dae133e0da0c98aa4552f22287518a7fc35894581bb654259a90011fb304bc48d1f117415d
-  data.tar.gz: b811a332a01d8960f9c672b2afcb8a89aeaf70589d25616c162cdddeb1ff118e14f0f343de293c026ab84f5ca3239dcfd9110e9eddd6d8bb736476f01b4a7d42
+  metadata.gz: 3578e487660aee0766daf01e4fab417c1152bd365c865c92f8c42fd570adc071d6caed97a243a18352e823aadddeeb470f406d1ec16d1c75899e3d00e2f71273
+  data.tar.gz: af6242d2e114e350884b673005ae3fd34a37416e70df0586b9465fdcb6f5d74b302f229f0ca04a6591c165908c84a9b84a603447915eda2f317da754d03ad33d

data/lib/posgra/client.rb

@@ -1,4 +1,6 @@
 class Posgra::Client
+  include Posgra::Utils::Helper
+
   DEFAULT_EXCLUDE_SCHEMA = /\A(?:pg_.*|information_schema)\z/
   DEFAULT_EXCLUDE_ROLE = /\A\z/
   DEFAULT_EXCLUDE_DATABASE = /\A(?:template\d+|postgres)\z/
@@ -144,14 +146,20 @@ class Posgra::Client
 
     actual.reject {|group, _|
       expected.has_key?(group)
-    }.each {|group, _|
-      updated = @driver.drop_group(group) || updated
+    }.each {|group, actual_users|
+      if matched?(group, @options[:include_role], @options[:exclude_role])
+        updated = @driver.drop_group(group) || updated
+      else
+        actual_users.each do |user|
+          updated = @driver.drop_user_from_group(user, group) || updated
+        end
+      end
     }
 
     updated
   end
 
-  def walk_groups(expected, actual, expected_users)
+  def walk_groups(expected, actual, current_users)
     updated = false
 
     expected.each do |expected_group, expected_users|
@@ -167,7 +175,7 @@ class Posgra::Client
       end
 
       (actual_users - expected_users).each do |user|
-        if expected_users.include?(user)
+        if current_users.include?(user)
           updated = @driver.drop_user_from_group(user, expected_group) || updated
         end
       end

data/lib/posgra/version.rb

@@ -1,3 +1,3 @@
 module Posgra
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posgra
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg