mspec 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733fa565d5e2085c638435f1fc22513fa124bec8
-  data.tar.gz: ed6da518e6058b01ef1a7ea8f99ffd2f051c2994
+  metadata.gz: 20b523d18faeba6833feae1b3539abaaa165bd65
+  data.tar.gz: d36ed3f25a4ce40cd94f5343ba28143e46736460
 SHA512:
-  metadata.gz: b61ffdbc4bfc08fcbd7bdcb31004186135b9e6e06f8c7c8b062ebf7b170d840e1368898af9d8b6995a701a647aa7e314d85ea80e5825e854365b351e98834589
-  data.tar.gz: d3312bdda59bfa8380bf7f85ccc010683f1e43e04e3dda5231ded27fea339af823bfad6bfca5d4b1c918f85e6cd9f8738ef0c7601bfd874ea6f6a4a40b94e81a
+  metadata.gz: 253e777134a828707b7f30eff06808519ad4da111b51498bd4e1252834a783f98ce6fe700be8012f8dd835fc411b7e05eb0e4133107dcd95031a97105013b1be
+  data.tar.gz: b6b1f8e113718582d7ff11f157bc321db0e647064df41ff7f2db71c3ad2a997c7f44e24c8be07421564cd1fcec486ba8cff34844c488db16d93b3d9b4d410711

data/lib/mspec/matchers.rb

@@ -36,3 +36,4 @@ require 'mspec/matchers/output'
 require 'mspec/matchers/output_to_fd'
 require 'mspec/matchers/respond_to'
 require 'mspec/matchers/signed_zero'
+require 'mspec/matchers/block_caller'

data/lib/mspec/matchers/block_caller.rb

@@ -0,0 +1,34 @@
+class BlockingMatcher
+  def initialize(timeout = 0.1)
+    @timeout = timeout
+  end
+
+  def matches?(block)
+    blocking = true
+
+    thread = Thread.new do
+      block.call
+
+      blocking = false
+    end
+
+    thread.join(@timeout)
+    thread.kill
+
+    blocking
+  end
+
+  def failure_message
+    ['Expected the given Proc', 'to block the caller']
+  end
+
+  def negative_failure_message
+    ['Expected the given Proc', 'to not block the caller']
+  end
+end
+
+class Object
+  def block_caller(timeout = 0.1)
+    BlockingMatcher.new(timeout)
+  end
+end

data/lib/mspec/runner/actions/timer.rb

@@ -5,11 +5,11 @@ class TimerAction
   end
 
   def start
-    @start = Time.now
+    @start = current_time
   end
 
   def finish
-    @stop = Time.now
+    @stop = current_time
   end
 
   def elapsed
@@ -19,4 +19,8 @@ class TimerAction
   def format
     "Finished in %f seconds" % elapsed
   end
+
+  def current_time
+    Time.now
+  end
 end

data/lib/mspec/runner/context.rb

@@ -6,7 +6,7 @@
 #--
 # A note on naming: this is named _ContextState_ rather
 # than _DescribeState_ because +describe+ is the keyword
-# in the DSL for refering to the context in which an example
+# in the DSL for referring to the context in which an example
 # is evaluated, just as +it+ refers to the example itself.
 #++
 class ContextState

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.8.0"
+  VERSION = SpecVersion.new "1.9.0"
 end

data/spec/commands/mspec_spec.rb

@@ -253,7 +253,7 @@ describe MSpecMain, "#run" do
   end
 
   it "calls #multi_exec if the command is 'ci' and the multi option is passed" do
-    @script.should_receive(:multi_exec).and_return do |arg|
+    @script.should_receive(:multi_exec) do |arg|
       arg.length.should == 3
       arg[0].should == "-v"
       arg[1].should =~ %r"#{MSPEC_HOME}/bin/mspec-ci$"
@@ -282,7 +282,7 @@ describe "The -A, --valgrind option" do
     ["-A", "--valgrind"].each do |opt|
       @config[:use_valgrind] = false
       @script.options [opt]
-      @config[:use_valgrind].should be_true
+      @config[:use_valgrind].should be_truthy
     end
   end
 end

