press 0.16 → 0.17

data/lib/example.rb

@@ -0,0 +1,145 @@
+$:.unshift(File.expand_path(File.join(Dir.getwd, "lib")))
+require "press"
+
+module Plain
+  extend Press
+
+  def self.run
+    puts "########## running ##########"
+
+    pd hello: "world"
+    puts
+
+    r = pd hello: "world" do
+      42
+    end
+    puts r
+    puts
+
+    pdfm __FILE__, __method__, hello: "world"
+    puts
+
+    r = pdfm __FILE__, __method__, hello: "world" do
+      42
+    end
+    puts r
+    puts
+
+    pd hello: "world" do
+      1 / 0
+    end rescue
+    puts
+
+    pdfm __FILE__, __method__, hello: "world" do
+      1 / 0
+    end rescue
+    puts
+  end
+end
+
+module Measure
+  extend Press
+
+  def self.run
+    puts "########## running ##########"
+
+    mpd hello: "world"
+    puts
+
+    r = mpd hello: "world" do
+      42
+    end
+    puts r
+    puts
+
+    mpdfm __FILE__, __method__, hello: "world"
+    puts
+
+    r = mpdfm __FILE__, __method__, hello: "world" do
+      42
+    end
+    puts r
+    puts
+
+    begin
+      1 / 0
+    rescue => e
+      mpde e, hello: "world"
+      mpdfme __FILE__, __method__, e, hello: "world"
+    end
+    puts
+
+    mpd hello: "world" do
+      1 / 0
+    end rescue
+    puts
+
+    mpdfm __FILE__, __method__, hello: "world" do
+      1 / 0
+    end rescue
+    puts
+  end
+end
+
+module MeasureEvent
+  extend Press
+
+  def self.run
+    puts "########## running ##########"
+
+    mpd hello: "world", event: "sunset"
+    puts
+
+    r = mpd hello: "world", event: "sunset" do
+      42
+    end
+    puts r
+    puts
+
+    mpdfm __FILE__, __method__, hello: "world", event: "sunset"
+    puts
+
+    r = mpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+      42
+    end
+    puts r
+    puts
+
+    begin
+      1 / 0
+    rescue => e
+      mpde e, hello: "world", event: "sunset"
+      mpdfme __FILE__, __method__, e, hello: "world", event: "sunset"
+    end
+    puts
+
+    mpd hello: "world", event: "sunset" do
+        1 / 0
+    end rescue
+    puts
+
+    mpdfm __FILE__, __method__, hello: "world", event: "sunset" do
+      1 / 0
+    end rescue
+    puts
+  end
+end
+
+#Plain.mctx nil, nil
+#Plain.run
+#Plain.mctx nil, app: "slasher", deploy: "staging"
+#Plain.run
+
+#Measure.mctx nil, nil
+#Measure.run
+#Measure.mctx ["ripper", "production"].join("."), nil
+#Measure.run
+#Measure.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
+#Measure.run
+
+#MeasureEvent.mctx nil, nil
+#MeasureEvent.run
+#MeasureEvent.mctx ["ripper", "production"].join("."), nil
+#MeasureEvent.run
+MeasureEvent.mctx ["screamer", "testing"].join("."), app: "shreiker", deploy: "beta"
+MeasureEvent.run

data/lib/press/printer.rb

@@ -12,45 +12,37 @@ module Press
     end
 
     def self.pd(*data, &blk)
-      write $stdout, hashify(*data, {}), &blk
+      write(hashify(*data, {}), &blk)
     end
 
     def self.mpd(*data, &blk)
-      mwrite $stdout, @mtx, hashify(*data, {}), &blk
+      mwrite(@mtx, hashify(*data, {}), &blk)
     end
 
     def self.pdfm(file, m, *data, &blk)
-      write $stdout, hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk
+      write(hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk)
     end
 
     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
