parallel_tests 0.4.1 → 0.4.2

data/README.markdown

@@ -108,6 +108,7 @@ inspired by [pivotal labs](http://pivotallabs.com/users/miked/blog/articles/849-
 
 ###Contributors (alphabetical)
  - [Charles Finkel](http://charlesfinkel.com/)
+ - [Indrek Juhkam](http://urgas.eu)
  - [Jason Morrison](http://jayunit.net)
  - [Joakim Kolsjö](http://www.rubyblocks.se)
  - [Kevin Scaldeferri](http://kevin.scaldeferri.com/blog/)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/parallel_cucumber.rb

@@ -8,7 +8,7 @@ class ParallelCucumber < ParallelTests
   end
 
   def self.executable
-    if File.file?(".bundle/environment.rb")
+    if bundler_enabled?
       "bundle exec cucumber"
     elsif File.file?("script/cucumber")
       "script/cucumber"

data/lib/parallel_specs.rb

@@ -7,7 +7,7 @@ class ParallelSpecs < ParallelTests
   end
 
   def self.executable
-    if File.file?(".bundle/environment.rb")
+    if bundler_enabled?
       "bundle exec spec"
     elsif File.file?("script/spec")
       "script/spec"

data/lib/parallel_tests.rb

@@ -65,6 +65,22 @@ class ParallelTests
 
   protected
 
+  # copied from http://github.com/carlhuda/bundler Bundler::SharedHelpers#find_gemfile
+  def self.bundler_enabled?
+    return true if Object.const_defined?(:Bundler) 
+
+    previous = nil
+    current = File.expand_path(Dir.pwd)
+
+    until !File.directory?(current) || current == previous
+      filename = File.join(current, "Gemfile")
+      return true if File.exists?(filename)
+      current, previous = File.expand_path("..", current), current
+    end
+
+    false
+  end
+
   def self.line_is_result?(line)
     line =~ /\d+ failure/
   end

data/lib/tasks/parallel_tests.rake

@@ -25,7 +25,7 @@ namespace :parallel do
   ['test', 'spec', 'features'].each do |type|
     desc "run #{type} in parallel with parallel:#{type}[num_cpus]"
     task type, :count, :path_prefix, :options do |t,args|
-      $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
+      $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..'))
       require "parallel_tests"
       count, prefix, options = ParallelTests.parse_rake_args(args)
       exec "#{File.join(File.dirname(__FILE__), '..', '..', 'bin', 'parallel_test')} --type #{type} -n #{count} -p '#{prefix}' -r '#{RAILS_ROOT}' -o '#{options}'"

data/parallel_tests.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parallel_tests}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/parallel_cucumber_spec.rb

@@ -27,7 +27,7 @@ describe ParallelCucumber do
     end
 
     it "runs bundle exec cucumber when on bundler 0.9" do
-      File.stub!(:file?).with('.bundle/environment.rb').and_return true
+      ParallelCucumber.stub!(:bundler_enabled?).and_return true
       ParallelCucumber.should_receive(:open).with{|x,y| x =~ %r{bundle exec cucumber}}.and_return mock(:getc=>false)
       ParallelCucumber.run_tests(['xxx'],1,'')
     end

data/spec/parallel_specs_spec.rb

@@ -34,7 +34,7 @@ describe ParallelSpecs do
     end
 
     it "run bundle exec spec when on bundler 0.9" do
-      File.stub!(:file?).with('.bundle/environment.rb').and_return true
+      ParallelSpecs.stub!(:bundler_enabled?).and_return true
       ParallelSpecs.should_receive(:open).with{|x,y| x =~ %r{bundle exec spec}}.and_return mock(:getc=>false)
       ParallelSpecs.run_tests(['xxx'],1,'')
     end

data/spec/parallel_tests_spec.rb

@@ -11,7 +11,7 @@ describe ParallelTests do
 
     it "should default to the prefix" do
       args = {:count => "models"}
-      ParallelTests.parse_rake_args(args).should == [2, "models", ""]
+      ParallelTests.parse_rake_args(args).should == [Parallel.processor_count, "models", ""]
     end
 
     it "should return the count and prefix" do
@@ -137,6 +137,35 @@ EOF
     end
   end
 
+  describe :bundler_enabled? do
+    it "should return false" do
+      use_temporary_directory_for do
+        ParallelTests.send(:bundler_enabled?).should == false
+      end
+    end
+
+    it "should return true when there is a constant called Bundler" do
+      use_temporary_directory_for do
+        Object.stub!(:const_defined?).with(:Bundler).and_return true
+        ParallelTests.send(:bundler_enabled?).should == true
+      end
+    end
+
+    it "should be true when there is a Gemfile" do
+      use_temporary_directory_for do
+        FileUtils.touch("Gemfile")
+        ParallelTests.send(:bundler_enabled?).should == true
+      end
+    end
+
+    it "should be true when there is a Gemfile in the parent directory" do
+      use_temporary_directory_for do
+        FileUtils.touch(File.join("..", "Gemfile"))
+        ParallelTests.send(:bundler_enabled?).should == true
+      end
+    end
+  end
+
   it "has a version" do
     ParallelTests::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end

data/spec/spec_helper.rb

@@ -11,6 +11,28 @@ def size_of(group)
   group.inject(0) { |sum, test| sum += File.stat(test).size }
 end
 
+# Uses /tmp/parallel_tests/application as the cwd so we can create and remove
+# files as we want to. After execution it changes cwd back to the original one.
+def use_temporary_directory_for
+  dir = File.join("/tmp", "parallel_tests")
+  new_dir = File.join(dir, "application")
+
+  begin
+    # just in case the temporary dir already exists
+    FileUtils.rm_rf(dir) if File.exists?(dir) 
+
+    # create the temporary directory
+    FileUtils.mkdir_p(new_dir)
+
+    # chdir changes cwd back to the original one after it is done
+    Dir.chdir(new_dir) do
+      yield
+    end
+  ensure
+    FileUtils.rm_rf(dir) if File.exists?(dir)
+  end
+end
+
 def test_tests_in_groups(klass, folder, suffix)
   test_root = "#{FAKE_RAILS_ROOT}/#{folder}"
 
@@ -79,4 +101,4 @@ def test_tests_in_groups(klass, folder, suffix)
       groups[1].should == ["file2.rb", "file4.rb"]
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Michael Grosser