mspec 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db64f3a62d63a1638a20baa6df40cebc68b02ec2
-  data.tar.gz: 65f01cb75ab6f4decb63e7fdb4989dd171645259
+  metadata.gz: 733fa565d5e2085c638435f1fc22513fa124bec8
+  data.tar.gz: ed6da518e6058b01ef1a7ea8f99ffd2f051c2994
 SHA512:
-  metadata.gz: 066466880beebed65251d5f8f167b3ecc61739b982ababa3c97021ef1421f40391c4ba8d24cff9fba50ba400f4ad7a911fee467ac3f2872f1827cd44654589ac
-  data.tar.gz: 10d37dbe04a31f6fe9fa0ceeb3c46abc5ca7e2013852dd29cc4d5500148ba382bfb3dcdc130ae0d19c687b27d93e62918ae2f6231ddd18b98e094c073259673f
+  metadata.gz: b61ffdbc4bfc08fcbd7bdcb31004186135b9e6e06f8c7c8b062ebf7b170d840e1368898af9d8b6995a701a647aa7e314d85ea80e5825e854365b351e98834589
+  data.tar.gz: d3312bdda59bfa8380bf7f85ccc010683f1e43e04e3dda5231ded27fea339af823bfad6bfca5d4b1c918f85e6cd9f8738ef0c7601bfd874ea6f6a4a40b94e81a

data/.travis.yml

@@ -5,14 +5,16 @@ jdk:
   - openjdk7
 rvm:
   - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.1.5
   - ruby-head
   - rbx-2
   - jruby-head
-allow_failures:
-  - rvm: jruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: rbx-2
+    - rvm: ruby-head
 notifications:
-  recipients:
-    - brixen@gmail.com
+  email:
+    recipients:
+      - brixen@gmail.com

data/lib/mspec/commands/mspec.rb

@@ -37,10 +37,6 @@ class MSpecMain < MSpecScript
 
     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 @@ class MSpecMain < MSpecScript
     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?

data/lib/mspec/guards/platform.rb

@@ -5,6 +5,10 @@ class PlatformGuard < SpecGuard
     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]

data/lib/mspec/helpers/environment.rb

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

data/lib/mspec/helpers/io.rb

@@ -53,7 +53,12 @@ class IOStub
     flush
     @output
   end
-  alias to_str to_s
+
+  alias_method :to_str, :to_s
+
+  def inspect
+    to_s.inspect
+  end
 end
 
 class Object

data/lib/mspec/helpers/mock_to_path.rb

@@ -1,6 +1,6 @@
 class Object
   def mock_to_path(path)
-    obj = mock('path')
+    obj = double('path')
     obj.should_receive(:to_path).and_return(path)
     obj
   end

data/lib/mspec/helpers/ruby_exe.rb

@@ -146,11 +146,16 @@ class Object
 
     if code and not File.exist?(code)
       if opts[:escape]
-        code = "'#{code}'"
+        heredoc_separator = "END_OF_RUBYCODE"
+        lines = code.lines
+        until lines.none? {|line| line.start_with? heredoc_separator }
+          heredoc_separator << heredoc_separator
+        end
+
+        body = %Q!-e "$(cat <<'#{heredoc_separator}'\n#{code}\n#{heredoc_separator}\n)"!
       else
-        code = code.inspect
+        body = "-e #{code.inspect}"
       end
-      body = "-e #{code}"
     end
 
     [RUBY_EXE, ENV['RUBY_FLAGS'], opts[:options], body, opts[:args]].compact.join(' ')

data/lib/mspec/runner/actions.rb

@@ -4,4 +4,3 @@ require 'mspec/runner/actions/filter'
 require 'mspec/runner/actions/tag'
 require 'mspec/runner/actions/taglist'
 require 'mspec/runner/actions/tagpurge'
-require 'mspec/runner/actions/gdb'

data/lib/mspec/utils/options.rb

@@ -468,10 +468,6 @@ class MSpecOptions
        "Invoke the debugger when a spec description matches (see -K, -S)") do
       config[:debugger] = true
     end
-    on("--spec-gdb",
-       "Invoke Gdb when a spec description matches (see -K, -S)") do
-      config[:gdb] = true
-    end
   end
 
   def debug

data/lib/mspec/utils/script.rb

@@ -125,7 +125,6 @@ class MSpecScript
     ProfileFilter.new(:exclude, *config[:xprofiles]).register unless config[:xprofiles].empty?
 
     DebugAction.new(config[:atags], config[:astrings]).register if config[:debugger]
