pry-test 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020727b338a4685172a46d1316cf2da5fd1fdc38
-  data.tar.gz: 760b17b36e795fbc62468e044f91cd400c210a24
+  metadata.gz: c6be3ce3aa63e94c3beabb6d47c14c802e069fb7
+  data.tar.gz: 613bd4bc5764a6e2ba508e23d899e39f0549bbe7
 SHA512:
-  metadata.gz: 419fa946efa0f52d0d92ae1bcd6c39da0b071937f0219ceeadb6dd34ec5a43e99b087367872e9f4131e5c1405332caddb3b0b821f528aac2fd781b9db8af7760
-  data.tar.gz: ef66f74defd2b4f0ae5258b40111a5dd5eea28d3a196c7dbb7f83bf2227f60318cfb2f82c3c5841f09770d762e0798386e9ff0e6aa530efecab706a19824b4cc
+  metadata.gz: 6ad0f9396749efb2f64d69cb113bd7e6da860b245cb3491b56a9f15222784a80c762dfe7759e6b56ecc102af027f1f05a27464636432a136952ce8db301c1f0e
+  data.tar.gz: d51093a0c22db3918871bbe720a9fc68208c6251aa9bf910b11602244019a77cdbf8ad556719048623c05b845de60821b2915e4620c5a9d58babffb91e10ae49

data/bin/pry-test

@@ -86,13 +86,17 @@ include PryTest::Color
 
 options[:disable_pry] = true if options[:async]
 if options[:disable_pry]
-  puts "Disabline pry #{options.inspect}"
+  puts "Disabling pry #{options.inspect}"
   exit runner(options).run
 else
   require "pry"
   require "pry-stack_explorer"
   require "pry-byebug"
   require "pry-rescue"
-  require "binding_of_caller"
+
+  Pry.config.hooks.add_hook :before_session, :print_instructions do |_, _, _pry_|
+    PryStackExplorer.frame_manager(_pry_).change_frame_to 1
+  end
+
   exit Pry.rescue { runner(options).run }
 end

data/lib/pry-test/formatters/default_async_formatter.rb

@@ -27,7 +27,7 @@ module PryTest
     end
 
     def render_output_for_test(test)
-      return unless test.finished?
+      return unless test.invoked?
 
       if test.passed?
         render "default/test_pass", test

data/lib/pry-test/runner.rb

@@ -13,64 +13,83 @@ module PryTest
       end
     end
 
-    attr_reader :formatter, :options, :active_test, :duration, :passed, :failed
+    attr_reader :formatter, :options, :duration, :passed, :failed
 
     def initialize(formatter, options={})
       @formatter = formatter
       @options = options
-      reset
     end
 
     def run
-      test_classes = PryTest::Test.subclasses.shuffle
-      tests = test_classes.map{ |klass| klass.tests }.flatten
       formatter.before_suite(test_classes)
-      start = Time.now
+      run_test_classes
+      formatter.after_suite(test_classes)
+      failed
+    end
 
-      test_classes.each do |test_class|
-        if !PryTest::Runner.terminate?
-          formatter.before_class(test_class)
-          test_class.tests.shuffle.each do |test|
-            @active_test = test
-            if @options[:async]
-              @tests ||= Queue.new
-              @tests << test
-            else
-              test.invoke(@formatter, @options)
-            end
-          end
-          formatter.after_class(test_class)
-        end
-      end
+    def test_classes
+      @test_classes ||= PryTest::Test.subclasses.shuffle
+    end
+
+    def tests
+      @tests ||= test_classes.map{ |klass| klass.tests }.flatten
+    end
 
-      run_threads if @options[:async]
+    def failed_tests
+      tests.select{ |test| test.invoked? && !test.passed? }
+    end
+
+    def failed
+      failed_tests.length
+    end
 
+    def passed_tests
+      tests.select{ |test| test.invoked? && test.passed? }
+    end
+
+    def passed
+      passed_tests.length
+    end
+
+    private
+
+    def run_test_classes
+      start = Time.now
+      queue ||= Queue.new if options[:async]
+      test_classes.each do |test_class|
+        run_test_class test_class, queue
+      end
+      run_threads(queue) if options[:async]
       @duration = Time.now - start
-      @passed = tests.select{ |test| test.invoked? && test.passed? }.count
-      @failed = tests.select{ |test| test.invoked? && !test.passed? }.count
       formatter.after_results(self)
-      formatter.after_suite(test_classes)
-      @failed
     end
 
