From 49213e5331346b6c1647eb01fffbab7970e4b154 Mon Sep 17 00:00:00 2001
From: eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 27 May 2017 21:54:38 +0000
Subject: Update to ruby/mspec@6c95759

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 spec/mspec/spec/commands/mspec_spec.rb             | 10 +---------
 spec/mspec/spec/fixtures/print_interpreter_spec.rb |  2 +-
 spec/mspec/spec/spec_helper.rb                     |  3 ++-
 spec/mspec/tool/sync/sync-rubyspec.rb              | 10 +++++++++-
 4 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'spec')

diff --git a/spec/mspec/spec/commands/mspec_spec.rb b/spec/mspec/spec/commands/mspec_spec.rb
index 8b8b8fcc41..5d2134a054 100644
--- a/spec/mspec/spec/commands/mspec_spec.rb
+++ b/spec/mspec/spec/commands/mspec_spec.rb
@@ -83,7 +83,7 @@ describe MSpecMain, "#run" do
 
   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 @@ describe "The -j, --multi option" do
       @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
index e1c514dc87..a662346d0a 100644
--- 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/spec_helper.rb b/spec/mspec/spec/spec_helper.rb
index 4fae9bd7e2..93e383ebb0 100644
--- 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/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index fe8c4edbb6..e7f054ca60 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -14,6 +14,7 @@ IMPLS = {
     git: "https://github.com/ruby/ruby.git",
     master: "trunk",
     prefix: "spec/rubyspec",
+    merge_message: "Update to ruby/spec@",
   },
 }
 
@@ -52,6 +53,10 @@ class RubyImplementation
     "#{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
 
-- 
cgit v1.2.3