mspec 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea78f04d5f7dd8d900b3a9de1462448b14a71db
-  data.tar.gz: a978b407496a528fbaf345bdf3188c52be68a8ad
+  metadata.gz: db64f3a62d63a1638a20baa6df40cebc68b02ec2
+  data.tar.gz: 65f01cb75ab6f4decb63e7fdb4989dd171645259
 SHA512:
-  metadata.gz: 1fd3e10ba43ac914f0191b93cd687c8d5bd299194f7a0b6c95d4dff4f52542a38e362c67ba5d13d74ec9a4c0842bbcff58d69be995404c7da79f0396166f66d3
-  data.tar.gz: 457f6c7dda4d73809de319c0c13a3d0047801f5f8e9927a7a681612cc290f27979e3d218ebb0166de34fe70caf013b2dc68fb69d97b559837d22da772d443da9
+  metadata.gz: 066466880beebed65251d5f8f167b3ecc61739b982ababa3c97021ef1421f40391c4ba8d24cff9fba50ba400f4ad7a911fee467ac3f2872f1827cd44654589ac
+  data.tar.gz: 10d37dbe04a31f6fe9fa0ceeb3c46abc5ca7e2013852dd29cc4d5500148ba382bfb3dcdc130ae0d19c687b27d93e62918ae2f6231ddd18b98e094c073259673f

data/lib/mspec/guards/block_device.rb

@@ -2,7 +2,7 @@ require 'mspec/guards/guard'
 
 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

data/lib/mspec/helpers/environment.rb

@@ -2,26 +2,38 @@ require 'mspec/guards/guard'
 
 class Object
   def env
-    env = ""
-    if PlatformGuard.windows?
-      env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
-    else
+    platform_is_not :opal, :windows do
       env = Hash[*`env`.split("\n").map { |e| e.split("=", 2) }.flatten]
     end
+
+    platform_is :windows do
+      env = Hash[*`cmd.exe /C set`.split("\n").map { |e| e.split("=", 2) }.flatten]
+    end
+
+    platform_is :opal do
+      env = {}
+    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?
+
+    platform_is :windows do
       user = windows_env_echo('USERNAME')
-    else
+    end
+
+    platform_is_not :opal do
       user = `whoami`.strip
     end
+
     user
   end
 
@@ -41,7 +53,10 @@ class Object
   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"

data/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,16 @@ class IOStub < String
   end
 
   def flush
+    @output += @buffer.join('')
+    @buffer.clear
     self
   end
+
+  def to_s
+    flush
+    @output
+  end
+  alias to_str to_s
 end
 
 class Object

data/lib/mspec/helpers/numeric.rb

@@ -18,7 +18,7 @@ class Object
   # 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

data/lib/mspec/helpers/ruby_exe.rb

@@ -128,7 +128,9 @@ class Object
       end
 
       begin
-        `#{ruby_cmd(code, opts)}`
+        platform_is_not :opal do
+          `#{ruby_cmd(code, opts)}`
+        end
       ensure
         saved_env.each { |key, value| ENV[key] = value }
         env.keys.each do |key|

data/lib/mspec/helpers/tmp.rb

@@ -3,7 +3,7 @@
 # should clean up any temporary files created so that the temp
 # directory is empty when the process exits.
 
-SPEC_TEMP_DIR = "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
+SPEC_TEMP_DIR = ENV["SPEC_TEMP_DIR"] || "#{File.expand_path(Dir.pwd)}/rubyspec_temp"
 
 SPEC_TEMP_UNIQUIFIER = "0"
 

data/lib/mspec/matchers/output.rb

@@ -42,20 +42,20 @@ class OutputMatcher
     expected_out = "\n"
     actual_out = "\n"
     unless @out.nil?
-      expected_out << "  $stdout: #{@out.inspect}\n"
-      actual_out << "  $stdout: #{@stdout.chomp.inspect}\n"
+      expected_out += "  $stdout: #{@out.inspect}\n"
+      actual_out += "  $stdout: #{@stdout.inspect}\n"
     end
     unless @err.nil?
