mspec 1.0.0 → 1.1.0

data/spec/runner/formatters/spinner_spec.rb

@@ -70,9 +70,16 @@ describe SpinnerFormatter, "#after" do
     @formatter.load
     @formatter.after @state
     @formatter.after @state
-    $stdout.should == "\r[/ | ========          20%                    | 00:00:00] " \
-                      "\e[0;32m     0F \e[0;32m     0E\e[0m" \
-                      "\r[- | ========          20%                    | 00:00:00] " \
-                      "\e[0;32m     0F \e[0;32m     0E\e[0m"
+
+    if ENV["TERM"] != "dumb"
+      $stdout.should == "\r[/ | ========          20%                    | 00:00:00] " \
+                        "\e[0;32m     0F \e[0;32m     0E\e[0m" \
+                        "\r[- | ========          20%                    | 00:00:00] " \
+                        "\e[0;32m     0F \e[0;32m     0E\e[0m" 
+    else
+      $stdout.should == "\r[/ | ========          20%                    | 00:00:00] " \
+                        "     0F      0E\r[- | ========          20%                 " \
+                        "   | 00:00:00]      0F      0E"
+    end
   end
 end

data/spec/runner/mspec_spec.rb

@@ -17,10 +17,10 @@ describe MSpec, ".register_mode" do
   end
 end
 
-describe MSpec, ".register_tags_path" do
-  it "records the path to tag files" do
-    MSpec.register_tags_path "path/to/tags"
-    MSpec.retrieve(:tags_path).should == "path/to/tags"
+describe MSpec, ".register_tags_patterns" do
+  it "records the patterns for generating a tag file from a spec file" do
+    MSpec.register_tags_patterns [[/spec\/ruby/, "spec/tags"], [/frozen/, "ruby"]]
+    MSpec.retrieve(:tags_patterns).should == [[/spec\/ruby/, "spec/tags"], [/frozen/, "ruby"]]
   end
 end
 
@@ -288,34 +288,33 @@ describe MSpec, ".shuffle" do
   end
 end
 
-describe MSpec, ".tags_path" do
+describe MSpec, ".tags_file" do
   before :each do
-    MSpec.store :tags_path, nil
-  end
-
-  it "returns 'spec/tags' if no tags path has been registered" do
-    MSpec.tags_path.should == "spec/tags"
+    MSpec.store :file, "path/to/spec/something/some_spec.rb"
+    MSpec.store :tags_patterns, nil
   end
 
-  it "returns the registered tags path" do
-    MSpec.register_tags_path "/path/to/tags"
-    MSpec.tags_path.should == "/path/to/tags"
+  it "returns the default tags file for the current spec file" do
+    MSpec.tags_file.should == "path/to/spec/tags/something/some_tags.txt"
   end
-end
 
-describe MSpec, ".tags_file" do
-  before :each do
-    MSpec.store :file, "/path/to/spec/something/some_spec.rb"
-    MSpec.store :tags_path, nil
+  it "returns the tags file for the current spec file with custom tags_patterns" do
+    MSpec.register_tags_patterns [[/^(.*)\/spec/, '\1/tags'], [/_spec.rb/, "_tags.txt"]]
+    MSpec.tags_file.should == "path/to/tags/something/some_tags.txt"
   end
 
-  it "returns the tags file for the current spec file with default tags_path" do
-    MSpec.tags_file.should == "spec/tags/something/some_tags.txt"
+  it "performs multiple substitutions" do
+    MSpec.register_tags_patterns [
+      [%r(/spec/something/), "/spec/other/"],
+      [%r(/spec/), "/spec/tags/"],
+      [/_spec.rb/, "_tags.txt"]
+    ]
+    MSpec.tags_file.should == "path/to/spec/tags/other/some_tags.txt"
   end
 
-  it "returns the tags file for the current spec file with custom tags_path" do
-    MSpec.register_tags_path "/path/to/tags"
-    MSpec.tags_file.should == "/path/to/tags/something/some_tags.txt"
+  it "handles cases where no substitution is performed" do
+    MSpec.register_tags_patterns [[/nothing/, "something"]]
+    MSpec.tags_file.should == "path/to/spec/something/some_spec.rb"
   end
 end
 

data/spec/spec_helper.rb

@@ -4,18 +4,13 @@ bin_path = File.expand_path(dir_path + '/..')
 $:.unshift lib_path unless $:.include? lib_path
 $:.unshift bin_path unless $:.include? bin_path
 
+require 'pp'
 require 'mspec/helpers/io'
 require 'mspec/helpers/scratch'
 
 # Remove this when MRI has intelligent warnings
 $VERBOSE = nil unless $VERBOSE
 
-module Kernel
-  def pretty_inspect
-    inspect
-  end
-end
-
 class MOSConfig < Hash
   def initialize
     self[:includes]  = []

data/spec/utils/options_spec.rb

@@ -187,27 +187,6 @@ describe "The -r, --require LIBRARY option" do
   end
 end
 
