jruby · May 14, 2017 · May 14, 2017 · May 14, 2017 · May 14, 2017 · May 14, 2017
diff --git a/spec/mspec/lib/mspec/helpers.rb b/spec/mspec/lib/mspec/helpers.rb
@@ -10,3 +10,4 @@
 require 'mspec/helpers/ruby_exe'
 require 'mspec/helpers/scratch'
 require 'mspec/helpers/tmp'
+require 'mspec/helpers/warning'
diff --git a/spec/mspec/lib/mspec/helpers/warning.rb b/spec/mspec/lib/mspec/helpers/warning.rb
@@ -0,0 +1,9 @@
+class Object
+  def suppress_warning
+    verbose = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = verbose
+  end
+end
diff --git a/spec/mspec/spec/helpers/suppress_warning_spec.rb b/spec/mspec/spec/helpers/suppress_warning_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'mspec/guards'
+require 'mspec/helpers'
+
+describe Object, "#suppress_warning" do
+  it "hides warnings" do
+    suppress_warning do
+      warn "should not be shown"
+    end
+  end
+
+  it "yields the block" do
+    a = 0
+    suppress_warning do
+      a = 1
+    end
+    a.should == 1
+  end
+end
diff --git a/spec/mspec/tool/sync/.gitignore b/spec/mspec/tool/sync/.gitignore
@@ -0,0 +1,4 @@
+/jruby
+/rubinius
+/ruby
+/truffleruby
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -0,0 +1,210 @@
+IMPLS = {
+  truffleruby: {
+    git: "https://github.com/graalvm/truffleruby.git",
+    from_commit: "f10ab6988d",
+  },
+  jruby: {
+    git: "https://github.com/jruby/jruby.git",
+    from_commit: "f10ab6988d",
+  },
+  rbx: {
+    git: "https://github.com/rubinius/rubinius.git",
+  },
+  mri: {
+    git: "https://github.com/ruby/ruby.git",
+    master: "trunk",
+    prefix: "spec/rubyspec",
+  },
+}
+
+# Assuming the rubyspec repo is a sibling of the mspec repo
+RUBYSPEC_REPO = File.expand_path("../../../../rubyspec", __FILE__)
+raise RUBYSPEC_REPO unless Dir.exist?(RUBYSPEC_REPO)
+
+NOW = Time.now
+
+class RubyImplementation
+  attr_reader :name
+
+  def initialize(name, data)
+    @name = name.to_s
+    @data = data
+  end
+
+  def git_url
+    @data[:git]
+  end
+
+  def default_branch
+    @data[:master] || "master"
+  end
+
+  def repo_name
+    File.basename(git_url, ".git")
+  end
+
+  def repo_org
+    File.basename(File.dirname(git_url))
+  end
+
+  def from_commit
+    from = @data[:from_commit]
+    "#{from}..." if from
+  end
+
+  def prefix
+    @data[:prefix] || "spec/ruby"
+  end
+
+  def rebased_branch
+    "#{@name}-rebased"
+  end
+end
+
+def sh(*args)
+  puts args.join(' ')
+  system(*args)
+  raise unless $?.success?
+end
+
+def branch?(name)
+  branches = `git branch`.sub('*', '').lines.map(&:strip)
+  branches.include?(name)
+end
+
+def update_repo(impl)
+  unless File.directory? impl.repo_name
+    sh "git", "clone", impl.git_url
+  end
+
+  Dir.chdir(impl.repo_name) do
+    puts Dir.pwd
+
+    sh "git", "checkout", impl.default_branch
+    sh "git", "pull"
+  end
+end
+
+def filter_commits(impl)
+  Dir.chdir(impl.repo_name) do
+    date = NOW.strftime("%F")
+    branch = "specs-#{date}"
+
+    unless branch?(branch)
+      sh "git", "checkout", "-b", branch
+      sh "git", "filter-branch", "-f", "--subdirectory-filter", impl.prefix, *impl.from_commit
+      sh "git", "push", "-f", RUBYSPEC_REPO, "#{branch}:#{impl.name}"
+    end
+  end
+end
+
+def rebase_commits(impl)
+  Dir.chdir(RUBYSPEC_REPO) do
+    sh "git", "checkout", "master"
+    sh "git", "pull"
+
+    rebased = impl.rebased_branch
+    if branch?(rebased)
+      puts "#{rebased} already exists, assuming it correct"
+      sh "git", "checkout", rebased
+    else
+      sh "git", "checkout", impl.name
+
+      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'`
+      end
+      last_merge, commit_timestamp = last_merge.chomp.split(' ')
+
+      raise "Could not find last merge" unless last_merge
+      puts "Last merge is #{last_merge}"
+
+      commit_date = Time.at(Integer(commit_timestamp))
+      days_since_last_merge = (NOW-commit_date) / 86400
+      if days_since_last_merge > 60
+        raise "#{days_since_last_merge} since last merge, probably wrong commit"
+      end
+
+      puts "Rebasing..."
+      sh "git", "branch", "-D", rebased if branch?(rebased)
+      sh "git", "checkout", "-b", rebased, impl.name
+      sh "git", "rebase", "--onto", "master", last_merge
+    end
+  end
+end
+
+def test_new_specs
+  require "yaml"
+  Dir.chdir(RUBYSPEC_REPO) do
+    versions = YAML.load_file(".travis.yml")
+    versions = versions["matrix"]["include"].map { |job| job["rvm"] }
+    versions.delete "ruby-head"
+    min_version, max_version = versions.minmax
+
+    run_rubyspec = -> version {
+      command = "chruby #{version} && ../mspec/bin/mspec -j"
+      sh ENV["SHELL"], "-c", command
+    }
+    run_rubyspec[min_version]
+    run_rubyspec[max_version]
+    run_rubyspec["trunk"]
+  end
+end
+
+def verify_commits(impl)
+  puts
+  Dir.chdir(RUBYSPEC_REPO) do
+    history = `git log master...`
+    history.lines.slice_before(/^commit \h{40}$/).each do |commit, *message|
+      commit = commit.chomp.split.last
+      message = message.join
+      if /\W(#\d+)/ === message
+        puts "Commit #{commit} contains an unqualified issue number: #{$1}"
+        puts "Replace it with #{impl.repo_org}/#{impl.repo_name}#{$1}"
+        sh "git", "rebase", "-i", "#{commit}^"
+      end
+    end
+
+    puts "Manually check commit messages:"
+    sh "git", "log", "master..."
+  end
+end
+
+def fast_forward_master(impl)
+  Dir.chdir(RUBYSPEC_REPO) do
+    sh "git", "checkout", "master"
+    sh "git", "merge", "--ff-only", "#{impl.name}-rebased"
+  end
+end
+
+def check_ci
+  puts
+  puts <<-EOS
+  Push to master, and check that the CI passes:
+    https://github.com/ruby/spec/commits/master
+  EOS
+end
+
+def main(impls)
+  impls.each_pair do |impl, data|
+    impl = RubyImplementation.new(impl, data)
+    update_repo(impl)
+    filter_commits(impl)
+    rebase_commits(impl)
+    test_new_specs
+    verify_commits(impl)
+    fast_forward_master(impl)
+    check_ci
+  end
+end
+
+if ARGV == ["all"]
+  impls = IMPLS
+else
+  args = ARGV.map { |arg| arg.to_sym }
+  raise ARGV.to_s unless (args - IMPLS.keys).empty?
+  impls = IMPLS.select { |impl| args.include?(impl) }
+end
+
+main(impls)
diff --git a/spec/mspec/tool/sync/sync.yml b/spec/mspec/tool/sync/sync.yml
@@ -0,0 +1,4 @@
+mri: 4e95b8c265d4d365477a05fe6701186415576303
+truffleruby: c8fb3e592bf354cd67893555c671955cc54c32ff
+jruby: d834e4279090998ba3ef087d81278734cab4c50a
+rbx: 7799d9fa48467cdbfceeed6765a63366d9dc8b0e
diff --git a/spec/ruby/command_line/dash_upper_s_spec.rb b/spec/ruby/command_line/dash_upper_s_spec.rb
@@ -0,0 +1,19 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+describe 'The -S command line option' do
+  before :each do
+    @path = [ENV['PATH'], fixture(__FILE__, "bin")].join(':')
+  end
+
+  platform_is_not :windows do
+    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"
+    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"
+    end
+  end
+end
diff --git a/spec/ruby/command_line/dash_x_spec.rb b/spec/ruby/command_line/dash_x_spec.rb
@@ -1,10 +1,19 @@
 describe "The -x command line option" do
-  before :each do
-    @file = fixture __FILE__, "embedded_ruby.txt"
+  it "runs code after the first /\#!.*ruby.*/-ish line in target file" do
+    embedded_ruby = fixture __FILE__, "bin/embedded_ruby.txt"
+    result = ruby_exe(embedded_ruby, options: '-x')
+    result.should == "success\n"
   end
 
-  it "runs code after the first /\#!.*ruby.*/-ish line in target file" do
-    result = ruby_exe(@file, options: '-x')
+  it "fails when /\#!.*ruby.*/-ish line in target file is not found" do
+    bad_embedded_ruby = fixture __FILE__, "bin/bad_embedded_ruby.txt"
+    result = ruby_exe(bad_embedded_ruby, options: '-x', args: '2>&1')
+    result.should include "no Ruby script found in input"
+  end
+
+  it "behaves as -x was set when non-ruby shebang is encountered on first line" do
+    embedded_ruby = fixture __FILE__, "bin/hybrid_launcher.sh"
+    result = ruby_exe(embedded_ruby)
     result.should == "success\n"
   end
 

diff --git a/spec/ruby/command_line/fixtures/bad_syntax.rb b/spec/ruby/command_line/fixtures/bad_syntax.rb
@@ -1 +1 @@
-f {
+f {
diff --git a/spec/ruby/command_line/fixtures/bin/bad_embedded_ruby.txt b/spec/ruby/command_line/fixtures/bin/bad_embedded_ruby.txt
@@ -0,0 +1,3 @@
+@@@This line is not value Ruby
+#!rub_y
+puts 'success'
diff --git a/...y/command_line/fixtures/embedded_ruby.txt → ...mmand_line/fixtures/bin/embedded_ruby.txt b/...y/command_line/fixtures/embedded_ruby.txt → ...mmand_line/fixtures/bin/embedded_ruby.txt
diff --git a/spec/ruby/command_line/fixtures/bin/hybrid_launcher.sh b/spec/ruby/command_line/fixtures/bin/hybrid_launcher.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+exec somehow this file
+#!ruby
+puts 'success'
diff --git a/spec/ruby/command_line/fixtures/bin/launcher.rb b/spec/ruby/command_line/fixtures/bin/launcher.rb
@@ -0,0 +1,2 @@
+#!ruby
+puts 'success'
diff --git a/spec/ruby/core/bignum/bit_and_spec.rb b/spec/ruby/core/bignum/bit_and_spec.rb
@@ -16,8 +16,8 @@
   end
 
   it "returns self bitwise AND other when one operand is negative" do
-    ((2*bignum_value) & -1).should == 18446744073709551616
-    ((4*bignum_value) & -1).should == 36893488147419103232
+    ((2*bignum_value) & -1).should == (2*bignum_value)
+    ((4*bignum_value) & -1).should == (4*bignum_value)
     (@bignum & -0xffffffffffffff5).should == 9223372036854775809
     (@bignum & -@bignum).should == 1
     (@bignum & -0x8000000000000000).should == 9223372036854775808

diff --git a/spec/ruby/core/binding/eval_spec.rb b/spec/ruby/core/binding/eval_spec.rb
@@ -13,6 +13,16 @@
     bind.eval("Inside.name").should == "BindingSpecs::Demo::Inside"
   end
 
+  it "does not leak variables to cloned bindings" do
+    obj = BindingSpecs::Demo.new(1)
+    bind = obj.get_empty_binding
+    bind2 = bind.dup
+
+    bind.eval("x = 72")
+    bind.local_variables.should == [:x]
+    bind2.local_variables.should == []
+  end
+
   describe "with a file given" do
     it "does not store the filename permanently" do
       obj = BindingSpecs::Demo.new(1)

diff --git a/spec/ruby/core/binding/fixtures/classes.rb b/spec/ruby/core/binding/fixtures/classes.rb
@@ -28,5 +28,13 @@ def get_file_of_binding
     def get_empty_binding
       binding
     end
+
+    def get_binding_in_block
+      a = true
+      1.times do
+        b = false
+        return binding
+      end
+    end
   end
 end
diff --git a/spec/ruby/core/binding/local_variable_get_spec.rb b/spec/ruby/core/binding/local_variable_get_spec.rb
@@ -42,4 +42,15 @@
 
     bind.local_variable_get(:number).should == 10
   end
+
+  it "raises a NameError on global access" do
+    bind = binding
+    lambda { bind.local_variable_get(:$0) }.should raise_error(NameError)
+  end
+
+  it "raises a NameError on special variable access" do
+    bind = binding
+    lambda { bind.local_variable_get(:$~) }.should raise_error(NameError)
+    lambda { bind.local_variable_get(:$_) }.should raise_error(NameError)
+  end
 end
diff --git a/spec/ruby/core/binding/local_variable_set_spec.rb b/spec/ruby/core/binding/local_variable_set_spec.rb
@@ -56,4 +56,16 @@
     bind.local_variable_set(:number, 20)
     bind.local_variable_get(:number).should == 20
   end
+
+  it "raises a NameError on global access" do
+    bind = binding
+    lambda { bind.local_variable_set(:$0, "") }.should raise_error(NameError)
+  end
+
+  it "raises a NameError on special variable access" do
+    bind = binding
+    lambda { bind.local_variable_set(:$~, "") }.should raise_error(NameError)
+    lambda { bind.local_variable_set(:$_, "") }.should raise_error(NameError)
+  end
+
 end