jruby · May 27, 2017 · May 27, 2017 · May 27, 2017 · May 27, 2017
diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -44,7 +44,6 @@ def options(argv=ARGV)
 
     options.on("-j", "--multi", "Run multiple (possibly parallel) subprocesses") do
       config[:multi] = true
-      config[:options] << "-fy"
     end
 
     options.version MSpec::VERSION do
@@ -94,6 +93,9 @@ def multi_exec(argv)
 
     require 'mspec/runner/formatters/multi'
     formatter = MultiFormatter.new
+    if config[:formatter]
+      warn "formatter options is ignored due to multi option"
+    end
 
     output_files = []
     processes = [cores, @files.size].min
@@ -105,7 +107,7 @@ def multi_exec(argv)
         "SPEC_TEMP_DIR" => "rubyspec_temp_#{i}",
         "MSPEC_MULTI" => i.to_s
       }
-      command = argv + ["-o", name]
+      command = argv + ["-fy", "-o", name]
       $stderr.puts "$ #{command.join(' ')}" if $MSPEC_DEBUG
       IO.popen([env, *command], "rb+")
     }

diff --git a/spec/mspec/lib/mspec/matchers/be_false.rb b/spec/mspec/lib/mspec/matchers/be_false.rb
@@ -17,4 +17,4 @@ class Object
   def be_false
     BeFalseMatcher.new
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/matchers/be_nil.rb b/spec/mspec/lib/mspec/matchers/be_nil.rb
@@ -17,4 +17,4 @@ class Object
   def be_nil
     BeNilMatcher.new
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/matchers/be_true.rb b/spec/mspec/lib/mspec/matchers/be_true.rb
@@ -17,4 +17,4 @@ class Object
   def be_true
     BeTrueMatcher.new
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/matchers/equal_element.rb b/spec/mspec/lib/mspec/matchers/equal_element.rb
@@ -75,4 +75,4 @@ class Object
   def equal_element(*args)
     EqualElementMatcher.new(*args)
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/matchers/have_class_variable.rb b/spec/mspec/lib/mspec/matchers/have_class_variable.rb
@@ -9,4 +9,4 @@ class Object
   def have_class_variable(variable)
     HaveClassVariableMatcher.new(variable)
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/matchers/have_instance_variable.rb b/spec/mspec/lib/mspec/matchers/have_instance_variable.rb
@@ -9,4 +9,4 @@ class Object
   def have_instance_variable(variable)
     HaveInstanceVariableMatcher.new(variable)
   end
-end
+end
diff --git a/spec/mspec/lib/mspec/runner/formatters/unit.rb b/spec/mspec/lib/mspec/runner/formatters/unit.rb
@@ -8,7 +8,7 @@ def finish
     @exceptions.each do |exc|
       outcome = exc.failure? ? "FAILED" : "ERROR"
       print "\n#{count += 1})\n#{exc.description} #{outcome}\n"
-      print exc.message, ": \n"
+      print exc.message, ":\n"
       print exc.backtrace, "\n"
     end
     print "\n#{@tally.format}\n"

diff --git a/spec/mspec/lib/mspec/utils/script.rb b/spec/mspec/lib/mspec/utils/script.rb
@@ -185,7 +185,7 @@ def entries(partial)
 
     patterns.each do |pattern|
       expanded = File.expand_path(pattern)
-      if File.file?(expanded)
+      if File.file?(expanded) && expanded.end_with?('.rb')
         return [expanded]
       elsif File.directory?(expanded)
         return Dir["#{expanded}/**/*_spec.rb"].sort

diff --git a/spec/mspec/spec/commands/fixtures/level2/three_spec.rb b/spec/mspec/spec/commands/fixtures/level2/three_spec.rb
@@ -0,0 +1 @@
+
diff --git a/spec/mspec/spec/commands/fixtures/one_spec.rb b/spec/mspec/spec/commands/fixtures/one_spec.rb
@@ -0,0 +1 @@
+
diff --git a/spec/mspec/spec/commands/fixtures/three.rb b/spec/mspec/spec/commands/fixtures/three.rb
@@ -0,0 +1 @@
+
diff --git a/spec/mspec/spec/commands/fixtures/two_spec.rb b/spec/mspec/spec/commands/fixtures/two_spec.rb
@@ -0,0 +1 @@
+
diff --git a/spec/mspec/spec/commands/mspec_spec.rb b/spec/mspec/spec/commands/mspec_spec.rb
@@ -83,7 +83,7 @@
 
   it "calls #multi_exec if the command is 'ci' and the multi option is passed" do
     @script.should_receive(:multi_exec).and_return do |argv|
