jruby · Mar 17, 2015 · Mar 17, 2015 · Mar 17, 2015 · Mar 17, 2015 · Mar 17, 2015
Showing 2,375 changed files with 56,637 additions and 3,645 deletions.
diff --git a/spec/mspec/.gitignore b/spec/mspec/.gitignore
@@ -0,0 +1,26 @@
+pkg
+*.rbc
+*.iml
+*.iws
+*.ipr
+*.sw?
+
+.rbx
+
+# ctags dir
+/tags
+
+*.gem
+.bundle
+.config
+.yardoc
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml
@@ -0,0 +1,20 @@
+language: ruby
+script:
+  - bundle exec rspec
+jdk:
+  - openjdk7
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+  - 2.1.5
+  - 2.2.1
+  - ruby-head
+  - rbx-2
+  - jruby-1.7
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+    - rvm: jruby-1.7
+    - rvm: jruby-head
diff --git a/spec/mspec/Gemfile.lock b/spec/mspec/Gemfile.lock
@@ -0,0 +1,27 @@
+PATH
+  remote: .
+  specs:
+    mspec (1.8.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.2.5)
+    rake (10.4.2)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.3)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  mspec!
+  rake (~> 10.0)
+  rspec (~> 2.8)
diff --git a/spec/mspec/README → spec/mspec/README.md b/spec/mspec/README → spec/mspec/README.md
@@ -1,4 +1,6 @@
-1. Overview
+[![Build Status](https://travis-ci.org/ruby/mspec.svg?branch=master)](https://travis-ci.org/ruby/mspec)
+
+## Overview
 
 MSpec is a specialized framework that is syntax-compatible with RSpec for
 basic things like 'describe', 'it' blocks and 'before', 'after' actions. MSpec
@@ -32,46 +34,55 @@ specs in a manner compatible with multiple Ruby implementations.
      overrides.
 
 
-2. Bundler
+## Bundler
 
 A Gemfile is provided. Use Bundler to install gem dependencies. To install
 Bundler, run the following:
 
-  $ gem install bundler
+```bash
+gem install bundler
+```
 
 To install the gem dependencies with Bundler, run the following:
 
-  $ RUBYLIB=lib ruby -S bundle install
-
+```bash
+ruby -S bundle install
+```
 
-3. Running Specs
+## Running Specs
 
 Use RSpec to run the MSpec specs. There are no plans currently to make the
 MSpec specs runnable by MSpec.
 
 After installing the gem dependencies, the specs can be run as follows:
 
-  $ ruby -S rspec
+```bash
+ruby -S bundle exec rspec
+```
 
 Or
 
-  $ ruby -S rake
+```bash
+ruby -S rake
+```
 
 To run an individual spec file, use the following example:
 
-  $ ruby -S rspec spec/helpers/ruby_exe_spec.rb
+```bash
+ruby -S bundle exec rspec spec/helpers/ruby_exe_spec.rb
+```
 
 
-4. Documentation
+## Documentation
 
 See http://rubyspec.org
 
 
-5. Source Code
+## Source Code
 
 See https://github.com/rubyspec/mspec
 
 
-6. License
+## License
 
 See the LICENSE in the source code.
diff --git a/spec/mspec/lib/mspec/commands/mspec-ci.rb b/spec/mspec/lib/mspec/commands/mspec-ci.rb
@@ -64,8 +64,6 @@ def options(argv=ARGV)
   end
 
   def run
-    MSpec.register_mode :no_ruby_bug
-
     MSpec.register_tags_patterns config[:tags_patterns]
     MSpec.register_files @files
 

diff --git a/spec/mspec/lib/mspec/commands/mspec-run.rb b/spec/mspec/lib/mspec/commands/mspec-run.rb
@@ -86,8 +86,6 @@ def options(argv=ARGV)
   end
 
   def run
-    MSpec.register_mode :no_ruby_bug
-
     MSpec.register_tags_patterns config[:tags_patterns]
     MSpec.register_files @files
 

diff --git a/spec/mspec/lib/mspec/commands/mspec-tag.rb b/spec/mspec/lib/mspec/commands/mspec-tag.rb
@@ -121,8 +121,6 @@ def register
   end
 
   def run
-    MSpec.register_mode :no_ruby_bug
-
     MSpec.register_tags_patterns config[:tags_patterns]
     MSpec.register_files @files
 

diff --git a/spec/mspec/lib/mspec/commands/mspec.rb b/spec/mspec/lib/mspec/commands/mspec.rb
@@ -37,10 +37,6 @@ def options(argv=ARGV)
 
     options.targets
 
-    options.on("-D", "--gdb", "Run under gdb") do
-      config[:use_gdb] = true
-    end
-
     options.on("-A", "--valgrind", "Run under valgrind") do
       config[:use_valgrind] = true
     end
@@ -162,12 +158,8 @@ def run
     else
       if config[:use_valgrind]
         more = ["--child-silent-after-fork=yes",
-                "--db-attach=#{config[:use_gdb] ? 'yes' : 'no'}",
                 config[:target]] + argv
         exec "valgrind", *more
-      elsif config[:use_gdb]
-        more = ["--args", config[:target]] + argv
-        exec "gdb", *more
       else
         cmd, *rest = config[:target].split(/\s+/)
         argv = rest + argv unless rest.empty?

diff --git a/spec/mspec/lib/mspec/guards/block_device.rb b/spec/mspec/lib/mspec/guards/block_device.rb
@@ -2,7 +2,7 @@
 
 class BlockDeviceGuard < SpecGuard
   def match?
-    platform_is_not :freebsd, :windows do
+    platform_is_not :freebsd, :windows, :opal do
       block = `find /dev /devices -type b 2> /dev/null`
       return !(block.nil? || block.empty?)
     end

diff --git a/spec/mspec/lib/mspec/guards/platform.rb b/spec/mspec/lib/mspec/guards/platform.rb
@@ -5,6 +5,10 @@ def self.windows?
     PlatformGuard.new(:os => :windows).match?
   end
 
+  def self.opal?
+    PlatformGuard.new(:opal)
+  end
+
   def initialize(*args)
     if args.last.is_a?(Hash)
       @options, @platforms = args.last, args[0..-2]

diff --git a/spec/mspec/lib/mspec/helpers/datetime.rb b/spec/mspec/lib/mspec/helpers/datetime.rb
@@ -25,4 +25,27 @@ def new_datetime(opts={})
     DateTime.new value[:year], value[:month], value[:day], value[:hour],
       value[:minute], value[:second], value[:offset], value[:sg]
   end
+
+  def with_timezone(name, offset = nil, daylight_saving_zone = "")
+    zone = name.dup
+
+    if offset
+      # TZ convention is backwards
+      offset = -offset
+
+      zone += offset.to_s
+      zone += ":00:00"
+    end
+    zone += daylight_saving_zone
+
+    old = ENV["TZ"]
+    ENV["TZ"] = zone
+
+    begin
+      yield
+    ensure
+      ENV["TZ"] = old
+    end
+  end
+
 end
diff --git a/spec/mspec/lib/mspec/helpers/environment.rb b/spec/mspec/lib/mspec/helpers/environment.rb
@@ -2,27 +2,29 @@
 
 class Object
   def env
-    env = ""
     if PlatformGuard.windows?
-      env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+      Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+    elsif PlatformGuard.opal?
+      {}
     else
-      env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
+      Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
     end
-    env
   end
 
   def windows_env_echo(var)
-    `cmd.exe /C ECHO %#{var}%`.strip
+    platform_is_not :opal do
+      `cmd.exe /C ECHO %#{var}%`.strip
+    end
   end
 
   def username
-    user = ""
     if PlatformGuard.windows?
-      user = windows_env_echo('USERNAME')
+      windows_env_echo('USERNAME')
+    elsif PlatformGuard.opal?
+      ""
     else
-      user = `whoami`.strip
+      `whoami`.strip
     end
-    user
   end
 
   def home_directory
@@ -41,7 +43,10 @@ def dev_null
   def hostname
     commands = ['hostname', 'uname -n']
     commands.each do |command|
-      name = `#{command}`
+      name = ''
+      platform_is_not :opal do
+        name = `#{command}`
+      end
       return name.strip if $?.success?
     end
     raise Exception, "hostname: unable to find a working command"

diff --git a/spec/mspec/lib/mspec/helpers/io.rb b/spec/mspec/lib/mspec/helpers/io.rb
@@ -1,14 +1,36 @@
 require 'mspec/guards/feature'
 
-class IOStub < String
+class IOStub
+  def initialize
+    @buffer = []
+    @output = ''
+  end
+
   def write(*str)
     self << str.join
   end
 
+  def << str
+    @buffer << str
+    self
+  end
+
   def print(*str)
     write(str.join + $\.to_s)
   end
 
+  def method_missing(name, *args, &block)
+    to_s.send(name, *args, &block)
+  end
+
+  def == other
+    to_s == other
+  end
+
+  def =~ other
+    to_s =~ other
+  end
+
   def puts(*str)
     if str.empty?
       write "\n"
@@ -22,8 +44,21 @@ def printf(format, *args)
   end
 
   def flush
+    @output += @buffer.join('')
+    @buffer.clear
     self
   end
+
+  def to_s
+    flush
+    @output
+  end
+
+  alias_method :to_str, :to_s
+
+  def inspect
+    to_s.inspect
+  end
 end
 
 class Object

diff --git a/spec/mspec/lib/mspec/helpers/mock_to_path.rb b/spec/mspec/lib/mspec/helpers/mock_to_path.rb
@@ -1,6 +1,7 @@
 class Object
   def mock_to_path(path)
-    obj = mock('path')
+    # Cannot use our Object#mock here since it conflicts with RSpec
+    obj = MockObject.new('path')
     obj.should_receive(:to_path).and_return(path)
     obj
   end

diff --git a/spec/mspec/lib/mspec/helpers/numeric.rb b/spec/mspec/lib/mspec/helpers/numeric.rb
@@ -18,7 +18,7 @@ def bignum_value(plus=0)
   # values.
   guard = SpecGuard.new
 
-  if guard.standard? or guard.implementation? :topaz
+  if guard.standard? or guard.implementation? :topaz or guard.implementation? :opal
     if guard.wordsize? 32
       def fixnum_max()
         (2**30) - 1