sauron 0.1.8 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.10

data/generators/sauron/sauron_generator.rb

@@ -2,12 +2,18 @@ class SauronGenerator < Rails::Generator::Base
   def manifest
     options[:runners] ||= 4
 
+    options[:rspec] ||= false
+    options[:testunit] ||= false
+    
+    options[:framework] = options[:rspec] ? 'rspec' : 'testunit'
+
     record do |m|
       m.file 'sauron_watchr.rb', 'sauron_watchr.rb'
       m.file 'test_helper.rb', 'test_helper.rb'
-      m.file 'sauron', 'sauron', :chmod => 0755
+      m.file 'script/sauron', 'script/sauron', :chmod => 0755
 
-      m.template 'config/hydra.yml', 'config/hydra.yml'
+      m.file 'config/hydra.yml', 'config/hydra.yml'
+      m.template 'config/sauron.yml', 'config/sauron.yml'
       
       m.directory 'lib/sauron'
       m.file 'lib/sauron/watchr.rb', 'lib/sauron/watchr.rb' 
@@ -21,5 +27,7 @@ class SauronGenerator < Rails::Generator::Base
   
   def add_options!(opt)
     opt.on('--runners='){|v| options[:runners] = v}
+    opt.on('--rspec'){|v| options[:rspec] = v}
+    opt.on('--testunit'){|v| options[:testunit] = v}
   end
 end

data/generators/sauron/templates/config/hydra.yml

@@ -1,3 +1,3 @@
 workers:
   - type: local
-    runners: <%= options[:runners] %>
+    runners: <%%= ENV['SAURON_WORKERS'] %>

data/generators/sauron/templates/config/sauron.yml

@@ -0,0 +1,2 @@
+:workers: <%= options[:runners] %>
+:framework: <%= options[:framework] %>

data/generators/sauron/templates/lib/sauron/watchr.rb

@@ -1,91 +1,8 @@
-require 'yaml'
-
-def set_hydra
-  $hydra = !!(`rake -T` =~ /rake hydra:sauron\s+/)
-end
-
-def run_routing_tests
-  message "running routing tests"
-  run_multiple_tests routing_tests
-end
-
-def run_single_test file
-  message "running #{file}"
-  system "time ruby -I.:lib:test -rubygems -e \"require '#{file}'\""  
-end
-
-def run_multiple_tests *files
-  joined_files = files.join(',')
-
-  message "running #{files.first.size} tests: #{joined_files}"
-  
-  if $hydra
-    system "time rake hydra:sauron RAILS_ENV=test FILE_LIST=#{joined_files}"
-  else
-    system "time ruby -I.:lib:test -rubygems -e \"%w[#{files.join(' ')}].each {|f| require f}\""  
-  end
-end
-
-def run_all_tests
-  message "running all tests"
-  run_multiple_tests all_tests
-end
-
-def unit_tests
-  Dir.glob('test/unit/*_test.rb')
-end
-
-def helper_tests
-  Dir.glob('test/unit/helpers/*_test.rb')
-end
-
-def functional_tests
-  Dir.glob('test/functional/*_test.rb')
-end
-
-def routing_tests
-  Dir.glob('test/unit/rout{es,ing}_test.rb')
-end
-
-def all_tests
-  Dir.glob('test/**/*_test.rb')
-end
-
-def message body
-  system 'clear'
-  puts body
-end
-
-def setup_databases
-  # Find the number of runners #
-  runners = 0
-  hydra_yaml = YAML.load_file('config/hydra.yml')
-  hydra_yaml['workers'].each do |worker|
-    runners = worker['runners'] if worker['runners'] > runners && worker['type'] == 'local'
-  end
- 
-  print "setting up #{runners} databases (you can change in config/hydra.yml)"
-  STDOUT.flush
-
-  # setup each database #
-  runners.times do |i|
-    print '.'
-    STDOUT.flush
-    
-    i = '' if i == 0
-    `rake db:reset RAILS_ENV=test TEST_ENV_NUMBER=#{i}`
-  end
-end
-
-def startup
-  set_hydra
-  setup_databases
-  run_all_tests
-end
+require 'sauron'
 
 Signal.trap('QUIT') do
-  run_all_tests
+  Sauron.run_all_tests
 end
 
 # Startup #
-startup
+Sauron.startup

data/generators/sauron/templates/lib/tasks/sauron.rake

@@ -1,10 +1,11 @@
 require 'hydra'
 require 'hydra/tasks'
+require 'sauron'
 
 Hydra::TestTask.new('hydra:sauron') do |t|
   if ENV.has_key?('FILE_LIST')
     ENV['FILE_LIST'].split(/,/).each {|file| t.add_files file}
   else