data/spec/commands/mspec_tag_spec.rb

@@ -360,7 +360,7 @@ describe MSpecTag, "#register" do
 
     it "sets config[:formatter] to false" do
       @script.register
-      @config[:formatter].should be_false
+      @config[:formatter].should be_falsey
     end
   end
 
@@ -382,7 +382,7 @@ describe MSpecTag, "#register" do
 
     it "sets config[:formatter] to false" do
       @script.register
-      @config[:formatter].should be_false
+      @config[:formatter].should be_falsey
     end
   end
 
@@ -410,7 +410,7 @@ describe MSpecTag, "#register" do
 
     it "sets config[:formatter] to false" do
       @script.register
-      @config[:formatter].should be_false
+      @config[:formatter].should be_falsey
     end
   end
 end

data/spec/guards/background_spec.rb

@@ -11,7 +11,7 @@ describe Object, "#process_is_foreground" do
   end
 
   it "yields if MSpec.mode?(:background) is false" do
-    MSpec.mode?(:background).should be_false
+    MSpec.mode?(:background).should be_falsey
     process_is_foreground { ScratchPad.record :yield }
     ScratchPad.recorded.should == :yield
   end

data/spec/guards/feature_spec.rb

@@ -4,24 +4,24 @@ require 'mspec/guards'
 describe FeatureGuard, ".enabled?" do
   it "returns true if the feature is enabled" do
     MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(true)
-    FeatureGuard.enabled?(:encoding).should be_true
+    FeatureGuard.enabled?(:encoding).should be_truthy
   end
 
   it "returns false if the feature is not enabled" do
     MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(false)
-    FeatureGuard.enabled?(:encoding).should be_false
+    FeatureGuard.enabled?(:encoding).should be_falsey
   end
 
   it "returns true if all the features are enabled" do
     MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
     MSpec.should_receive(:feature_enabled?).with(:two).and_return(true)
-    FeatureGuard.enabled?(:one, :two).should be_true
+    FeatureGuard.enabled?(:one, :two).should be_truthy
   end
 
   it "returns false if any of the features are not enabled" do
     MSpec.should_receive(:feature_enabled?).with(:one).and_return(true)
     MSpec.should_receive(:feature_enabled?).with(:two).and_return(false)
-    FeatureGuard.enabled?(:one, :two).should be_false
+    FeatureGuard.enabled?(:one, :two).should be_falsey
   end
 end
 

data/spec/guards/guard_spec.rb

@@ -240,12 +240,12 @@ describe SpecGuard, "#standard?" do
 
   it "returns true if #implementation? returns true" do
     @guard.should_receive(:implementation?).with(:ruby).and_return(true)
-    @guard.standard?.should be_true
+    @guard.standard?.should be_truthy
   end
 
   it "returns false if #implementation? returns false" do
     @guard.should_receive(:implementation?).with(:ruby).and_return(false)
-    @guard.standard?.should be_false
+    @guard.standard?.should be_falsey
   end
 end
 

data/spec/helpers/fs_spec.rb

@@ -35,12 +35,12 @@ describe Object, "#touch" do
 
   it "creates a file" do
     touch @name
-    File.exist?(@name).should be_true
+    File.exist?(@name).should be_truthy
   end
 
   it "accepts an optional mode argument" do
     touch @name, "wb"
-    File.exist?(@name).should be_true
+    File.exist?(@name).should be_truthy
   end
 
   it "overwrites an existing file" do
@@ -68,7 +68,7 @@ describe Object, "#touch" do
 
   it "creates all the directories in the path to the file" do
     touch @name
-    File.exist?(@name).should be_true
+    File.exist?(@name).should be_truthy
   end
 end
 
@@ -86,7 +86,7 @@ describe Object, "#mkdir_p" do
 
   it "creates all the directories in a path" do
     mkdir_p @dir2
-    File.directory?(@dir2).should be_true
+    File.directory?(@dir2).should be_truthy
   end
 
   it "raises an ArgumentError if a path component is a file" do
@@ -129,20 +129,20 @@ describe Object, "#rm_r" do
 
   it "removes a single file" do
     rm_r @subfile
