posgra 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88ab471ccf58ec73004e2126bfc4e792cd5d820a
-  data.tar.gz: bdad2d5360a197562813e9c0b2fc02f32bae8e1c
+  metadata.gz: 951beba5dfa0b044ea3b5467f856c20b475e373d
+  data.tar.gz: 0ad1275dcb66c096037f2f8b3bf5a7817334288f
 SHA512:
-  metadata.gz: b9e1fcdd4093419f51b9d3206ca2b77c18e51c97cee2487d06091590f9e9c9ff213d4ae427f6a02a5362e6e165650ce1b78d990436ceb1e15d35c36b5b42ea51
-  data.tar.gz: c40c624fb7b38894e969e3e569f8a4a636c5d8fdcd9e7b236780142292db05349c19cefbc6a51fbe76893d9326cac4742859e0ecaf3d47cae8babafb7d719ad1
+  metadata.gz: f5da29a44a9d95f2c9867df4154bebab2d954c54b7d285568bd91c8070fcfb7bfd8a4ef3057b9117357c1767c407c96952594b323a0d7055503ff3af4c1f268a
+  data.tar.gz: 1cd71973a72a56835041229493e914b751822214ec291e64f81f4f206772a089c834560eace40a1c079cb84b1c35f84f6b99c0f6fc650e5d93b5151e39945e09

data/.travis.yml

@@ -11,6 +11,9 @@ script:
   - bundle exec rake
 addons:
   postgresql: "9.4"
+  apt:
+    packages:
+      - libgmp-dev
 env:
   global:
     - POSGRA_TEST_USER=postgres

data/lib/posgra/client.rb

@@ -74,7 +74,7 @@ class Posgra::Client
     expected_users_by_group = expected.fetch(:users_by_group)
     actual_users_by_group = actual.fetch(:users_by_group)
     expected_users = (expected_users_by_group.values.flatten + expected.fetch(:users)).uniq
-    actual_users = actual.fetch(:users)
+    actual_users = (actual_users_by_group.values.flatten + actual.fetch(:users)).uniq
 
     updated = pre_walk_groups(expected_users_by_group, actual_users_by_group)
     updated = walk_users(expected_users, actual_users) || updated

data/lib/posgra/dsl/roles.rb

@@ -10,7 +10,27 @@ class Posgra::DSL::Roles
   end
 
   def result
-    @result.fetch(:users).uniq
+    @result[:users].uniq!
+
+    group_users = @result[:users_by_group].flat_map do |group, users|
+      if users.empty?
+        [group, nil]
+      else
+        users.map {|u| [group, u] }
+      end
+    end
+
+    new_users_by_group = {}
+
+    group_users.each do |group, user|
+      next unless [group, user].any? {|i| not i.nil? and matched?(i, @options[:include_role], @options[:exclude_role]) }
+      new_users_by_group[group] ||= []
+      new_users_by_group[group] << user if user
+    end
+
+    new_users_by_group.values.each(&:uniq!)
+    @result[:users_by_group] = new_users_by_group
+
     @result
   end
 
@@ -59,9 +79,6 @@ class Posgra::DSL::Roles
 
   def group(name, &block)
     name = name.to_s
-
-    if matched?(name, @options[:include_role], @options[:exclude_role])
-      @result[:users_by_group][name] = Posgra::DSL::Roles::Group.new(@context, name, @options, &block).result
-    end
+    @result[:users_by_group][name] = Posgra::DSL::Roles::Group.new(@context, name, @options, &block).result
   end
 end

data/lib/posgra/dsl/roles/group.rb

@@ -15,10 +15,6 @@ class Posgra::DSL::Roles::Group
 
   def user(name)
     name = name.to_s
-
-    if matched?(name, @options[:include_role], @options[:exclude_role])
-      name = name.kind_of?(Regexp) ? name : name.to_s
-      @result << name
-    end
+    @result << name
   end
 end

data/lib/posgra/version.rb

@@ -1,3 +1,3 @@
 module Posgra
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: posgra
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg