Update to ruby/mspec@673fcab

Author: eregon

spec/mspec/lib/mspec/expectations/should.rb

@@ -3,7 +3,10 @@ class Object
 
   def should(matcher = NO_MATCHER_GIVEN)
     MSpec.expectation
-    MSpec.actions :expectation, MSpec.current.state
+    state = MSpec.current.state
+    raise "should outside example" unless state
+    MSpec.actions :expectation, state
+
     if NO_MATCHER_GIVEN.equal?(matcher)
       SpecPositiveOperatorMatcher.new(self)
     else
@@ -16,7 +19,10 @@ def should(matcher = NO_MATCHER_GIVEN)
 
   def should_not(matcher = NO_MATCHER_GIVEN)
     MSpec.expectation
-    MSpec.actions :expectation, MSpec.current.state
+    state = MSpec.current.state
+    raise "should_not outside example" unless state
+    MSpec.actions :expectation, state
+
     if NO_MATCHER_GIVEN.equal?(matcher)
       SpecNegativeOperatorMatcher.new(self)
     else

spec/mspec/lib/mspec/runner/formatters/specdoc.rb

@@ -24,7 +24,7 @@ def before(state)
   # the sequential number of the exception raised. If
   # there has already been an exception raised while
   # evaluating this example, it prints another +it+
-  # block description string so that each discription
+  # block description string so that each description
   # string has an associated 'ERROR' or 'FAILED'
   def exception(exception)
     print "\n- #{exception.it}" if exception?

spec/mspec/lib/mspec/utils/options.rb

@@ -94,7 +94,7 @@ def match?(opt)
     @options.find { |o| o.match? opt }
   end
 
-  # Processes an option. Calles the #on_extra block (or default) for
+  # Processes an option. Calls the #on_extra block (or default) for
   # unrecognized options. For registered options, possibly fetches an
   # argument and invokes the option's block if it is not nil.
   def process(argv, entry, opt, arg)
@@ -414,7 +414,7 @@ def obj.load
   end
 
   def interrupt
-    on("--int-spec", "Control-C interupts the current spec only") do
+    on("--int-spec", "Control-C interrupts the current spec only") do
       config[:abort] = false
     end
   end

spec/mspec/spec/expectations/should.rb

@@ -41,7 +41,7 @@ def finish
     :sym.should be_kind_of(Symbol)
   end
 
-  it "causes a failue to be recorded" do
+  it "causes a failure to be recorded" do
     1.should == 2
   end
 

spec/mspec/spec/expectations/should_spec.rb

@@ -13,7 +13,7 @@
     it "records failures" do
       @out.should include <<-EOS
 1)
-MSpec expectation method #should causes a failue to be recorded FAILED
+MSpec expectation method #should causes a failure to be recorded FAILED
 Expected 1 == 2
 to be truthy but was false
 EOS

spec/mspec/spec/matchers/base_spec.rb

@@ -52,7 +52,7 @@
   end
 end
 
-describe SpecPositiveOperatorMatcher, "< operater" do
+describe SpecPositiveOperatorMatcher, "< operator" do
   it "provides a failure message that 'Expected x to be less than y'" do
     lambda {
       SpecPositiveOperatorMatcher.new(5) < 4
@@ -64,7 +64,7 @@
   end
 end
 
-describe SpecPositiveOperatorMatcher, "<= operater" do
+describe SpecPositiveOperatorMatcher, "<= operator" do
   it "provides a failure message that 'Expected x to be less than or equal to y'" do
     lambda {
       SpecPositiveOperatorMatcher.new(5) <= 4

spec/mspec/spec/matchers/complain_spec.rb

@@ -8,7 +8,7 @@
     ComplainMatcher.new(nil).matches?(proc).should == true
   end
 
-  it "maches when executing the proc results in the expected output to $stderr" do
+  it "matches when executing the proc results in the expected output to $stderr" do
     proc = lambda { warn "Que haces?" }
     ComplainMatcher.new("Que haces?\n").matches?(proc).should == true
     ComplainMatcher.new("Que pasa?\n").matches?(proc).should == false

spec/mspec/spec/runner/formatters/dotted_spec.rb

@@ -91,7 +91,7 @@
     @formatter.exception?.should be_true
   end
 
-  it "addes the exception to the list of exceptions" do
+  it "adds the exception to the list of exceptions" do
     @formatter.exceptions.should == []
     @formatter.exception @error
     @formatter.exception @failure

spec/mspec/spec/utils/script_spec.rb

@@ -406,7 +406,7 @@ class MSSClass < MSpecScript; end
     @script = MSpecScript.new
   end
 
-  it "accumlates the values returned by #entries" do
+  it "accumulates the values returned by #entries" do
     @script.should_receive(:entries).and_return(["file1"], ["file2"])
     @script.files(["a", "b"]).should == ["file1", "file2"]
   end

spec/mspec/tool/sync/sync-rubyspec.rb

@@ -12,7 +12,6 @@
   },
   mri: {
     git: "https://github.com/ruby/ruby.git",
-    master: "trunk",
   },
 }
 
@@ -48,10 +47,6 @@ def git_url
     @data[:git]
   end
 
-  def default_branch
-    @data[:master] || "master"
-  end
-
   def repo_name
     File.basename(git_url, ".git")
   end
@@ -99,7 +94,7 @@ def update_repo(impl)
   Dir.chdir(impl.repo_name) do
     puts Dir.pwd
 
-    sh "git", "checkout", impl.default_branch
+    sh "git", "checkout", "master"
     sh "git", "pull"
   end
 end
@@ -162,12 +157,7 @@ def rebase_commits(impl)
 def test_new_specs
   require "yaml"
   Dir.chdir(SOURCE_REPO) do
-    versions = YAML.load_file(".travis.yml")
-    versions = if versions.include? "matrix"
-      versions["matrix"]["include"].map { |job| job["rvm"] }
-    else
-      versions["rvm"]
-    end
+    versions = YAML.load_file("#{MSPEC_REPO}/.travis.yml").fetch("rvm")
     versions = versions.grep(/^\d+\./) # Test on MRI
     min_version, max_version = versions.minmax