manipulate.rb in rbbt-util-5.14.0

- old
+ new

@@ -160,12 +160,11 @@
       step = 100
       if Hash === @monitor
         desc = @monitor[:desc] if @monitor.include? :desc 
         step = @monitor[:step] if @monitor.include? :step 
       end
-      #progress_monitor = Progress::Bar.new(size, 0, step, desc)
-      progress_monitor = Log::ProgressBar.new(size, :desc => desc)
+      progress_monitor = Log::ProgressBar.new_bar(size, :desc => desc)
     else
       progress_monitor = nil
     end
 
     each do |key, value|
@@ -190,14 +189,14 @@
             NamedArray.setup(value, traverser.new_field_names, key, entity_options, entity_templates)
 
         when :flat, :single
           prepare_entity(value, traverser.new_field_names.first, entity_options)
         end
-
       end
 
 
+
       if zipped
 
         keys.each_with_index do |k,i|
           v = value.collect{|v|
             r = v[i]
@@ -222,12 +221,15 @@
           value.key = key if NamedArray === value
           yield key, value
         end
 
       end
+
     end
 
+    Log::ProgressBar.remove_bar progress_monitor if progress_monitor
+
     [traverser.new_key_field_name, traverser.new_field_names]
   end
 
   def reorder(new_key_field = nil, new_fields = nil, options = {}) 
     zipped, uniq = Misc.process_options options, :zipped, :uniq
@@ -413,10 +415,10 @@
       key  = method.keys.first
       method = method.values.first
       case
       when (Array === method and (key == :key or key_field == key))
         with_unnamed do
-          Annotated.purge(method).uniq.each{|key| 
+          TSV.traverse(Annotated.purge(method).uniq, :bar => true){|key| 
             new[key] = self[key] if invert ^ (self.include? key)
           }
         end
       when Array === method
         with_unnamed do