busted 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b2f09dd75ef91b3714f55d44f195ef30492d6bb
-  data.tar.gz: 539f8e9ca781ea35895c26b3a090a70b5c408beb
+  metadata.gz: 988c396e54ce313e0340a3cf81235f3572dfb8c5
+  data.tar.gz: e714740003083eb282666197a7bf33d9a1e51b09
 SHA512:
-  metadata.gz: f222d51d2ade0ad55de451ddc982895dc022443fcdead8c3463ea0da24dbc75f4376260a6942ce5569b2a219ea40e8939530afd32ae3e63f85ae6eb8f3ae46cc
-  data.tar.gz: 7be3029d528cdc9baac2ae6a3c3b0749e80cff86f7581efbbc884c99beeb38a51472d55b750ad4af960211373d4bc653d8d81cab9ba76b5d26bc52e6213d3e53
+  metadata.gz: a94d468be6ace8ceef4f9269fc73aebeee1443d95ad4d2eca88162f7d6ab2fb6737d5c094d39800d3e1bb691d093b0b5f60236c0affc10704cb26609e8525e11
+  data.tar.gz: 4c509f67c7f2f1aa1e8362f8e56a9595c1c2f06805c815c2b4387b5be31ef2f6dbce15e7d76b7a267ba1f61b6c475b936722da11edda361cff94635105bd13e1

data/busted.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/simeonwillbanks/busted"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 2.1.0"
+
   spec.files         = %w(
     .ruby-version
     CONTRIBUTING.md
@@ -34,10 +36,12 @@ Gem::Specification.new do |spec|
     lib/busted/profiler.rb
     lib/busted/profiler/default.rb
     lib/busted/profiler/sandwich.rb
+    lib/busted/stack.rb
     lib/busted/traceable.rb
     lib/busted/tracer.rb
     lib/busted/version.rb
     test/busted/current_process_test.rb
+    test/busted/stack_test.rb
     test/busted_test.rb
     test/test_helper.rb
   )

data/lib/busted/countable.rb

@@ -5,7 +5,7 @@ module Busted
     attr_writer :report
 
     def start_counter
-      @counter = Counter.new
+      @counter ||= Counter.new
 
       counter.start
     end

data/lib/busted/counter.rb

@@ -1,15 +1,24 @@
+require "busted/stack"
+
 module Busted
   class Counter
 
+    def initialize(stack = Stack.new)
+      @stack = stack
+    end
+
     def start
-      @started = counts
+      stack.started = counts
     end
 
     def finish
-      @finished = counts
+      stack.finished = counts
     end
 
     def report
+      started = stack.started
+      finished = stack.finished
+
       [:method, :constant].each_with_object({}) do |counter, result|
         result[counter] = finished[counter] - started[counter]
       end
@@ -17,7 +26,7 @@ module Busted
 
     private
 
-    attr_reader :started, :finished
+    attr_reader :stack
 
     def counts
       stat = RubyVM.stat

data/lib/busted/profiler/sandwich.rb

@@ -47,12 +47,13 @@ module Busted
         @report = {}
         start_tracer
         start_counter
+        true
       end
 
       def finish
         finish_counter
         finish_tracer
-        report
+        report.dup
       end
     end
   end

data/lib/busted/stack.rb

@@ -0,0 +1,24 @@
+module Busted
+  class Stack
+    def initialize
+      @started = []
+      @finished = []
+    end
+
+    def started
+      @started.pop
+    end
+
+    def started=(element)
+      @started.push element
+    end
+
+    def finished
+      @finished.pop
+    end
+
+    def finished=(element)
+      @finished.push element
+    end
+  end
+end

data/lib/busted/version.rb

@@ -1,3 +1,3 @@
 module Busted
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/busted/stack_test.rb

