Renaming files to the normal convention now that we don't need to sup…

…port autotest defaults. Added guard as the new default.
joakimk · Jun 19, 2011 · 0705f47 · 0705f47
1 parent fbe04bf
commit 0705f47
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 3 deletions.
diff --git a/.bundle/config b/.bundle/config
@@ -1,2 +1,3 @@
 --- 
 BUNDLE_DISABLE_SHARED_GEMS: "1"
+BUNDLE_BIN: .bundle/bin
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ instance*
 */**/*.swp
 */*/*/*.swp
 tmp
+.bundle/bin
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,6 +28,11 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
+    guard (0.4.2)
+      thor (~> 0.14.6)
+    guard-test (0.3.0)
+      guard (>= 0.2.2)
+      test-unit (~> 2.2)
     httparty (0.7.4)
       crack (= 0.1.8)
     json (1.4.6)
@@ -43,6 +48,8 @@ GEM
     sinatra (1.0)
       rack (>= 1.0)
     term-ansicolor (1.0.5)
+    test-unit (2.3.0)
+    thor (0.14.6)
 
 PLATFORMS
   ruby
@@ -51,6 +58,8 @@ DEPENDENCIES
   bundler
   cucumber
   flexmock
+  guard
+  guard-test
   rack-test
   rake
   rvm

diff --git a/Guardfile b/Guardfile
@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'test', :all_after_pass => false, :all_on_start => false do
+  watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^test/.+_test\.rb$})
+end
diff --git a/README.markdown b/README.markdown
@@ -117,9 +117,10 @@ First, get the tests to run:
     bundle
     rake
 
-For development I recommend: [grosser/autotest](http://github.com/grosser/autotest)
+For development I recommend using guard.
 
-    autotest -f -c
+    # OSX needs: gem install rb-fsevent
+    guard
 
 Make your change (don't forget to write tests) and send me a pull request.
 

diff --git a/Rakefile b/Rakefile
@@ -11,7 +11,7 @@ end
 
 desc "Run Test::Unit tests"
 task :test do
-  Dir["test/**/test_*.rb"].each { |test| require(File.expand_path(test)) }
+  Dir["test/**/*_test.rb"].each { |test| require(File.expand_path(test)) }
 end
 
 

diff --git a/test/test_integration.rb → test/integration_test.rb b/test/test_integration.rb → test/integration_test.rb
diff --git a/test/requester/test_requester.rb → test/requester/requester_test.rb b/test/requester/test_requester.rb → test/requester/requester_test.rb
diff --git a/test/runner/test_job.rb → test/runner/job_test.rb b/test/runner/test_job.rb → test/runner/job_test.rb
diff --git a/test/server/test_group.rb → test/server/group_test.rb b/test/server/test_group.rb → test/server/group_test.rb
diff --git a/test/server/test_server.rb → test/server/server_test.rb b/test/server/test_server.rb → test/server/server_test.rb
diff --git a/test/shared/adapters/test_adapter.rb → test/shared/adapters/adapter_test.rb b/test/shared/adapters/test_adapter.rb → test/shared/adapters/adapter_test.rb
diff --git a/.../shared/adapters/helpers/test_ruby_env.rb → .../shared/adapters/helpers/ruby_env_test.rb b/.../shared/adapters/helpers/test_ruby_env.rb → .../shared/adapters/helpers/ruby_env_test.rb
diff --git a/test/shared/test_testbot.rb → test/shared/testbot_test.rb b/test/shared/test_testbot.rb → test/shared/testbot_test.rb
diff --git a/testbot.gemspec b/testbot.gemspec
@@ -28,5 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rvm")
   s.add_development_dependency("rake")
   s.add_development_dependency("bundler")
+  s.add_development_dependency("guard")
+  s.add_development_dependency("guard-test")
 end