opal · Apr 25, 2014 · Apr 25, 2014
Showing with 42 additions and 15 deletions.

+2 −0 .spectator

+5 −0 .spectator-mspec

+16 −2 README.md

+9 −0 bin/opal-mspec

+10 −13 lib/mspec/opal/rake_task.rb
diff --git a/.spectator b/.spectator
@@ -0,0 +1,2 @@
+BASE_DIR_GLOB: 'lib/opal'
+SPEC_DIR_GLOB: 'spec/cli'
diff --git a/.spectator-mspec b/.spectator-mspec
@@ -0,0 +1,5 @@
+BASE_DIR_REGEXP: '(?:opal/corelib|stdlib|spec)'
+SPEC_DIR_REGEXP: '(?:spec/corelib/core|spec/stdlib/\w+/spec)'
+RSPEC_COMMAND: 'bundle exec ./bin/opal-mspec'
+
+# RSPEC_COMMAND: "bundle exec mspec run -t ./bin/opal -I $(dirname $(gem which mspec)) -I lib/ -rmspec/opal/mspec_fixes.rb spec/corelib/"
diff --git a/README.md b/README.md
@@ -77,15 +77,29 @@ This will command will run all RSpec and MSpec examples in sequence.
 Alternatively, you can just load up a rack instance using `rackup spec/config.ru`, and
 visit `http://localhost:9292/` in any web browser.
 
+#### Automated runs
+
+[spectator][] can be used in an autotest fashion with this command
+
+```shell
+spectator .spectator-mspec # this will run RSpec examples only
+```
+
+
+
 ### Rspec
 
 [RSpec][] tests can be run with
 
     $ rake rspec
 
-Alternatively [spectator][] can be used in an autotest fashion with this command:
+#### Automated runs
 
-    BASE_DIR_GLOB='lib/opal' SPEC_DIR_GLOB='spec/cli' spectator
+[spectator][] can be used in an autotest fashion with this command
+
+```shell
+spectator # this will run RSpec examples only
+```
 
 
 ## Code Overview

diff --git a/bin/opal-mspec b/bin/opal-mspec
@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+specs = ARGV.map do |s|
+  s.end_with?('.rb') ? s : "#{s}/**/*_spec.rb"
+end
+pattern = %Q{MSPEC_PATTERN="{#{specs.join(',').inspect}}"} if specs.any?
+command = [pattern, 'rake mspec'].compact.join(' ')
+puts "Executing: #{command}"
+exec command
diff --git a/lib/mspec/opal/rake_task.rb b/lib/mspec/opal/rake_task.rb
@@ -164,23 +164,20 @@ def files
 
       def add_files specs
         puts "Adding #{specs.size} spec files..."
-        files.concat specs.flatten
-      end
-
-      def paths_from_glob pattern
-        Dir.glob(File.expand_path(pattern)).map do |s|
-          s.sub(/^#{basedir}\//, '').sub(/\.rb$/, '')
-        end
-      end
-
-      def rubyspec_paths
-        rubyspec_white_list.map do |path|
+        specs = specs.flatten.map do |path|
           dirname = File.join([basedir, path])
           if File.directory? dirname
             rubyspec_paths_in_dir(dirname, path)
           else
             path
           end
+        end.flatten
+        files.concat specs
+      end
+
+      def paths_from_glob pattern
+        Dir.glob(File.expand_path(pattern)).map do |s|
+          s.sub(/^#{basedir}\//, '').sub(/\.rb$/, '')
         end
       end
 
@@ -204,14 +201,14 @@ def files_to_run(pattern=nil)
 
         if pattern
           # add custom opal specs from spec/
-          add_files paths_from_glob(pattern) & rubyspec_paths
+          add_files paths_from_glob(pattern) & rubyspec_white_list
 
         else
           # add opal specific specs
           add_files paths_from_glob("#{basedir}/{opal}/**/*_spec.rb")
 
           # add any rubyspecs we want to run (defined in spec/rubyspecs)
-          add_files rubyspec_paths
+          add_files rubyspec_white_list
         end
       end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		BASE_DIR_GLOB: 'lib/opal'
		SPEC_DIR_GLOB: 'spec/cli'