ldumbd 0.1.1 → 0.1.2

data/NEWS

@@ -1,4 +1,9 @@
 * ldumbd NEWS
+** 0.1.2 (2014-03-24)
+
+ - Add import-ldif-data.rb to contrib
+ - Update dependencies
+
 ** 0.1.1 (2014-03-21)
 
  - Require ldumbd/version in bin/ldumbd

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/sometimesfood/ldumbd.svg?branch=master)](https://travis-ci.org/sometimesfood/ldumbd)
+
 ldumbd
 ======
 

data/contrib/import-ldif-data.rb

@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+
+require 'sequel'
+
+if ARGV.size != 3
+  program_name = File.basename($PROGRAM_NAME)
+  puts <<EOS
+usage: #{program_name} USERFILE GROUPFILE DATABASE_URL
+
+Examples:
+#{program_name} users.ldif groups.ldif sqlite:///var/lib/ldumbd/ldumbd.sqlite3
+#{program_name} users.ldif groups.ldif postgres://user:password@host:port/ldumbd
+#{program_name} users.ldif groups.ldif mysql2://user:password@host:port/ldumbd
+EOS
+  exit false
+end
+
+USER_FILE=ARGV[0]
+GROUP_FILE=ARGV[1]
+DATABASE_URL=ARGV[2]
+
+def empty_line?(line)
+  line.empty? || line.start_with?('#')
+end
+
+def attribute_value(ldif_line)
+  unless /\A(?<attribute>\w+):\s*(?<value>.*)\z/ =~ ldif_line
+    fail %Q{Invalid LDIF line: "#{ldif_line}"}
+  end
+  return attribute, value
+end
+
+def ldif_hash(filename)
+  hash = {}
+  last_dn = nil
+  File.readlines(filename).each do |line|
+    line.chomp!
+    next if empty_line?(line)
+
+    attribute, value = attribute_value(line)
+    if attribute == 'dn'
+      last_dn = value
+    else
+      fail "Invalid DN" if last_dn.nil?
+      hash[last_dn] ||= {}
+      hash[last_dn][attribute] ||= []
+      hash[last_dn][attribute] << value
+    end
+  end
+  hash
+end
+
+def users_from_ldif(user_file)
+  ldif_hash(user_file).map do |dn, avs|
+    {
+      id: avs['uidNumber'].first.to_i,
+      name: avs['uid'].first,
+      realname: avs['cn'].first,
+      shell: avs['loginShell'].first,
+      homedir: avs['homeDirectory'].first,
+      group_id: avs['gidNumber'].first.to_i,
+      # mail: avs['mail'].first
+    }
+  end
+end
+
+def groups_from_ldif(group_file)
+  ldif_hash(group_file).map do |dn, avs|
+    {
+      name: avs['cn'].first,
+      id: avs['gidNumber'].first.to_i,
+      members: avs['memberUid'] || []
+    }
+  end
+end
+
+def skip(reason)
+  $stderr.puts "#{reason}, skipping..."
+end
+
+def add_groups(groups, database)
+  groups.each do |group|
+    puts %Q{Adding group "#{group[:name]}..."}
+    database[:groups].insert(group.reject { |k, v| k == :members })
+  end
+end
+
+def add_users(users, database)
+  users.each do |user|
+    gid = user[:group_id]
+    name = user[:name]
+    unless database[:groups].where(id: gid).any?
+      skip %Q{Invalid gid #{gid} for user "#{name}"}
+      next
+    end
+    puts %Q{Adding user "#{name}"...}
+    database[:users].insert(user.reject { |k, v| k == :mail })
+  end
+end
+
+def add_group_members(groups, database)
+  groups.each do |group|
+    group[:members].each do |member|
+      unless database[:users].where(name: member).any?
+        skip %Q{Invalid member "#{member}" for group "#{group[:name]}"}
+        next
+      end
+      uid = database[:users].where(name: member).first[:id]
+      gid = group[:id]
+      database[:groups_users].insert(group_id: gid, user_id: uid)
+    end
+  end
+end
+
+begin
+  users  = users_from_ldif(USER_FILE)
+  groups = groups_from_ldif(GROUP_FILE)
+
+  database = Sequel.connect(DATABASE_URL)
+  connected = database.test_connection
+
+  database.transaction do
+    add_groups(groups, database)
+    add_users(users, database)
+    add_group_members(groups, database)
+  end
+rescue => e
+  $stderr.puts e
+  $stderr.puts 'Reverted database to previous state.' if connected
+  exit false
+end

data/ldumbd.gemspec

@@ -26,17 +26,18 @@ EOS
         'Rakefile',
         'README.md',
         'TODO.org',
-        '{bin,lib,db,spec}/**/*']
+        '{bin,contrib,db,lib,spec}/**/*']
   spec.executables   = ['ldumbd']
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 
+  spec.required_ruby_version = '>= 1.9.3'
+
   spec.add_dependency 'ruby-ldapserver', '~> 0.5.0'
-  spec.add_dependency 'sequel', '~> 4.7.0'
+  spec.add_dependency 'sequel', '~> 4.8.0'
 
   spec.add_development_dependency 'sqlite3', '~> 1.3.9'
   spec.add_development_dependency 'pg', '~> 0.17.1'
   spec.add_development_dependency 'mysql2', '~> 0.3.15'
-  spec.add_development_dependency 'rake', '~> 10.0.4'
-  spec.add_development_dependency 'net-ldap', '~> 0.3.1'
+  spec.add_development_dependency 'rake', '~> 10.1.1'
   spec.add_development_dependency 'minitest', '~> 5.3.0'
 end

data/lib/ldumbd/version.rb

@@ -1,3 +1,3 @@
 module Ldumbd
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ldumbd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ldapserver
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,23 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
-- !ruby/object:Gem::Dependency
-  name: net-ldap
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +142,7 @@ files:
 - TODO.org
 - bin/ldumbd
 - config.yml.sample
+- contrib/import-ldif-data.rb
 - db/migrations/001_create_users.rb
 - db/migrations/002_create_groups.rb
 - db/migrations/003_add_user_group_id.rb
@@ -189,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: