assert 2.16.5 → 2.17.0

data/lib/assert/config_helpers.rb

@@ -33,27 +33,27 @@ module Assert
       self.pass_result_count == self.result_count
     end
 
-    def formatted_run_time(run_time, format = '%.6f')
+    def formatted_run_time(run_time, format = "%.6f")
       format % run_time
     end
 
-    def formatted_test_rate(test_rate, format = '%.6f')
+    def formatted_test_rate(test_rate, format = "%.6f")
       format % test_rate
     end
 
-    def formatted_result_rate(result_rate, format = '%.6f')
+    def formatted_result_rate(result_rate, format = "%.6f")
       format % result_rate
     end
 
-    def formatted_suite_run_time(format = '%.6f')
+    def formatted_suite_run_time(format = "%.6f")
       formatted_run_time(self.config.suite.run_time, format)
     end
 
-    def formatted_suite_test_rate(format = '%.6f')
+    def formatted_suite_test_rate(format = "%.6f")
       formatted_test_rate(self.config.suite.test_rate, format)
     end
 
-    def formatted_suite_result_rate(format = '%.6f')
+    def formatted_suite_result_rate(format = "%.6f")
       formatted_result_rate(self.config.suite.result_rate, format)
     end
 

data/lib/assert/context.rb

@@ -1,13 +1,13 @@
-require 'assert/assertions'
-require 'assert/context/setup_dsl'
-require 'assert/context/subject_dsl'
-require 'assert/context/suite_dsl'
-require 'assert/context/test_dsl'
-require 'assert/context_info'
-require 'assert/macros/methods'
-require 'assert/result'
-require 'assert/suite'
-require 'assert/utils'
+require "assert/assertions"
+require "assert/context/setup_dsl"
+require "assert/context/subject_dsl"
+require "assert/context/suite_dsl"
+require "assert/context/test_dsl"
+require "assert/context_info"
+require "assert/macros/methods"
+require "assert/result"
+require "assert/suite"
+require "assert/utils"
 
 module Assert
 
@@ -33,7 +33,7 @@ module Assert
         klass_method_name = "#{self}##{method_name}"
 
         if self.suite.test_methods.include?(klass_method_name)
-          puts "WARNING: redefining '#{klass_method_name}'"
+          puts "WARNING: redefining "#{klass_method_name}""
           puts "  from: #{caller_locations(1,1)}"
         else
           self.suite.test_methods << klass_method_name
@@ -111,15 +111,15 @@ module Assert
     def fail(message = nil)
       if @__assert_pending__ == 0
         if halt_on_fail?
-          raise Result::TestFailure, message || ''
+          raise Result::TestFailure, message || ""
         else
-          capture_result(Assert::Result::Fail, message || '')
+          capture_result(Assert::Result::Fail, message || "")
         end
       else
         if halt_on_fail?
-          raise Result::TestSkipped, "Pending fail: #{message || ''}"
+          raise Result::TestSkipped, "Pending fail: #{message || ""}"
         else
-          capture_result(Assert::Result::Skip, "Pending fail: #{message || ''}")
+          capture_result(Assert::Result::Skip, "Pending fail: #{message || ""}")
         end
       end
     end
@@ -128,7 +128,7 @@ module Assert
     # adds a Skip result to the end of the test's results
     # breaks test execution
     def skip(skip_msg = nil, called_from = nil)
-      raise Result::TestSkipped, (skip_msg || ''), called_from
+      raise Result::TestSkipped, (skip_msg || ""), called_from
     end
 
     # runs block and any fails are skips and any passes are fails
@@ -172,7 +172,7 @@ module Assert
     # Returns a Proc that will output a custom message along with the default
     # fail message.
     def fail_message(fail_desc = nil, what_failed_msg = nil)
-      [ fail_desc, what_failed_msg ].compact.join("\n")
+      [fail_desc, what_failed_msg].compact.join("\n")
     end
 
     private

data/lib/assert/context/test_dsl.rb

@@ -1,7 +1,7 @@
-require 'assert/context_info'
-require 'assert/macro'
-require 'assert/suite'
-require 'assert/test'
+require "assert/context_info"
+require "assert/macro"
+require "assert/suite"
+require "assert/test"
 
 module Assert; end
 class Assert::Context