@@ -0,0 +1,23 @@
+require "test_helper"
+
+class Busted::StackTest < MiniTest::Unit::TestCase
+  def test_lifo_with_one_set_of_counts
+    stack = Busted::Stack.new
+    stack.started = 1
+    stack.finished = 1
+    assert_equal 1, stack.started
+    assert_equal 1, stack.finished
+  end
+
+  def test_lifo_with_three_sets_of_counts
+    stack = Busted::Stack.new
+    stack.started = 1
+    stack.started = 2
+    stack.started = 3
+    stack.finished = 1
+    stack.finished = 2
+    stack.finished = 3
+    assert_equal 3, stack.started
+    assert_equal 3, stack.finished
+  end
+end

data/test/busted_test.rb

@@ -231,6 +231,51 @@ class BustedTest < MiniTest::Unit::TestCase
     assert Busted.constant_cache? { Object.class_eval "class SantasLittleHelper; end" }
   end
 
+  def test_nesting_run
+    outer_report = {}
+    inner_report = {}
+
+    outer_report = Busted.run do
+
+      Object.class_eval "class CarlsbadChronic; end"
+
+      inner_report = Busted.run do
+
+        Object.class_eval "class SharkBite; end"
+      end
+    end
+
+    assert_equal({invalidations:{method:0,constant:1}}, inner_report)
+    assert_equal({invalidations:{method:0,constant:2}}, outer_report)
+  end
+
+  def test_nesting_start_finish
+    outer_report = {}
+    inner_report = {}
+
+    Busted.start
+
+    Object.class_eval "class ExtraCheese; end"
+
+    Busted.start
+
+    Object.class_eval "class ExtraExtraCheese; end"
+
+    inner_report = Busted.finish
+
+    Object.class_eval "class TooMuchCheese; end"
+
+    outer_report = Busted.finish
+
+    assert_equal({invalidations:{method:0,constant:1}}, inner_report)
+    assert_equal({invalidations:{method:0,constant:3}}, outer_report)
+  end
+
+  def test_start_return_value
+    assert_equal true, Busted.start
+    Busted.finish
+  end
+
   if Busted::Tracer.exists? && Busted::CurrentProcess.privileged?
 
     def test_cache_invalidations_and_traces_with_new_method
@@ -239,7 +284,7 @@ class BustedTest < MiniTest::Unit::TestCase
       assert_equal 0, report[:invalidations][:constant]
       assert_equal "global", report[:traces][:method][0][:class]
       assert_match /test\/busted_test.rb\z/, report[:traces][:method][0][:sourcefile]
-      assert_equal "237", report[:traces][:method][0][:lineno]
+      assert_equal "#{__LINE__ - 5}", report[:traces][:method][0][:lineno]
     end
 
     def test_start_finish_and_traces_with_new_method
@@ -250,7 +295,7 @@ class BustedTest < MiniTest::Unit::TestCase
       assert_equal 0, report[:invalidations][:constant]
       assert_equal "global", report[:traces][:method][0][:class]
       assert_match /test\/busted_test.rb\z/, report[:traces][:method][0][:sourcefile]
-      assert_equal "247", report[:traces][:method][0][:lineno]
+      assert_equal "#{__LINE__ - 6}", report[:traces][:method][0][:lineno]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: busted
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Simeon F. Willbanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,10 +61,12 @@ files:
 - lib/busted/profiler.rb
 - lib/busted/profiler/default.rb
 - lib/busted/profiler/sandwich.rb
+- lib/busted/stack.rb
 - lib/busted/traceable.rb
 - lib/busted/tracer.rb
 - lib/busted/version.rb
 - test/busted/current_process_test.rb
+- test/busted/stack_test.rb
 - test/busted_test.rb
 - test/test_helper.rb
 homepage: https://github.com/simeonwillbanks/busted
@@ -79,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -95,5 +97,6 @@ summary: MRI Ruby defines RubyVM.stat which accesses internal cache counters. Wh
   when code increments these counters.
 test_files:
 - test/busted/current_process_test.rb
+- test/busted/stack_test.rb
 - test/busted_test.rb
 - test/test_helper.rb