-    def reset
-      @duration = 0
-      @passed = 0
-      @failed = 0
+    def run_test_class(test_class, queue)
+      return if PryTest::Runner.terminate?
+      formatter.before_class(test_class)
+      test_class.tests.shuffle.each do |test|
+        if options[:async]
+          queue << test
+        else
+          test.invoke(formatter, options)
+        end
+      end
+      formatter.after_class(test_class)
     end
 
-    protected
+    def thread_count
+      count = OS.cpu_count
+      count < 2 ? 2 : count
+    end
 
-    def run_threads
-      threads = []
-      thread_count = OS.cpu_count
-      thread_count = 2 if thread_count < 2
+    def run_threads(queue)
       puts "PryTest is running #{thread_count} threads."
-      thread_count.times do
-        threads << Thread.new do
-          while !@tests.empty?
-            Thread.current.kill if PryTest::Runner.terminate?
-            @tests.pop.invoke(@formatter, @options)
+      threads = thread_count.times.map do
+        Thread.new do
+          while !queue.empty?
+            Thread.current.terminate if PryTest::Runner.terminate?
+            test = queue.pop
+            test.invoke(formatter, options)
           end
         end
       end

data/lib/pry-test/test.rb

@@ -34,12 +34,6 @@ module PryTest
         @files ||= {}
       end
 
-      # Resets the state in preparation for a new test run.
-      def reset
-        tests.each { |test| test.reset }
-        subclasses.each { |subclass| subclass.reset }
-      end
-
       # A callback provided by Ruby that is invoked whenever a subclass is created.
       def inherited(subclass)
         file_path = caller[0][0, caller[0].index(/:[0-9]+:/)]

data/lib/pry-test/test_wrapper.rb

@@ -16,8 +16,8 @@ module PryTest
       super() # inits MonitorMixin
       @test_class = test_class
       @desc = desc
+      @asserts = []
       create_method(:test, &block)
-      reset
     end
 
     # Creates a method on this instance.
@@ -36,7 +36,6 @@ module PryTest
     # @formatter [PryTest::Formatter] The formatter to use.
     # @options [Hash]
     def invoke(formatter, options={})
-      reset
       @formatter = formatter
       @options = options
       @formatter.before_test(self)
@@ -44,8 +43,8 @@ module PryTest
       before
       test
       @invoked = true
-      after
       @duration = Time.now - start
+      after
       @formatter.after_test(self)
     end
 
@@ -63,7 +62,7 @@ module PryTest
       @asserts << assert_info(caller).merge(:value => value)
 
       if !value
-        Pry.start binding.of_caller(0) unless @options[:disable_pry]
+        Pry.start unless @options[:disable_pry]
 
         # TODO: I don't really like the coupling to the runner here
         PryTest::Runner.terminate if @options[:fail_fast]
@@ -72,12 +71,6 @@ module PryTest
       value
     end
 
-    # Indicates if this test has finished running.
-    # @return [Boolean]
-    def finished?
-      !@duration.nil?
-    end
-
     # Indicates if this test has been invoked.
     # @return [Boolean]
     def invoked?
@@ -92,17 +85,9 @@ module PryTest
 
     # Returns a list of all failed asserts.
     def failed_asserts
-      return [] if passed?
       @asserts.select { |a| !a[:value] }
     end
 
-    # Resets this test in preparation for a clean test run.
-    def reset
-      @invoked = false
-      @asserts = []
-      @duration = nil
-    end
-
     # Rounded duration.
     def duration
       return nil if @duration.nil?

data/lib/pry-test/version.rb

@@ -1,3 +1,3 @@
 module PryTest
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/test_test.rb

@@ -39,17 +39,6 @@ unless ENV["PRY_TEST_DEMO"]
       assert @test_test.files[file].select{ |l| l.start_with?("      assert @test_test.files[file].select{ |l| l.start_with?(") }.length > 0
     end
 
-    test ".reset" do
-      @Example.tests.first.instance_eval do
-        @asserts = nil
-        @duration = nil
-      end
-      @Example.reset
-      assert @Example.tests.length == 1
-      assert @Example.tests.first.asserts == []
-      assert @Example.tests.first.duration == nil
-    end
-
     test ".before" do
       assert @Example.instance_eval { @before } == @before_callback
     end

data/test/test_wrapper_test.rb

@@ -11,7 +11,6 @@ unless ENV["PRY_TEST_DEMO"]
       assert t.test == ".new"
       assert t.invoked? == false
       assert t.passed? == false
-      assert t.finished? == false
       assert t.duration.nil?
       assert t.asserts.empty?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pry-test
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Nathan Hopkins
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: binding_of_caller
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement