lib/mspec/matchers/match_yaml.rb mspec-1.1.1.gemspec spec/matchers/match_yaml_spec.rb @@ -20,7 +20,6 @@ class MSpecCI < MSpecScript options.separator "\n How to run the specs" options.add_config { |f| load f } options.add_name - options.add_tags_dir options.add_pretend options.add_interrupt @@ -59,7 +58,7 @@ class MSpecCI < MSpecScript files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? end - MSpec.register_tags_path config[:tags_dir] + MSpec.register_tags_patterns config[:tags_patterns] MSpec.register_files files TagFilter.new(:exclude, "fails").register TagFilter.new(:exclude, "unstable").register lib/mspec/commands/mspec-ci.rb @@ -24,7 +24,6 @@ class MSpecRun < MSpecScript options.separator "\n How to modify the execution" options.add_config { |f| load f } options.add_name - options.add_tags_dir options.add_randomize options.add_pretend options.add_interrupt @@ -70,7 +69,7 @@ class MSpecRun < MSpecScript files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? end - MSpec.register_tags_path config[:tags_dir] + MSpec.register_tags_patterns config[:tags_patterns] MSpec.register_files files MSpec.process lib/mspec/commands/mspec-run.rb @@ -30,7 +30,6 @@ class MSpecTag < MSpecScript options.separator "\n How to modify the execution" options.add_config { |f| load f } options.add_name - options.add_tags_dir options.add_pretend options.add_interrupt @@ -77,7 +76,7 @@ class MSpecTag < MSpecScript files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? end - MSpec.register_tags_path config[:tags_dir] + MSpec.register_tags_patterns config[:tags_patterns] MSpec.register_files files MSpec.process lib/mspec/commands/mspec-tag.rb @@ -81,6 +81,8 @@ class SpecGuard RUBY_NAME =~ /^ruby(1.9)?/ and RUBY_VERSION =~ /^1.9/ when :jruby RUBY_NAME =~ /^jruby/ + when :ironruby + RUBY_NAME =~ /^ironruby/ else false end lib/mspec/guards/guard.rb @@ -9,6 +9,7 @@ require 'mspec/matchers/be_true' require 'mspec/matchers/equal' require 'mspec/matchers/eql' require 'mspec/matchers/include' +require 'mspec/matchers/match_yaml' require 'mspec/matchers/raise_error' require 'mspec/matchers/output' require 'mspec/matchers/output_to_fd' lib/mspec/matchers.rb @@ -1,4 +1,3 @@ - require 'mspec/runner/state' require 'mspec/runner/tag' require 'fileutils' @@ -68,8 +67,15 @@ module MSpec store :files, files end - def self.register_tags_path(path) - store :tags_path, path + # Stores one or more substitution patterns for transforming + # a spec filename into a tags filename, where each pattern + # has the form: + # + # [Regexp, String] + # + # See also +tags_file+. + def self.register_tags_patterns(patterns) + store :tags_patterns, patterns end def self.register_mode(mode) @@ -171,18 +177,22 @@ module MSpec end end - def self.tags_path - retrieve(:tags_path) || "spec/tags" - end - + # Transforms a spec filename into a tags filename by applying each + # substitution pattern in :tags_pattern. The default patterns are: + # + # [%r(/spec/), '/spec/tags/'], [/_spec.rb$/, '_tags.txt'] + # + # which will perform the following transformation: + # + # path/to/spec/class/method_spec.rb => path/to/spec/tags/class/method_tags.txt + # + # See also +register_tags_patterns+. def self.tags_file - path = tags_path - file = retrieve :file - tags_file = File.basename(file, '.*').sub(/_spec$/, '_tags') + '.txt' - - m = file.match %r[.*spec/(.*)/.*_spec.rb] - path = File.join(path, m[1]) if m - File.join path, tags_file + patterns = retrieve(:tags_patterns) || + [[%r(spec/), 'spec/tags/'], [/_spec.rb$/, '_tags.txt']] + patterns.inject(retrieve(:file).dup) do |file, pattern| + file.gsub(*pattern) + end end def self.read_tags(*keys) lib/mspec/runner/mspec.rb @@ -122,13 +122,6 @@ class MSpecOptions end end - def add_tags_dir - on("-X", "--tags-dir DIR", String, - "Use DIR as the path prefix for locating spec tag files") do |d| - @config[:tags_dir] = d - end - end - def add_formatters on("-f", "--format FORMAT", String, "Formatter for reporting, where FORMAT is one of:") do |o| lib/mspec/utils/options.rb @@ -4,7 +4,10 @@ require 'mspec/runner/formatters/dotted' class MSpecScript def self.config - @config ||= { :path => ['.', 'spec'] } + @config ||= { + :path => ['.', 'spec'], + :config_ext => '.mspec' + } end def self.set(key, value) @@ -32,11 +35,18 @@ class MSpecScript end def load(name) - return Kernel.load(name) if File.exist?(File.expand_path(name)) + names = [name] + unless name[-6..-1] == config[:config_ext] + names << name + config[:config_ext] + end + + names.each do |name| + return Kernel.load(name) if File.exist?(File.expand_path(name)) - config[:path].each do |dir| - file = File.join dir, name - return Kernel.load(file) if File.exist? file + config[:path].each do |dir| + file = File.join dir, name + return Kernel.load(file) if File.exist? file + end end end lib/mspec/utils/script.rb @@ -1,3 +1,3 @@ module MSpec - VERSION = '1.0.0' + VERSION = '1.1.1' end lib/mspec/version.rb @@ -27,11 +27,6 @@ describe MSpecCI, "#options" do @script.options end - it "enables the tags dir option" do - @options.should_receive(:add_tags_dir) - @script.options - end - it "enables the dry run option" do @options.should_receive(:add_pretend) @script.options @@ -94,9 +89,9 @@ describe MSpecCI, "#run" do @script.options end - it "registers the tags directory path" do - @config[:tags_dir] = "tags_dir" - MSpec.should_receive(:register_tags_path).with("tags_dir") + it "registers the tags patterns" do + @config[:tags_patterns] = [/spec/, "tags"] + MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"]) @script.run end spec/commands/mspec_ci_spec.rb @@ -38,11 +38,6 @@ describe MSpecRun, "#options" do @script.options @argv end - it "enables the tags dir option" do - @options.should_receive(:add_tags_dir) - @script.options @argv - end - it "enables the randomize option to runs specs in random order" do @options.should_receive(:add_randomize) @script.options @argv @@ -122,9 +117,9 @@ describe MSpecRun, "#run" do @script.options end - it "registers the tags directory path" do - @config[:tags_dir] = "tags_dir" - MSpec.should_receive(:register_tags_path).with("tags_dir") + it "registers the tags patterns" do + @config[:tags_patterns] = [/spec/, "tags"] + MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"]) @script.run end spec/commands/mspec_run_spec.rb @@ -38,11 +38,6 @@ describe MSpecTag, "#options" do @script.options @argv end - it "enables the tags dir option" do - @options.should_receive(:add_tags_dir) - @script.options @argv - end - it "enables the dry run option" do @options.should_receive(:add_pretend) @script.options @argv @@ -107,9 +102,9 @@ describe MSpecTag, "#run" do @script.options end - it "registers the tags directory path" do - @config[:tags_dir] = "tags_dir" - MSpec.should_receive(:register_tags_path).with("tags_dir") + it "registers the tags patterns" do + @config[:tags_patterns] = [/spec/, "tags"] + MSpec.should_receive(:register_tags_patterns).with([/spec/, "tags"]) @script.run end spec/commands/mspec_tag_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 spec/runner/formatters/spinner_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 spec/runner/mspec_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 spec/utils/options_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 spec/utils/script_spec.rb mspec-1.0.0.gemspec 105cfdbeb024cdae057ff2afdd294cb93daa4d56 f7be7e6aa05105d9a458eb52f9545bc78e372e16 Jim Deville jdeville@microsoft.com http://github.com/jflam/mspec/commit/38ba4222033f75c1d095a0b12f8edc0dbc0951ec 38ba4222033f75c1d095a0b12f8edc0dbc0951ec 2008-07-04T16:48:52-07:00 2008-07-04T16:48:52-07:00 updating mspec 9ed4911cf355170f8143f1797524d5d499772cb3 Jim Deville jdeville@microsoft.com