memory_usage 0.0.3 → 0.0.4

data/lib/memory_usage.rb

@@ -14,10 +14,16 @@ class MemoryUsage
       refresh
    end
 
+   #Filter process by name when printing
    def filter (text="")
       @options.filter = (text)
    end
 
+   #Filter processes using greater than x MB
+   def gt( num=0 )
+      @options.min = num
+   end
+
 
    #Recalculate Memory usage. stops have to call MemoryUsage.new
    def refresh
@@ -37,9 +43,6 @@ class MemoryUsage
             #Allow if no options set OR
             #Allow if command matches filter but not with --filter (because that is this file)  OR
             #Filter is memory_usage we will allow it to profile itself
-            if (@options.filter == "") or 
-             ((command.match(/.*#{@options.filter}.*/)) and (not command.match(/.*--filter #{@options.filter}.*/) )) or
-             ((command.match(/.*#{@options.filter}.*/)) and (@options.filter.match(/.*memory_usage.*/)))
                rss = rss.to_f
                @usage << {:pid=>pid, :rss=>(rss/1024), :command=>command }
                @total += rss/1024
@@ -55,7 +58,6 @@ class MemoryUsage
                if command.size > @max[:command]
                   @max[:command] = command.size
                end
-            end
             #puts pid + (" %.2f MB " % (rss/1024)) + command
             
          end
@@ -68,8 +70,14 @@ class MemoryUsage
    #Display to stdout Error report
    def report
       @usage.each do |x|
-         #rjust string.rjust(min length)
-         puts x[:pid].rjust( @max[:pid] ) + (" %.2f MB " % x[:rss]).rjust( @max[:rss]+3 ) + x[:command]
+         if  (@options.filter == "") or 
+             ((x[:command].match(/.*#{@options.filter}.*/)) and (not x[:command].match(/.*--filter #{@options.filter}.*/) )) or
+             ((x[:command].match(/.*#{@options.filter}.*/)) and (@options.filter.match(/.*memory_usage.*/)))
+            if x[:rss] > @options.min 
+               #rjust string.rjust(min length)
+               puts x[:pid].rjust( @max[:pid] ) + (" %.2f MB " % x[:rss]).rjust( @max[:rss]+3 ) + x[:command]
+            end
+         end
       end
       puts "Total Memory Usage: %.2f MB" % @total
    end

data/lib/memory_usage_optparse.rb

@@ -9,7 +9,7 @@ class MemoryUsageOptparse
     # Return a structure describing the options.
     #
     def self.parse(args)
-      @VERSION = "0.0.3"
+      @VERSION = "0.0.4"
       
       # The options specified on the command line will be collected in *options*.
       # We set default values here.
@@ -26,22 +26,22 @@ class MemoryUsageOptparse
          opts.separator "Common options:"
 
          # No argument, shows at tail. This will print an options summary.
-         opts.on_tail("-h", "--help", "Show this message") do
+         opts.on("-h", "--help", "Show this message") do
             puts opts
             exit
          end
 
          # Another typical switch to print the version.
-         opts.on_tail("--version", "Show version") do
+         opts.on("--version", "Show version") do
             #puts OptionParser::Version.join('.')
             puts "Version #{@VERSION}"
             exit
          end
 
          # Boolean switch.
-         opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
-            options.verbose = v
-         end
+         #opts.on("-v", "--[no-]verbose", "Run verbosely") do |v|
+         #   options.verbose = v
+         #end
 
          opts.separator ""
          opts.separator "Specific options:"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memory_usage
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Morgan Prior
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-22 00:00:00 +01:00
+date: 2010-06-23 00:00:00 +01:00
 default_executable: 
 dependencies: []