ruby-changes:46815
From: eregon <ko1@a...>
Date: Sun, 28 May 2017 06:54:45 +0900 (JST)
Subject: [ruby-changes:46815] eregon:r58930 (trunk): Update to ruby/mspec@6c95759
eregon 2017-05-28 06:54:38 +0900 (Sun, 28 May 2017) New Revision: 58930 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58930 Log: Update to ruby/mspec@6c95759 Modified files: trunk/spec/mspec/spec/commands/mspec_spec.rb trunk/spec/mspec/spec/fixtures/print_interpreter_spec.rb trunk/spec/mspec/spec/spec_helper.rb trunk/spec/mspec/tool/sync/sync-rubyspec.rb Index: spec/mspec/tool/sync/sync-rubyspec.rb =================================================================== --- spec/mspec/tool/sync/sync-rubyspec.rb (revision 58929) +++ spec/mspec/tool/sync/sync-rubyspec.rb (revision 58930) @@ -14,6 +14,7 @@ IMPLS = { https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L14 git: "https://github.com/ruby/ruby.git", master: "trunk", prefix: "spec/rubyspec", + merge_message: "Update to ruby/spec@", }, } @@ -52,6 +53,10 @@ class RubyImplementation https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L53 "#{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) https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L118 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) https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L172 end puts "Manually check commit messages:" + print "Press enter >" + STDIN.gets sh "git", "log", "master..." end end @@ -183,6 +190,7 @@ def check_ci https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L190 puts <<-EOS Push to master, and check that the CI passes: https://github.com/ruby/spec/commits/master + EOS end Index: spec/mspec/spec/commands/mspec_spec.rb =================================================================== --- spec/mspec/spec/commands/mspec_spec.rb (revision 58929) +++ spec/mspec/spec/commands/mspec_spec.rb (revision 58930) @@ -83,7 +83,7 @@ describe MSpecMain, "#run" do https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/commands/mspec_spec.rb#L83 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 https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/commands/mspec_spec.rb#L140 @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 Index: spec/mspec/spec/fixtures/print_interpreter_spec.rb =================================================================== --- spec/mspec/spec/fixtures/print_interpreter_spec.rb (revision 58929) +++ spec/mspec/spec/fixtures/print_interpreter_spec.rb (revision 58930) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/fixtures/print_interpreter_spec.rb#L1 unless defined?(RSpec) puts ENV["RUBY_EXE"] - puts ruby_cmd("nil").split.first + puts ruby_cmd(nil).split.first end Index: spec/mspec/spec/spec_helper.rb =================================================================== --- spec/mspec/spec/spec_helper.rb (revision 58929) +++ spec/mspec/spec/spec_helper.rb (revision 58930) @@ -48,7 +48,8 @@ def run_mspec(command, args) https://github.com/ruby/ruby/blob/trunk/spec/mspec/spec/spec_helper.rb#L48 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/