mooset 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b093bf686448abfb179a9a60f6c370c476a9f301
4
- data.tar.gz: b4ecd462864322ac24333f0c0015b3d8457e1ffc
3
+ metadata.gz: fd815ef3180d0001c0bfea94435f61c2b0a953df
4
+ data.tar.gz: 125fe26bb6f0870686a63480b0fc45da1b62e1c9
5
5
  SHA512:
6
- metadata.gz: 06001439352cdda129beae947f94bb4c017a1d2bd40efa9cbcf971000424cb9e2e23f07cb25e7e5b5d838294ee2462535d6c98de08e216cbe076d191c1f61fae
7
- data.tar.gz: 4d4e54909d05db0ddfa47e4767978a51d56b967aa6268b8b90b31711e85589257d44f2fa09abffaf8c32f6683bd1107a6a039423858949a74e96d09845ea761f
6
+ metadata.gz: 34568840243f31f477950956e9fe011b2d094354187917e53fe04190979df92df92d1ba240fa91c410e8408a2f44a5b2b24e2ef558504a35d57ccca1bf5f863c
7
+ data.tar.gz: 583c62e43eda275f863f75fe20963c1504d7f7526c1d32f0902b36fcc808c90a3305e30a37bb198db5c62ded31f68e5723f37167aa389c89fef2e4ed186ae29c
@@ -39,7 +39,7 @@ module Mooset
39
39
  def members(id)
40
40
  return to_enum(:members, id) unless block_given?
41
41
 
42
- paginate ->(page){ connection.group_members(id, page: page) }, ->(object){ yield User.build(endpoint, object) }
42
+ connection.group_members(id).map { |object| yield User.build(endpoint, object) }
43
43
  end
44
44
 
45
45
  def create(name, path)
@@ -28,7 +28,7 @@ module Mooset
28
28
 
29
29
  def self.identity_from(identities)
30
30
  identities.within do |o|
31
- o["extern_uid"] if o["provider"] == 'ldap'
31
+ o["extern_uid"] if ["ldap", "ldapmain"].include?(o["provider"])
32
32
  end
33
33
  end
34
34
  end
@@ -45,7 +45,8 @@ module Mooset
45
45
  name: user.full_name,
46
46
  username: user.username,
47
47
  extern_uid: user.dn,
48
- provider: 'ldap',
48
+ provider: endpoint.provider,
49
+ confirm: false
49
50
  })
50
51
  end
51
52
 
@@ -53,10 +54,12 @@ module Mooset
53
54
  User.build(endpoint, connection.create_user(email, password, opts))
54
55
  end
55
56
 
56
- def group_members(id, &block)
57
+ def group_members(id)
57
58
  return to_enum(:group_members, id) unless block_given?
58
59
 
59
- paginate ->(page){ connection.group_members(id, page: page) }, ->(object){ block.call User.build(endpoint, object) }
60
+ connection.group_members(id).collect do |user|
61
+ yield User.build(endpoint, user)
62
+ end
60
63
  end
61
64
 
62
65
  private
@@ -12,6 +12,7 @@ module Mooset
12
12
  private_token: gitlab.private_token,
13
13
  })
14
14
  }
15
+ attribute :provider, String, default: 'ldapmain'
15
16
 
16
17
  resource :users do
17
18
  UserSearch.new(self)
@@ -2,6 +2,16 @@ module Mooset
2
2
  module Endpoints
3
3
  class Ldap
4
4
  class Ou < Group
5
+ def self.build(endpoint, params)
6
+ group = Optional.new(params)
7
+ new(
8
+ endpoint: endpoint,
9
+ id: group[:dn].first.value,
10
+ dn: group[:dn].first.value,
11
+ name: group[:ou].first.value
12
+ )
13
+ end
14
+
5
15
  def members
6
16
  endpoint.users.query('(&(objectClass=user)(!(useraccountcontrol:1.2.840.113556.1.4.803:=2)))', base: dn)
7
17
  end
@@ -20,6 +20,7 @@ module Mooset
20
20
 
21
21
  group.members.each do |user|
22
22
  #next unless user.id =~ /Alexandru/
23
+ next if @opts[:skip] && @opts[:skip].any? { |o| user.username == o }
23
24
 
24
25
  to_user = @to.users.find(user)
25
26
 
@@ -1,3 +1,3 @@
1
1
  module Mooset
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
@@ -2,7 +2,7 @@ require 'spec_helper'
2
2
 
3
3
  describe Mooset::Endpoints::Gitlab::UserSearch do
4
4
  let(:connection) { double }
5
- subject(:user_search) { Mooset::Endpoints::Gitlab::UserSearch.new(double(connection: connection)) }
5
+ subject(:user_search) { Mooset::Endpoints::Gitlab::UserSearch.new(double(connection: connection, provider: 'ldap')) }
6
6
 
7
7
  let(:user1) { OpenStruct.new({
8
8
  name: "Admin",
@@ -123,7 +123,8 @@ describe Mooset::Endpoints::Gitlab::UserSearch do
123
123
  name: 'Full name',
124
124
  username: 'username',
125
125
  extern_uid: 'dn',
126
- provider: 'ldap'
126
+ provider: 'ldap',
127
+ confirm: false
127
128
  }).and_return(user1)
128
129
 
129
130
  @user = user_search.import(@ldap_user)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mooset
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.4
4
+ version: 0.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alexandru Keszeg
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-17 00:00:00.000000000 Z
11
+ date: 2015-06-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: gitlab
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
207
207
  version: '0'
208
208
  requirements: []
209
209
  rubyforge_project:
210
- rubygems_version: 2.4.6
210
+ rubygems_version: 2.4.7
211
211
  signing_key:
212
212
  specification_version: 4
213
213
  summary: A Ruby library and client for user migration.