-      argv.should == ["ruby", "#{MSPEC_HOME}/bin/mspec-ci", "-fy"]
+      argv.should == ["ruby", "#{MSPEC_HOME}/bin/mspec-ci"]
     end
     @script.options ["ci", "-j"]
     lambda do
@@ -140,14 +140,6 @@
       @config[:multi].should == true
     end
   end
-
-  it "sets the formatter to YamlFormatter" do
-    ["-j", "--multi"].each do |opt|
-      @config[:options] = []
-      @script.options [opt]
-      @config[:options].should include("-fy")
-    end
-  end
 end
 
 describe "The -h, --help option" do

diff --git a/spec/mspec/spec/fixtures/print_interpreter_spec.rb b/spec/mspec/spec/fixtures/print_interpreter_spec.rb
@@ -1,4 +1,4 @@
 unless defined?(RSpec)
   puts ENV["RUBY_EXE"]
-  puts ruby_cmd("nil").split.first
+  puts ruby_cmd(nil).split.first
 end
diff --git a/spec/mspec/spec/runner/formatters/unit_spec.rb b/spec/mspec/spec/runner/formatters/unit_spec.rb
@@ -65,7 +65,7 @@
 
 1)
 describe it ERROR
-Exception: broken: 
+Exception: broken:
 path/to/some/file.rb:35:in method
 
 1 example, 0 failures

diff --git a/spec/mspec/spec/spec_helper.rb b/spec/mspec/spec/spec_helper.rb
@@ -48,7 +48,8 @@ def run_mspec(command, args)
   ret = $?
   out = out.sub(/\A\$.+\n/, '') # Remove printed command line
   out = out.sub(RUBY_DESCRIPTION, "RUBY_DESCRIPTION")
-  out = out.gsub(/\d\.\d{6}/, "D.DDDDDD")
+  out = out.gsub(/\d\.\d{6}/, "D.DDDDDD") # Specs total time
+  out = out.gsub(/\d{2}:\d{2}:\d{2}/, "00:00:00") # Progress bar time
   out = out.gsub(cwd, "CWD")
   return out, ret
 end
diff --git a/spec/mspec/spec/utils/deprecate_spec.rb b/spec/mspec/spec/utils/deprecate_spec.rb
@@ -9,7 +9,7 @@
     warning.should start_with(<<-EOS.chomp)
 
 some_method is deprecated, use other_method instead.
-from 
+from
 EOS
     warning.should include(__FILE__)
     warning.should include('8')

diff --git a/spec/mspec/spec/utils/script_spec.rb b/spec/mspec/spec/utils/script_spec.rb
@@ -356,9 +356,9 @@ class MSSClass < MSpecScript; end
   end
 
   it "returns the pattern in an array if it is a file" do
-    File.should_receive(:expand_path).with("file").and_return("file/expanded")
-    File.should_receive(:file?).with("file/expanded").and_return(true)
-    @script.entries("file").should == ["file/expanded"]
+    File.should_receive(:expand_path).with("file").and_return("file/expanded.rb")
+    File.should_receive(:file?).with("file/expanded.rb").and_return(true)
+    @script.entries("file").should == ["file/expanded.rb"]
   end
 
   it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do
@@ -381,9 +381,10 @@ class MSSClass < MSpecScript; end
     end
 
     it "returns the pattern in an array if it is a file" do
-      File.should_receive(:expand_path).with(@name).and_return(@name)
-      File.should_receive(:file?).with(@name).and_return(true)
-      @script.entries("name").should == [@name]
+      name = "#{@name}.rb"
+      File.should_receive(:expand_path).with(name).and_return(name)
+      File.should_receive(:file?).with(name).and_return(true)
+      @script.entries("name.rb").should == [name]
     end
 
     it "returns Dir['pattern/**/*_spec.rb'] if pattern is a directory" do

diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -14,6 +14,7 @@
     git: "https://github.com/ruby/ruby.git",
     master: "trunk",
     prefix: "spec/rubyspec",
+    merge_message: "Update to ruby/spec@",
   },
 }
 