-      expected_out << "  $stderr: #{@err.inspect}\n"
-      actual_out << "  $stderr: #{@stderr.chomp.inspect}\n"
+      expected_out += "  $stderr: #{@err.inspect}\n"
+      actual_out += "  $stderr: #{@stderr.inspect}\n"
     end
     ["Expected:#{expected_out}", "     got:#{actual_out}"]
   end
 
   def negative_failure_message
     out = ""
-    out << "  $stdout: #{@stdout.chomp.dump}\n" unless @out.nil?
-    out << "  $stderr: #{@stderr.chomp.dump}\n" unless @err.nil?
+    out += "  $stdout: #{@stdout.chomp.dump}\n" unless @out.nil?
+    out += "  $stderr: #{@stderr.chomp.dump}\n" unless @err.nil?
     ["Expected output not to be:\n", out]
   end
 end

data/lib/mspec/mocks/mock.rb

@@ -62,11 +62,11 @@ module Mock
       meta.__send__ :alias_method, key.first, sym
     end
 
-    meta.class_eval <<-END
-      def #{sym}(*args, &block)
-        Mock.verify_call self, :#{sym}, *args, &block
+    meta.class_eval {
+      define_method(sym) do |*args, &block|
+        Mock.verify_call self, sym, *args, &block
       end
-    END
+    }
 
     proxy = MockProxy.new type
 

data/lib/mspec/runner/exception.rb

@@ -6,8 +6,8 @@ class ExceptionState
 
     @description = location ? "An exception occurred during: #{location}" : ""
     if state
-      @description << "\n" unless @description.empty?
-      @description << state.description
+      @description += "\n" unless @description.empty?
+      @description += state.description
       @describe = state.describe
       @it = state.it
     else

data/lib/mspec/utils/options.rb

@@ -81,7 +81,7 @@ class MSpecOptions
   # instance to the list of registered options.
   def add(short, long, arg, description, block)
     s = short ? short.dup : "  "
-    s << (short ? ", " : "  ") if long
+    s += (short ? ", " : "  ") if long
     doc "   #{s}#{long} #{arg}".ljust(@width-1) + " #{description}"
     @options << MSpecOption.new(short, long, arg, description, block)
   end
@@ -231,6 +231,9 @@ class MSpecOptions
         config[:target] = 'maglev-ruby'
       when 't','topaz'
         config[:target] = 'topaz'
+      when 'o','opal'
+        mspec_lib = File.expand_path('../../../', __FILE__)
+        config[:target] = "./bin/opal -syaml -siconv -sfileutils -rnodejs -rnodejs/require -rnodejs/yaml -rprocess -Derror -I#{mspec_lib} -I./lib/ -I. "
       else
         config[:target] = t
       end
@@ -247,7 +250,8 @@ class MSpecOptions
     doc "     j or jruby        invokes jruby in PATH"
     doc "     i or ironruby     invokes ir in PATH"
     doc "     m or maglev       invokes maglev-ruby in PATH"
-    doc "     t or topaz       invokes topaz in PATH"
+    doc "     t or topaz        invokes topaz in PATH"
+    doc "     o or opal         invokes ./bin/opal with options"
     doc "     full path to EXE  invokes EXE directly\n"
 
     on("-T", "--target-opt", "OPT",

data/lib/mspec/version.rb

@@ -1,5 +1,5 @@
 require 'mspec/utils/version'
 
 module MSpec
-  VERSION = SpecVersion.new "1.6.0"
+  VERSION = SpecVersion.new "1.7.0"
 end

metadata

@@ -1,45 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: mspec
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Brian Shirai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  type: :development
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-  type: :development
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-description: |
-  MSpec is a specialized framework for RubySpec.
+description: 'MSpec is a specialized framework for RubySpec.
+
+'
 email:
 - bshirai@engineyard.com
 executables:
@@ -358,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/mspec
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MSpec is a specialized framework that is syntax-compatible with RSpec for