[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Luke Kanies]

The following commit has been merged in the experimental branch:
commit 69db81746fee54e14ee3e46f2fc31e93c096d529
Author: Luke Kanies <luke at puppetlabs.com>
Date:   Sat Apr 9 15:04:23 2011 -0700

    Fixing the watchr script
    
    It had not been updated for quite a while.
    
    Signed-off-by: Luke Kanies <luke at puppetlabs.com>
    Reviewed-by: Daniel Pittman <daniel at puppetlabs.com>

diff --git a/spec/spec.opts b/spec/spec.opts
index 91cd642..425f0ed 100644
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,6 +1,4 @@
 --format
 s
 --colour
---loadby
-mtime
 --backtrace
diff --git a/autotest/watcher.rb b/spec/watchr.rb
similarity index 96%
rename from autotest/watcher.rb
rename to spec/watchr.rb
index 9f89a44..bad89b0 100644
--- a/autotest/watcher.rb
+++ b/spec/watchr.rb
@@ -47,7 +47,7 @@ end
 
 def file2specs(file)
   %w{spec/unit spec/integration}.collect { |d|
-    file.sub('lib/puppet', d)
+    file.sub('lib/puppet', d).sub(".rb", "_spec.rb")
   }.find_all { |f|
     File.exist?(f)
   }
@@ -81,7 +81,7 @@ def run_spec_files(files)
   files = Array(files)
   return if files.empty?
   opts = File.readlines('spec/spec.opts').collect { |l| l.chomp }.join(" ")
-  run_spec("spec #{files.join(' ')}")
+  run_spec("rspec #{opts} --tty #{files.join(' ')}")
 end
 
 def run_all_tests

-- 
Puppet packaging for Debian