-    t.add_files 'test/**/*_test.rb'
+    Sauron.all_tests
   end
 end

data/generators/sauron/templates/sauron_watchr.rb

@@ -1,16 +1,35 @@
 require 'lib/sauron/watchr'
 
-# Unit tests #
-watch('test/unit/.*_test\.rb'){|f| run_single_test f[0]}
-watch('app/models/(.*)\.rb'){|f| run_single_test "test/unit/#{f[1]}_test.rb"}
+case Sauron.framework
+when 'testunit'
+  # Unit tests #
+  watch('test/unit/.*_test\.rb'){|f| Sauron.run_single_test f[0]}
+  watch('app/models/(.*)\.rb'){|f| Sauron.run_single_test "test/unit/#{f[1]}_test.rb"}
 
-# Functional tests #
-watch('test/functional/.*_test\.rb'){|f| run_single_test f[0]}
-watch('app/controllers/(.*)\.rb'){|f| run_single_test "test/functional/#{f[1]}_test.rb"}
-watch('app/views/(.*)/.*\.html.erb'){|f| run_single_test "test/functional/#{f[1]}_controller_test.rb"}
+  # Functional tests #
+  watch('test/functional/.*_test\.rb'){|f| Sauron.run_single_test f[0]}
+  watch('app/controllers/(.*)\.rb'){|f| Sauron.run_single_test "test/functional/#{f[1]}_test.rb"}
+  watch('app/views/(.*)/.*\.html.erb'){|f| Sauron.run_single_test "test/functional/#{f[1]}_controller_test.rb"}
 
-# Routing tests #
-watch('config/routes.rb'){|f| run_routing_tests }
+  # Routing tests #
+  watch('config/routes.rb'){|f| Sauron.run_routing_tests }
 
-# Multiple tests #
-watch('test/test_helper.rb'){|f| run_all_tests }
+  # Multiple tests #
+  watch('test/test_helper.rb'){|f| Sauron.run_all_tests }
+  
+when 'rspec'
+  # Model tests #
+  watch('spec/models/.*_spec\.rb'){|f| Sauron.run_single_test f[0]}
+  watch('app/models/(.*)\.rb'){|f| Sauron.run_single_test "spec_models/#{f[1]}_spec.rb"}
+
+  # Controller/View tests #
+  watch('spec/controllers/.*_spec\.rb'){|f| Sauron.run_single_test f[0]}
+  watch('app/controllers/(.*)\.rb'){|f| Sauron.run_multiple_tests ["spec/controllers/#{f[1]}_spec.rb"] + view_tests(f[1])}
+  watch('app/views/(.*)/(.*)'){|f| Sauron.run_multiple_tests "spec/controllers/#{f[1]}_controller_spec.rb", "spec/views/#{f[1]}/#{f[2]}_spec.rb"}
+
+  # Routing tests #
+  watch('config/routes.rb'){|f| Sauron.run_routing_tests }
+
+  # Multiple tests #
+  watch('spec/spec_helper.rb'){|f| Sauron.run_all_tests }
+end

data/lib/sauron/sauron_template.rb

