press 0.20 → 0.21

data/lib/example.rb

@@ -43,19 +43,17 @@ module Measure
   def self.run
     puts "########## running ##########"
 
-    r = mpd hello: "world"
-    puts "XXX=#{r.inspect}"
+    cpd hello: "world"
 
-    r = mpd hello: "world" do
+    r = xpd hello: "world" do
       42
     end
     puts r
     puts
 
-    r = mpdfm __FILE__, __method__, hello: "world"
-    puts "XXX=#{r.inspect}"
+    cpdfm __FILE__, __method__, hello: "world"
 
-    r = mpdfm __FILE__, __method__, hello: "world" do
+    r = xpdfm __FILE__, __method__, hello: "world" do
       42
     end
     puts r
@@ -64,19 +62,17 @@ module Measure
     begin
       1 / 0
     rescue => e
-      r = mpde e, hello: "world"
-      puts "XXX=#{r.inspect}"
-      r = mpdfme __FILE__, __method__, e, hello: "world"
-      puts "XXX=#{r.inspect}"
+      cpde e, hello: "world"
+      cpdfme __FILE__, __method__, e, hello: "world"
     end
     puts
 
-    mpd hello: "world" do
+    xpd hello: "world" do
       1 / 0
     end rescue
     puts
 
-    mpdfm __FILE__, __method__, hello: "world" do
+    xpdfm __FILE__, __method__, hello: "world" do
       1 / 0
     end rescue
     puts
@@ -89,19 +85,19 @@ module MeasureEvent
   def self.run
     puts "########## running ##########"
 
-    mpd hello: "world", event: "sunset"
+    cpd hello: "world", event: "sunset"
     puts
 
-    r = mpd hello: "world", event: "sunset" do
+    r = xpd hello: "world", event: "sunset" do
       42
     end
     puts r
     puts
 
-    mpdfm __FILE__, __method__, hello: "world", event: "sunset"
+    cpdfm __FILE__, __method__, hello: "world", event: "sunset"
     puts
 
-    r = mpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+    r = xpdfm __FILE__, __method__, hello: "world", event: "sunset" do
       42
     end
     puts r
@@ -110,17 +106,66 @@ module MeasureEvent
     begin
       1 / 0
     rescue => e
-      mpde e, hello: "world", event: "sunset"
-      mpdfme __FILE__, __method__, e, hello: "world", event: "sunset"
+      cpde e, hello: "world", event: "sunset"
+      cpdfme __FILE__, __method__, e, hello: "world", event: "sunset"
     end
     puts
 
-    mpd hello: "world", event: "sunset" do
+    xpd hello: "world", event: "sunset" do
         1 / 0
     end rescue
     puts
 
-    mpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+    xpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+      1 / 0
+    end rescue
+    puts
+  end
+end
+
+module NewEvent
+  extend Press
+
+  def self.run
+    puts "########## running ##########"
+
+    # cpd hello: "world", event: "sunset"
+    # puts
+
+    # spd hello: "world", event: "sunset", val: 10
+    # puts
+
+    r = xpd hello: "world", event: "sunset" do
+      42
+    end
+    puts r
+    puts
+
+    # cpdfm __FILE__, __method__, hello: "world", event: "sunset"
+    # puts
+
+    r = xpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+      42
+    end
+    puts r
+    puts
+
+    # begin
+    #   1 / 0
+    # rescue => e
+    #   cpde e, hello: "world"
+    #   cpde e, hello: "world", event: "sunset"
+    #   cpdfme __FILE__, __method__, e, hello: "world"
+    #   cpdfme __FILE__, __method__, e, hello: "world", event: "sunset"
+    # end
+    # puts
+
+    xpd hello: "world", event: "sunset" do
+        1 / 0
+    end rescue
+    puts
+
+    xpdfm __FILE__, __method__, hello: "world", event: "sunset" do
       1 / 0
     end rescue
     puts
@@ -136,8 +181,8 @@ end
 # Measure.run
 # Measure.mctx ["ripper", "production"].join("."), nil
 # Measure.run
-Measure.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
-Measure.run
+# Measure.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
+# Measure.run
 
 # MeasureEvent.mctx nil, nil
 # MeasureEvent.run
@@ -145,3 +190,7 @@ Measure.run
 # MeasureEvent.run
 # MeasureEvent.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
 # MeasureEvent.run
+
+
+NewEvent.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
+NewEvent.run

data/lib/press/printer.rb

@@ -3,46 +3,96 @@ require "time"
 module Press
   module Printer
 
+    # context
     def self.ctx=(data)
       @ctx = data
     end
 
+    # measure tag
     def self.mtx=(tag)
       @mtx = tag
     end
 
+    # print data
     def self.pd(*data, &blk)
       write($stdout, hashify(*data, {}), &blk)
     end
 
+    # measure print data
     def self.mpd(*data, &blk)
       mwrite($stdout, @mtx, hashify(*data, {}), &blk)
     end
 
+    # measure print data
+    def self.xpd(*data, &blk)
+      xwrite($stdout, @mtx, hashify(*data, {}), &blk)
+    end
+
+    # sample print data
+    def self.spd(*data)
+      swrite($stdout, @mtx, hashify(*data, {}))
+    end
+
+    # count print data
+    def self.cpd(*data)
+      cwrite($stdout, @mtx, hashify(*data, {}))
+    end
+
+    # print data file method
     def self.pdfm(file, m, *data, &blk)
       write($stdout, hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk)
     end
 
+    # measure print data file method
     def self.mpdfm(file, m, *data, &blk)
       mwrite($stdout, [@mtx, File.basename(file, ".rb"), m].compact.join("."), hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk)
     end
 
+    # measure print data file method
+    def self.xpdfm(file, m, *data, &blk)
+      xwrite($stdout, [@mtx, File.basename(file, ".rb"), m].compact.join("."), hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk)
+    end
+
+    # sample print data file method
+    def self.spdfm(file, m, *data)
+      swrite($stdout, [@mtx, File.basename(file, ".rb"), m].compact.join("."), hashify(*data, :file => File.basename(file, ".rb"), :fn => m))
+    end
+
+    # count print data file method
+    def self.cpdfm(file, m, *data)
+      cwrite($stdout, [@mtx, File.basename(file, ".rb"), m].compact.join("."), hashify(*data, :file => File.basename(file, ".rb"), :fn => m))
+    end
+
+    # print data exception
     def self.pde(e, *data)
       write($stderr, hashify(*data, errorify(e)))
     end
 
+    # measure print data exception
     def self.mpde(e, *data)
       mwrite($stderr, [@mtx, "error"].compact.join("."), hashify(*data, errorify(e)))
     end
 
+    # count print data exception
+    def self.cpde(e, *data)
+      cwrite($stderr, [@mtx, "error"].compact.join("."), hashify(*data, errorify(e)))
+    end
+
+    # print data file method exception
     def self.pdfme(file, m, e, *data)
       write($stderr, hashify(*data, errorify(e).merge(:file => File.basename(file, ".rb"), :fn => m)))
     end
 
+    # measure print data file method exception
     def self.mpdfme(file, m, e, *data)
       mwrite($stderr, [@mtx, "error"].compact.join("."), hashify(*data, errorify(e).merge(:file => File.basename(file, ".rb"), :fn => m)))
     end
 
+    # count print data file method exception
+    def self.cpdfme(file, m, e, *data)
+      cwrite($stderr, [@mtx, "error"].compact.join("."), hashify(*data, errorify(e).merge(:file => File.basename(file, ".rb"), :fn => m)))
+    end
+
     def self.errorify(e)
       { :at => "error", :class => e.class, :message => e.message.lines.to_a.first, :trace => e.backtrace.map { |i| i.match(/(#{Gem.dir}|#{Dir.getwd})?\/(.*):in (.*)/) && $2 }[0..5].compact.inspect}
     end
@@ -97,5 +147,26 @@ module Press
         end
       end
     end
+
+    def self.xwrite(file, tag, data, &blk)
+      unless blk
+        write(file, data.tap { |d| d["measure.#{[tag, d[:event]].compact.join(".")}"] = d[:val] if tag })
+      else
+        start = Time.now
+        write(file, { :at => "start" }.merge(data))
+        yield.tap do
+          elapsed = Time.now - start;
+          xwrite(file, tag, { :at => "finish", :elapsed => elapsed }.merge(data).tap { |d| d[:val] = elapsed if tag })
+        end
+      end
+    end
+
+    def self.swrite(file, tag, data)
+      write(file, data.tap { |d| d["sample.#{[tag, d[:event]].compact.join(".")}"] = d[:val] if tag })
+    end
+
+    def self.cwrite(file, tag, data)
+      write(file, data.tap { |d| d["count.#{[tag, d[:event]].compact.join(".")}"] = 1 if tag })
+    end
   end
 end

data/lib/press.rb

@@ -2,51 +2,102 @@ require "press/printer"
 
 module Press
 
+  # context
   def ctx(data)
     Printer.ctx = data
   end
 
+  # measure tag
   def mtx(tag)
     Printer.mtx = tag
   end
 
+  # measure tag, context
   def mctx(tag, data)
     mtx tag
     ctx data
   end
 
+  # print data
   def pd(*data, &blk)
     Printer.pd *data, &blk
   end
 
+  # measure print data
   def mpd(*data, &blk)
     Printer.mpd *data, &blk
   end
 
+  # measure print data
+  def xpd(*data, &blk)
+    Printer.xpd *data, &blk
+  end
+
+  # sample print data
+  def spd(*data)
+    Printer.spd *data
+  end
+
+  # count print data
+  def cpd(*data)
+    Printer.cpd *data
+  end
+
+  # print data file method
   def pdfm(file, m, *data, &blk)
     Printer.pdfm file, m, *data, &blk
   end
 
+  # measure print data file method
   def mpdfm(file, m, *data, &blk)
     Printer.mpdfm file, m, *data, &blk
   end
 
+  # measure print data file method
+  def xpdfm(file, m, *data, &blk)
+    Printer.xpdfm file, m, *data, &blk
+  end
+
+  # sample print data file method
+  def spdfm(file, m, *data)
+    Printer.spdfm file, m, *data
+  end
+
+  # count print data file method
+  def cpdfm(file, m, *data)
+    Printer.cpdfm file, m, *data
+  end
+
+  # print data exception
   def pde(e, *data)
     Printer.pde e, *data
   end
 
+  # measure print data exception
   def mpde(e, *data)
     Printer.mpde e, *data
   end
 
+  # count print data exception
+  def cpde(e, *data)
+    Printer.cpde e, *data
+  end
+
+  # print data file method exception
   def pdfme(file, m, e, *data)
     Printer.pdfme file, m, e, *data
   end
 
+  # measure print data file method exception
   def mpdfme(file, m, e, *data)
     Printer.mpdfme file, m, e, *data
   end
 
+  # count print data file method exception
+  def cpdfme(file, m, e, *data)
+    Printer.cpdfme file, m, e, *data
+  end
+
   class Logger
 
     def self.level(*attrs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: press
 version: !ruby/object:Gem::Version
-  version: '0.20'
+  version: '0.21'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Data and exception printer.
 email: mark.fine@gmail.com
@@ -47,3 +47,4 @@ signing_key:
 specification_version: 3
 summary: printer
 test_files: []
+has_rdoc: