corn 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd6bf050c9281d4d7466d536e0c21a742b49a54c
-  data.tar.gz: 85b6e57c88e13ef0e4eef17c92bc8084b2aeb0ca
+  metadata.gz: 8772493b9949b6c7b4867b7c7f2c3c7efa8b5ab5
+  data.tar.gz: 6dc258e0d06b44a8548b6b2a9efb8e1a9daf253f
 SHA512:
-  metadata.gz: 8397e9bf1689a62df96fd5a07e7d576ee576dd0f66c749e38f1564fb0697a6cf5d0e97ff8f5d290220c6f0f1ec1768a89de3874e11f0b4a1be71056e92a8564a
-  data.tar.gz: 1823d6d382275608edeace1b8114e14a48baf57ba122be4ac05d048dbffaa85eb7b77ca55739ec6a7922d5c8381f4fbb14350182a0b93909a332c4149fe29e3c
+  metadata.gz: db292f19239353bc7eb1abc990dbd4a88f48e9afdf922d4a4833e0b7568aaa61a10d5a64bfd7ea723682e1c272c5de28a9dc306ae01a2bc786bb156b62dd605c
+  data.tar.gz: 2141b7349b808cef1a5e74e79096cf798e3483deb98ffa0fde3f8c22d6017026338ac1d576593345b90144f7cce257a118d5adb0d32e95a088aa8dd9ec0f0ef2

data/lib/corn.rb

@@ -37,41 +37,23 @@ module Corn
     end
   end
 
-  def report(test_name, &block)
-    rep = report_start
-    begin
-      yield(rep)
-    ensure
-      report_end(test_name, rep)
-    end
-  end
-
-  def report_start
-    @reports ||= create_reports
-    Report.new
+  def report(label, &block)
+    @report ||= Report.new
+    @report.record(label, &block)
   end
 
-  def report_end(test_name, report)
-    @reports << [test_name] + report.records.flatten
+  def exit_submit_hook
+    at_exit { submit }
   end
 
-  def create_reports
-    at_exit { submit_reports }
-    []
-  end
-
-  def submit_reports
-    return if @reports.nil? || @reports.empty?
+  def submit(report=@report)
+    return if report.empty?
     log_error do
-      reports_csv = CSV.generate do |csv|
-        @reports.each do |rep|
-          csv << rep
-        end
-      end
-      data = { client_id: client_id,
-        build_label: build_label,
-        reports: reports_csv }
-      @reports = []
+      data = {
+        :client_id => client_id,
+        :build_label => build_label,
+        :reports => report.to_csv
+      }
       http_post(File.join(host, 'benchmarks'), data)
     end
   end

data/lib/corn/mini_test.rb

@@ -6,28 +6,29 @@ module Corn
     end
 
     def run_with_corn(runner, &block)
-      Corn.report("#{__name__}(#{self.class.name})") do |report|
-        @__corn_report__ = report
+      label = "#{self.class.name}.#{__name__}"
+      Corn.report(label) do |report|
+        @corn_report = report
         run_without_corn(runner, &block)
       end
     end
 
     def before_setup
-      @__corn_report__.record_start(:setup)
+      @corn_report.record_start(:setup)
     end
 
     def after_setup
-      @__corn_report__.record_end
-      @__corn_report__.record_start(:run_test)
+      @corn_report.record_end
+      @corn_report.record_start(:run_test)
     end
 
     def before_teardown
-      @__corn_report__.record_end
-      @__corn_report__.record_start(:teardown)
+      @corn_report.record_end
+      @corn_report.record_start(:teardown)
     end
 
     def after_teardown
-      @__corn_report__.record_end
+      @corn_report.record_end
     end
   end
 end

data/lib/corn/report.rb

@@ -1,29 +1,66 @@
+require 'csv'
+
 module Corn
   class Report
-    attr_reader :records
 
-    def initialize
+    def initialize(prefix=nil)
+      @prefix = prefix
       @records = []
     end
 
     def record(label, &block)
       record_start(label)
-      yield
+      yield(sub_report)
     ensure
       record_end
     end
 
+    # start record a benchmark time by label
     def record_start(label)
-      @record = [label, Time.now]
+      @record = [record_label(label), Time.now]
+    end
+
+    # should only be called between record_start and record_end to generate
+    # sub report for current report
+    def sub_report
+      @sub_report ||= Report.new(@record[0])
     end
 
+    # should only be called after record_start
     def record_end
       @record << Time.now - @record[1]
       @records << @record
+      if @sub_report
+        @records.concat @sub_report.to_a
+        @sub_report = nil
+      end
+    end
+
+    def empty?
+      @records.empty?
+    end
+
+    def to_a
+      @records
+    end
+
+    def to_csv
+      if RUBY_VERSION =~ /1.8/
+        buf = ''
+        @records.each do |r|
+          CSV.generate_row(r, r.size, buf)
+        end
+        buf
+      else
+        CSV.generate do |csv|
+          @records.each { |r| csv << r }
+        end
+      end
     end
 
-    def record_time
-      Time.now - @start_at
+    private
+    def record_label(label)
+      [@prefix, label].compact.join('.').to_sym
     end
   end
 end

data/lib/corn/test_unit.rb

@@ -8,7 +8,8 @@ module Corn
     end
 
     def run_with_corn(result, &block)
-      Corn.report(name) do |report|
+      label = "#{self.class.name}.#{@method_name}"
+      Corn.report(label) do |report|
         __run_with_corn__(report, result, &block)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Xiao Li