@@ -0,0 +1,146 @@
+require 'yaml'
+require 'erb'
+
+class SauronTemplate
+  attr_accessor :framework, :workers, :hydra
+  
+  def initialize
+    config = YAML::load(ERB.new(IO.read(config_file)).result)
+    
+    framework = config[:framework]
+    workers = config[:workers]
+  end
+  
+  def config_file
+    'config/sauron.yml'
+  end
+  
+  def set_hydra
+    if hydra = !!(`rake -T hydra:sauron` =~ /hydra:sauron/)
+      message "Using hydra to run multiple tests in parallel"
+    else
+      message "You don't have hydra properly setup.  All tests will be run in single-threaded mode."
+    end
+  end
+
+  def run_routing_tests
+    message "running routing tests"
+    run_multiple_tests routing_tests
+  end
+
+  def run_single_test file
+    message "running #{file}"
+
+    case framework
+    when 'testunit'
+      system "time ruby -I.:lib:test -rubygems -e \"require '#{file}'\""
+    when 'rspec'
+      system "time ruby script/spec -O spec/spect.opts #{file}"
+    end
+  end
+
+  def run_multiple_tests *files
+    joined_files = files.join(',')
+
+    message "running #{files.first.size} tests: #{joined_files}"
+
+    if hydra
+      system "time rake hydra:sauron RAILS_ENV=test FILE_LIST=#{joined_files} SAURON_WORKERS=#{$sauron.workers}"
+    else
+      case framework
+      when 'testunit'
+        system "time ruby -I.:lib:test -rubygems -e \"%w[#{files.join(' ')}].each {|f| require f}\""  
+      when 'rspec'
+        system "time ruby script/spec -O spec/spect.opts #{files.join(' ')}"
+      end
+    end
+  end
+
+  def run_all_tests
+    message "running all tests"
+    run_multiple_tests all_tests
+  end
+
+  def unit_tests
+    case framework
+    when 'testunit'
+      Dir.glob('test/unit/*_test.rb')
+    when 'rspec'
+      Dir.glob('spec/models/*_spec.rb')
+    end
+  end
+
+  def helper_tests
+    case framework
+    when 'testunit'
+      Dir.glob('test/unit/helpers/*_test.rb')
+    when 'rspec'
+      Dir.glob('spec/helpers/*_spec.rb')
+    end
+  end
+
+  def functional_tests
+    case framework
+    when 'testunit'
+      Dir.glob('test/functional/*_test.rb')
+    when 'rspec'
+      Dir.glob('spec/controllers/*_spec.rb')
+    end
+  end
+
+  def view_tests controller = :all
+    case framework
+    when 'testunit'
+      []
+    when 'rspec'
+      if controller == :all
+        Dir.glob('spec/views/**/*_spec.rb')
+      else
+        Dir.glob('spec/views/#{controller}/*_spec.rb')
+      end
+    end
+  end
+
+  def routing_tests
+    case framework
+    when 'testunit'
+      Dir.glob('test/unit/rout{es,ing}_test.rb')
+    when 'rspec'
+      Dir.glob('spec/models/rout{es,ing}_spec.rb')
+    end
+  end
+
+  def all_tests
+    case framework
+    when 'testunit'
+      Dir.glob('test/**/*_test.rb')
+    when 'rspec'
+      Dir.glob('spec/**/*_spec.rb')
+    end
+  end
+
+  def message body
+    system 'clear'
+    puts body
+  end
+
+  def setup_databases
+    print "setting up #{workers} workers and their databases (you can change in config/sauron.yml)"
+    STDOUT.flush
+
+    # setup each database #
+    workers.times do |i|
+      print '.'
+      STDOUT.flush
+
+      i = '' if i == 0
+      `rake db:reset RAILS_ENV=test TEST_ENV_NUMBER=#{i}`
+    end
+  end
+
+  def startup
+    set_hydra
+    setup_databases
+    run_all_tests
+  end
+end

data/lib/sauron.rb

@@ -0,0 +1,3 @@
+require 'lib/sauron_template'
+
+Sauron = SauronTemplate

data/sauron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauron}
-  s.version = "0.1.8"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jaime Bellmyer"]
-  s.date = %q{2010-07-18}
+  s.date = %q{2010-07-19}
   s.description = %q{Speed up your automated tests with multiple databases and workers.}
   s.email = %q{jaime@kconrails.com}
   s.extra_rdoc_files = [
@@ -23,12 +23,14 @@ Gem::Specification.new do |s|
      "generators/sauron/USAGE",
      "generators/sauron/sauron_generator.rb",
      "generators/sauron/templates/config/hydra.yml",
+     "generators/sauron/templates/config/sauron.yml",
      "generators/sauron/templates/lib/sauron/watchr.rb",
      "generators/sauron/templates/lib/tasks/sauron.rake",
-     "generators/sauron/templates/sauron",
      "generators/sauron/templates/sauron_watchr.rb",
+     "generators/sauron/templates/script/sauron",
      "generators/sauron/templates/test_helper.rb",
      "lib/sauron.rb",
+     "lib/sauron/sauron_template.rb",
      "sauron.gemspec",
      "test/sauron_test.rb",
      "test/test_helper.rb"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sauron
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jaime Bellmyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-18 00:00:00 -05:00
+date: 2010-07-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,12 +65,14 @@ files:
 - generators/sauron/USAGE
 - generators/sauron/sauron_generator.rb
 - generators/sauron/templates/config/hydra.yml
+- generators/sauron/templates/config/sauron.yml
 - generators/sauron/templates/lib/sauron/watchr.rb
 - generators/sauron/templates/lib/tasks/sauron.rake
-- generators/sauron/templates/sauron
 - generators/sauron/templates/sauron_watchr.rb
+- generators/sauron/templates/script/sauron
 - generators/sauron/templates/test_helper.rb
 - lib/sauron.rb
+- lib/sauron/sauron_template.rb
 - sauron.gemspec
 - test/sauron_test.rb
 - test/test_helper.rb