assert 2.16.5 → 2.18.3

data/lib/assert/runner.rb

@@ -1,9 +1,8 @@
-require 'assert/config_helpers'
-require 'assert/suite'
-require 'assert/view'
+require "assert/config_helpers"
+require "assert/suite"
+require "assert/view"
 
 module Assert
-
   class Runner
     include Assert::ConfigHelpers
 
@@ -29,12 +28,16 @@ module Assert
         self.view.puts ", seeded with \"#{self.runner_seed}\""
       end
 
-      # if INFO signal requested (Ctrl+T on Macs), process it
       @current_running_test = nil
-      trap("INFO") do
-        self.on_info(@current_running_test)
-        self.suite.on_info(@current_running_test)
-        self.view.on_info(@current_running_test)
+
+      # if SIGINFO available (ie on OSX, not on BSD) and if SIGINFO requested
+      # (Ctrl+T on Macs), process it
+      if Signal.list.keys.include?("INFO")
+        Signal.trap("INFO") do
+          self.on_info(@current_running_test)
+          self.suite.on_info(@current_running_test)
+          self.view.on_info(@current_running_test)
+        end
       end
 
       begin
@@ -99,7 +102,5 @@ module Assert
         self.suite.sorted_tests_to_run{ rand self.tests_to_run_count }
       end
     end
-
   end
-
 end

data/lib/assert/stub.rb

@@ -1,7 +1,6 @@
-require 'much-stub'
+require "much-stub"
 
 module Assert
-
   def self.stubs
     MuchStub.stubs
   end
@@ -10,6 +9,10 @@ module Assert
     MuchStub.stub(*args, &block)
   end
 
+  def self.stub_on_call(*args, &block)
+    MuchStub.stub_on_call(*args, &block)
+  end
+
   def self.unstub(*args)
     MuchStub.unstub(*args)
   end
@@ -28,4 +31,15 @@ module Assert
     end
   end
 
+  def self.stub_tap(*args, &block)
+    MuchStub.tap(*args, &block)
+  end
+
+  def self.stub_tap_on_call(*args, &block)
+    MuchStub.tap_on_call(*args, &block)
+  end
+
+  def self.stub_spy(*args, &block)
+    MuchStub.spy(*args, &block)
+  end
 end

data/lib/assert/suite.rb

@@ -1,14 +1,12 @@
-require 'assert/config_helpers'
-require 'assert/test'
+require "assert/config_helpers"
+require "assert/test"
 
 module Assert
-
   # This is the base suite. It loads the tests to run in memory and provides
   # methods for these tests that the runner/view uses for handling and
   # presentation purposes. It also stores suite-level setups and teardowns.
   # Override the test/result count methods and the callbacks as needed.  See
   # the default suite for example usage.
-
   class Suite
     include Assert::ConfigHelpers
 
@@ -97,11 +95,9 @@ module Assert
     def on_interrupt(err); end
 
     def inspect
-      "#<#{self.class}:#{'0x0%x' % (object_id << 1)}"\
+      "#<#{self.class}:#{"0x0%x" % (object_id << 1)}"\
       " test_count=#{self.test_count.inspect}"\
       " result_count=#{self.result_count.inspect}>"
     end
-
   end
-
 end

data/lib/assert/test.rb

@@ -1,14 +1,11 @@
-require 'stringio'
-require 'assert/file_line'
-require 'assert/result'
+require "stringio"
+require "assert/file_line"
+require "assert/result"
 
 module Assert
-
   class Test
-
-    # a Test is some code/method to run in the scope of a Context that may
-    # produce results
-
+    # Test is some code/method to run in the scope of a Context that may
+    # produce results.
     def self.name_file_line_context_data(ci, name)
       { :name      => ci.test_name(name),
         :file_line => ci.called_from
@@ -37,18 +34,18 @@ module Assert
     end
 
     def file_line
-      @file_line ||= FileLine.parse((@build_data[:file_line] || '').to_s)
+      @file_line ||= FileLine.parse((@build_data[:file_line] || "").to_s)
     end
 
     def file_name; self.file_line.file;      end
     def line_num;  self.file_line.line.to_i; end
 
     def name
-      @name ||= (@build_data[:name] || '')
+      @name ||= (@build_data[:name] || "")
     end
 
     def output
-      @output ||= (@build_data[:output] || '')
+      @output ||= (@build_data[:output] || "")
     end
 
     def run_time
@@ -90,16 +87,16 @@ module Assert
       attributes_string = ([:name, :context_info].collect do |attr|
         "@#{attr}=#{self.send(attr).inspect}"
       end).join(" ")
-      "#<#{self.class}:#{'0x0%x' % (object_id << 1)} #{attributes_string}>"
+      "#<#{self.class}:#{"0x0%x" % (object_id << 1)} #{attributes_string}>"
     end
 
     private
 
     def run_test(scope)
       begin
-        # run any assert style 'setup do' setups
+        # run any assert style "setup do" setups
         self.context_class.run_setups(scope)
-        # run any test/unit style 'def setup' setups
+        # run any test/unit style "def setup" setups
         scope.setup if scope.respond_to?(:setup)
         # run the code block
         scope.instance_eval(&(self.code || proc{}))
@@ -113,9 +110,9 @@ module Assert
         capture_result(Result::Error, err)
       ensure
         begin
-          # run any assert style 'teardown do' teardowns
+          # run any assert style "teardown do" teardowns
           self.context_class.run_teardowns(scope)
-          # run any test/unit style 'def teardown' teardowns
+          # run any test/unit style "def teardown" teardowns
           scope.teardown if scope.respond_to?(:teardown)
         rescue Result::TestFailure => err
           capture_result(Result::Fail, err)
@@ -147,7 +144,5 @@ module Assert
     def capture_io
       StringIO.new(self.output, "a+")
     end
-
   end
-
 end

data/lib/assert/utils.rb

@@ -1,9 +1,7 @@
-require 'assert'
+require "assert"
 
 module Assert
-
   module Utils
-
     # show objects in a human-readable manner.  Either inspects or pretty-prints
     # them depending on settings.
     def self.show(obj, config)
@@ -16,7 +14,7 @@ module Assert
     # expands on the basic `show` util by escaping newlines and making object id
     # hex-values generic.
     def self.show_for_diff(obj, config)
-      show(obj, config).gsub(/\\n/, "\n").gsub(/:0x[a-fA-F0-9]{4,}/m, ':0xXXXXXX')
+      show(obj, config).gsub(/\\n/, "\n").gsub(/:0x[a-fA-F0-9]{4,}/m, ":0xXXXXXX")
     end
 
     # open a tempfile and yield it
@@ -30,8 +28,8 @@ module Assert
 
     # Get a proc that uses stdlib `PP.pp` to pretty print objects
     def self.stdlib_pp_proc(width = nil)
-      require 'pp'
-      Proc.new{ |obj| PP.pp(obj, '', width || 79).strip }
+      require "pp"
+      Proc.new{ |obj| PP.pp(obj, "", width || 79).strip }
     end
 
     # Return true if if either show output has newlines or is bigger than 29 chars
@@ -46,8 +44,8 @@ module Assert
     def self.syscmd_diff_proc(syscmd = "diff --unified=-1")
       Proc.new do |exp_show_output, act_show_output|
         result = ""
-        tempfile('exp_show_output', exp_show_output) do |a|
-          tempfile('act_show_output', act_show_output) do |b|
+        tempfile("exp_show_output", exp_show_output) do |a|
+          tempfile("act_show_output", act_show_output) do |b|
             result = `#{syscmd} #{a.path} #{b.path}`.strip
             result.sub!(/^\-\-\- .+/, "--- expected")
             result.sub!(/^\+\+\+ .+/, "+++ actual")
@@ -65,18 +63,16 @@ module Assert
         cmd = [
           "git diff --no-ext-diff --name-only #{config.changed_ref}", # changed files
           "git ls-files --others --exclude-standard"                  # added files
-        ].map{ |c| "#{c} -- #{test_paths.join(' ')}" }.join(' && ')
-        Assert::CLI.bench('Load only changed files') do
+        ].map{ |c| "#{c} -- #{test_paths.join(" ")}" }.join(" && ")
+        Assert::CLI.bench("Load only changed files") do
           files = `#{cmd}`.split("\n")
         end
         puts Assert::CLI.debug_msg("  `#{cmd}`") if config.debug
         files
       end
     end