@@ -31,7 +31,7 @@ class Assert::Context
         desc_or_macro.kind_of?(Assert::Macro) ? desc_or_macro.name : desc_or_macro,
         ci,
         self.suite.config,
-        &proc { skip('TODO', [ci.called_from.to_s]) }
+        &proc { skip("TODO", [ci.called_from.to_s]) }
       ))
     end
     alias_method :test_skip, :test_eventually

data/lib/assert/context_info.rb

@@ -7,11 +7,11 @@ module Assert
     def initialize(klass, called_from = nil, first_caller = nil)
       @called_from = called_from || first_caller
       @klass = klass
-      @file = @called_from.to_s.gsub(/\:[0-9]+.*$/, '') if @called_from
+      @file = @called_from.to_s.gsub(/\:[0-9]+.*$/, "") if @called_from
     end
 
     def test_name(name)
-      [klass.description.to_s, name.to_s].compact.reject(&:empty?).join(' ')
+      [klass.description.to_s, name.to_s].compact.reject(&:empty?).join(" ")
     end
 
   end

data/lib/assert/default_runner.rb

@@ -1,4 +1,4 @@
-require 'assert/runner'
+require "assert/runner"
 
 module Assert
 

data/lib/assert/default_suite.rb

@@ -1,4 +1,4 @@
-require 'assert/suite'
+require "assert/suite"
 
 module Assert
 

data/lib/assert/default_view.rb

@@ -1,5 +1,5 @@
-require 'assert/view'
-require 'assert/view_helpers'
+require "assert/view"
+require "assert/view_helpers"
 
 module Assert
 
@@ -11,12 +11,12 @@ module Assert
 
     # setup options and their default values
 
-    option 'styled',        true
-    option 'pass_styles',   :green
-    option 'fail_styles',   :red, :bold
-    option 'error_styles',  :yellow, :bold
-    option 'skip_styles',   :cyan
-    option 'ignore_styles', :magenta
+    option "styled",        true
+    option "pass_styles",   :green
+    option "fail_styles",   :red, :bold
+    option "error_styles",  :yellow, :bold
+    option "skip_styles",   :cyan
+    option "ignore_styles", :magenta
 
     def before_load(test_files)
     end

data/lib/assert/factory.rb

@@ -1,4 +1,4 @@
-require 'much-factory'
+require "much-factory"
 
 module Assert
 

data/lib/assert/macro.rb

@@ -2,7 +2,7 @@ module Assert
   class Macro < ::Proc
 
     # this class is essentially a way to define a custom set of tests using
-    # arguments.  When passed as an argument to the 'should' method, a macro
+    # arguments.  When passed as an argument to the "should" method, a macro
     # will be instance_eval'd in that Assert::Context.
 
     attr_accessor :name

data/lib/assert/macros/methods.rb

@@ -1,4 +1,4 @@
-require 'assert/macro'
+require "assert/macro"
 
 module Assert::Macros
   module Methods

data/lib/assert/result.rb

@@ -1,4 +1,4 @@
-require 'assert/file_line'
+require "assert/file_line"
 
 module Assert; end
 module Assert::Result
@@ -28,7 +28,7 @@ module Assert::Result
   class Base
 
     def self.type; :unknown; end
