corn 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 65c8f764fa897611e644e7d5ad89afeeb9a88317
-  data.tar.gz: dc42b9d354000c87e9b90e1b43f1557399a7814d
-SHA512: 
-  metadata.gz: 08901a2e5162aa0c346816a6b51899c9097d1c5917701919c63bd7903127cc1ee352103ce7c7fa447b5b7f8601b800245eea49d680a76de12cc9dd05471e5f43
-  data.tar.gz: eb38dd6ecaaa95436dc77f35f3e13123c7696d798e629532bb6cd8a0f4927e18963d4798ea9cd21c465d9d0dc7920e96df269d6009861057ebfcb5d66e022952
+---
+SHA1:
+  metadata.gz: 607a7f0ddaf8c0d778472a489584bae965435d46
+  data.tar.gz: bbd395af2e6c79c364ac5ed250994a49baedd9d1
+SHA512:
+  metadata.gz: ab8d249138a7a9ae6246e130b9af1f9b1d15366f59114f826aef86f00f755118a617754b5fa721919ef75660179cdd6ab88255a4aa9fad5f7f74d8920ccb3c59
+  data.tar.gz: 2b375bf3db20fffee3e335f6fde8a841f72f955c8767d2a72f9fb371cca9a32ad08ceaa4ff8d77ffe916013ce6064d9f9c51847dadf9bfed294c81cd0257e518

data/lib/corn.rb

@@ -1,8 +1,10 @@
-require 'corn/test_unit'
 require 'net/http'
 require 'net/https'
 require 'logger'
 
+require 'corn/report'
+require 'corn/test_unit'
+
 module Corn
   module_function
 
@@ -26,31 +28,27 @@ module Corn
     Test::Unit::TestCase.send(:include, Corn::TestUnit)
   end
 
-  def benchmark(*labels, &block)
-    reports = []
-    yield(reporter(reports))
-
-    log_error { report(labels, reports) }
+  def report(test_name, &block)
+    rep = report_start
+    begin
+      yield(rep)
+    ensure
+      report_end(test_name, rep)
+    end
   end
 
-  def reporter(reports)
-    lambda do |label, &block|
-      start_at = Time.now
-      begin
-        block.call
-      ensure
-        realtime = Time.now - start_at
-        reports << [label, start_at.to_i, realtime]
-      end
-    end
+  def report_start
+    Report.new
   end
 
-  def report(labels, reports)
-    data = [['client_id', client_id],
-            ['build_id', build_id]]
-    data.concat(labels.map {|l| ['labels[]', l]})
-    data.concat(reports.map {|r| ['reports[]', r.join(",")]})
-    http_post(File.join(host, 'benchmarks'), data)
+  def report_end(test_name, report)
+    log_error do
+      head = [['client_id', client_id],
+              ['build_id', build_id],
+              ['test_name', test_name]]
+      data = head.concat(report.records.map {|r| ['reports[]', r.join(",")]})
+      http_post(File.join(host, 'benchmarks'), data)
+    end
   end
 
   def http_post(url, data)

data/lib/corn/report.rb

@@ -0,0 +1,29 @@
+module Corn
+  class Report
+    attr_reader :records
+
+    def initialize
+      @records = []
+    end
+
+    def record(label, &block)
+      record_start(label)
+      yield
+    ensure
+      record_end
+    end
+
+    def record_start(label)
+      @record = [label, Time.now]
+    end
+
+    def record_end
+      @record << Time.now - @record[1]
+      @records << @record
+    end
+
+    def record_time
+      Time.now - @start_at
+    end
+  end
+end

data/lib/corn/test_unit.rb

@@ -8,7 +8,7 @@ module Corn
     end
 
     def run_with_corn(result, &block)
-      Corn.benchmark(name) do |report|
+      Corn.report(name) do |report|
         __run_with_corn__(report, result, &block)
       end
     end
@@ -17,8 +17,8 @@ module Corn
       yield(Test::Unit::TestCase::STARTED, name)
       @_result = result
       begin
-        report.call(:setup) { setup }
-        report.call(@method_name) { __send__(@method_name) }
+        report.record(:setup) { setup }
+        report.record(@method_name) { __send__(@method_name) }
       rescue AssertionFailedError => e
         add_failure(e.message, e.backtrace)
       rescue Exception
@@ -26,7 +26,7 @@ module Corn
         add_error($!)
       ensure
         begin
-          report.call(:teardown) { teardown }
+          report.record(:teardown) { teardown }
         rescue AssertionFailedError => e
           add_failure(e.message, e.backtrace)
         rescue Exception
@@ -38,5 +38,38 @@ module Corn
       yield(Test::Unit::TestCase::FINISHED, name)
     end
   end
-  TestUnit = TestUnit18
+
+  module TestUnit19
+    def self.included(base)
+      base.send(:alias_method, :run_without_corn, :run)
+      base.send(:alias_method, :run, :run_with_corn)
+    end
+
+    def run_with_corn(runner, &block)
+      Corn.report("#{__name__}(#{self.class.name})") do |report|
+        @__corn_report__ = report
+        run_without_corn(runner, &block)
+      end
+    end
+
+    def before_setup
+      @__corn_report__.record_start(:setup)
+    end
+
+    def after_setup
+      @__corn_report__.record_end
+      @__corn_report__.record_start(__name__)
+    end
+
+    def before_teardown
+      @__corn_report__.record_end
+      @__corn_report__.record_start(:teardown)
+    end
+
+    def after_teardown
+      @__corn_report__.record_end
+    end
+  end
+
+  TestUnit = RUBY_VERSION =~ /^1.8/ ? TestUnit18 : TestUnit19
 end

metadata

@@ -1,56 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: corn
-version: !ruby/object:Gem::Version 
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
 platform: ruby
-authors: 
-  - Xiao Li
+authors:
+- Xiao Li
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-29 00:00:00 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies: []
-
 description: TBD
-email: 
-  - swing1979@gmail.com
+email:
+- swing1979@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - README.md
-  - lib/corn.rb
-  - lib/corn/setup.rb
-  - lib/corn/test_unit.rb
+files:
+- README.md
+- lib/corn.rb
+- lib/corn/report.rb
+- lib/corn/setup.rb
+- lib/corn/test_unit.rb
 homepage: https://github.com/xli/corn
-licenses: 
-  - MIT
+licenses:
+- MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - &id001 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - *id001
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: TBD
 test_files: []
-