parallel_tests 0.8.12 → 0.8.13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_tests (0.8.12)
+    parallel_tests (0.8.13)
       parallel
 
 GEM

data/lib/parallel_tests.rb

@@ -12,22 +12,6 @@ module ParallelTests
     ].detect{|c| not c.to_s.strip.empty? }.to_i
   end
 
-  # parallel:spec[:count, :pattern, :options]
-  def self.parse_rake_args(args)
-    # order as given by user
-    args = [args[:count], args[:pattern], args[:options]]
-
-    # count given or empty ?
-    # parallel:spec[2,models,options]
-    # parallel:spec[,models,options]
-    count = args.shift if args.first.to_s =~ /^\d*$/
-    num_processes = count.to_i unless count.to_s.empty?
-    pattern = args.shift
-    options = args.shift
-
-    [num_processes, pattern.to_s, options.to_s]
-  end
-
   # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
   def self.bundler_enabled?
     return true if Object.const_defined?(:Bundler)

data/lib/parallel_tests/tasks.rb

@@ -1,48 +1,82 @@
-namespace :parallel do
-  rails_env = ENV['RAILS_ENV'] || 'test'
+require 'rake'
 
-  def run_in_parallel(cmd, options)
-    count = "-n #{options[:count]}" if options[:count]
-    executable = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')
-    command = "#{executable} --exec '#{cmd}' #{count} #{'--non-parallel' if options[:non_parallel]}"
-    abort unless system(command)
-  end
+module ParallelTests
+  module Tasks
+    class << self
+      def rails_env
+        ENV['RAILS_ENV'] || 'test'
+      end
 
-  # this is a crazy-complex solution for a very simple problem:
-  # removing certain lines from the output without chaning the exit-status
-  # normally I'd not do this, but it has been lots of fun and a great learning experience :)
-  #
-  # - sed does not support | without -r
-  # - grep changes 0 exitstatus to 1 if nothing matches
-  # - sed changes 1 exitstatus to 0
-  # - pipefail makes pipe fail with exitstatus of first failed command
-  # - pipefail is not supported in (zsh)
-  # - defining a new rake task like silence_schema would force users to load parallel_tests in test env
-  # - do not use ' since run_in_parallel uses them to quote stuff
-  # - simple system "set -o pipefail" returns nil even though set -o pipefail exists with 0
-  def parallel_tests_suppress_output(command, ignore_regex)
-    activate_pipefail = "set -o pipefail"
-    remove_ignored_lines = %Q{(grep -v "#{ignore_regex}" || test 1)}
+      def run_in_parallel(cmd, options={})
+        count = " -n #{options[:count]}" if options[:count]
+        executable = File.expand_path("../../../bin/parallel_test", __FILE__)
+        command = "#{executable} --exec '#{cmd}'#{count}#{' --non-parallel' if options[:non_parallel]}"
+        abort unless system(command)
+      end
 
-    if system("#{activate_pipefail} && test 1")
-      "#{activate_pipefail} && (#{command}) | #{remove_ignored_lines}"
-    else
-      command
+      # this is a crazy-complex solution for a very simple problem:
+      # removing certain lines from the output without chaning the exit-status
+      # normally I'd not do this, but it has been lots of fun and a great learning experience :)
+      #
+      # - sed does not support | without -r
+      # - grep changes 0 exitstatus to 1 if nothing matches
+      # - sed changes 1 exitstatus to 0
+      # - pipefail makes pipe fail with exitstatus of first failed command
+      # - pipefail is not supported in (zsh)
+      # - defining a new rake task like silence_schema would force users to load parallel_tests in test env
+      # - do not use ' since run_in_parallel uses them to quote stuff
+      # - simple system "set -o pipefail" returns nil even though set -o pipefail exists with 0
+      def suppress_output(command, ignore_regex)
+        activate_pipefail = "set -o pipefail"
+        remove_ignored_lines = %Q{(grep -v "#{ignore_regex}" || test 1)}
+
+        if system("#{activate_pipefail} && test 1")
+          "#{activate_pipefail} && (#{command}) | #{remove_ignored_lines}"
+        else
+          command
+        end
+      end
+
+      def check_for_pending_migrations
+        abort_migrations = "db:abort_if_pending_migrations"
+        if Rake::Task.task_defined?(abort_migrations)
+          Rake::Task[abort_migrations].invoke
+        end
+      end
+
+      # parallel:spec[:count, :pattern, :options]
+      def parse_args(args)
+        # order as given by user
+        args = [args[:count], args[:pattern], args[:options]]
+
+        # count given or empty ?
+        # parallel:spec[2,models,options]
+        # parallel:spec[,models,options]
+        count = args.shift if args.first.to_s =~ /^\d*$/
+        num_processes = count.to_i unless count.to_s.empty?
+        pattern = args.shift
+        options = args.shift
+
+        [num_processes, pattern.to_s, options.to_s]
+      end
     end
   end
