mspec 1.5.5 → 1.5.6

data/lib/mspec/commands/mspec-ci.rb

@@ -18,9 +18,12 @@ class MSpecCI < MSpecScript
     options.doc "  4. When to perform it?"
 
     options.doc "\n How to run the specs"
+    options.chdir
+    options.prefix
     options.configure { |f| load f }
     options.name
     options.pretend
+    options.background
     options.unguarded
     options.interrupt
 

data/lib/mspec/commands/mspec-run.rb

@@ -28,10 +28,13 @@ class MSpecRun < MSpecScript
     options.filters
 
     options.doc "\n How to modify the execution"
+    options.chdir
+    options.prefix
     options.configure { |f| load f }
     options.name
     options.randomize
     options.pretend
+    options.background
     options.unguarded
     options.interrupt
 

data/lib/mspec/guards.rb

@@ -1,4 +1,5 @@
 require 'mspec/utils/ruby_name'
+require 'mspec/guards/background'
 require 'mspec/guards/bug'
 require 'mspec/guards/compliance'
 require 'mspec/guards/conflict'

data/lib/mspec/guards/background.rb

@@ -0,0 +1,19 @@
+require 'mspec/guards/guard'
+
+# Some specs, notably those for Readline, will block under certain
+# circumstances when run as background or subprocesses. Use this guard for
+# such specs.
+
+class BackgroundGuard < SpecGuard
+  def match?
+    MSpec.mode? :background
+  end
+end
+
+class Object
+  def process_is_foreground
+    g = BackgroundGuard.new
+    yield if g.yield? true
+    g.unregister
+  end
+end

data/lib/mspec/guards/tty.rb

@@ -1,9 +1,7 @@
 require 'mspec/guards/guard'
 
-# Some specs will block if run under as subprocess where STDOUT is not a TTY.
-# For most specs, there is probably a way to provide an IOStub that could
-# pretend to be a TTY. See the IOStub helper. That helper needs combined with
-# the output_to_fd helper.
+# If a spec depends on STDOUT being a tty, use this guard. For specs that may
+# block if run as a background process, see BackgroundGuard.
 
 class TTYGuard < SpecGuard
   def match?

data/lib/mspec/helpers/ruby_exe.rb

@@ -91,14 +91,14 @@ class Object
 
   def resolve_ruby_exe
     [:env, :engine, :name, :install_name].each do |option|
-      exe = ruby_exe_options option
+      next unless cmd = ruby_exe_options(option)
+      exe = cmd.split.first
 
       # It has been reported that File.executable is not reliable
       # on Windows platforms (see commit 56bc555c). So, we check the
       # platform. 
-      if exe and File.exists?(exe) and
-          (SpecGuard.windows? || File.executable?(exe))
-        return exe
+      if File.exists?(exe) and (SpecGuard.windows? or File.executable?(exe))
+        return cmd
       end
     end
     nil

data/lib/mspec/utils/options.rb

@@ -327,6 +327,19 @@ class MSpecOptions
     end
   end
 
+  def chdir
+    on("-C", "--chdir", "DIR",
+       "Change the working directory to DIR before running specs") do |d|
+      Dir.chdir d
+    end
+  end
+
+  def prefix
+    on("--prefix", "STR", "Prepend STR when resolving spec file names") do |p|
+      config[:prefix] = p
+    end
+  end
+
   def pretend
     on("-Z", "--dry-run",
        "Invoke formatters and other actions, but don't execute the specs") do
@@ -334,6 +347,13 @@ class MSpecOptions
     end
   end
 
+  def background
+    on("--background",
+       "Enable guard for specs that may hang in background processes") do
+      MSpec.register_mode :background
+    end
+  end
+
   def unguarded
     on("--unguarded", "Turn off all guards") do
       MSpec.register_mode :unguarded

data/lib/mspec/utils/script.rb

@@ -25,6 +25,18 @@ class MSpecScript
     config[key] = value
   end
 
+  # Gets the value of +key+ from the config object. Simplifies
+  # getting values in a config file:
+  #
+  #   class MSpecScript
+  #     set :a, 1
+  #     set :b, 2
+  #     set :c, get(:a) + get(:b)
+  #   end
+  def self.get(key)
+    config[key]
+  end
+
   def initialize
     config[:formatter] = nil
     config[:includes]  = []
@@ -140,19 +152,30 @@ class MSpecScript
     patterns.each do |pattern|
       expanded = File.expand_path(pattern)
       return [pattern] if File.file?(expanded)
-      return Dir[pattern+"/**/*_spec.rb"].sort if File.directory?(expanded)
+
+      specs = File.join pattern, "/**/*_spec.rb"
+      return Dir[specs].sort if File.directory?(expanded)
     end
 
     Dir[partial]
   end
 
-  # Resolves each entry in +list+ to a set of files. If the entry
-  # has a leading '^' character, the list of files is subtracted
-  # from the list of files accumulated to that point.
+  # Resolves each entry in +list+ to a set of files.
+  #
+  # If the entry has a leading '^' character, the list of files
+  # is subtracted from the list of files accumulated to that point.
+  #
+  # If the entry has a leading ':' character, the corresponding
+  # key is looked up in the config object and the entries in the
+  # value retrieved are processed through #entries.
   def files(list)
     list.inject([]) do |files, item|
-      if item[0] == ?^
+      case item[0]
+      when ?^
         files -= entries(item[1..-1])
+      when ?:
+        key = item[1..-1].to_sym
+        files += files(Array(config[key]))
       else
         files += entries(item)
       end

data/lib/mspec/version.rb

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

data/spec/commands/mspec_ci_spec.rb

@@ -13,6 +13,16 @@ describe MSpecCI, "#options" do
     @script.stub!(:files).and_return([])
   end
 
+  it "enables the chdir option" do
+    @options.should_receive(:chdir)
+    @script.options
+  end
+
+  it "enables the prefix option" do
+    @options.should_receive(:prefix)
+    @script.options
+  end
+
   it "enables the config option" do
     @options.should_receive(:configure)
     @script.options
@@ -33,6 +43,11 @@ describe MSpecCI, "#options" do
     @script.options
   end
 
+  it "enables the background option" do
+    @options.should_receive(:background)
+    @script.options
+  end
+
   it "enables the unguarded option" do
     @options.should_receive(:unguarded)
     @script.options

data/spec/commands/mspec_run_spec.rb

@@ -33,6 +33,16 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
+  it "enables the chdir option" do
+    @options.should_receive(:chdir)
+    @script.options @argv
+  end
+
+  it "enables the prefix option" do
+    @options.should_receive(:prefix)
+    @script.options @argv
+  end
+
   it "enables the configure option" do
     @options.should_receive(:configure)
     @script.options @argv
@@ -58,6 +68,11 @@ describe MSpecRun, "#options" do
     @script.options @argv
   end
 
+  it "enables the background option" do
+    @options.should_receive(:background)
+    @script.options @argv
+  end
+
   it "enables the unguarded option" do
     @options.should_receive(:unguarded)
     @script.options @argv

data/spec/guards/background_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/guards/background'
+
+describe Object, "#process_is_foreground" do
+  before :each do
+    MSpec.clear_modes
+    ScratchPad.clear
+  end
+
+  it "yields if MSpec.mode?(:background) is false" do
+    MSpec.mode?(:background).should be_false
+    process_is_foreground { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+
+  it "does not yield if MSpec.mode?(:background) is true" do
+    MSpec.register_mode :background
+    process_is_foreground { ScratchPad.record :yield }
+    ScratchPad.recorded.should_not == :yield
+  end
+end

data/spec/utils/options_spec.rb

@@ -467,6 +467,44 @@ describe "The -B, --config FILE option" do
   end
 end
 
+describe "The -C, --chdir DIR option" do
+  before :each do
+    @options, @config = new_option
+    @options.chdir
+  end
+
+  it "is enabled with #chdir" do
+    @options.should_receive(:on).with("-C", "--chdir", "DIR",
+        an_instance_of(String))
+    @options.chdir
+  end
+
+  it "changes the working directory to DIR" do
+    Dir.should_receive(:chdir).with("dir").twice
+    ["-C", "--chdir"].each do |opt|
+      @options.parse [opt, "dir"]
+    end
+  end
+end
+
+describe "The --prefix STR option" do
+  before :each do
+    @options, @config = new_option
+  end
+
+  it "is enabled with #prefix" do
+    @options.should_receive(:on).with("--prefix", "STR",
+       an_instance_of(String))
+    @options.prefix
+  end
+
+  it "sets the prefix config value" do
+    @options.prefix
+    @options.parse ["--prefix", "some/dir"]
+    @config[:prefix].should == "some/dir"
+  end
+end
+
 describe "The -n, --name RUBY_NAME option" do
   before :each do
     @verbose, $VERBOSE = $VERBOSE, nil
@@ -942,6 +980,23 @@ describe "The -Z, --dry-run option" do
   end
 end
 
+describe "The --background option" do
+  before :each do
+    @options, @config = new_option
+  end
+
+  it "is enabled with #background" do
+    @options.should_receive(:on).with("--background", an_instance_of(String))
+    @options.background
+  end
+
+  it "registers the MSpec background mode" do
+    MSpec.should_receive(:register_mode).with(:background)
+    @options.background
+    @options.parse "--background"
+  end
+end
+
 describe "The --unguarded option" do
   before :each do
     @options, @config = new_option

data/spec/utils/script_spec.rb

@@ -19,6 +19,13 @@ describe MSpecScript, ".set" do
   end
 end
 
+describe MSpecScript, ".get" do
+  it "gets the config hash value for a key" do
+    MSpecScript.set :a, 10
+    MSpecScript.get(:a).should == 10
+  end
+end
+
 describe MSpecScript, "#config" do
   it "returns the MSpecScript config hash" do
     MSpecScript.set :b, 5
@@ -380,3 +387,24 @@ describe MSpecScript, "#files" do
     @script.files(["^a", "a", "b"]).should == ["file1", "file2"]
   end
 end
+
+describe MSpecScript, "#files" do
+  before :each do
+    MSpecScript.set :files, ["file1", "file2"]
+
+    @script = MSpecScript.new
+  end
+
+  after :each do
+    MSpecScript.config.delete :files
+  end
+
+  it "looks up items with leading ':' in the config object" do
+    @script.should_receive(:entries).and_return(["file1"], ["file2"])
+    @script.files(":files").should == ["file1", "file2"]
+  end
+
+  it "returns an empty list if the config key is not set" do
+    @script.files(":all_files").should == []
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors: 
 - Brian Ford
@@ -35,6 +35,7 @@ files:
 - lib/mspec/expectations/expectations.rb
 - lib/mspec/expectations/should.rb
 - lib/mspec/expectations.rb
+- lib/mspec/guards/background.rb
 - lib/mspec/guards/bug.rb
 - lib/mspec/guards/compliance.rb
 - lib/mspec/guards/conflict.rb
@@ -140,6 +141,7 @@ files:
 - spec/commands/mspec_tag_spec.rb
 - spec/expectations/expectations_spec.rb
 - spec/expectations/should_spec.rb
+- spec/guards/background_spec.rb
 - spec/guards/bug_spec.rb
 - spec/guards/compliance_spec.rb
 - spec/guards/conflict_spec.rb