-    File.exist?(@subfile).should be_false
+    File.exist?(@subfile).should be_falsey
   end
 
   it "removes multiple files" do
     rm_r @topfile, @subfile
-    File.exist?(@topfile).should be_false
-    File.exist?(@subfile).should be_false
+    File.exist?(@topfile).should be_falsey
+    File.exist?(@subfile).should be_falsey
   end
 
   platform_is_not :windows do
     it "removes a symlink to a file" do
       File.symlink @topfile, @link
       rm_r @link
-      File.exist?(@link).should be_false
+      File.exist?(@link).should be_falsey
     end
 
     it "removes a symlink to a directory" do
@@ -151,7 +151,7 @@ describe Object, "#rm_r" do
       lambda do
         File.lstat(@link)
       end.should raise_error(Errno::ENOENT)
-      File.exist?(@subdir1).should be_true
+      File.exist?(@subdir1).should be_truthy
     end
 
     it "removes a dangling symlink" do
@@ -166,17 +166,17 @@ describe Object, "#rm_r" do
       require 'socket'
       UNIXServer.new(@socket).close
       rm_r @socket
-      File.exist?(@socket).should be_false
+      File.exist?(@socket).should be_falsey
     end
   end
 
   it "removes a single directory" do
     rm_r @subdir2
-    File.directory?(@subdir2).should be_false
+    File.directory?(@subdir2).should be_falsey
   end
 
   it "recursively removes a directory tree" do
     rm_r @topdir
-    File.directory?(@topdir).should be_false
+    File.directory?(@topdir).should be_falsey
   end
 end

data/spec/helpers/numeric_spec.rb

@@ -14,7 +14,7 @@ end
 
 describe Object, "#nan_value" do
   it "returns NaN" do
-    nan_value.nan?.should be_true
+    nan_value.nan?.should be_truthy
   end
 end
 

data/spec/matchers/be_an_instance_of_spec.rb

@@ -16,22 +16,22 @@ end
 describe BeAnInstanceOfMatcher do
   it "matches when actual is an instance_of? expected" do
     a = BeAnInOfSpecs::A.new
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(a).should be_true
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(a).should be_truthy
 
     b = BeAnInOfSpecs::B.new
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(b).should be_true
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(b).should be_truthy
   end
 
   it "does not match when actual is not an instance_of? expected" do
     a = BeAnInOfSpecs::A.new
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(a).should be_false
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(a).should be_falsey
 
     b = BeAnInOfSpecs::B.new
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(b).should be_false
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(b).should be_falsey
 
     c = BeAnInOfSpecs::C.new
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(c).should be_false
-    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(c).should be_false
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(c).should be_falsey
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(c).should be_falsey
   end
 
   it "provides a useful failure message" do

data/spec/matchers/be_computed_by_function_spec.rb

@@ -5,25 +5,25 @@ describe BeComputedByFunctionMatcher do
   it "matches when all entries in the Array compute" do
     array = [ ["%2d",  65, "65"],
               ["%04d", 90, "0090"] ]
-    BeComputedByFunctionMatcher.new(:sprintf).matches?(array).should be_true
+    BeComputedByFunctionMatcher.new(:sprintf).matches?(array).should be_truthy
   end
 
   it "matches when all entries in the Array with arguments compute" do
     array = [ ["%2d",  "65"],
               ["%04d", "0065"] ]
-    BeComputedByFunctionMatcher.new(:sprintf, 65).matches?(array).should be_true
+    BeComputedByFunctionMatcher.new(:sprintf, 65).matches?(array).should be_truthy
   end
 
   it "does not match when any entry in the Array does not compute" do
     array = [ ["%2d",  65, "65"],
               ["%04d", 90, "00090"] ]
-    BeComputedByFunctionMatcher.new(:sprintf).matches?(array).should be_false
+    BeComputedByFunctionMatcher.new(:sprintf).matches?(array).should be_falsey
   end
 
   it "does not match when any entry in the Array with arguments does not compute" do
     array = [ ["%2d",  "65"],
               ["%04d", "0065"] ]
