mooset 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b093bf686448abfb179a9a60f6c370c476a9f301
-  data.tar.gz: b4ecd462864322ac24333f0c0015b3d8457e1ffc
+  metadata.gz: fd815ef3180d0001c0bfea94435f61c2b0a953df
+  data.tar.gz: 125fe26bb6f0870686a63480b0fc45da1b62e1c9
 SHA512:
-  metadata.gz: 06001439352cdda129beae947f94bb4c017a1d2bd40efa9cbcf971000424cb9e2e23f07cb25e7e5b5d838294ee2462535d6c98de08e216cbe076d191c1f61fae
-  data.tar.gz: 4d4e54909d05db0ddfa47e4767978a51d56b967aa6268b8b90b31711e85589257d44f2fa09abffaf8c32f6683bd1107a6a039423858949a74e96d09845ea761f
+  metadata.gz: 34568840243f31f477950956e9fe011b2d094354187917e53fe04190979df92df92d1ba240fa91c410e8408a2f44a5b2b24e2ef558504a35d57ccca1bf5f863c
+  data.tar.gz: 583c62e43eda275f863f75fe20963c1504d7f7526c1d32f0902b36fcc808c90a3305e30a37bb198db5c62ded31f68e5723f37167aa389c89fef2e4ed186ae29c

data/lib/mooset/endpoints/gitlab/group_search.rb

@@ -39,7 +39,7 @@ module Mooset
         def members(id)
           return to_enum(:members, id) unless block_given?
 
-          paginate ->(page){ connection.group_members(id, page: page) }, ->(object){ yield User.build(endpoint, object) }
+          connection.group_members(id).map { |object| yield User.build(endpoint, object) }
         end
 
         def create(name, path)

data/lib/mooset/endpoints/gitlab/user.rb

@@ -28,7 +28,7 @@ module Mooset
 
         def self.identity_from(identities)
           identities.within do |o|
-            o["extern_uid"] if o["provider"] == 'ldap'
+            o["extern_uid"] if ["ldap", "ldapmain"].include?(o["provider"])
           end
         end
       end

data/lib/mooset/endpoints/gitlab/user_search.rb

@@ -45,7 +45,8 @@ module Mooset
             name: user.full_name,
             username: user.username,
             extern_uid: user.dn,
-            provider: 'ldap',
+            provider: endpoint.provider,
+            confirm: false
           })
         end
 
@@ -53,10 +54,12 @@ module Mooset
           User.build(endpoint, connection.create_user(email, password, opts))
         end
 
-        def group_members(id, &block)
+        def group_members(id)
           return to_enum(:group_members, id) unless block_given?
 
-          paginate ->(page){ connection.group_members(id, page: page) }, ->(object){ block.call User.build(endpoint, object) }
+          connection.group_members(id).collect do |user|
+            yield User.build(endpoint, user)
+          end
         end
 
         private

data/lib/mooset/endpoints/gitlab.rb

@@ -12,6 +12,7 @@ module Mooset
           private_token: gitlab.private_token,
         })
       }
+      attribute :provider, String, default: 'ldapmain'
 
       resource :users do
         UserSearch.new(self)

data/lib/mooset/endpoints/ldap/ou.rb

@@ -2,6 +2,16 @@ module Mooset
   module Endpoints
     class Ldap
       class Ou < Group
+        def self.build(endpoint, params)
+          group = Optional.new(params)
+          new(
+            endpoint: endpoint,
+            id: group[:dn].first.value,
+            dn: group[:dn].first.value,
+            name: group[:ou].first.value
+          )
+        end
+
         def members
           endpoint.users.query('(&(objectClass=user)(!(useraccountcontrol:1.2.840.113556.1.4.803:=2)))', base: dn)
         end

data/lib/mooset/synchronize_group.rb

@@ -20,6 +20,7 @@ module Mooset
 
         group.members.each do |user|
           #next unless user.id =~ /Alexandru/
+          next if @opts[:skip] && @opts[:skip].any? { |o| user.username == o }
 
           to_user = @to.users.find(user)
 

data/lib/mooset/version.rb

@@ -1,3 +1,3 @@
 module Mooset
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/mooset/endpoints/gitlab/user_search_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mooset::Endpoints::Gitlab::UserSearch do
   let(:connection) { double }
-  subject(:user_search) { Mooset::Endpoints::Gitlab::UserSearch.new(double(connection: connection)) }
+  subject(:user_search) { Mooset::Endpoints::Gitlab::UserSearch.new(double(connection: connection, provider: 'ldap')) }
 
   let(:user1) { OpenStruct.new({
     name: "Admin",
@@ -123,7 +123,8 @@ describe Mooset::Endpoints::Gitlab::UserSearch do
           name: 'Full name',
           username: 'username',
           extern_uid: 'dn',
-          provider: 'ldap'
+          provider: 'ldap',
+          confirm: false
         }).and_return(user1)
 
         @user = user_search.import(@ldap_user)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mooset
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Alexandru Keszeg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A Ruby library and client for user migration.