zeus-parallel_tests 0.1.1 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9ddfc02ea9f897dbb022adf3a43dcb754d3382
-  data.tar.gz: 667d9c3efa43f7e9e247aafba77209afb737039a
+  metadata.gz: defcebae997e5144a3de67c7dfdf79a7a1c99006
+  data.tar.gz: a3678f055ac0a432fb77181217b6e81b79db3bc0
 SHA512:
-  metadata.gz: fd52aee09d6bf030dc18e4441c2c5e379d9560499f578e18ef82d09f6716298e40ed68193f6c7f56d8715b1260b26881a5d171e29f8a140cf01f6d960cb5751c
-  data.tar.gz: 1d04a157c8eb309219b90eba4bb3bedc9aa023d11830374375cad92da9f228530fb006c070dbdb3dd18d62a26dcfd41d9c36790ce5c91604dbd0acb56dfa2e72
+  metadata.gz: 3d8924e1842bda6494c16b2a1d05f74c5030902a00b623fe49c97ba5f5590d6e6d0d4e1d468602260e0c8fc871763d1fe64e38e8108d154734dd0f61eb89f0e2
+  data.tar.gz: 5902643045dbd7750e906373cb4167588d14fa8dc9071cb79b1703a5a40cf717661f1cb81f12b27dac42aaf64b899c0f17e3f455a9fad3312d1265d4796041b9

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+        - 2.0.0
+        - 1.9.3
+script: bundle exec rake travis:test

data/README.md

@@ -1,6 +1,67 @@
 # Zeus::ParallelTests
 
-TODO: Write a gem description
+[![Build Status](https://travis-ci.org/sevos/zeus-parallel_tests.png?branch=master)](https://travis-ci.org/sevos/zeus-parallel_tests)
+[![Dependency Status](https://gemnasium.com/sevos/zeus-parallel_tests.png)](https://gemnasium.com/sevos/zeus-parallel_tests)
+
+[Zeus](https://github.com/burke/zeus) is a tool for speeding up your tests by preloading a Rails app.
+[parallel_tests](https://github.com/grosser/parallel_tests) also speeds up your tests by running them, well,
+in parallel. Two good gems, so why not to use them together? Let's make our CPUs sweat!
+
+## Show me the numbers!
+
+### RSpec
+
+```
+$ time rspec spec
+
+...
+
+Finished in 1 minute 8.34 seconds
+916 examples, 0 failures
+
+real    1m21.480s
+user    1m4.805s
+sys     0m4.516s
+```
+
+### parallel_tests
+
+```
+$ time rake parallel:spec[8]
+Using recorded test runtime
+8 processes for 141 specs, ~ 17 specs per process
+
+...
+
+916 examples, 0 failures
+
+Took 46.626499 seconds
+
+real    0m55.790s
+user    4m3.065s
+sys     0m32.160s
+```
+
+### Zeus+parallel_tests
+
+```
+$ time zeus rake parallel:spec[8]
+Developer helpers loaded
+Using recorded test runtime
+8 processes for 141 specs, ~ 17 specs per process
+
+...
+
+916 examples, 0 failures
+
+Took 26.610327 seconds
+
+real    0m28.514s
+user    0m0.732s
+sys     0m0.061s
+```
+
+Ready to go?
 
 ## Installation
 
@@ -12,13 +73,47 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
+You need also to initialize your project with custom Zeus plan:
+
+    $ zeus-parallel_tests init
+
+This will create two files in your project:
 
-    $ gem install zeus-parallel_tests
+* custom_plan.rb
+* zeus.json
+
+### RVM
+
+For RVM users it is recommended to install rvm-bundler gem.
 
 ## Usage
 
-TODO: Write usage instructions here
+First [follow instructions](https://github.com/grosser/parallel_tests) and prepare
+your application to use parallel_tests.
+
+Launch another terminal and run zeus' master process:
+
+    $ bundle exec zeus start
+
+Then you can run your parallel specs:
+
+    $ zeus parallel_rspec spec
+
+or your cucumbers:
+
+    $ zeus parallel_cucumber features
+
+## What is supported?
+
+* rspec
+* cucumber
+
+## TODO
+
+* smoke tests
+* minitest support
+* cucumber support
+* guard-rspec <del>(just pass `zeus: true` and `parallel: true` into configuration hash)</del>
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,20 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.libs.push "lib"
+  t.test_files = FileList[File.expand_path('../test/**/*_test.rb', __FILE__)]
+  t.verbose = true
+end
+
+
+namespace :travis do
+  Rake::TestTask.new do |t|
+    t.libs.push "lib"
+    t.test_files = FileList[File.expand_path('../test/**/*_test.rb', __FILE__)] -
+      FileList[File.expand_path('../test/slow/*_test.rb', __FILE__)]
+    t.verbose = true
+  end
+end

data/bin/{zeus-parallel_specs → zeus-parallel_tests}

@@ -8,7 +8,7 @@ unless ARGV == ["init"]
   exit 1
 end
 
-def copy(file, target_dir, mode = 0644)
+def copy(file, target_dir)
   templates_dir = File.expand_path("../../lib/zeus/parallel_tests/templates/", __FILE__)
   source_file = File.join(templates_dir, file)
   dest_file  = File.join(File.expand_path(target_dir), file)
@@ -20,9 +20,7 @@ def copy(file, target_dir, mode = 0644)
     end
   end
   FileUtils.cp(source_file, dest_file)
-  FileUtils.chmod(mode, dest_file)
 end
 
 copy "custom_plan.rb", "./"
 copy "zeus.json", "./"
-copy "spec", "script/", 0755

data/lib/zeus/parallel_tests/rails.rb

@@ -1,12 +1,69 @@
+require_relative '../parallel_tests'
+require_relative 'worker'
+
 module Zeus
   module ParallelTests
     class Rails < ::Zeus::Rails
+      def parallel_cucumber
+        exec parallel_runner_command "cucumber", ARGV
+      end
+
       def parallel_rspec
-        argv = ARGV.dup
-        test_env_number = argv.shift
+        exec parallel_runner_command "rspec", ARGV
+      end
+
+      def parallel_cucumber_worker
+        spawn_slave { |args| cucumber(args) }
+      end
+
+      def parallel_rspec_worker
+        spawn_slave { |args| test(["--color", "--tty", *args]) }
+      end
+
+      # Patches required in Zeus
+
+      def test(argv = ARGV)
+        if spec_file?(argv) && defined?(RSpec)
+          # disable autorun in case the user left it in spec_helper.rb
+          RSpec::Core::Runner.disable_autorun!
+          exit RSpec::Core::Runner.run(argv)
+        else
+          Zeus::M.run(argv)
+        end
+      end
+
+      def cucumber(argv = ARGV)
+        cucumber_main = Cucumber::Cli::Main.new(argv.dup)
+        had_failures = cucumber_main.execute!(@cucumber_runtime)
+        exit_code = had_failures ? 1 : 0
+        exit exit_code
+      end
+
+      # End of patches for Zeus
+
+      private
+
+      def parallel_runner_command(suite, argv)
+        env_slave_path = %[PARALLEL_TESTS_EXECUTABLE='#{Worker.command suite}']
+        "#{env_slave_path} parallel_#{suite} #{argv.join ' '}"
+      end
+
+      def spawn_slave
+        worker, workers_count, args_file = ARGV
         # Parallels spec reuse main test db instead of db with "1" appended
-        test_env_number = nil if test_env_number == "1"
+        ENV['TEST_ENV_NUMBER'] = test_env_number = (worker == "1" ? nil : worker)
+        ENV['PARALLEL_TEST_GROUPS'] = workers_count
+
+        reconfigure_activerecord test_env_number
+
+        yield load_args_from_file(args_file)
+      end
 
+      def load_args_from_file(path)
+        File.readlines(path).map(&:chomp)
+      end
+
+      def reconfigure_activerecord(test_env_number)
         return unless defined?(ActiveRecord::Base)
         begin
           ActiveRecord::Base.clear_all_connections!
@@ -15,31 +72,13 @@ module Zeus
           config[:database] = "#{config[:database]}#{test_env_number}"
 
           ActiveRecord::Base.establish_connection(config)
+          puts "Connecting to #{ActiveRecord::Base.connection_config[:database]}"
           if ActiveRecord::Base.respond_to?(:shared_connection)
             ActiveRecord::Base.shared_connection = ActiveRecord::Base.retrieve_connection
           end
         rescue ActiveRecord::AdapterNotSpecified
         end
-
-        ENV['TEST_ENV_NUMBER'] = test_env_number
-        ENV['PARALLEL_TEST_GROUPS'] = argv.shift
-
-        rspec_args_file = argv.shift
-        test_files = File.readlines(rspec_args_file).map(&:chomp)
-
-        test(test_files.unshift("--colour").unshift("--tty"))
-      end
-
-      def test(argv = ARGV)
-        if spec_file?(argv) && defined?(RSpec)
-          # disable autorun in case the user left it in spec_helper.rb
-          RSpec::Core::Runner.disable_autorun!
-          exit RSpec::Core::Runner.run(argv)
-        else
-          Zeus::M.run(argv)
-        end
       end
-
     end
   end
 end

data/lib/zeus/parallel_tests/templates/zeus.json

@@ -11,13 +11,18 @@
           "server": ["s"],
           "generate": ["g"],
           "destroy": ["d"],
-          "dbconsole": []
+          "dbconsole": [],
+          "parallel_rspec": [],
+          "parallel_cucumber": []
         },
         "test_environment": {
-          "cucumber_environment": {"cucumber": []},
+          "cucumber_environment": {
+                  "cucumber": [],
+                  "parallel_cucumber_worker": []
+	  },
           "test_helper": {
                   "test": ["rspec", "testrb"],
-                  "parallel_rspec": []
+                  "parallel_rspec_worker": []
           }
         }
       }

data/lib/zeus/parallel_tests/version.rb

@@ -1,5 +1,5 @@
 module Zeus
   module ParallelTests
-    VERSION = "0.1.1"
+    VERSION = "0.2.0.beta1"
   end
 end

data/lib/zeus/parallel_tests/worker.rb

@@ -0,0 +1,51 @@
+require_relative '../parallel_tests'
+require 'tempfile'
+
+module Zeus::ParallelTests
+  class Worker
+    def self.command(suite)
+      "ruby #{__FILE__} #{suite}"
+    end
+
+    def initialize(suite, env, argv)
+      @env = env
+      @argv = argv
+      @suite = suite
+    end
+
+    def call
+      system %{zeus parallel_#{@suite}_worker #{parallel_tests_attributes}}
+      args_file.unlink
+      $?.to_i
+    end
+
+    private
+
+    def parallel_tests_attributes
+      [test_env_number.to_s,
+       @env['PARALLEL_TEST_GROUPS'],
+       args_file.path].join(' ')
+    end
+
+    def args_file
+      @args_file ||= begin
+                       Tempfile.new("rspec_args").tap do |file|
+                         @argv.each do |arg|
+                           file.puts arg
+                         end
+                         file.close
+                       end
+                     end
+    end
+
+    def test_env_number
+      @env['TEST_ENV_NUMBER'] != "" && @env['TEST_ENV_NUMBER'] || 1
+    end
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  argv = ARGV.dup
+  exit Zeus::ParallelTests::Worker.new(argv.shift, ENV, argv).call.to_i
+end
+

data/test/integration_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path("../test_helper", __FILE__)
+
+require 'zeus/parallel_tests'
+
+describe "zeus-parallel_tests" do
+  it 'should be tested' do
+    skip("any ideas how to test this?")
+  end
+end

data/test/slow/zeus-parallel_tests_test.rb

@@ -0,0 +1,29 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'tmpdir'
+require 'fileutils'
+
+describe 'zeus-parallel_tests' do
+  before do
+    @project_dir = File.expand_path(Dir.mktmpdir)
+    Dir.mkdir(File.join(@project_dir, "script"))
+
+    bin = File.expand_path('../../../bin/zeus-parallel_tests', __FILE__)
+    @run = -> { system("#{bin} init &>/dev/null", chdir: @project_dir) }
+  end
+
+  after do
+    FileUtils.rm_rf @project_dir
+    @io && @io.close
+  end
+
+  it "creates zeus configuration and script/spec in projects directory" do
+    @run.call
+
+    expected_files = ['zeus.json', 'custom_plan.rb'].
+      map { |f| File.join(@project_dir, f) }
+
+    expected_files.each do |f|
+      assert File.exists?(f), "#{f} should exists"
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+ENV["TEST"] = 'true'
+require 'rubygems'
+require 'minitest/autorun'
+$:.unshift File.expand_path("../../lib")
+require 'zeus/parallel_tests'

data/zeus-parallel_tests.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "zeus", "~> 0.13.3"
-  spec.add_dependency "parallel_tests", "0.10.3"
+  spec.add_dependency "parallel_tests", "~> 0.10.4"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeus-parallel_tests
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Artur Roszczyk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeus
@@ -28,16 +28,16 @@ dependencies:
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,24 +70,28 @@ description: Integration for zeus and parallel_tests
 email:
 - artur.roszczyk@gmail.com
 executables:
-- zeus-parallel_specs
+- zeus-parallel_tests
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/zeus-parallel_specs
+- bin/zeus-parallel_tests
 - lib/zeus/parallel_tests.rb
 - lib/zeus/parallel_tests/rails.rb
 - lib/zeus/parallel_tests/templates/custom_plan.rb
-- lib/zeus/parallel_tests/templates/spec
 - lib/zeus/parallel_tests/templates/zeus.json
 - lib/zeus/parallel_tests/version.rb
+- lib/zeus/parallel_tests/worker.rb
+- test/integration_test.rb
+- test/slow/zeus-parallel_tests_test.rb
+- test/test_helper.rb
 - zeus-parallel_tests.gemspec
 homepage: ''
 licenses:
@@ -104,13 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: ''
-test_files: []
+test_files:
+- test/integration_test.rb
+- test/slow/zeus-parallel_tests_test.rb
+- test/test_helper.rb
+has_rdoc: 

data/lib/zeus/parallel_tests/templates/spec

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-require 'tempfile'
-
-test_env_number = ENV['TEST_ENV_NUMBER'] || 1
-test_env_number = 1 if test_env_number == ""
-
-rspec_args_file = Tempfile.new("rspec_args")
-ARGV.each do |arg|
-  rspec_args_file.puts arg
-end
-
-rspec_args_file.close
-
-system %{zeus parallel_rspec #{test_env_number} #{ENV['PARALLEL_TEST_GROUPS']} #{rspec_args_file.path}}
-status = $?
-
-rspec_args_file.unlink
-
-exit status.to_i