mspec 1.4.0 → 1.5.0

data/lib/mspec/utils/script.rb

@@ -27,6 +27,7 @@ class MSpecScript
     config[:xprofiles] = []
     config[:atags]     = []
     config[:astrings]  = []
+    config[:ltags]     = []
     config[:abort]     = true
   end
 
@@ -51,7 +52,7 @@ class MSpecScript
   end
 
   def register
-    config[:formatter].new(config[:output]).register
+    config[:formatter].new(config[:output]).register if config[:formatter]
 
     MatchFilter.new(:include, *config[:includes]).register    unless config[:includes].empty?
     MatchFilter.new(:exclude, *config[:excludes]).register    unless config[:excludes].empty?
@@ -75,6 +76,15 @@ class MSpecScript
     end
   end
 
+  def files(list)
+    list.inject([]) do |files, item|
+      stat = File.stat(File.expand_path(item))
+      files << item if stat.file?
+      files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory?
+      files
+    end
+  end
+
   def self.main
     $VERBOSE = nil unless ENV['OUTPUT_WARNINGS']
     script = new

data/lib/mspec/version.rb

@@ -1,3 +1,3 @@
 module MSpec
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/spec/commands/mkspec_spec.rb

@@ -4,16 +4,16 @@ require 'mspec/commands/mkspec'
 
 describe "The -c, --constant CONSTANT option" do
   before :each do
