press 0.5 → 0.6

data/lib/press/printer.rb

@@ -24,11 +24,11 @@ module Press
     end
 
     def self.pdfme(file, m, e, *data)
-      write $stderr, hashify(*data, file: File.basename(file, ".rb"), fn: m, at: "error", class: e.class, message: e.message)
+      write $stderr, hashify(*data, at: "error", class: e.class, message: e.message, file: File.basename(file, ".rb"), fn: m)
     end
 
     def self.hashify(*data, initial)
-      data.compact.reduce(ctx.merge(initial)) { |d, v| d.merge v }
+      data.compact.reduce(initial.merge(ctx)) { |d, v| d.merge v }
     end
 
     def self.stringify(data)
@@ -57,9 +57,14 @@ module Press
         file.flush
       else
         start = Time.now
-        write file, data.merge(at: "start")
-        result = yield
-        write file, data.merge(at: "finish", elapsed: Time.now - start)
+        write file, { at: "start" }.merge(data)
+        begin
+          result = yield
+        rescue => e
+          pde e, data
+          raise
+        end
+        write file, { at: "finish", elapsed: Time.now - start }.merge(data)
         result
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: press
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000Z
+date: 2012-06-04 00:00:00.000000000Z
 dependencies: []
 description: Data and exception printer.
 email: mark.fine@gmail.com