-
   end
 
   # alias for brevity
   U = Utils
-
 end

data/lib/assert/version.rb

@@ -1,3 +1,3 @@
 module Assert
-  VERSION = "2.16.5"
+  VERSION = "2.18.3"
 end

data/lib/assert/view.rb

@@ -1,10 +1,9 @@
-require 'assert/config'
-require 'assert/config_helpers'
-require 'assert/suite'
-require 'assert/view_helpers'
+require "assert/config"
+require "assert/config_helpers"
+require "assert/suite"
+require "assert/view_helpers"
 
 module Assert
-
   class View
     include Assert::ConfigHelpers
     include Assert::ViewHelpers
@@ -15,12 +14,12 @@ module Assert
 
     def self.require_user_view(view_name)
       views_file = File.expand_path(
-        File.join("#{ENV['HOME']}/.assert/views", view_name, 'lib', view_name)
+        File.join("#{ENV["HOME"]}/.assert/views", view_name, "lib", view_name)
       )
 
-      if File.exists?(view_name) || File.exists?(view_name + '.rb')
+      if File.exists?(view_name) || File.exists?(view_name + ".rb")
         require view_name
-      elsif File.exists?(views_file + '.rb')
+      elsif File.exists?(views_file + ".rb")
         require views_file
       else
         msg = "[WARN] Can't find or require #{view_name.inspect} view."
@@ -31,18 +30,18 @@ module Assert
 
     # setup options and their default values
 
-    option 'styled',        false
-    option 'pass_styles'    # none
-    option 'fail_styles'    # none
-    option 'error_styles'   # none
-    option 'skip_styles'    # none
-    option 'ignore_styles'  # none
+    option "styled",        false
+    option "pass_styles"    # none
+    option "fail_styles"    # none
+    option "error_styles"   # none
+    option "skip_styles"    # none
+    option "ignore_styles"  # none
 
-    option 'pass_abbrev',   '.'
-    option 'fail_abbrev',   'F'
-    option 'ignore_abbrev', 'I'
-    option 'skip_abbrev',   'S'
-    option 'error_abbrev',  'E'
+    option "pass_abbrev",   "."
+    option "fail_abbrev",   "F"
+    option "ignore_abbrev", "I"
+    option "skip_abbrev",   "S"
+    option "error_abbrev",  "E"
 
     attr_reader :config
 
@@ -92,7 +91,5 @@ module Assert
 
     def puts(*args); @output_io.puts(*args); end
     def print(*args); @output_io.print(*args); end
-
   end
-
 end

data/lib/assert/view_helpers.rb

@@ -1,9 +1,7 @@
-require 'assert/config_helpers'
+require "assert/config_helpers"
 
 module Assert
-
   module ViewHelpers
-
     def self.included(receiver)
       receiver.class_eval do
         include Assert::ConfigHelpers
@@ -13,7 +11,6 @@ module Assert
     end
 
     module ClassMethods
-
       def option(name, *default_vals)
         default = default_vals.size > 1 ? default_vals : default_vals.first
         define_method(name) do |*args|
@@ -23,11 +20,9 @@ module Assert
           (val = instance_variable_get("@#{name}")).nil? ? default : val
         end
       end
-
     end
 
     module InstanceMethods
-
       # show any captured output
       def captured_output(output)
         "--- stdout ---\n"\
