lib/rays/module.rb in rays-0.1.6 vs lib/rays/module.rb in rays-0.1.7

@@ -2,26 +2,30 @@
 
 
 module Rays
 
 
-  extend module ModuleInfo
+  module Module
 
+    def name ()
+      super.split('::')[-2]
+    end
+
     def version ()
       open(root_dir 'VERSION') {|f| f.readline.chomp}
     end
 
     def root_dir (path = '')
       File.expand_path "../../../#{path}", __FILE__
     end
 
-    def include_dirs ()
-      %w[include].map {|dir| root_dir dir}
+    def include_dir ()
+      root_dir 'include'
     end
 
-    def lib_dirs ()
-      %w[lib].map {|dir| root_dir dir}
+    def lib_dir ()
+      root_dir 'lib'
     end
 
     def task_dir ()
       root_dir 'task'
     end
@@ -35,11 +39,11 @@
           load path if File.exist? path
         end
       end
     end
 
-    self
+    extend self
 
-  end# ModuleInfo
+  end# Module
 
 
 end# Rays