ldap-shell-utils 0.0.1 → 0.0.2

data/bin/lsu

@@ -1,11 +1,36 @@
 #!/usr/bin/env ruby
 
+
 $:.unshift( File.join( File.dirname( __FILE__ ), %w[.. lib] ) )
 
-require 'loader'
 
-LdapShellUtils::CliApplication.run( 
-  Choice.choices[:config],
-  Choice.choices[:filter],
-  Choice.choices[:attributes]
-)
+require 'rubygems'
+require 'slop'
+require 'ldap-shell-utils'
+
+
+def validate_options( options )
+
+  options[:config] && options[:filter]
+end
+
+
+slop = Slop.new( :strict => true, :help=> true ) do
+  
+  banner "Usage:\n\t#{$0} [options]\n\nOptions:"
+  
+  on :a, :audit,  'Audit result entries'
+  on :c, :config, 'The configuration file', :optional => false
+  on :f, :filter, 'Query', :optional => false
+  on :attributes, 'Entry attribute list', :optional => true, :as => Array, :delimiter => ','
+end
+
+
+begin
+  slop.parse( )
+  options = slop.to_hash( true )
+  LdapShellUtils::CliApplication.run( options ) if validate_options( options )
+rescue Slop::InvalidOptionError => e
+  $stderr.puts( e.message )
+  exit 
+end

data/lib/{loader.rb → ldap-shell-utils.rb}

@@ -1,5 +1,5 @@
 begin
-  Dir.glob( File.join( File.dirname( __FILE__ ), "**", "*.rb" ) ).each { |library| require library }
+  Dir.glob( File.join( File.dirname( __FILE__ ), "**", "*.rb" ) ).each { |l| require l }
 rescue LoadError => e
   $sdterr.puts( e.message )
-end
+end

data/lib/ldap-shell-utils/cli_application.rb

@@ -6,18 +6,17 @@ module LdapShellUtils
   module CliApplication
     extend self
     
-    def run( config, filter, attributes )
+    def print_entry( entry )
 
-      ConfigContext.load( File.expand_path( config ) )
-      results = LdapConnection.new( ConfigContext.url, ConfigContext.all ).search( filter, attributes )
-      
-      if( results )
-        results.each do |entry|
-      
-          puts "dn: #{entry.dn}"
-          entry.each { |a,v| puts " - #{a}: #{v.length == 1 ? v[0]:v.inspect}" unless a == :dn }
-        end
-      end      
+      puts "dn: #{entry.dn}"
+      entry.each { |a,v| puts "#{a}: #{(v.size == 1) ? v[0]:v.inspect}" unless a == :dn }
+    end
+    
+    def run( options )
+
+      ConfigContext.load( File.expand_path( options[:config] ) )
+      results = LdapConnection.new( ConfigContext.url, ConfigContext.all ).search( options[:filter], options[:attributes], options[:audit] )
+      results.each { |e| print_entry( e ) } if results
     rescue Exception => e
       $stderr.puts( e.message )
     end

data/lib/ldap-shell-utils/ldap_connection.rb

@@ -6,8 +6,14 @@ require 'net/ldap'
 module LdapShellUtils
   class LdapConnection
       
-    attr_reader :connection
+    OPERATIONAL_ATTRIBUTES = [
+      :creatorsname, 
+      :createtimestamp, 
+      :modifiersname, 
+      :modifytimestamp
+    ]
       
+    public
     def initialize( url, config )
 
       @uri           = URI.parse( url )
@@ -21,22 +27,26 @@ module LdapShellUtils
           :password => config[:password]
         }
       }
-        
+      
       @configuration[:encryption] = { :method => :simple_tls } if( @uri.scheme.to_sym == :ldaps )
-      @connection                 = Net::LDAP.new( @configuration )
+
+      @connection = Net::LDAP.new( @configuration )
       
       self
     rescue Exception => e
       raise ArgumentError.new( e.message )
     end
     
-    def search( filter, attributes=[] )
-      
-      @connection.search( :filter=>Net::LDAP::Filter.from_rfc2254( filter ), :attributes=>attributes, :result=>false )
-    end
     
-    def to_s
-      "#{@configuration.uri}"
-    end
+    def search( filter, attributes, audit=false )
+      
+      final_attributes = attributes ? attributes : []
+      final_attributes += OPERATIONAL_ATTRIBUTES if audit
+      final_filter     = Net::LDAP::Filter.construct( filter )
+      
+      @connection.search( :filter=>Net::LDAP::Filter.from_rfc2254( filter ), 
+                          :attributes=>final_attributes, 
+                          :return_result=>true )
+    end    
   end
 end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Version
   INFO = {
     :major =>0,
     :minor =>0,
-    :patch =>1
+    :patch =>2
   }
 
   NAME    = 'ldap-shell-utils'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ldap-shell-utils
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Javier Juarez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-07 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: lsu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,7 +29,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: choice
+  name: slop
   version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -145,7 +145,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: choice
+  name: slop
   version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -171,10 +171,9 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
+- lib/ldap-shell-utils.rb
 - lib/ldap-shell-utils/cli_application.rb
 - lib/ldap-shell-utils/ldap_connection.rb
-- lib/ldap-shell-utils/options_parser.rb
-- lib/loader.rb
 - lib/version.rb
 - README.rdoc
 - bin/lsu

data/lib/ldap-shell-utils/options_parser.rb

@@ -1,38 +0,0 @@
-require 'rubygems'
-require 'choice'
-
-
-Choice.options do
-  
-  header ''
-  header ' options:'
-
-  option :config, :required=>true do
-    short '-c'
-    long  '--config'
-    desc  'The Yaml config file'
-  end
-  
-  option :filter, :required=>true do
-    short '-f'
-    long  '--filter'
-    desc  'The LDAP query'
-  end
-
-  option :attributes, :required=>false do
-    short '-a'
-    long  '--attributes *ATTRIBUTES'
-    desc  'The attributes list'
-  end
-
-  separator ''
-  separator ' help:'
-
-  option :help do
-    short '-h'
-    long  '--help'
-    desc  'Show this help screen'
-  end
-
-  separator ''
-end