memory_usage 0.0.2 → 0.0.3

data/bin/memory_usage

@@ -2,9 +2,10 @@
 
 require 'rubygems'
 require 'memory_usage'
+require 'memory_usage_optparse'
 
 
-a = MemoryUsage.new
+a = MemoryUsage.new(ARGV)
 a.report
 
    #a.refresh

data/lib/memory_usage.rb

@@ -1,13 +1,24 @@
 
+path = File.expand_path __FILE__
+path = File.dirname(path)
+
+require "#{path}/memory_usage_optparse"
+
 #Class which has function for gathering memory stats.
 # Should work on unix/linux and OS X
 # Example usage at the bottom
 class MemoryUsage
 
-   def initialize
+   def initialize(argv=[""])
+      @options = MemoryUsageOptparse.parse(argv)
       refresh
    end
 
+   def filter (text="")
+      @options.filter = (text)
+   end
+
+
    #Recalculate Memory usage. stops have to call MemoryUsage.new
    def refresh
       #Based on: http://gist.github.com/290988
@@ -21,20 +32,29 @@ class MemoryUsage
             p =~ /(\d+)\s+(\d+)\s+(.+)/
             
             pid, rss, command = [$1, $2, $3]
-            rss = rss.to_f
-            @usage << {:pid=>pid, :rss=>(rss/1024), :command=>command }
-            @total += rss/1024
 
-            if pid.to_s.size > @max[:pid]
-               @max[:pid] = pid.to_s.size
-            end
+            # Some complicated logic
+            #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
 
-            if rss.to_s.size > @max[:rss]
-               @max[:rss] = rss.to_s.size
-            end
-      
-            if command.size > @max[:command]
-               @max[:command] = command.size
+               if pid.to_s.size > @max[:pid]
+                  @max[:pid] = pid.to_s.size
+               end
+
+               if rss.to_s.size > @max[:rss]
+                  @max[:rss] = rss.to_s.size
+               end
+         
+               if command.size > @max[:command]
+                  @max[:command] = command.size
+               end
             end
             #puts pid + (" %.2f MB " % (rss/1024)) + command
             
@@ -59,4 +79,23 @@ class MemoryUsage
       "%.2f" % @total
    end
 end
+ 
+
+
+
+
+#Run example only if called directly
+#ie not if included/required for class 
+if $0 == __FILE__
+   a = MemoryUsage.new
+   a.report
+
+   #a.refresh
+   #a.report
+   #puts a.total
+   
+   #command = MemoryUsage.new
+   #exit command.run!
+
+end
 

data/lib/memory_usage_optparse.rb

@@ -0,0 +1,67 @@
+require 'optparse'
+require 'optparse/time'
+require 'ostruct'
+
+class MemoryUsageOptparse
+
+
+    #
+    # Return a structure describing the options.
+    #
+    def self.parse(args)
+      @VERSION = "0.0.3"
+      
+      # The options specified on the command line will be collected in *options*.
+      # We set default values here.
+      options = OpenStruct.new
+      
+      options.verbose = false
+      options.filter = ""
+      options.min = 0.0
+       
+
+      opts = OptionParser.new do |opts|
+         opts.banner = "Usage: #{__FILE__} [options]"
+         opts.separator ""
+         opts.separator "Common options:"
+
+         # No argument, shows at tail. This will print an options summary.
+         opts.on_tail("-h", "--help", "Show this message") do
+            puts opts
+            exit
+         end
+
+         # Another typical switch to print the version.
+         opts.on_tail("--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.separator ""
+         opts.separator "Specific options:"
+
+
+         # Cast 'delay' argument to a Float.
+         opts.on("--filter name", String, "text to filter process") do |n|
+            options.filter = n
+         end
+         
+         opts.on("--gt N", Float, "Memory usage greater than N") do |n|
+            options.min = n
+         end
+         
+        
+      end
+      
+      options.leftovers = opts.parse!(args)
+      options
+    end # parse()
+
+  end # class OptparseExample
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memory_usage
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Morgan Prior
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-18 00:00:00 +01:00
+date: 2010-06-22 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ extra_rdoc_files: []
 files: 
 - bin/memory_usage
 - lib/memory_usage.rb
+- lib/memory_usage_optparse.rb
 has_rdoc: true
 homepage: http://amaras-tech.co.uk/software/memory_usage
 licenses: []