@@ -52,6 +53,10 @@ def from_commit
     "#{from}..." if from
   end
 
+  def last_merge_message
+    @data[:merge_message] || "Merge ruby/spec commit"
+  end
+
   def prefix
     @data[:prefix] || "spec/ruby"
   end
@@ -113,7 +118,7 @@ def rebase_commits(impl)
       if ENV["LAST_MERGE"]
         last_merge = `git log -n 1 --format='%H %ct' #{ENV["LAST_MERGE"]}`
       else
-        last_merge = `git log --grep='Merge ruby/spec commit' -n 1 --format='%H %ct'`
+        last_merge = `git log --grep='#{impl.last_merge_message}' -n 1 --format='%H %ct'`
       end
       last_merge, commit_timestamp = last_merge.chomp.split(' ')
 
@@ -167,6 +172,8 @@ def verify_commits(impl)
     end
 
     puts "Manually check commit messages:"
+    print "Press enter >"
+    STDIN.gets
     sh "git", "log", "master..."
   end
 end
@@ -183,6 +190,7 @@ def check_ci
   puts <<-EOS
   Push to master, and check that the CI passes:
     https://github.com/ruby/spec/commits/master
+
   EOS
 end
 

diff --git a/spec/ruby/.travis.yml b/spec/ruby/.travis.yml
@@ -20,6 +20,9 @@ matrix:
       env: CHECK_LEAKS=true
     - os: linux
       rvm: ruby-head
+  allow_failures:
+    - os: linux
+      rvm: ruby-head
 branches:
   only:
     - master

diff --git a/spec/ruby/command_line/dash_upper_s_spec.rb b/spec/ruby/command_line/dash_upper_s_spec.rb
@@ -6,14 +6,18 @@
   end
 
   platform_is_not :windows do
+    # On VirtualBox shared directory (vboxsf) all files are world writable
+    # and MRI shows warning when including world writable path in ENV['PATH'].
+    # This is why we are using /success$/ matching in the following cases.
+
     it "runs launcher found in PATH, but only code after the first /\#!.*ruby.*/-ish line in target file" do
       result = ruby_exe(nil, options: '-S hybrid_launcher.sh', env: { 'PATH' => @path }, args: '2>&1')
-      result.should == "success\n"
+      result.should =~ /success$/
     end
 
     it "runs launcher found in PATH" do
       result = ruby_exe(nil, options: '-S launcher.rb', env: { 'PATH' => @path }, args: '2>&1')
-      result.should == "success\n"
+      result.should =~ /success$/
     end
   end
 end
diff --git a/spec/ruby/core/dir/home_spec.rb b/spec/ruby/core/dir/home_spec.rb
@@ -5,8 +5,10 @@
   it "returns the current user's home directory as a string if called without arguments" do
     home_directory = ENV['HOME']
     platform_is :windows do
-      path = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
-      home_directory = path.tr('\\', '/').chomp('/')
+      unless home_directory
+        home_directory = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
+      end
+      home_directory = home_directory.tr('\\', '/').chomp('/')
     end
 
     Dir.home.should == home_directory

diff --git a/spec/ruby/core/dir/shared/delete.rb b/spec/ruby/core/dir/shared/delete.rb
@@ -40,8 +40,10 @@
   end
 
   it "raises an Errno::ENOTDIR when trying to remove a non-directory" do
+    file = DirSpecs.mock_rmdir("nonempty/regular")
+    touch(file)
     lambda do
-      Dir.send @method, __FILE__
+      Dir.send @method, file
     end.should raise_error(Errno::ENOTDIR)
   end
 

diff --git a/spec/ruby/core/exception/uncaught_throw_error_spec.rb b/spec/ruby/core/exception/uncaught_throw_error_spec.rb
@@ -0,0 +1,19 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe "UncaughtThrowError" do
+  it "is a subclass of ArgumentError" do
+    ArgumentError.should be_ancestor_of(UncaughtThrowError)
+  end
+end
+
+describe "UncaughtThrowError#tag" do
+  it "returns the object thrown" do
+    begin
+      throw :abc
+
+    rescue UncaughtThrowError => e
+      e.tag.should == :abc
+    end
+  end
+end
+
diff --git a/spec/ruby/core/io/fixtures/classes.rb b/spec/ruby/core/io/fixtures/classes.rb
@@ -14,7 +14,7 @@ def self.lines
       "\n",
       "\n",
       "Aqu\303\255 est\303\241 la l\303\255nea tres.\n",