-    def self.name; '';       end
+    def self.name; "";       end
 
     def self.for_test(test, message, bt)
       self.new({
@@ -54,11 +54,11 @@ module Assert::Result
     end
 
     def test_name
-      @test_name ||= (@build_data[:test_name] || '')
+      @test_name ||= (@build_data[:test_name] || "")
     end
 
     def test_file_line
-      @test_file_line ||= (@build_data[:test_file_line] || Assert::FileLine.parse(''))
+      @test_file_line ||= (@build_data[:test_file_line] || Assert::FileLine.parse(""))
     end
 
     def test_file_name; self.test_file_line.file;      end
@@ -69,11 +69,11 @@ module Assert::Result
     end
 
     def message
-      @message ||= (@build_data[:message] || '')
+      @message ||= (@build_data[:message] || "")
     end
 
     def output
-      @output ||= (@build_data[:output] || '')
+      @output ||= (@build_data[:output] || "")
     end
 
     def backtrace
@@ -135,7 +135,7 @@ module Assert::Result
     end
 
     def inspect
-      "#<#{self.class}:#{'0x0%x' % (object_id << 1)} "\
+      "#<#{self.class}:#{"0x0%x" % (object_id << 1)} "\
       "@message=#{self.message.inspect} "\
       "@file_line=#{self.file_line.to_s.inspect} "\
       "@test_file_line=#{self.test_file_line.to_s.inspect}>"
@@ -166,14 +166,14 @@ module Assert::Result
   class Pass < Base
 
     def self.type; :pass;  end
-    def self.name; 'Pass'; end
+    def self.name; "Pass"; end
 
   end
 
   class Ignore < Base
 
     def self.type; :ignore;  end
-    def self.name; 'Ignore'; end
+    def self.name; "Ignore"; end
 
   end
 
@@ -181,13 +181,13 @@ module Assert::Result
     attr_accessor :assert_with_bt
   end
 
-  # raised by the 'fail' context helper to break test execution
+  # raised by the "fail" context helper to break test execution
   TestFailure = Class.new(HaltingTestResultError)
 
   class Fail < Base
 
     def self.type; :fail;  end
-    def self.name; 'Fail'; end
+    def self.name; "Fail"; end
 
     # fail results can be generated manually or by raising Assert::Result::TestFailure
     def self.for_test(test, msg_or_err, bt = nil)
@@ -204,13 +204,13 @@ module Assert::Result
 
   end
 
-  # raised by the 'skip' context helper to break test execution
+  # raised by the "skip" context helper to break test execution
   TestSkipped = Class.new(HaltingTestResultError)
 
   class Skip < Base
 
     def self.type; :skip;  end
-    def self.name; 'Skip'; end
+    def self.name; "Skip"; end
 
     # skip results are generated by raising Assert::Result::TestSkipped
     def self.for_test(test, msg_or_err, bt = nil)
@@ -230,7 +230,7 @@ module Assert::Result
   class Error < Base
 
     def self.type; :error;  end
-    def self.name; 'Error'; end
+    def self.name; "Error"; end
 
     # error results are generated by raising exceptions in tests
     def self.for_test(test, err)
@@ -274,9 +274,9 @@ module Assert::Result
 
     # filter a line out if it's an assert lib/bin line
     def filter_out?(line)
-      # './lib' in project dir, or '/usr/local/blahblah' if installed
-      assert_lib_path    = File.expand_path('../..', __FILE__)
-      assert_macros_path = File.join(assert_lib_path, 'assert/macros')
+      # "./lib" in project dir, or "/usr/local/blahblah" if installed
+      assert_lib_path    = File.expand_path("../..", __FILE__)
+      assert_macros_path = File.join(assert_lib_path, "assert/macros")
       assert_bin_regex = /bin\/assert\:/
       ( line.rindex(assert_lib_path, 0) &&
         !line.rindex(assert_macros_path, 0)

data/lib/assert/runner.rb

@@ -1,6 +1,6 @@
-require 'assert/config_helpers'
-require 'assert/suite'
-require 'assert/view'
+require "assert/config_helpers"
+require "assert/suite"
+require "assert/view"
 
 module Assert
 
@@ -29,12 +29,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

data/lib/assert/stub.rb

@@ -1,4 +1,4 @@
-require 'much-stub'
+require "much-stub"
 
 module Assert
 

data/lib/assert/suite.rb

@@ -1,5 +1,5 @@
-require 'assert/config_helpers'
-require 'assert/test'
+require "assert/config_helpers"
+require "assert/test"
 
 module Assert
 
@@ -97,7 +97,7 @@ 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

data/lib/assert/test.rb

@@ -1,6 +1,6 @@
-require 'stringio'
-require 'assert/file_line'
-require 'assert/result'
+require "stringio"
+require "assert/file_line"
+require "assert/result"
 
 module Assert
 
@@ -37,18 +37,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 +90,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 +113,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)

data/lib/assert/utils.rb

@@ -1,4 +1,4 @@
-require 'assert'
+require "assert"
 
 module Assert
 
@@ -16,7 +16,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 +30,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 +46,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,8 +65,8 @@ 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