-    GdbAction.new(config[:atags], config[:astrings]).register   if config[:gdb]
 
     custom_register
   end

data/lib/mspec/version.rb

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

data/spec/commands/mkspec_spec.rb

@@ -5,13 +5,13 @@ require 'mspec/commands/mkspec'
 describe "The -c, --constant CONSTANT option" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
-    @options.stub!(:on)
+    @options.stub(:on)
     @options.should_receive(:on).with("-c", "--constant", "CONSTANT",
       an_instance_of(String))
     @script.options
@@ -29,13 +29,13 @@ end
 describe "The -b, --base DIR option" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
-    @options.stub!(:on)
+    @options.stub(:on)
     @options.should_receive(:on).with("-b", "--base", "DIR",
       an_instance_of(String))
     @script.options
@@ -53,13 +53,13 @@ end
 describe "The -r, --require LIBRARY option" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
-    @options.stub!(:on)
+    @options.stub(:on)
     @options.should_receive(:on).with("-r", "--require", "LIBRARY",
       an_instance_of(String))
     @script.options
@@ -77,13 +77,13 @@ end
 describe "The -V, --version-guard VERSION option" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
-    @options.stub!(:on)
+    @options.stub(:on)
     @options.should_receive(:on).with("-V", "--version-guard", "VERSION",
       an_instance_of(String))
     @script.options
@@ -101,7 +101,7 @@ end
 describe MkSpec, "#options" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
     @script = MkSpec.new
   end
 
@@ -117,8 +117,8 @@ describe MkSpec, "#options" do
 
   it "prints help and exits if passed an unrecognized option" do
     @options.should_receive(:raise).with(MSpecOptions::ParseError, an_instance_of(String))
-    @options.stub!(:puts)
-    @options.stub!(:exit)
+    @options.stub(:puts)
+    @options.stub(:exit)
     @script.options "--iunknown"
   end
 end
@@ -162,8 +162,8 @@ describe MkSpec, "#write_requires" do
     @script = MkSpec.new
     @script.config[:base] = "spec"
 
-    @file = mock("file")
-    File.stub!(:open).and_yield(@file)
+    @file = double("file")
+    File.stub(:open).and_yield(@file)
   end
 
   it "writes the spec_helper require line" do
@@ -172,7 +172,7 @@ describe MkSpec, "#write_requires" do
   end
 
   it "writes require lines for each library specified on the command line" do
-    @file.stub!(:puts)
+    @file.stub(:puts)
     @file.should_receive(:puts).with("require File.expand_path('../../../../spec_helper', __FILE__)")
     @file.should_receive(:puts).with("require 'complex'")
     @script.config[:requires] << 'complex'
@@ -183,14 +183,14 @@ end
 describe MkSpec, "#write_spec" do
   before :each do
     @file = IOStub.new
-    File.stub!(:open).and_yield(@file)
+    File.stub(:open).and_yield(@file)
 
     @script = MkSpec.new
-    @script.stub!(:puts)
+    @script.stub(:puts)
 
-    @response = mock("system command response")
-    @response.stub!(:=~).and_return(false)
-    @script.stub!(:`).and_return(@response)
+    @response = double("system command response")
+    @response.stub(:=~).and_return(false)
+    @script.stub(:`).and_return(@response)
   end
 
   it "checks if specs exist for the method if the spec file exists" do
@@ -206,12 +206,12 @@ describe MkSpec, "#write_spec" do
   end
 
   it "returns nil if the spec file exists and contains a spec for the method" do
-    @response.stub!(:=~).and_return(true)
+    @response.stub(:=~).and_return(true)
     @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true).should == nil
   end
 
   it "does not print the spec file name if it exists and contains a spec for the method" do
-    @response.stub!(:=~).and_return(true)
+    @response.stub(:=~).and_return(true)
     @script.should_not_receive(:puts)
     @script.write_spec("spec/core/tcejbo/inspect_spec.rb", "Object#inspect", true)
   end
@@ -262,10 +262,10 @@ end
 describe MkSpec, "#create_file" do
   before :each do
     @script = MkSpec.new
-    @script.stub!(:write_requires)
-    @script.stub!(:write_spec)
+    @script.stub(:write_requires)
+    @script.stub(:write_spec)
 
-    File.stub!(:exist?).and_return(false)
+    File.stub(:exist?).and_return(false)
   end
 
   it "generates a file name based on the directory, class/module, and method" do
