parallelized_specs 0.1.7 → 0.1.8

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.email    = "jake@instructure.com"
     gem.homepage = "http://github.com/jakesorce/#{gem.name}"
     gem.authors  = "Jake Sorce, Bryan Madsen"
-    gem.version = "0.1.7"
+    gem.version = "0.1.8"
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/parallelized_specs/tasks.rb

@@ -2,18 +2,15 @@ $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
 require "parallelized_specs"
 
 namespace :parallel do
-  def run_db_in_parallel(cmd, options={})
-    ParallelizedSpecs.execute_parallel_db(cmd, options)
-  end
 
   desc "create test databases via db:create --> parallel:create[num_cpus]"
   task :create, :count do |t, args|
-    run_db_in_parallel('rake db:create RAILS_ENV=test', args)
+    ParallelizedSpecs.execute_parallel_db('rake db:create RAILS_ENV=test', args)
   end
 
   desc "drop test databases via db:drop --> parallel:drop[num_cpus]"
   task :drop, :count do |t, args|
-    run_db_in_parallel('rake db:drop RAILS_ENV=test', args)
+    ParallelizedSpecs.execute_parallel_db('rake db:drop RAILS_ENV=test', args)
   end
 
   desc "update test databases by dumping and loading --> parallel:prepare[num_cpus]"
@@ -25,27 +22,26 @@ namespace :parallel do
     else
       # there is no separate dump / load for schema_format :sql -> do it safe and slow
       args = args.to_hash.merge(:non_parallel => true) # normal merge returns nil
-      run_db_in_parallel('rake db:test:prepare --trace', args)
+      ParallelizedSpecs.execute_parallel_db('rake db:test:prepare --trace', args)
     end
   end
 
   # when dumping/resetting takes too long
   desc "update test databases via db:migrate --> parallel:migrate[num_cpus]"
   task :migrate, :count do |t, args|
-    run_db_in_parallel('rake db:migrate RAILS_ENV=test', args)
+    ParallelizedSpecs.execute_parallel_db('rake db:migrate RAILS_ENV=test', args)
   end
 
   # just load the schema (good for integration server <-> no development db)
   desc "load dumped schema for test databases via db:schema:load --> parallel:load_schema[num_cpus]"
   task :load_schema, :count do |t, args|
-    run_db_in_parallel('rake db:test:load', args)
+    ParallelizedSpecs.execute_parallel_db('rake db:test:load', args)
   end
 
   desc "run spec in parallel with parallel:spec[num_cpus]"
   task 'spec', :count, :pattern, :options, :arguments do |t, args|
     count, pattern, options = ParallelizedSpecs.parse_rake_args(args)
-    #command = "-n #{count} -p '#{pattern}' -r '#{Rails.root}' -o '#{options}' #{args[:arguments]}"
-    opts = [:count => count, :pattern => pattern, :options => options, :root => Rails.root, :files => args[:arguments]]
+    opts = {:count => count, :pattern => pattern, :root => Rails.root, :files => args[:arguments]}
     ParallelizedSpecs.execute_parallel_specs(opts)
   end
 end

data/lib/parallelized_specs.rb

@@ -53,7 +53,7 @@ class ParallelizedSpecs
   end
 
   def self.execute_parallel_db(cmd, options={})
-    count = options[:count].to_i
+    count = options[:count].to_i || Parallel.processor_count
     count = Parallel.processor_count if count == 0
     runs = (0...count).to_a
     results = if options[:non_parallel]
@@ -69,19 +69,26 @@ class ParallelizedSpecs
   end
 
   def self.execute_parallel_specs(options)
+    if options[:files].to_s.empty?
+      tests = find_tests(Rails.root, options)
+      run_specs(tests, options)
+    else
+      run_specs(options[:files], options)
+    end
+  end
+
+  def self.run_specs(tests, options)
     num_processes = options[:count] || Parallel.processor_count
-    lib, name, task = {
-        'spec' => %w(specs spec spec),
-    }[options[:type]||'spec']
+    name = 'spec'
 
     start = Time.now
 
-    tests_folder = task
+    tests_folder = 'spec'
     tests_folder = File.join(options[:root], tests_folder) unless options[:root].to_s.empty?
-    if options[:files].is_a?(Array)
-      groups = tests_in_groups(options[:files] || tests_folder, num_processes, options)
+    if tests.is_a?(Array)
+      groups = tests_in_groups(tests || tests_folder, num_processes, options)
     else
-      files_array = options[:files].split(/ /)
+      files_array = tests.split(/ /)
       groups = tests_in_groups(files_array || tests_folder, num_processes, options)
     end
     num_processes = groups.size
@@ -110,7 +117,7 @@ class ParallelizedSpecs
     abort "#{name.capitalize}s Failed" if failed
   end
 
-  # parallel:spec[:count, :pattern, :options]
+# parallel:spec[:count, :pattern, :options]
   def self.parse_rake_args(args)
     # order as given by user
     args = [args[:count], args[:pattern], args[:options]]
@@ -129,9 +136,8 @@ class ParallelizedSpecs
     [num_processes.to_i, pattern.to_s, options.to_s]
   end
 
-  # finds all tests and partitions them into groups
-  def self.tests_in_groups(root, num_groups, options)
-    tests = find_tests(root, options)
+# finds all tests and partitions them into groups
+  def self.tests_in_groups(tests, num_groups, options)
     if options[:no_sort]
       Grouper.in_groups(tests, num_groups)
     else
@@ -176,7 +182,7 @@ class ParallelizedSpecs
 
   protected
 
-  # read output of the process and print in in chucks
+# read output of the process and print in in chucks
   def self.fetch_output(process, options)
     all = ''
     buffer = ''
@@ -205,7 +211,7 @@ class ParallelizedSpecs
     all
   end
 
-  # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
+# copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
   def self.bundler_enabled?
     return true if Object.const_defined?(:Bundler)
 
@@ -243,16 +249,17 @@ class ParallelizedSpecs
     end
   end
 
-  def self.find_tests(root, options)
+  def self.find_tests(root, options={})
     if root.is_a?(Array)
       root
     else
       # follow one symlink and direct children
       # http://stackoverflow.com/questions/357754/can-i-traverse-symlinked-directories-in-ruby-with-a-glob
-      files = Dir["#{Rails.root}/**{,/*/**}/*#{test_suffix}"].uniq
+      files = Dir["#{root}/**{,/*/**}/*#{test_suffix}"].uniq
       files = files.map { |f| f.sub(root+'/', '') }
-      files = files.grep(/#{options['pattern']}/)
-      files.map { |f| "#{root}/#{f}" }
+      files = files.grep(/#{options[:pattern]}/)
+      files.map { |f| "/#{f}" }
     end
   end
+
 end

data/parallelized_specs.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "parallelized_specs"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jake Sorce, Bryan Madsen"]
-  s.date = "2012-05-02"
+  s.date = "2012-05-03"
   s.email = "jake@instructure.com"
   s.files = [
     "Gemfile",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parallelized_specs
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Jake Sorce, Bryan Madsen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-02 00:00:00 Z
+date: 2012-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: parallel