@@ -37,21 +32,21 @@ module Assert
 
       # show any captured output
       def re_run_test_cmd(test_id)
-        "assert -t #{test_id.gsub(Dir.pwd, '.')}"
+        "assert -t #{test_id.gsub(Dir.pwd, ".")}"
       end
 
       def tests_to_run_count_statement
-        "#{self.tests_to_run_count} test#{'s' if self.tests_to_run_count != 1}"
+        "#{self.tests_to_run_count} test#{"s" if self.tests_to_run_count != 1}"
       end
 
       def result_count_statement
-        "#{self.result_count} result#{'s' if self.result_count != 1}"
+        "#{self.result_count} result#{"s" if self.result_count != 1}"
       end
 
       # generate a comma-seperated sentence fragment given a list of items
       def to_sentence(items)
         if items.size <= 2
-          items.join(items.size == 2 ? ' and ' : '')
+          items.join(items.size == 2 ? " and " : "")
         else
           [items[0..-2].join(", "), items.last].join(", and ")
         end
@@ -86,13 +81,10 @@ module Assert
         end
         self.to_sentence(summaries)
       end
-
     end
 
     module Ansi
-
       # Table of supported styles/codes (http://en.wikipedia.org/wiki/ANSI_escape_code)
-
       CODES = {
         :clear            => 0,
         :reset            => 0,
@@ -173,7 +165,7 @@ module Assert
       }
 
       def self.code_for(*style_names)
-        style_names.map{ |n| "\e[#{CODES[n]}m" if CODES.key?(n) }.compact.join('')
+        style_names.map{ |n| "\e[#{CODES[n]}m" if CODES.key?(n) }.compact.join("")
       end
 
       def ansi_styled_msg(msg, result_type)
@@ -182,9 +174,6 @@ module Assert
         return msg if code.empty?
         code + msg + Assert::ViewHelpers::Ansi.code_for(:reset)
       end
-
     end
-
   end
-
 end

data/test/helper.rb

@@ -6,54 +6,39 @@ ROOT_PATH = File.expand_path("../..", __FILE__)
 $LOAD_PATH.unshift(ROOT_PATH)
 
 # require pry for debugging (`binding.pry`)
-require 'pry'
-require 'test/support/factory'
-
-# 1.8.7 backfills
-
-# Array#sample
-if !(a = Array.new).respond_to?(:sample) && a.respond_to?(:choice)
-  class Array
-    alias_method :sample, :choice
-  end
-end
-
-class Assert::Test
-
-  module TestHelpers
-
-    def self.included(receiver)
-      receiver.class_eval do
-        setup do
-          @test_run_results = []
-          @run_callback = proc{ |result| @test_run_results << result }
-        end
+require "pry"
+require "test/support/factory"
+
+module Assert::Test::TestHelpers
+  def self.included(receiver)
+    receiver.class_eval do
+      setup do
+        @test_run_results = []
+        @run_callback = proc { |result| @test_run_results << result }
       end
+    end
 
-      private
-
-      def test_run_callback
-        @run_callback
-      end
+    private
 
-      def test_run_results(type = nil)
-        return @test_run_results if type.nil?
-        @test_run_results.select{ |r| r.type == type }
-      end
+    def test_run_callback
+      @run_callback
+    end
 
-      def test_run_result_count(type = nil)
-        test_run_results(type).count
-      end
+    def test_run_results(type = nil)
+      return @test_run_results if type.nil?
+      @test_run_results.select{ |r| r.type == type }
+    end
 
-      def test_run_result_messages
-        @test_run_results.map(&:message)
-      end
+    def test_run_result_count(type = nil)
+      test_run_results(type).count
+    end
 
-      def last_test_run_result
-        @test_run_results.last
-      end
+    def test_run_result_messages
+      @test_run_results.map(&:message)
     end
 
+    def last_test_run_result
+      @test_run_results.last
+    end
   end
-
 end