+end
 
+namespace :parallel do
   desc "create test databases via db:create --> parallel:create[num_cpus]"
   task :create, :count do |t,args|
-    run_in_parallel("rake db:create RAILS_ENV=#{rails_env}", args)
+    ParallelTests::Tasks.run_in_parallel("rake db:create RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
   desc "drop test databases via db:drop --> parallel:drop[num_cpus]"
   task :drop, :count do |t,args|
-    run_in_parallel("rake db:drop RAILS_ENV=#{rails_env}", args)
+    ParallelTests::Tasks.run_in_parallel("rake db:drop RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
   desc "update test databases by dumping and loading --> parallel:prepare[num_cpus]"
-  task(:prepare, [:count] => 'db:abort_if_pending_migrations') do |t,args|
+  task(:prepare, [:count]) do |t,args|
+    ParallelTests::Tasks.check_for_pending_migrations
     if defined?(ActiveRecord) && ActiveRecord::Base.schema_format == :ruby
       # dump then load in parallel
       Rake::Task['db:schema:dump'].invoke
@@ -50,34 +84,35 @@ 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_in_parallel('rake db:test:prepare --trace', args)
+      ParallelTests::Tasks.run_in_parallel('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_in_parallel("rake db:migrate RAILS_ENV=#{rails_env}", args)
+    ParallelTests::Tasks.run_in_parallel("rake db:migrate RAILS_ENV=#{ParallelTests::Tasks.rails_env}", 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|
-    command = "rake db:schema:load RAILS_ENV=#{rails_env}"
-    run_in_parallel(parallel_tests_suppress_output(command, "^   ->\\|^-- "), args)
+    command = "rake db:schema:load RAILS_ENV=#{ParallelTests::Tasks.rails_env}"
+    ParallelTests::Tasks.run_in_parallel(ParallelTests::Tasks.suppress_output(command, "^   ->\\|^-- "), args)
   end
 
   desc "load the seed data from db/seeds.rb via db:seed --> parallel:seed[num_cpus]"
   task :seed, :count do |t,args|
-    run_in_parallel("rake db:seed RAILS_ENV=#{rails_env}", args)
+    run_in_parallel("rake db:seed RAILS_ENV=#{ParallelTests::Tasks.rails_env}", args)
   end
 
   ['test', 'spec', 'features'].each do |type|
     desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
-    task type, [:count, :pattern, :options] => 'db:abort_if_pending_migrations' do |t,args|
+    task type, [:count, :pattern, :options] do |t,args|
+      ParallelTests::Tasks.check_for_pending_migrations
       $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
       require "parallel_tests"
-      count, pattern, options = ParallelTests.parse_rake_args(args)
+      count, pattern, options = ParallelTests::Tasks.parse_args(args)
       test_framework = {
         'spec' => 'rspec',
         'test' => 'test',

data/lib/parallel_tests/version.rb

@@ -1,3 +1,3 @@
 module ParallelTests
-  VERSION = Version = '0.8.12'
+  VERSION = Version = '0.8.13'
 end

data/spec/parallel_tests/tasks_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+require 'parallel_tests/tasks'
+
+describe ParallelTests::Tasks do
+  describe ".parse_args" do
+    it "should return the count" do
+      args = {:count => 2}
+      ParallelTests::Tasks.parse_args(args).should == [2, '', ""]
+    end
+
+    it "should default to the prefix" do
+      args = {:count => "models"}
+      ParallelTests::Tasks.parse_args(args).should == [nil, "models", ""]
+    end
+
+    it "should return the count and pattern" do
+      args = {:count => 2, :pattern => "models"}
+      ParallelTests::Tasks.parse_args(args).should == [2, "models", ""]
+    end
+
+    it "should return the count, pattern, and options" do
+      args = {:count => 2, :pattern => "plain", :options => "-p default" }
+      ParallelTests::Tasks.parse_args(args).should == [2, "plain", "-p default"]
+    end
+  end
+
+  describe ".rails_env" do
+    around do |example|
+      begin
+        old = ENV["RAILS_ENV"]
+        ENV.delete "RAILS_ENV"
+        example.call
+      ensure
+        ENV["RAILS_ENV"] = old
+      end
+    end
+
+    it "should be test when nothing was set" do
+      ParallelTests::Tasks.rails_env.should == "test"
+    end
+
+    it "should be whatever was set" do
+      ENV["RAILS_ENV"] = "foo"
+      ParallelTests::Tasks.rails_env.should == "foo"
+    end
+  end
+
+  describe ".run_in_parallel" do
+    let(:full_path){ File.expand_path("../../../bin/parallel_test", __FILE__) }
+
+    it "should have the executable" do
+      File.file?(full_path).should == true
+      File.executable?(full_path).should == true
+    end
+
+    it "runs command in parallel" do
+      ParallelTests::Tasks.should_receive(:system).with("#{full_path} --exec 'echo'").and_return true
+      ParallelTests::Tasks.run_in_parallel("echo")
+    end
+
+    it "runs command with :count option" do
+      ParallelTests::Tasks.should_receive(:system).with("#{full_path} --exec 'echo' -n 123").and_return true
+      ParallelTests::Tasks.run_in_parallel("echo", :count => 123)
+    end
+
+    it "runs command with :non_parallel option" do
+      ParallelTests::Tasks.should_receive(:system).with("#{full_path} --exec 'echo' --non-parallel").and_return true
+      ParallelTests::Tasks.run_in_parallel("echo", :non_parallel => true)
+    end
+
+    it "runs aborts if the command fails" do
+      ParallelTests::Tasks.should_receive(:system).and_return false
+      ParallelTests::Tasks.should_receive(:abort).and_return false
+      ParallelTests::Tasks.run_in_parallel("echo")
+    end
+  end
+
+  describe ".suppress_output" do
+    def call(command, grep)
+      result = `#{ParallelTests::Tasks.suppress_output(command, grep)}`
+      [result, $?.success?]
+    end
+
+    it "should hide offending lines" do
+      call("echo 123", "123").should == ["", true]
+    end
+
+    it "should not hide other lines" do
+      call("echo 124", "123").should == ["124\n", true]
+    end
+
+    it "should fail if command fails and the pattern matches" do
+      call("echo 123 && test", "123").should == ["", false]
+    end
+
+    it "should fail if command fails and the pattern fails" do
+      call("echo 124 && test", "123").should == ["124\n", false]
+    end
+
+    it "should not filter if pipefail is not possible" do
+      ParallelTests::Tasks.should_receive(:system).with("set -o pipefail && test 1").and_return false
+      call("echo 123", "123").should == ["123\n", true]
+    end
+  end
+
+  describe ".check_for_pending_migrations" do
+    after do
+      Rake.application.instance_variable_get('@tasks').delete("db:abort_if_pending_migrations")
+    end
+
+    it "should do nothing if pending migrations is no defined" do
+      ParallelTests::Tasks.check_for_pending_migrations
+    end
+
+    it "should run pending migrations is task is defined" do
+      foo = 1
+      Rake::Task.define_task("db:abort_if_pending_migrations") do
+        foo = 2
+      end
+      ParallelTests::Tasks.check_for_pending_migrations
+      foo.should == 2
+    end
+
+    it "should not execute the task twice" do
+      foo = 1
+      Rake::Task.define_task("db:abort_if_pending_migrations") do
+        foo += 1
+      end
+      ParallelTests::Tasks.check_for_pending_migrations
+      ParallelTests::Tasks.check_for_pending_migrations
+      foo.should == 2
+    end
+  end
+end

data/spec/parallel_tests_spec.rb

@@ -1,28 +1,6 @@
 require "spec_helper"
 
 describe ParallelTests do
-  describe :parse_rake_args do
-    it "should return the count" do
-      args = {:count => 2}
-      ParallelTests.parse_rake_args(args).should == [2, '', ""]
-    end
-
-    it "should default to the prefix" do
-      args = {:count => "models"}
-      ParallelTests.parse_rake_args(args).should == [nil, "models", ""]
-    end
-
-    it "should return the count and pattern" do
-      args = {:count => 2, :pattern => "models"}
-      ParallelTests.parse_rake_args(args).should == [2, "models", ""]
-    end
-
-    it "should return the count, pattern, and options" do
-      args = {:count => 2, :pattern => "plain", :options => "-p default" }
-      ParallelTests.parse_rake_args(args).should == [2, "plain", "-p default"]
-    end
-  end
-
   describe ".determine_number_of_processes" do
     before do
       ENV.delete('PARALLEL_TEST_PROCESSORS')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.8.12
+  version: 0.8.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -71,6 +71,7 @@ files:
 - spec/parallel_tests/rspec/runner_spec.rb
 - spec/parallel_tests/rspec/runtime_logger_spec.rb
 - spec/parallel_tests/rspec/summary_logger_spec.rb
+- spec/parallel_tests/tasks_spec.rb
 - spec/parallel_tests/test/runner_spec.rb
 - spec/parallel_tests/test/runtime_logger_spec.rb
 - spec/parallel_tests_spec.rb
@@ -90,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2655389699589220897
+      hash: -388650261339101456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2655389699589220897
+      hash: -388650261339101456
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24