-      "Ist hier Linie vier.\n",
+      "Hier ist Zeile vier.\n",
       "\n",
       "Est\303\241 aqui a linha cinco.\n",
       "Here is line six.\n" ]
@@ -31,8 +31,8 @@ def self.lines_limit
       "Aquí está",
       " la línea",
       " tres.\n",
-      "Ist hier L",
-      "inie vier.",
+      "Hier ist Z",
+      "eile vier.",
       "\n",
       "\n",
       "Está aqui",
@@ -55,9 +55,10 @@ def self.lines_space_separator_limit
       "está ",
       "la ",
       "línea ",
-      "tres.\nIst ",
-      "hier ",
-      "Linie ",
+      "tres.\nHier",
+      " ",
+      "ist ",
+      "Zeile ",
       "vier.\n\nEst",
       "á ",
       "aqui ",
@@ -71,37 +72,35 @@ def self.lines_space_separator_limit
   end
 
   def self.lines_r_separator
-    [ "Voici la ligne une.\nQui \303\250 la linea due.\n\n\n" \
-      "Aqu\303\255 est\303\241 la l\303\255nea tr",
-      "es.\nIst hier",
-      " Linie vier",
+    [ "Voici la ligne une.\nQui \303\250 la linea due.\n\n\nAqu\303\255 est\303\241 la l\303\255nea tr",
+      "es.\nHier",
+      " ist Zeile vier",
       ".\n\nEst\303\241 aqui a linha cinco.\nHer",
       "e is line six.\n" ]
   end
 
   def self.lines_empty_separator
     [ "Voici la ligne une.\nQui \303\250 la linea due.\n\n",
-      "Aqu\303\255 est\303\241 la l\303\255nea tres.\nIst hier Linie vier.\n\n",
+      "Aqu\303\255 est\303\241 la l\303\255nea tres.\nHier ist Zeile vier.\n\n",
       "Est\303\241 aqui a linha cinco.\nHere is line six.\n" ]
   end
 
   def self.lines_space_separator
     [ "Voici ", "la ", "ligne ", "une.\nQui ",
       "\303\250 ", "la ", "linea ", "due.\n\n\nAqu\303\255 ",
-      "est\303\241 ", "la ", "l\303\255nea ", "tres.\nIst ",
-      "hier ", "Linie ", "vier.\n\nEst\303\241 ", "aqui ", "a ",
+      "est\303\241 ", "la ", "l\303\255nea ", "tres.\nHier ",
+      "ist ", "Zeile ", "vier.\n\nEst\303\241 ", "aqui ", "a ",
       "linha ", "cinco.\nHere ", "is ", "line ", "six.\n" ]
   end
 
   def self.lines_arbitrary_separator
     [ "Voici la ligne une.\nQui \303\250",
-      " la linea due.\n\n\nAqu\303\255 est\303\241 la l\303\255nea tres.\n" \
-      "Ist hier Linie vier.\n\nEst\303\241 aqui a linha cinco.\nHere is line six.\n" ]
+      " la linea due.\n\n\nAqu\303\255 est\303\241 la l\303\255nea tres.\nHier ist Zeile vier.\n\nEst\303\241 aqui a linha cinco.\nHere is line six.\n" ]
   end
 
   def self.paragraphs
     [ "Voici la ligne une.\nQui \303\250 la linea due.\n\n",
-      "Aqu\303\255 est\303\241 la l\303\255nea tres.\nIst hier Linie vier.\n\n",
+      "Aqu\303\255 est\303\241 la l\303\255nea tres.\nHier ist Zeile vier.\n\n",
       "Est\303\241 aqui a linha cinco.\nHere is line six.\n" ]
   end
 

diff --git a/spec/ruby/core/io/fixtures/lines.txt b/spec/ruby/core/io/fixtures/lines.txt
@@ -3,7 +3,7 @@ Qui è la linea due.
 
 
 Aquí está la línea tres.
-Ist hier Linie vier.
+Hier ist Zeile vier.
 
 Está aqui a linha cinco.
 Here is line six.
-Original file line number
+Diff line change
@@ @@ -17,4 +17,4 @@ class Object @@
       def be_false
         BeFalseMatcher.new
       end
-    end
+    end