rbbt-util 5.1.0 → 5.2.0

data/lib/rbbt/resource/path.rb

@@ -37,7 +37,7 @@ module Path
   end
 
   def glob(pattern = '*')
-    Dir.glob(File.join(self, pattern))
+    Dir.glob(File.join(self, pattern)).collect{|f| Path.setup(f, self.resource, self.pkgdir)}
   end
 
   def path_get_brackets(name)
@@ -59,13 +59,20 @@ module Path
   end
 
   SEARCH_PATHS = {
-    :user => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
-    :global => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :local => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
-    :lib => File.join('{LIBDIR}', "{TOPLEVEL}", "{SUBPATH}"),
+    :user    => File.join(ENV['HOME'], ".{PKGDIR}", "{TOPLEVEL}", "{SUBPATH}"),
+    :global  => File.join('/', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+    :local   => File.join('/usr/local', "{TOPLEVEL}", "{PKGDIR}", "{SUBPATH}"),
+    :lib     => File.join('{LIBDIR}', "{TOPLEVEL}", "{SUBPATH}"),
     :default => :user
   }
 
+  search_path_file = File.join(ENV['HOME'], '.rbbt/etc/search_paths')
+  if File.exists?(search_path_file)
+    YAML.load(File.open(search_path_file)).each do |where, location|
+      SEARCH_PATHS[where.to_sym] = location
+    end
+  end
+
   def find(where = nil, caller_lib = nil, search_paths = nil)
     where = search_paths[:default] if where == :default
     search_paths ||= SEARCH_PATHS
@@ -78,7 +85,9 @@ module Path
 
     path = nil
     if where.nil?
-      search_paths.keys.each do |w| 
+      %w(user local global lib).each do |w| 
+        w = w.to_sym
+        next unless search_paths.include? w
         path = find(w, caller_lib, search_paths)
         return path if File.exists? path
       end
@@ -88,12 +97,19 @@ module Path
         raise "Path '#{ path }' not found, and no default specified in search paths: #{search_paths.inspect}"
       end
     else
+      where = where.to_sym
+      raise "Did not recognize the 'where' tag: #{where}. Options: #{search_paths.keys}" unless search_paths.include? where
       libdir = where == :lib ? Path.caller_lib_dir(caller_lib) : ""
       libdir ||= ""
       Path.setup search_paths[where].sub('{PKGDIR}', pkgdir).sub('{TOPLEVEL}', toplevel).sub('{SUBPATH}', subpath).sub('{LIBDIR}', libdir), @pkgdir, @resource
     end
   end
 
+  def find_all(caller_lib = nil, search_paths = nil)
+    search_paths ||= SEARCH_PATHS
+    search_paths.keys.collect{|where| find(where, Path.caller_lib_dir, search_paths)}.select{|file| file.exists?}.uniq
+  end
+
   #{{{ Methods
 
   def in_dir?(dir)
@@ -125,13 +141,18 @@ module Path
 
     resource.produce self, force
 
-    path
+    self
   end
 
   def read(&block)
     Open.read(self.produce.find, &block)
   end
 
+  def write(*args, &block)
+    Open.write(self.produce.find, *args, &block)
+  end
+
+
   def open(options = {})
     Open.open(self.produce.find, options)
   end
@@ -140,6 +161,10 @@ module Path
     "" + self
   end
 
+  def basename
+    Path.setup(File.basename(self), self.resource, self.pkgdir)
+  end
+
   def tsv(*args)
     TSV.open(self.produce, *args)
   end
@@ -157,15 +182,15 @@ module Path
   end
 
   def index(options = {})
-    TSV.index(self.produce.find, options)
+    TSV.index(self.produce, options)
   end
 
   def range_index(start, eend, options = {})
-    TSV.range_index(self.produce.find, start, eend, options)
+    TSV.range_index(self.produce, start, eend, options)
   end
 
   def pos_index(pos, options = {})
-    TSV.pos_index(self.produce.find, pos, options)
+    TSV.pos_index(self.produce, pos, options)
   end
 
   def to_yaml(*args)

data/lib/rbbt/resource/util.rb

@@ -1,4 +1,3 @@
-require 'rbbt/resource/rake'
 
 module Path
 
@@ -31,53 +30,60 @@ end
 
 module Resource
   def set_software_env(software_dir)
-    bin_dir = File.join(software_dir, 'bin')
-    opt_dir = File.join(software_dir, 'opt')
-
-    Misc.env_add 'PATH', bin_dir
-
-    FileUtils.mkdir_p opt_dir unless File.exists? opt_dir
-    %w(.ld-paths .pkgconfig-paths .aclocal-paths .java-classpaths).each do |file|
-      filename = File.join(opt_dir, file)
-      FileUtils.touch filename unless File.exists? filename
-    end
-
-    if not File.exists? File.join(opt_dir,'.post_install')
-      Open.write(File.join(opt_dir,'.post_install'),"#!/bin/bash\n")
-    end
-
-    Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
-      Misc.env_add('LD_LIBRARY_PATH',line.chomp)
-      Misc.env_add('LD_RUN_PATH',line.chomp)
-    end
-
-    Open.read(File.join opt_dir, '.pkgconfig-paths').split(/\n/).each do |line|
-      Misc.env_add('PKG_CONFIG_PATH',line.chomp)
-    end
-
-    Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
-      Misc.env_add('LD_LIBRARY_PATH',line.chomp)
+    software_dir.find_all.each do |software_dir|
+      bin_dir = File.join(software_dir, 'bin')
+      opt_dir = File.join(software_dir, 'opt')
+
+      Misc.env_add 'PATH', bin_dir
+
+      FileUtils.mkdir_p opt_dir unless File.exists? opt_dir
+
+      %w(.ld-paths .pkgconfig-paths .aclocal-paths .java-classpaths).each do |file|
+        filename = File.join(opt_dir, file)
+        begin
+          FileUtils.touch filename unless File.exists? filename
+        rescue
+          Log.warn("Could not touch #{ filename }")
+        end
+      end
+
+      begin
+        if not File.exists? File.join(opt_dir,'.post_install')
+          Open.write(File.join(opt_dir,'.post_install'),"#!/bin/bash\n")
+        end
+      rescue Exception
+        Log.warn("Could not create default .post_install in #{ software_dir }")
+      end
+
+      Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
+        Misc.env_add('LD_LIBRARY_PATH',line.chomp)
+        Misc.env_add('LD_RUN_PATH',line.chomp)
+      end if File.exists? File.join(opt_dir, '.ld-paths')
+
+      Open.read(File.join opt_dir, '.pkgconfig-paths').split(/\n/).each do |line|
+        Misc.env_add('PKG_CONFIG_PATH',line.chomp)
+      end if File.exists? File.join(opt_dir, '.pkgconfig-paths')
+
+      Open.read(File.join opt_dir, '.aclocal-paths').split(/\n/).each do |line|
+        Misc.env_add('ACLOCAL_FLAGS', "-I#{File.join(opt_dir, line.chomp)}", ' ')
+      end if File.exists? File.join(opt_dir, '.aclocal-paths')
+
+      Open.read(File.join opt_dir, '.java-classpaths').split(/\n/).each do |line|
+        Misc.env_add('CLASSPATH', "#{File.join(opt_dir,'java', 'lib', line.chomp)}")
+      end if File.exists? File.join(opt_dir, '.java-classpaths')
+
+      Dir.glob(File.join opt_dir, 'jars', '*').each do |file|
+        Misc.env_add('CLASSPATH', "#{File.expand_path(file)}")
+      end
+
+      begin
+        File.chmod 0777, File.join(opt_dir, '.post_install')
+      rescue
+        Log.warn("Could not change permisions of .post_install in #{ software_dir }")
+      end
+
+      CMD.cmd(File.join(opt_dir, '.post_install')) if File.exists? File.join(opt_dir, '.post_install')
     end
-
-    Open.read(File.join opt_dir, '.ld-paths').split(/\n/).each do |line|
-      Misc.env_add('LD_LIBRARY_PATH',line.chomp)
-    end
-
-    Open.read(File.join opt_dir, '.aclocal-paths').split(/\n/).each do |line|
-      Misc.env_add('ACLOCAL_FLAGS', "-I#{File.join(opt_dir, line.chomp)}", ' ')
-    end
-
-    Open.read(File.join opt_dir, '.java-classpaths').split(/\n/).each do |line|
-      Misc.env_add('CLASSPATH', "#{File.join(opt_dir,'java', 'lib', line.chomp)}")
-    end
-
-    Dir.glob(File.join opt_dir, 'jars', '*').each do |file|
-      Misc.env_add('CLASSPATH', "#{File.expand_path(file)}")
-    end
-
-    File.chmod 0774, File.join(opt_dir, '.post_install')
-
-    CMD.cmd(File.join(opt_dir, '.post_install'))
   end
 
 
@@ -100,6 +106,7 @@ module Resource
     rake_dir = rake_dir.find if rake_dir.respond_to? :find
 
     begin
+      require 'rbbt/resource/rake'
       Rake.run(rakefile, rake_dir, task)
     rescue Rake::TaskNotFound
       raise $! if rake_dir.nil? or rake_dir.empty? or rake_dir == "/" or rake_dir == "./"

data/lib/rbbt/tsv.rb

@@ -31,7 +31,7 @@ module TSV
     hash
   end
 
-  # options shifts if type.nil?
+  # options shift if type.nil?
   def self.open(source, type = nil, options = nil)
     type, options = nil, type if options.nil? and Hash === type
     options ||= {}
@@ -50,24 +50,24 @@ module TSV
 
     lock_filename = filename.nil? ? nil : Persist.persistence_path(filename, {:dir => Rbbt.tmp.tsv_open_locks.find})
     Misc.lock lock_filename  do
-    data = Persist.persist_tsv source, filename, options, persist_options do |data|
-      if serializer
-        data.extend TSV unless TSV === data
-        data.serializer = serializer
-      end
+      data = Persist.persist_tsv source, filename, options, persist_options do |data|
+        if serializer
+          data.extend TSV unless TSV === data
+          data.serializer = serializer
+        end
 
-      open_options = Misc.pull_keys options, :open
+        open_options = Misc.pull_keys options, :open
 
-      stream = get_stream source, open_options
-      parse stream, data, options
+        stream = get_stream source, open_options
+        parse stream, data, options
 
-      data.filename = filename.to_s unless filename.nil?
-      if data.identifiers.nil? and Path === filename and filename.identifier_file_path
-        data.identifiers = filename.identifier_file_path.to_s 
-      end
+        data.filename = filename.to_s unless filename.nil?
+        if data.identifiers.nil? and Path === filename and filename.identifier_file_path
+          data.identifiers = filename.identifier_file_path.to_s 
+        end
 
-      data
-    end
+        data
+      end
     end
 
     data.unnamed = unnamed unless unnamed.nil?
@@ -145,6 +145,8 @@ module TSV
       begin
         progress_monitor.tick(stream.pos) if progress_monitor 
 
+        raise Parser::SKIP_LINE if line.empty?
+
         line = Misc.fixutf8(line)
         line = parser.process line
         parts = parser.chop_line line

data/lib/rbbt/tsv/accessor.rb

@@ -6,7 +6,7 @@ module TSV
 
   NIL_YAML = "--- \n"
 
-  attr_accessor :unnamed, :serializer_module, :entity_options
+  attr_accessor :unnamed, :serializer_module, :entity_options, :entity_templates
 
   def entity_options
     if @entity_options.nil?
@@ -16,33 +16,43 @@ module TSV
     @entity_options
   end
 
+  def entity_templates
+    @entity_templates ||= {}
+  end
+
   def prepare_entity(entity, field, options = {})
     return entity if entity.nil?
     return entity unless defined? Entity
     entity = entity if options.delete :dup_array
-    @entity_templates ||= {}
-    if (template = @entity_templates[field])
+    entity_templates
+    if (template = entity_templates[field])
       entity = template.annotate(entity.frozen? ? entity.dup : entity)
       entity.extend AnnotatedArray if Array === entity
       entity
     else
-      if @entity_templates.include? field
+      if entity_templates.include? field
         entity
       else
         template = Misc.prepare_entity("TEMPLATE", field, options)
         if Annotated === template
-          @entity_templates[field] = template
+          entity_templates[field] = template
           entity = template.annotate(entity.frozen? ? entity.dup : entity)
           entity.extend AnnotatedArray if Array === entity
           entity
         else
-          @entity_templates[field] = nil
+          entity_templates[field] = nil
           entity
         end
       end
     end
   end
 
+  def setup_array(*args)
+    res = NamedArray.setup(*args)
+    res.instance_variable_set(:@entity_templates, entity_templates)
+    res
+  end
+
   def with_unnamed
     saved_unnamed = @unnamed 
     @unnamed = true
@@ -109,7 +119,7 @@ module TSV
 
     case type
     when :double, :list
-      NamedArray.setup value, fields, key, entity_options
+      setup_array value, fields, key, entity_options, entity_templates
     when :flat, :single
       value = value.dup if value.frozen?
 
@@ -135,7 +145,7 @@ module TSV
 
     case type
     when :double, :list
-      values.each{|value| NamedArray.setup value, fields, nil, entity_options}
+      values.each{|value| setup_array value, fields, nil, entity_options}
     when :flat, :single
       values = values.collect{|v| prepare_entity(v, fields.first, entity_options)}
     end
@@ -159,7 +169,7 @@ module TSV
         if not fields.nil? 
           case type
           when :double, :list
-            NamedArray.setup value, fields, key, entity_options if Array === value
+            setup_array value, fields, key, entity_options, entity_templates if Array === value
           when :flat, :single
             prepare_entity(value, fields.first, entity_options)
           end
@@ -186,7 +196,7 @@ module TSV
         if not fields.nil? 
           case type
           when :double, :list
-            NamedArray.setup value, fields, key, entity_options if Array === value 
+            setup_array value, fields, key, entity_options if Array === value 
           when :flat, :single
             value = prepare_entity(value, fields.first, entity_options)
           end
@@ -194,7 +204,6 @@ module TSV
         key = prepare_entity(key, key_field, entity_options)
       end
 
-
       if block_given?
         yield key, value
       else
@@ -225,8 +234,6 @@ module TSV
     end
   end
 
-
-
   #{{{ Sorting
 
   def tsv_sort_by(field = nil, just_keys = false, &block)
@@ -282,30 +289,21 @@ module TSV
   end
 
   # Starts in page 1
-  def page(pnum, psize, field = nil, just_keys = false, &block)
-    if pnum.to_s =~ /-(.*)/
-      reverse = true
-      pnum = $1.to_i
+  def page(pnum, psize, field = nil, just_keys = false, reverse = false, &block)
+    pstart = psize * (pnum - 1)
+    pend = psize * pnum - 1
+    field = :key if field == "key"
+    keys = sort_by(field || :key, true, &block)
+    keys.reverse! if reverse
+
+    if just_keys
+      keys[pstart..pend]
     else
-      reverse = false
-    end
-
-    with_unnamed do
-      pstart = psize * (pnum - 1)
-      pend = psize * pnum - 1
-      field = :key if field == "key"
-      keys = sort_by(field || :key, true, &block)
-      keys.reverse! if reverse
-
-      if just_keys
-        keys[pstart..pend]
-      else
-        select :key => keys[pstart..pend]
-      end
+      select :key => keys[pstart..pend]
     end
   end
 
-  
+
   def self.entry(*entries)
     entries = entries.collect{|entry| entry.to_s}
     ENTRIES.concat entries
@@ -332,7 +330,7 @@ if '#{entry}' == 'serializer'
     return if value.nil?
 
     self.serializer_module = SERIALIZER_ALIAS[value.to_sym]
-    
+
     if serializer_module.nil?
       class << self
         alias serialized_get tsv_clean_get_brackets
@@ -366,7 +364,7 @@ else
     self.tsv_clean_set_brackets '#{key}', value.nil? ? NIL_YAML : value.to_yaml
   end
 end
-"
+  "
     end
   end
 
@@ -384,7 +382,7 @@ end
     if @fields.nil? or @unnamed
       @fields
     else
-      @named_fields ||= NamedArray.setup @fields, @fields, nil, entity_options
+      @named_fields ||= NamedArray.setup @fields, @fields, nil, entity_options, entity_templates
     end
   end
 
@@ -404,7 +402,7 @@ end
     return [] if list.nil? || list.empty?
     fields ||= list.fields if list.respond_to? :fields
     zipped = list[0].zip(*list[1..-1])
-    zipped = zipped.collect{|v| NamedArray.setup(v, fields)} if fields 
+    zipped = zipped.collect{|v| setup_array(v, fields)} if fields 
     zipped 
   end