-describe "The -X, --tags-dir DIR option" do
-  before :each do
-    @options, @config = new_option
-    @options.add_tags_dir
-  end
-
-  it "is enabled with #add_tags_dir" do
-    @options.should_receive(:on).with("-X", "--tags-dir DIR",
-        String, an_instance_of(String))
-    @options.add_tags_dir
-  end
-
-  it "sets the tags directory to DIR" do
-    ["-X", "--tags-dir"].each do |opt|
-      @config[:tags_dir] = nil
-      @options.parse [opt, "tags"]
-      @config[:tags_dir].should == "tags"
-    end
-  end
-end
-
 describe "The -f, --format FORMAT option" do
   before :each do
     @options, @config = new_option

data/spec/utils/script_spec.rb

@@ -80,17 +80,18 @@ describe MSpecScript, "#initialize" do
   end
 
   it "sets the default config values" do
-    @config[:tags_dir].should  == 'spec/tags'
-    @config[:formatter].should == DottedFormatter
-    @config[:includes].should  == []
-    @config[:excludes].should  == []
-    @config[:patterns].should  == []
-    @config[:xpatterns].should == []
-    @config[:tags].should      == []
-    @config[:xtags].should     == []
-    @config[:atags].should     == []
-    @config[:astrings].should  == []
-    @config[:abort].should     == true
+    @config[:tags_dir].should   == 'spec/tags'
+    @config[:formatter].should  == DottedFormatter
+    @config[:includes].should   == []
+    @config[:excludes].should   == []
+    @config[:patterns].should   == []
+    @config[:xpatterns].should  == []
+    @config[:tags].should       == []
+    @config[:xtags].should      == []
+    @config[:atags].should      == []
+    @config[:astrings].should   == []
+    @config[:abort].should      == true
+    @config[:config_ext].should == '.mspec'
   end
 end
 
@@ -99,6 +100,7 @@ describe MSpecScript, "#load" do
     File.stub!(:exist?).and_return(false)
     @script = MSpecScript.new
     @file = "default.mspec"
+    @base = "default"
   end
 
   it "attempts to locate the file through the expanded path name" do
@@ -108,6 +110,15 @@ describe MSpecScript, "#load" do
     @script.load(@file).should == :loaded
   end
 
+  it "appends config[:config_ext] to the name and attempts to locate the file through the expanded path name" do
+    File.should_receive(:expand_path).with(@base).and_return(@base)
+    File.should_receive(:expand_path).with(@file).and_return(@file)
+    File.should_receive(:exist?).with(@base).and_return(false)
+    File.should_receive(:exist?).with(@file).and_return(true)
+    Kernel.should_receive(:load).with(@file).and_return(:loaded)
+    @script.load(@base).should == :loaded
+  end
+
   it "attemps to locate the file in '.'" do
     path = File.join ".", @file
     File.should_receive(:exist?).with(path).and_return(true)
@@ -115,12 +126,26 @@ describe MSpecScript, "#load" do
     @script.load(@file).should == :loaded
   end
 
+  it "appends config[:config_ext] to the name and attempts to locate the file in '.'" do
+    path = File.join ".", @file
+    File.should_receive(:exist?).with(path).and_return(true)
+    Kernel.should_receive(:load).with(path).and_return(:loaded)
+    @script.load(@base).should == :loaded
+  end
+
   it "attemps to locate the file in 'spec'" do
     path = File.join "spec", @file
     File.should_receive(:exist?).with(path).and_return(true)
     Kernel.should_receive(:load).with(path).and_return(:loaded)
     @script.load(@file).should == :loaded
   end
+
+  it "appends config[:config_ext] to the name and attempts to locate the file in 'spec'" do
+    path = File.join "spec", @file
+    File.should_receive(:exist?).with(path).and_return(true)
+    Kernel.should_receive(:load).with(path).and_return(:loaded)
+    @script.load(@base).should == :loaded
+  end
 end
 
 describe MSpecScript, "#register" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mspec
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Brian Ford
@@ -69,6 +69,7 @@ files:
 - lib/mspec/matchers/equal.rb
 - lib/mspec/matchers/equal_utf16.rb
 - lib/mspec/matchers/include.rb
+- lib/mspec/matchers/match_yaml.rb
 - lib/mspec/matchers/output.rb
 - lib/mspec/matchers/output_to_fd.rb
 - lib/mspec/matchers/raise_error.rb
@@ -150,6 +151,7 @@ files:
 - spec/matchers/equal_spec.rb
 - spec/matchers/equal_utf16_spec.rb
 - spec/matchers/include_spec.rb
+- spec/matchers/match_yaml_spec.rb
 - spec/matchers/output_spec.rb
 - spec/matchers/output_to_fd_spec.rb
 - spec/matchers/raise_error_spec.rb
@@ -212,6 +214,6 @@ rubyforge_project: http://rubyforge.org/projects/mspec
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: MSpec is a specialized framework that is syntax-compatible  with RSpec for basic things like describe, it blocks and  before, after actions.  MSpec contains additional features that assist in writing  the RubySpecs used by multiple Ruby implementations. Also,  MSpec attempts to use the simplest Ruby language features  so that beginning Ruby implementations can run it.
+summary: MSpec is a specialized framework that is syntax-compatible with RSpec for basic things like describe, it blocks and before, after actions.  MSpec contains additional features that assist in writing the RubySpecs used by multiple Ruby implementations. Also, MSpec attempts to use the simplest Ruby language features so that beginning Ruby implementations can run it.
 test_files: []