@@ -297,19 +297,19 @@ end
 describe MkSpec, "#run" do
   before :each do
     @options = MSpecOptions.new
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
 
     @map = NameMap.new
-    NameMap.stub!(:new).and_return(@map)
+    NameMap.stub(:new).and_return(@map)
 
     @script = MkSpec.new
-    @script.stub!(:create_directory).and_return("spec/mkspec")
-    @script.stub!(:create_file)
+    @script.stub(:create_directory).and_return("spec/mkspec")
+    @script.stub(:create_file)
     @script.config[:constants] = [MkSpec]
   end
 
   it "loads files in the requires list" do
-    @script.stub!(:require)
+    @script.stub(:require)
     @script.should_receive(:require).with("alib")
     @script.should_receive(:require).with("blib")
     @script.config[:requires] = ["alib", "blib"]
@@ -336,8 +336,8 @@ end
 
 describe MkSpec, ".main" do
   before :each do
-    @script = mock("MkSpec").as_null_object
-    MkSpec.stub!(:new).and_return(@script)
+    @script = double("MkSpec").as_null_object
+    MkSpec.stub(:new).and_return(@script)
   end
 
   it "sets MSPEC_RUNNER = '1' in the environment" do

data/spec/commands/mspec_ci_spec.rb

@@ -6,11 +6,11 @@ require 'mspec/commands/mspec-ci'
 describe MSpecCI, "#options" do
   before :each do
     @options, @config = new_option
-    MSpecOptions.stub!(:new).and_return(@options)
+    MSpecOptions.stub(:new).and_return(@options)
 
     @script = MSpecCI.new
-    @script.stub!(:config).and_return(@config)
-    @script.stub!(:files).and_return([])
+    @script.stub(:config).and_return(@config)
+    @script.stub(:files).and_return([])
   end
 
   it "enables the chdir option" do
@@ -96,19 +96,19 @@ end
 
 describe MSpecCI, "#run" do
   before :each do
-    MSpec.stub!(:process)
+    MSpec.stub(:process)
 
-    @filter = mock("TagFilter")
-    TagFilter.stub!(:new).and_return(@filter)
-    @filter.stub!(:register)
+    @filter = double("TagFilter")
+    TagFilter.stub(:new).and_return(@filter)
+    @filter.stub(:register)
 
     @tags = ["fails", "critical", "unstable", "incomplete", "unsupported"]
 
     @config = { :ci_files => ["one", "two"] }
     @script = MSpecCI.new
-    @script.stub!(:exit)
-    @script.stub!(:config).and_return(@config)
-    @script.stub!(:files).and_return(["one", "two"])
+    @script.stub(:exit)
+    @script.stub(:config).and_return(@config)
+    @script.stub(:files).and_return(["one", "two"])
     @script.options
   end
 
@@ -124,7 +124,7 @@ describe MSpecCI, "#run" do
   end
 
   it "registers a tag filter for 'fails', 'unstable', 'incomplete', 'critical', 'unsupported'" do
-    filter = mock("fails filter")
+    filter = double("fails filter")
     TagFilter.should_receive(:new).with(:exclude, *@tags).and_return(filter)
     filter.should_receive(:register)
     @script.run
@@ -132,7 +132,7 @@ describe MSpecCI, "#run" do
 
   it "registers an additional exclude tag specified by :ci_xtags" do
     @config[:ci_xtags] = "windows"
-    filter = mock("fails filter")
+    filter = double("fails filter")
     TagFilter.should_receive(:new).with(:exclude, *(@tags + ["windows"])).and_return(filter)
     filter.should_receive(:register)
     @script.run
@@ -140,7 +140,7 @@ describe MSpecCI, "#run" do
 
   it "registers additional exclude tags specified by a :ci_xtags array" do
     @config[:ci_xtags] = ["windows", "windoze"]
-    filter = mock("fails filter")
+    filter = double("fails filter")
     TagFilter.should_receive(:new).with(:exclude,
         *(@tags + ["windows", "windoze"])).and_return(filter)
     filter.should_receive(:register)
@@ -153,7 +153,7 @@ describe MSpecCI, "#run" do
   end
 
   it "exits with the exit code registered with MSpec" do
-    MSpec.stub!(:exit_code).and_return(7)
+    MSpec.stub(:exit_code).and_return(7)
     @script.should_receive(:exit).with(7)
     @script.run
   end