-
-    def self.pde(e, *data)
-      write $stderr, hashify(*data, :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)
+      mwrite([@mtx, File.basename(file, ".rb"), m].compact.join("."), hashify(*data, :file => File.basename(file, ".rb"), :fn => m), &blk)
     end
 
     def self.mpde(e, *data)
-      mwrite $stderr, [@mtx, "error"].compact.join("."), hashify(*data, :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)
+      ewrite(hashify(*data, errorify(e)))
     end
 
-    def self.pdfme(file, m, e, *data)
-      write $stderr, hashify(*data, :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, :file => File.basename(file, ".rb"), :fn => m)
+    def self.mpdfme(file, m, e, *data)
+      ewrite(hashify(*data, errorify(e).merge(:file => File.basename(file, ".rb"), :fn => m)))
     end
 
-    def self.mpdfme(file, m, e, *data)
-      mwrite $stderr, [@mtx, "error"].compact.join("."), hashify(*data, :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, :file => File.basename(file, ".rb"), :fn => m)
+    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
 
     def self.hashify(*data, initial)
       data.compact.reduce(initial.merge(@ctx || {})) { |d, v| d.merge v }
     end
 
-    def self.mtag(tag, data)
-      data.tap { |d| d[:measure] = [tag, d[:event]].compact.join(".") if tag }
-    end
-
     def self.stringify(data)
       data.map do |(k, v)|
         case v
@@ -66,32 +58,44 @@ module Press
           "#{k}=#{v.iso8601}"
         else
           v_str = v.to_s.strip
-          v_str.match(/\s/) ? "#{k}=\"#{v_str}\"" : "#{k}=#{v_str}"
+          v_str.match(/\s/) ? "#{k}=\'#{v_str}\'" : "#{k}=#{v_str}"
         end
       end.join(" ")
     end
 
-    def self.write(file, data, &blk)
+    def self.ewrite(data)
+      $stderr.puts stringify(data.tap { |d| d[:measure] = [@mtx, "error"].compact.join(".") })
+      $stderr.flush
+    end
+
+    def self.write(data, &blk)
       unless blk
-        file.puts stringify(data)
-        file.flush
+        $stdout.puts stringify(data)
+        $stdout.flush
       else
         start = Time.now
-        write file, { :at => "start" }.merge(data)
-        yield.tap { write file, { :at => "finish", :elapsed => Time.now - start }.merge(data) }
+        write({ :at => "start" }.merge(data))
+        begin
+          yield.tap { write({ :at => "finish", :elapsed => Time.now - start }.merge(data)) }
+        rescue => e
+          ewrite(errorify(e).merge(data))
+          raise e
+        end
       end
     end
 
-    def self.mwrite(file, tag, data, &blk)
+    def self.mwrite(tag, data, &blk)
       unless blk
-        file.puts stringify(mtag(tag, data))
-        file.flush
+        $stdout.puts stringify(data.tap { |d| d[:measure] = [tag, d[:event]].compact.join(".") if tag })
+        $stdout.flush
       else
         start = Time.now
-        write file, { :at => "start" }.merge(data)
-        yield.tap do
-          elapsed = Time.now - start
-          mwrite file, tag, { :at => "finish", :elapsed => elapsed }.merge(data).tap { |d| d[:val] = elapsed if tag }
+        write({ :at => "start" }.merge(data))
+        begin
+          yield.tap { elapsed = Time.now - start; mwrite(tag, { :at => "finish", :elapsed => elapsed }.merge(data).tap { |d| d[:val] = elapsed if tag }) }
+        rescue => e
+          ewrite(errorify(e).merge(data))
+          raise e
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: press
 version: !ruby/object:Gem::Version
-  version: '0.16'
+  version: '0.17'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-17 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies: []
 description: Data and exception printer.
 email: mark.fine@gmail.com
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/example.rb
 - lib/press/printer.rb
 - lib/press.rb
 - Gemfile