-    BeComputedByFunctionMatcher.new(:sprintf, 91).matches?(array).should be_false
+    BeComputedByFunctionMatcher.new(:sprintf, 91).matches?(array).should be_falsey
   end
 
   it "provides a useful failure message" do

data/spec/matchers/be_computed_by_spec.rb

@@ -5,31 +5,31 @@ describe BeComputedByMatcher do
   it "matches when all entries in the Array compute" do
     array = [ [65, "A"],
               [90, "Z"] ]
-    BeComputedByMatcher.new(:chr).matches?(array).should be_true
+    BeComputedByMatcher.new(:chr).matches?(array).should be_truthy
   end
 
   it "matches when all entries in the Array with arguments compute" do
     array = [ [1, 2, 3],
               [2, 4, 6] ]
-    BeComputedByMatcher.new(:+).matches?(array).should be_true
+    BeComputedByMatcher.new(:+).matches?(array).should be_truthy
   end
 
   it "does not match when any entry in the Array does not compute" do
     array = [ [65, "A" ],
               [91, "Z" ] ]
-    BeComputedByMatcher.new(:chr).matches?(array).should be_false
+    BeComputedByMatcher.new(:chr).matches?(array).should be_falsey
   end
 
   it "accepts an argument list to apply to each method call" do
     array = [ [65, "1000001" ],
               [90, "1011010" ] ]
-    BeComputedByMatcher.new(:to_s, 2).matches?(array).should be_true
+    BeComputedByMatcher.new(:to_s, 2).matches?(array).should be_truthy
   end
 
   it "does not match when any entry in the Array with arguments does not compute" do
     array = [ [1, 2, 3],
               [2, 4, 7] ]
-    BeComputedByMatcher.new(:+).matches?(array).should be_false
+    BeComputedByMatcher.new(:+).matches?(array).should be_falsey
   end
 
   it "provides a useful failure message" do

data/spec/matchers/be_valid_dns_name_spec.rb

@@ -4,35 +4,35 @@ require 'mspec/matchers'
 
 describe BeValidDNSName do
   it "matches when actual is 'localhost'" do
-    BeValidDNSName.new.matches?("localhost").should be_true
+    BeValidDNSName.new.matches?("localhost").should be_truthy
   end
 
   it "matches when actual is 'localhost.localdomain'" do
-    BeValidDNSName.new.matches?("localhost.localdomain").should be_true
+    BeValidDNSName.new.matches?("localhost.localdomain").should be_truthy
   end
 
   it "matches when actual is hyphenated" do
-    BeValidDNSName.new.matches?("local-host").should be_true
+    BeValidDNSName.new.matches?("local-host").should be_truthy
   end
 
   it "matches when actual is 'a.b.c'" do
-    BeValidDNSName.new.matches?("a.b.c").should be_true
+    BeValidDNSName.new.matches?("a.b.c").should be_truthy
   end
 
   it "matches when actual has a trailing '.'" do
-    BeValidDNSName.new.matches?("a.com.").should be_true
+    BeValidDNSName.new.matches?("a.com.").should be_truthy
   end
 
   it "does not match when actual is not a valid dns name" do
-    BeValidDNSName.new.matches?(".").should be_false
+    BeValidDNSName.new.matches?(".").should be_falsey
   end
 
   it "does not match when actual contains a hyphen at the beginning" do
-    BeValidDNSName.new.matches?("-localhost").should be_false
+    BeValidDNSName.new.matches?("-localhost").should be_falsey
   end
 
   it "does not match when actual contains a hyphen at the end" do
-    BeValidDNSName.new.matches?("localhost-").should be_false
+    BeValidDNSName.new.matches?("localhost-").should be_falsey
   end
 
   it "provides a failure message" do

data/spec/matchers/block_caller_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers'
+
+describe BlockingMatcher do
+  it 'matches when a Proc blocks the caller' do
+    BlockingMatcher.new.matches?(proc { sleep }).should == true
+  end
+
+  it 'does not match when a Proc does not block the caller' do
+    BlockingMatcher.new.matches?(proc { 1 }).should == false
+  end
+end