lib/mspec/commands/mkspec_command.rb lib/mspec/commands/mspec-ci_command.rb lib/mspec/commands/mspec-run_command.rb lib/mspec/commands/mspec-tag_command.rb lib/mspec/commands/mspec_command.rb mspec-1.0.0.gemspec spec/commands/mkspec_spec.rb spec/commands/mspec_ci_spec.rb spec/commands/mspec_run_spec.rb spec/commands/mspec_spec.rb spec/commands/mspec_tag_spec.rb @@ -1,3 +1,4 @@ +pkg/* *.rbc *.iml *.iws .gitignore @@ -1,6 +1,44 @@ require 'rubygems' require 'spec/rake/spectask' +require 'rake/gempackagetask' Spec::Rake::SpecTask.new task :default => :spec + + +spec = Gem::Specification.new do |s| + s.name = %q{mspec} + s.version = "1.0.0" + + s.specification_version = 2 if s.respond_to? :specification_version= + + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Brian Ford"] + s.date = %q{2008-05-21} + s.email = %q{bford@engineyard.com} + s.has_rdoc = true + s.extra_rdoc_files = %w[ README LICENSE ] + s.executables = ["mkspec", "mspec", "mspec-ci", "mspec-run", "mspec-tag"] + s.files = FileList[ '{bin,lib,spec}/**/*.{yaml,txt,rb}', 'Rakefile', *s.extra_rdoc_files ] + s.homepage = %q{http://rubyspec.org} + s.rubyforge_project = 'http://rubyforge.org/projects/mspec' + s.require_paths = ["lib"] + s.rubygems_version = %q{1.1.1} + s.summary = <<EOS +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. +EOS + + s.rdoc_options << '--title' << 'MSpec Gem' << + '--main' << 'README' << + '--line-numbers' +end + +Rake::GemPackageTask.new(spec){ |pkg| pkg.gem_spec = spec } \ No newline at end of file Rakefile @@ -2,134 +2,6 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') -require 'fileutils' -require 'optparse' -require 'mspec/version' -require 'mspec/utils/name_map' +require 'mspec/commands/mkspec_command' - -class MkSpec - attr_reader :config - - def initialize - @config = { - :constants => [], - :requires => [], - :base => "spec/ruby/1.8/core" - } - @map = NameMap.new - end - - def options(argv=ARGV) - options = OptionParser.new - options.version = MSpec::VERSION - options.banner = "mkspec [options]" - options.separator "" - - options.on("-c", "--constant CONSTANT", String, - "Class or Module to generate spec stubs for") do |name| - config[:constants] << name - end - options.on("-b", "--base DIR", String, - "Directory to generate specs into") do |directory| - config[:base] = File.expand_path directory - end - options.on("-r", "--require LIBRARY", String, - "A library to require") do |file| - config[:requires] << file - end - - options.separator "\n How might this work in the real world?\n" - options.separator " 1. To create spec stubs for every class or module in Object\n" - options.separator " $ mkspec\n" - options.separator " 2. To create spec stubs for Fixnum\n" - options.separator " $ mkspec -c Fixnum\n" - options.separator " 3. To create spec stubs for Complex in 'superspec/complex'\n" - options.separator " $ mkspec -c Complex -rcomplex -b superspec" - options.separator "" - - options.parse argv - rescue OptionParser::ParseError => e - puts options - puts - puts e - exit 1 - end - - def create_directory(mod) - subdir = @map.dir_name mod, config[:base] - - if File.exist? subdir - unless File.directory? subdir - puts "#{subdir} already exists and is not a directory." - return nil - end - else - FileUtils.mkdir_p subdir - end - - subdir - end - - def write_requires(dir, file) - /\A#{Regexp.escape config[:base]}\/?(.*)/ =~ dir - parents = '../' * ($1.split('/').length + 1) - - File.open file, 'w' do |f| - f.puts "require File.dirname(__FILE__) + '/#{parents}spec_helper'" - config[:requires].each do |lib| - f.puts "require '#{lib}'" - end - end - end - - def write_spec(file, meth, exists) - if exists - out = `mspec/bin/mspec-run --dry-run -fs -e '#{meth}' #{file}` - return if out =~ /#{Regexp.escape meth}/ - end - - File.open file, 'a' do |f| - f.puts <<-EOS - -describe "#{meth}" do - it "needs to be reviewed for spec completeness" do - end -end -EOS - end - - puts file - end - - def create_file(dir, mod, meth, name) - file = File.join dir, @map.file_name(meth, mod) - exists = File.exist? file - - write_requires dir, file unless exists - write_spec file, name, exists - end - - def run - config[:requires].each { |lib| require lib } - constants = config[:constants] - constants = @map.filter(Object.constants) if constants.empty? - - @map.map({}, constants).each do |mod, methods| - name = mod.chop - next unless dir = create_directory(name) - - methods.each { |method| create_file dir, name, method, mod + method } - end - end - - def self.main - ENV['MSPEC_RUNNER'] = '1' - - script = new - script.options - script.run - end -end - -MkSpec.main if __FILE__ == $0 +MkSpec.main bin/mkspec @@ -1,145 +1,6 @@ #!/usr/bin/env ruby -MSPEC_HOME = File.expand_path(File.dirname(__FILE__) + '/..') -$:.unshift "#{MSPEC_HOME}/lib" +$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') +require 'mspec/commands/mspec_command' -require 'optparse' -require 'mspec/utils/options' -require 'mspec/utils/script' -require 'mspec/helpers/tmp' -require 'mspec/runner/actions/timer' - - -class MSpecMain < MSpecScript - def initialize - config[:includes] = [] - config[:requires] = [] - config[:target] = ENV['RUBY'] || 'ruby' - config[:flags] = [] - config[:command] = nil - config[:options] = [] - end - - def options(argv=ARGV) - if ["ci", "run", "tag"].include? argv[0] - config[:command] = argv.shift - config[:options] << "-h" if argv.delete("-h") || argv.delete("--help") - config[:options] << "-v" if argv.delete("-v") || argv.delete("--version") - end - - options = MSpecOptions.new config, "[COMMAND]", "", 28, " " - - options.separator "" - options.separator " The mspec command sets up and invokes the sub-commands" - options.separator " (see below) to enable, for instance, running the specs" - options.separator " with different implementations like ruby, jruby, rbx, etc.\n" - - options.add_config do |f| - config[:options] << '-B' << f - end - - options.add_targets - - options.on("-D", "--gdb", "Run under gdb") do - config[:flags] << '--gdb' - end - options.on("-A", "--valgrind", "Run under valgrind") do - config[:flags] << '--valgrind' - end - options.on("--warnings", "Don't supress warnings") do - config[:flags] << '-w' - ENV['OUTPUT_WARNINGS'] = '1' - end - options.on("-j", "--multi", "Run multiple (possibly parallel) subprocesses") do - config[:multi] = true - config[:options] << "-fy" - end - options.add_version - options.on("-h", "--help", "Show this message") do - puts options.parser - exit - end - - # The rest of the help output - options.separator "\n where COMMAND is one of:\n" - options.separator " run - Run the specified specs (default)" - options.separator " ci - Run the known good specs" - options.separator " tag - Add or remove tags\n" - options.separator " mspec COMMAND -h for more options\n" - - config[:options] += options.parser.filter! argv - options.parse argv - end - - def register; end - - def parallel - @parallel ||= !(Object.const_defined?(:JRUBY_VERSION) || - /(mswin|mingw)/ =~ RUBY_PLATFORM) - end - - def fork(&block) - parallel ? Kernel.fork(&block) : block.call - end - - def report(files, timer) - require 'yaml' - - exceptions = [] - tally = Tally.new - - files.each do |file| - d = File.open(file, "r") { |f| YAML.load f } - File.delete file - - exceptions += Array(d['exceptions']) - tally.files! d['files'] - tally.examples! d['examples'] - tally.expectations! d['expectations'] - tally.errors! d['errors'] - tally.failures! d['failures'] - end - - print "\n" - exceptions.each_with_index do |exc, index| - print "\n#{index+1})\n", exc, "\n" - end - print "\n#{timer.format}\n\n#{tally.format}\n" - end - - def multi_exec(argv) - timer = TimerAction.new - timer.start - - files = config[:ci_files].inject([]) do |list, item| - name = tmp "mspec-ci-multi-#{list.size}" - - rest = argv + ["-o", name, item] - fork { system [config[:target], *rest].join(" ") } - - list << name - end - - Process.waitall - timer.finish - report files, timer - end - - def run - ENV['MSPEC_RUNNER'] = '1' - - argv = config[:flags] - argv.concat config[:includes] - argv.concat config[:requires] - argv << "#{MSPEC_HOME}/bin/mspec-#{ config[:command] || "run" }" - argv.concat config[:options] - - if config[:multi] and config[:command] == "ci" - multi_exec argv - else - exec config[:target], *argv - end - end -end - -MSpecMain.main if __FILE__ == $0 +MSpecMain.main bin/mspec @@ -2,75 +2,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') -require 'optparse' -require 'mspec/utils/options' -require 'mspec/utils/script' +require 'mspec/commands/mspec-ci_command' +require 'mspec' - -class MSpecCI < MSpecScript - def options(argv=ARGV) - options = MSpecOptions.new config, "ci", "", 28, " " - - options.separator " Ask yourself:" - options.separator " 1. How to run the specs?" - options.separator " 2. How to display the output?" - options.separator " 3. What action to perform?" - options.separator " 4. When to perform it?" - - 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 - - options.separator "\n How to display their output" - options.add_formatters - options.add_verbose - - options.separator "\n What action to perform" - options.add_actions - - options.separator "\n When to perform it" - options.add_action_filters - - options.separator "\n Help!" - options.add_version - options.add_help - - options.separator "\n How might this work in the real world?" - options.separator "\n 1. To simply run the known good specs" - options.separator "\n $ mspec ci" - options.separator "\n 2. To run a subset of the known good specs" - options.separator "\n $ mspec ci path/to/specs" - options.separator "\n 3. To start the debugger before the spec matching 'this crashes'" - options.separator "\n $ mspec ci --spec-debug -S 'this crashes'" - options.separator "" - - @patterns = options.parse argv - @patterns = config[:ci_files] if @patterns.empty? - end - - def run - files = [] - @patterns.each do |item| - stat = File.stat(File.expand_path(item)) - files << item if stat.file? - files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? - end - - MSpec.register_tags_path config[:tags_dir] - MSpec.register_files files - TagFilter.new(:exclude, "fails").register - TagFilter.new(:exclude, "unstable").register - TagFilter.new(:exclude, "incomplete").register - - MSpec.process - exit MSpec.exit_code - end -end - -if __FILE__ == $0 - require 'mspec' - MSpecCI.main -end \ No newline at end of file +MSpecCI.main bin/mspec-ci @@ -2,83 +2,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') -require 'optparse' -require 'mspec/utils/options' -require 'mspec/utils/script' +require 'mspec/commands/mspec-run_command' +require 'mspec' - -class MSpecRun < MSpecScript - def options(argv=ARGV) - options = MSpecOptions.new config, "run", "", 28, " " - - options.separator " Ask yourself:" - options.separator " 1. What specs to run?" - options.separator " 2. How to modify the execution?" - options.separator " 3. How to display the output?" - options.separator " 4. What action to perform?" - options.separator " 5. When to perform it?" - - options.separator "\n What specs to run" - options.add_filters - - 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 - - options.separator "\n How to display their output" - options.add_formatters - options.add_verbose - - options.separator "\n What action to perform" - options.add_actions - options.add_verify - - options.separator "\n When to perform it" - options.add_action_filters - - options.separator "\n Help!" - options.add_version - options.add_help - - options.separator "\n How might this work in the real world?" - options.separator "\n 1. To simply run some specs" - options.separator "\n $ mspec path/to/the/specs" - options.separator " mspec path/to/the_file_spec.rb" - options.separator "\n 2. To run specs tagged with 'fails'" - options.separator "\n $ mspec -g fails path/to/the_file_spec.rb" - options.separator "\n 3. To start the debugger before the spec matching 'this crashes'" - options.separator "\n $ mspec --spec-debug -S 'this crashes' path/to/the_file_spec.rb" - options.separator "" - - @patterns = options.parse argv - if @patterns.empty? - puts options.parser - puts "No files specified." - exit 1 - end - end - - def run - files = [] - @patterns.each do |item| - stat = File.stat(File.expand_path(item)) - files << item if stat.file? - files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? - end - - MSpec.register_tags_path config[:tags_dir] - MSpec.register_files files - - MSpec.process - exit MSpec.exit_code - end -end - -if __FILE__ == $0 - require 'mspec' - MSpecRun.main -end +MSpecRun.main bin/mspec-run @@ -2,92 +2,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib') -require 'optparse' -require 'mspec/utils/options' -require 'mspec/utils/script' +require 'mspec/commands/mspec-tag_command' +require 'mspec' - -class MSpecTag < MSpecScript - def initialize - super - - config[:tagger] = :add - config[:tag] = 'fails:' - config[:outcome] = :fail - end - - def options(argv=ARGV) - options = MSpecOptions.new config, "tag", "", 28, " " - - options.separator " Ask yourself:" - options.separator " 1. What specs to run?" - options.separator " 2. How to modify the execution?" - options.separator " 3. How to display the output?" - options.separator " 4. What tag action to perform?" - options.separator " 5. When to perform it?" - - options.separator "\n What specs to run" - options.add_filters - - 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 - - options.separator "\n How to display their output" - options.add_formatters - options.add_verbose - - options.separator "\n What action to perform and when to perform it" - options.add_tagging - - options.separator "\n Help!" - options.add_version - options.add_help - - options.separator "\n How might this work in the real world?" - options.separator "\n 1. To add the 'fails' tag to failing specs" - options.separator "\n $ mspec tag path/to/the_file_spec.rb" - options.separator "\n 2. To remove the 'fails' tag from passing specs" - options.separator "\n $ mspec tag --del fails path/to/the_file_spec.rb" - options.separator "" - - @patterns = options.parse argv - if @patterns.empty? - puts options.parser - puts "No files specified." - exit 1 - end - end - - def register - super - - tag = SpecTag.new config[:tag] - tagger = TagAction.new(config[:tagger], config[:outcome], tag.tag, tag.comment, - config[:atags], config[:astrings]) - tagger.register - end - - def run - files = [] - @patterns.each do |item| - stat = File.stat(File.expand_path(item)) - files << item if stat.file? - files.concat(Dir[item+"/**/*_spec.rb"].sort) if stat.directory? - end - - MSpec.register_tags_path config[:tags_dir] - MSpec.register_files files - - MSpec.process - exit MSpec.exit_code - end -end - -if __FILE__ == $0 - require 'mspec' - MSpecTag.main -end +MSpecTag.main bin/mspec-tag @@ -1,3 +1,4 @@ + require 'mspec/runner/state' require 'mspec/runner/tag' require 'fileutils' lib/mspec/runner/mspec.rb spec/bin/mkspec_spec.rb spec/bin/mspec_ci_spec.rb spec/bin/mspec_run_spec.rb spec/bin/mspec_spec.rb spec/bin/mspec_tag_spec.rb 477df68a6fd8515bf2ee28db69378bcf5105117f Gordon Thiesfeld gthiesfeld@gmail.com http://github.com/brixen/mspec/commit/820a70bca8bbd61e2941ee4e9aa66d114104b980 820a70bca8bbd61e2941ee4e9aa66d114104b980 2008-05-31T15:46:06-07:00 2008-05-31T15:46:06-07:00 Gemified MSpec. Signed-off-by: Brian Ford <bford@engineyard.com> f972d8eb0001799e3a7ab7e3f093a61a5ea0ade5 Brian Ford bford@engineyard.com