-    @options = OptionParser.new
-    OptionParser.stub!(:new).and_return(@options)
+    @options = MSpecOptions.new
+    MSpecOptions.stub!(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
     @options.stub!(:on)
-    @options.should_receive(:on).with("-c", "--constant CONSTANT",
-      String, an_instance_of(String))
+    @options.should_receive(:on).with("-c", "--constant", "CONSTANT",
+      an_instance_of(String))
     @script.options
   end
 
@@ -28,16 +28,16 @@ end
 
 describe "The -b, --base DIR option" do
   before :each do
-    @options = OptionParser.new
-    OptionParser.stub!(:new).and_return(@options)
+    @options = MSpecOptions.new
+    MSpecOptions.stub!(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
     @options.stub!(:on)
-    @options.should_receive(:on).with("-b", "--base DIR",
-      String, an_instance_of(String))
+    @options.should_receive(:on).with("-b", "--base", "DIR",
+      an_instance_of(String))
     @script.options
   end
 
@@ -52,16 +52,16 @@ end
 
 describe "The -r, --require LIBRARY option" do
   before :each do
-    @options = OptionParser.new
-    OptionParser.stub!(:new).and_return(@options)
+    @options = MSpecOptions.new
+    MSpecOptions.stub!(:new).and_return(@options)
     @script = MkSpec.new
     @config = @script.config
   end
 
   it "is enabled by #options" do
     @options.stub!(:on)
-    @options.should_receive(:on).with("-r", "--require LIBRARY",
-      String, an_instance_of(String))
+    @options.should_receive(:on).with("-r", "--require", "LIBRARY",
+      an_instance_of(String))
     @script.options
   end
 
@@ -76,8 +76,8 @@ end
 
 describe MkSpec, "#options" do
   before :each do
-    @options = OptionParser.new
-    OptionParser.stub!(:new).and_return(@options)
+    @options = MSpecOptions.new
+    MSpecOptions.stub!(:new).and_return(@options)
     @script = MkSpec.new
   end
 
@@ -92,8 +92,9 @@ describe MkSpec, "#options" do
   end
 
   it "prints help and exits if passed an unrecognized option" do
-    @script.should_receive(:puts).exactly(3).times
-    @script.should_receive(:exit)
+    @options.should_receive(:raise).with(MSpecOptions::ParseError, an_instance_of(String))
+    @options.stub!(:puts)
+    @options.stub!(:exit)
     @script.options "--iunknown"
   end
 end
@@ -257,8 +258,8 @@ end
 
 describe MkSpec, "#run" do
   before :each do
-    @options = OptionParser.new
-    OptionParser.stub!(:new).and_return(@options)
+    @options = MSpecOptions.new
+    MSpecOptions.stub!(:new).and_return(@options)
 
     @map = NameMap.new
     NameMap.stub!(:new).and_return(@map)

data/spec/commands/mspec_ci_spec.rb

@@ -13,7 +13,7 @@ describe MSpecCI, "#options" do
   end
 
   it "enables the config option" do
-    @options.should_receive(:add_config)
+    @options.should_receive(:configure)
     @script.options
   end
 
@@ -23,47 +23,47 @@ describe MSpecCI, "#options" do
   end
 
   it "enables the name option" do
-    @options.should_receive(:add_name)
+    @options.should_receive(:name)
     @script.options
   end
 
   it "enables the dry run option" do
-    @options.should_receive(:add_pretend)
+    @options.should_receive(:pretend)
     @script.options
   end
 
   it "enables the interrupt single specs option" do
-    @options.should_receive(:add_interrupt)
+    @options.should_receive(:interrupt)
     @script.options
   end
 
   it "enables the formatter options" do
-    @options.should_receive(:add_formatters)
+    @options.should_receive(:formatters)
     @script.options
   end
 
   it "enables the verbose option" do
-    @options.should_receive(:add_verbose)
+    @options.should_receive(:verbose)
     @script.options
   end
 
   it "enables the action options" do
-    @options.should_receive(:add_actions)
+    @options.should_receive(:actions)
     @script.options
   end
 
   it "enables the action filter options" do
-    @options.should_receive(:add_action_filters)
+    @options.should_receive(:action_filters)
     @script.options
   end
 
   it "enables the version option" do
-    @options.should_receive(:add_version)
+    @options.should_receive(:version)
     @script.options
   end
 
   it "enables the help option" do
-    @options.should_receive(:add_help)
+    @options.should_receive(:help)
     @script.options
   end
 end
@@ -100,37 +100,10 @@ describe MSpecCI, "#run" do
     @script.run
   end
 
-  it "registers a tag filter for 'fails'" do
+  it "registers a tag filter for 'fails', 'unstable', 'incomplete', 'critical', 'unsupported'" do
     filter = mock("fails filter")
-    TagFilter.should_receive(:new).with(:exclude, 'fails').and_return(filter)
-    filter.should_receive(:register)
-    @script.run
-  end
-
-  it "registers a tag filter for 'unstable'" do
-    filter = mock("unstable filter")
-    TagFilter.should_receive(:new).with(:exclude, 'unstable').and_return(filter)
-    filter.should_receive(:register)
-    @script.run
-  end
-
-  it "registers a tag filter for 'incomplete'" do
-    filter = mock("incomplete filter")
-    TagFilter.should_receive(:new).with(:exclude, 'incomplete').and_return(filter)
-    filter.should_receive(:register)
-    @script.run
-  end
-
-  it "registers a tag filter for 'critical'" do
-    filter = mock("critical filter")
-    TagFilter.should_receive(:new).with(:exclude, 'critical').and_return(filter)
-    filter.should_receive(:register)
-    @script.run
-  end
-
-  it "registers a tag filter for 'unsupported'" do
-    filter = mock("unsupported filter")
-    TagFilter.should_receive(:new).with(:exclude, 'unsupported').and_return(filter)
+    TagFilter.should_receive(:new).with(:exclude,
+        "fails", "critical", "unstable", "incomplete", "unsupported").and_return(filter)
     filter.should_receive(:register)
     @script.run
   end

data/spec/commands/mspec_run_spec.rb

@@ -19,12 +19,12 @@ describe MSpecRun, "#options" do
   end
 
   it "enables the filter options" do
-    @options.should_receive(:add_filters)
+    @options.should_receive(:filters)
     @script.options @argv
   end
 
-  it "enables the config option" do
-    @options.should_receive(:add_config)
+  it "enables the configure option" do
+    @options.should_receive(:configure)
     @script.options @argv
   end
 
@@ -34,57 +34,57 @@ describe MSpecRun, "#options" do
   end
 
   it "enables the name option" do
-    @options.should_receive(:add_name)
+    @options.should_receive(:name)
     @script.options @argv
   end
 
   it "enables the randomize option to runs specs in random order" do
-    @options.should_receive(:add_randomize)
+    @options.should_receive(:randomize)
     @script.options @argv
   end
 
   it "enables the dry run option" do
-    @options.should_receive(:add_pretend)
+    @options.should_receive(:pretend)
     @script.options @argv
   end
 
   it "enables the interrupt single specs option" do
-    @options.should_receive(:add_interrupt)
+    @options.should_receive(:interrupt)
     @script.options @argv
   end
 
   it "enables the formatter options" do
-    @options.should_receive(:add_formatters)
+    @options.should_receive(:formatters)
     @script.options @argv
   end
 
   it "enables the verbose option" do
-    @options.should_receive(:add_verbose)
+    @options.should_receive(:verbose)
     @script.options @argv
   end
 
   it "enables the verify options" do
-    @options.should_receive(:add_verify)
+    @options.should_receive(:verify)
     @script.options @argv
   end
 
   it "enables the action options" do
-    @options.should_receive(:add_actions)
+    @options.should_receive(:actions)
     @script.options @argv
   end
 
   it "enables the action filter options" do
-    @options.should_receive(:add_action_filters)
+    @options.should_receive(:action_filters)
     @script.options @argv
   end
 
   it "enables the version option" do
-    @options.should_receive(:add_version)
+    @options.should_receive(:version)
     @script.options @argv
   end
 
   it "enables the help option" do
-    @options.should_receive(:add_help)
+    @options.should_receive(:help)
     @script.options @argv
   end
 

data/spec/commands/mspec_spec.rb

@@ -5,16 +5,14 @@ require 'mspec/commands/mspec'
 describe MSpecMain, "#options" do
   before :each do
     @options, @config = new_option
-    @options.stub!(:parser).and_return(mock("parser"))
-    @options.parser.stub!(:filter!).and_return(["blocked!"])
     MSpecOptions.stub!(:new).and_return(@options)
 
     @script = MSpecMain.new
     @script.stub!(:config).and_return(@config)
   end
 
-  it "enables the config option" do
-    @options.should_receive(:add_config)
+  it "enables the configure option" do
+    @options.should_receive(:configure)
     @script.options
   end
 
@@ -24,14 +22,36 @@ describe MSpecMain, "#options" do
   end
 
   it "enables the target options" do
-    @options.should_receive(:add_targets)
+    @options.should_receive(:targets)
     @script.options
   end
 
   it "enables the version option" do
-    @options.should_receive(:add_version)
+    @options.should_receive(:version)
     @script.options
   end
+
+  it "sets config[:options] to all argv entries that are not registered options" do
+    @options.on "-X", "--exclude", "ARG", "description"
+    @script.options [".", "-G", "fail", "-X", "ARG", "--list", "unstable", "some/file.rb"]
+    @config[:options].should == [".", "-G", "fail", "--list", "unstable", "some/file.rb"]
+  end
+
+  it "passes -h, --help to the subscript" do
+    ["-h", "--help"].each do |opt|
+      @config[:options] = []
+      @script.options ["ci", opt]
+      @config[:options].sort.should == ["-h"]
+    end
+  end
+
+  it "passes -v, --version to the subscript" do
+    ["-v", "--version"].each do |opt|
+      @config[:options] = []
+      @script.options ["ci", opt]
+      @config[:options].sort.should == ["-v"]
+    end
+  end
 end
 
 describe MSpecMain, "#parallel" do
@@ -205,15 +225,29 @@ describe MSpecMain, "#run" do
     @options, @config = new_option
     MSpecOptions.stub!(:new).and_return(@options)
     @script = MSpecMain.new
+    @script.stub!(:config).and_return(@config)
+    @script.stub!(:exec)
   end
 
   it "sets MSPEC_RUNNER = '1' in the environment" do
-    @script.stub!(:exec)
     ENV["MSPEC_RUNNER"] = "0"
     @script.run
     ENV["MSPEC_RUNNER"].should == "1"
   end
 
+  it "sets RUBY_EXE = config[:target] in the environment" do
+    ENV["RUBY_EXE"] = nil
+    @script.run
+    ENV["RUBY_EXE"].should == @config[:target]
+  end
+
+  it "sets RUBY_FLAGS = config[:flags] in the environment" do
+    ENV["RUBY_FLAGS"] = nil
+    @config[:flags] = ["-w", "-Q"]
+    @script.run
+    ENV["RUBY_FLAGS"].should == "-w -Q"
+  end
+
   it "uses exec to invoke the runner script" do
     @script.should_receive(:exec).with("ruby", "-v", %r"mspec/bin/mspec-run$")
     @script.options

data/spec/commands/mspec_tag_spec.rb

@@ -1,6 +1,30 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/commands/mspec-tag'
+require 'mspec/runner/actions/tag'
+require 'mspec/runner/actions/taglist'
+
+describe MSpecTag, ".new" do
+  before :each do
+    @script = MSpecTag.new
+  end
+
+  it "sets config[:ltags] to an empty list" do
+    @script.config[:ltags].should == []
+  end
+
+  it "sets config[:tagger] to :add" do
+    @script.config[:tagger] = :add
+  end
+
+  it "sets config[:tag] to 'fails:'" do
+    @script.config[:tag] = 'fails:'
+  end
+
+  it "sets config[:outcome] to :fail" do
+    @script.config[:outcome] = :fail
+  end
+end
 
 describe MSpecTag, "#options" do
   before :each do
@@ -19,12 +43,12 @@ describe MSpecTag, "#options" do
   end
 
   it "enables the filter options" do
-    @options.should_receive(:add_filters)
+    @options.should_receive(:filters)
     @script.options @argv
   end
 
-  it "enables the config option" do
-    @options.should_receive(:add_config)
+  it "enables the configure option" do
+    @options.should_receive(:configure)
     @script.options @argv
   end
 
@@ -34,42 +58,37 @@ describe MSpecTag, "#options" do
   end
 
   it "enables the name option" do
-    @options.should_receive(:add_name)
+    @options.should_receive(:name)
     @script.options @argv
   end
 
   it "enables the dry run option" do
-    @options.should_receive(:add_pretend)
+    @options.should_receive(:pretend)
     @script.options @argv
   end
 
   it "enables the interrupt single specs option" do
-    @options.should_receive(:add_interrupt)
+    @options.should_receive(:interrupt)
     @script.options @argv
   end
 
   it "enables the formatter options" do
-    @options.should_receive(:add_formatters)
+    @options.should_receive(:formatters)
     @script.options @argv
   end
 
   it "enables the verbose option" do
-    @options.should_receive(:add_verbose)
-    @script.options @argv
-  end
-
-  it "enables the tagging options" do
-    @options.should_receive(:add_tagging)
+    @options.should_receive(:verbose)
     @script.options @argv
   end
 
   it "enables the version option" do
-    @options.should_receive(:add_version)
+    @options.should_receive(:version)
     @script.options @argv
   end
 
   it "enables the help option" do
-    @options.should_receive(:add_help)
+    @options.should_receive(:help)
     @script.options @argv
   end
 
@@ -81,6 +100,136 @@ describe MSpecTag, "#options" do
   end
 end
 
+describe MSpecTag, "options" do
+  before :each do
+    @options, @config = new_option
+    MSpecOptions.stub!(:new).and_return(@options)
+    @script = MSpecTag.new
+    @script.stub!(:config).and_return(@config)
+  end
+
+  describe "-N, --add TAG" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("-N", "--add", "TAG", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the mode to :add and sets the tag to TAG" do
+      ["-N", "--add"].each do |opt|
+        @config[:tagger] = nil
+        @config[:tag] = nil
+        @script.options [opt, "taggit", "file.rb"]
+        @config[:tagger].should == :add
+        @config[:tag].should == "taggit:"
+      end
+    end
+  end
+
+  describe "-R, --del TAG" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("-R", "--del", "TAG",
+          an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "it sets the mode to :del, the tag to TAG, and the outcome to :pass" do
+      ["-R", "--del"].each do |opt|
+        @config[:tagger] = nil
+        @config[:tag] = nil
+        @config[:outcome] = nil
+        @script.options [opt, "taggit", "file.rb"]
+        @config[:tagger].should == :del
+        @config[:tag].should == "taggit:"
+        @config[:outcome].should == :pass
+      end
+    end
+  end
+
+  describe "-Q, --pass" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("-Q", "--pass", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the outcome to :pass" do
+      ["-Q", "--pass"].each do |opt|
+        @config[:outcome] = nil
+        @script.options [opt, "file.rb"]
+        @config[:outcome].should == :pass
+      end
+    end
+  end
+
+  describe "-F, --fail" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("-F", "--fail", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the outcome to :fail" do
+      ["-F", "--fail"].each do |opt|
+        @config[:outcome] = nil
+        @script.options [opt, "file.rb"]
+        @config[:outcome].should == :fail
+      end
+    end
+  end
+
+  describe "-L, --all" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("-L", "--all", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the outcome to :all" do
+      ["-L", "--all"].each do |opt|
+        @config[:outcome] = nil
+        @script.options [opt, "file.rb"]
+        @config[:outcome].should == :all
+      end
+    end
+  end
+
+  describe "--list TAG" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("--list", "TAG", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the mode to :list" do
+      @config[:tagger] = nil
+      @script.options ["--list", "TAG", "file.rb"]
+      @config[:tagger].should == :list
+    end
+
+    it "sets ltags to include TAG" do
+      @config[:tag] = nil
+      @script.options ["--list", "TAG", "file.rb"]
+      @config[:ltags].should == ["TAG"]
+    end
+  end
+
+  describe "--list-all" do
+    it "is enabled with #options" do
+      @options.stub!(:on)
+      @options.should_receive(:on).with("--list-all", an_instance_of(String))
+      @script.options ["file.rb"]
+    end
+
+    it "sets the mode to :list_all" do
+      @config[:tagger] = nil
+      @script.options ["--list-all", "file.rb"]
+      @config[:tagger].should == :list_all
+    end
+  end
+end
+
 describe MSpecTag, "#run" do
   before :each do
     MSpec.stub!(:process)
@@ -124,3 +273,87 @@ describe MSpecTag, "#run" do
     @script.run
   end
 end
+
+describe MSpecTag, "#register" do
+  before :each do
+    @script = MSpecTag.new
+    @config = @script.config
+    @config[:tag] = "fake:"
+    @config[:atags] = []
+    @config[:astrings] = []
+    @config[:ltags] = ["fails", "unstable"]
+
+    @t = mock("TagAction")
+    @t.stub!(:register)
+
+    @tl = mock("TagListAction")
+    @tl.stub!(:register)
+  end
+
+  it "creates a TagAction if config[:tagger] is :add" do
+    TagAction.should_receive(:new).with(:add, :fail, "fake", nil, [], []).and_return(@t)
+    @script.register
+  end
+
+  it "creates a TagAction if config[:tagger] is :del" do
+    @config[:tagger] = :del
+    @config[:outcome] = :pass
+    TagAction.should_receive(:new).with(:del, :pass, "fake", nil, [], []).and_return(@t)
+    @script.register
+  end
+
+  it "calls #register on the TagAction instance" do
+    TagAction.should_receive(:new).and_return(@t)
+    @t.should_receive(:register)
+    @script.register
+  end
+
+  it "raises an ArgumentError if no recognized action is given" do
+    @config[:tagger] = :totally_whack
+    lambda { @script.register }.should raise_error(ArgumentError)
+  end
+
+  describe "when config[:tagger] is :list" do
+    before :each do
+      @config[:tagger] = :list
+    end
+
+    it "creates a TagListAction" do
+      TagListAction.should_receive(:new).with(@config[:ltags]).and_return(@tl)
+      @tl.should_receive(:register)
+      @script.register
+    end
+
+    it "registers MSpec pretend mode" do
+      MSpec.should_receive(:register_mode).with(:pretend)
+      @script.register
+    end
+
+    it "sets config[:formatter] to nil" do
+      @script.register
+      @config[:formatter].should be_nil
+    end
+  end
+
+  describe "when config[:tagger] is :list_all" do
+    before :each do
+      @config[:tagger] = :list_all
+    end
+
+    it "creates a TagListAction" do
+      TagListAction.should_receive(:new).with(nil).and_return(@tl)
+      @tl.should_receive(:register)
+      @script.register
+    end
+
+    it "registers MSpec pretend mode" do
+      MSpec.should_receive(:register_mode).with(:pretend)
+      @script.register
+    end
+
+    it "sets config[:formatter] to nil" do
+      @script.register
+      @config[:formatter].should be_nil
+    end
+  end
+end