step-track 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44d2a673a0a4ad99bef64eb7c0b6938f87a30ede
-  data.tar.gz: 42f58e8beae25271da55980d72e4d1d35fb243dc
+  metadata.gz: 1e7fbc29e0c6322fafba55a9cbbdc62edc015b30
+  data.tar.gz: 59a755c0ad211f30927ac47e1ccd4e00d704b279
 SHA512:
-  metadata.gz: 67becd249f79ffd6e4ccf073190fa6b83a14b2e78b7d256e0fd19f254173629d5a1bc575946c2bbd85d665d664e94b5bca8edf91d4cc2d820e590940effbb833
-  data.tar.gz: b2d198521e9ada64b4a5b5159757b424b60143dcc5cb836b329dcb80b6a56ea63b7f04904573526e3c4f238c9e0a576dcd423417d9361b48689d442dd7f10036
+  metadata.gz: d9eaa71b6e0018cefd9631b9df58ae5c90f145db490e15539308d26a56ee9aab7807bd97e420c75296da06f0891a06543186eb1bdfb31776ab739389d03d8240
+  data.tar.gz: 2dcc4bc50959135f4656c455228bba454132abb65c69ddf8a767df24515a9445cdd673e8b1d9b1b1cae482671c123ce03133ecafff0429dd7944f18b8f068e23

data/lib/step_track.rb

@@ -5,26 +5,28 @@ module StepTrack
 
   REF = "step_track/%{track}"
 
-  def init(track)
+  def init(track, config={merge_key: :merge, error_key: :error})
     raise ArgumentError, "callback block required" unless block_given?
     Thread.current[ref(track)] = {
       steps: [],
       callback: Proc.new,
       time: Time.now
-    }
+    }.merge(config)
   end
 
   def push(track, name, payload={})
     require_init!(track)
     track_ref = Thread.current[ref(track)]
+    return if track_ref[:steps].last&.[](track_ref[:error_key])
+    merge_step = track_ref[:steps].pop if payload.delete(track_ref[:merge_key])
     last_step = track_ref[:steps].last
-    track_ref[:steps] << {
-      split: Time.now - (last_step&.[](:time) || track_ref[:time]),
-      duration: Time.now - track_ref[:time],
+    track_ref[:steps] << (merge_step || {}).merge(
+      split: Time.now.to_f - (last_step&.[](:time) || track_ref[:time]).to_f,
+      duration: Time.now.to_f - track_ref[:time].to_f,
       time: Time.now,
       caller: caller[0].sub(Dir.pwd + "/", ""),
       name: name
-    }.merge(payload)
+    ).merge(payload)
   end
 
   def done(track)
@@ -37,6 +39,7 @@ module StepTrack
     result.merge!(steps.last || {})
     steps.each_with_index do |step, i|
       name = step[:name]
+      [:split, :duration].each { |k| step[k] = (step[k] * 1000).to_i }
       result.merge!(step.merge(i: i + 1).
         map { |k, v| ["step_#{name}_#{k}".to_sym, v] }.to_h)
     end

data/lib/step_track/version.rb

@@ -1,3 +1,3 @@
 module StepTrack
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/test/step_track_test.rb

@@ -51,6 +51,24 @@ describe "StepTrack" do
       expected_keys = [:name, :split, :duration, :time, :caller]
       assert_equal expected_keys, expected_keys & step.keys
     end
+
+    it "does nothing when previous step was an error" do
+      StepTrack.push("test", "step", moo: "bar", error: true)
+      data = Thread.current[StepTrack.send(:ref, "test")]
+      assert_equal 1, data[:steps].size
+      StepTrack.push("test", "new")
+      assert_equal 1, data[:steps].size
+    end
+
+    it "merges the new payload into the previous result when requested" do
+      StepTrack.push("test", "step", moo: "bar")
+      StepTrack.push("test", "new", blu: "gnu", merge: true)
+      data = Thread.current[StepTrack.send(:ref, "test")]
+      assert_equal 1, data[:steps].size
+      step = data[:steps].first
+      assert_equal "bar", step[:moo]
+      assert_equal "gnu", step[:blu]
+    end
   end
 
   describe ".done" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: step-track
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthias Geier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest