zeus-parallel_tests 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c9000350e005f314f302a75ee90f5a8e6e5d26c
-  data.tar.gz: 24ed90c5aafe7feb39b1bf30d0869a2763edf510
+  metadata.gz: a1ed74925120942d4780e3f7743b2c0f0fe7180d
+  data.tar.gz: cbf15519f8c68a45ba260885c8f4370c2eee0b95
 SHA512:
-  metadata.gz: 80664da8bdd7c9960b93904651b680c203f48e01588c4e097cea6c94fa75daa846372cdfbbe97c6ad61cef8929e99db1872feb5e43da16f73c33084706bca322
-  data.tar.gz: ea56e4a8cd5d193d9645708c4dee555ced2f660a701e28ddf5f704a8e349f031b010b7851695cfc64b7426baa45a4c5516b8e06b00ffb2d73b2c3bff452ba821
+  metadata.gz: 99d16d2f0583ff8b5e4bd472bb80e1cb84beb8db0342d14038b46ffc370a343cf034eb2201127e08a1ae86ae7b3a6a92bc70f7a8f836f396be9035b431a31ad7
+  data.tar.gz: 90e2c837d5f0fd9fa7c4c8ae8f779e63356ae6ce9163cfbc639b8873a452e56aa24edcae81d3fc04b1f28df99fca363baecd27e29760c5636fcaeb29014f70f4

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -11,6 +12,8 @@ doc/
 lib/bundler/man
 pkg
 rdoc
+spec/dummy/Gemfile
+spec/dummy/vendor
 spec/reports
 test/tmp
 test/version_tmp

data/.rspec

@@ -1,2 +1,4 @@
 --color
 --format progress
+--require spec_helper
+--exclude-pattern 'spec/dummy/**/*'

data/.rubocop.yml

@@ -0,0 +1,12 @@
+AllCops:
+  Exclude:
+    - bin/**/*
+    - vendor/**/*
+    - spec/dummy/vendor/**/*
+
+Documentation:
+  Enabled: false
+LineLength:
+  Enabled: false
+MethodLength:
+  Enabled: false

data/Appraisals

@@ -0,0 +1,19 @@
+appraise 'rails-3-zeus-0.15' do
+  gem 'rails', '3.2.21'
+  gem 'zeus', '0.15.4'
+end
+
+appraise 'rails-4-zeus-0.15' do
+  gem 'rails', '4.2.3'
+  gem 'zeus', '0.15.4'
+end
+
+appraise 'rails-3-zeus-0.13' do
+  gem 'rails', '3.2.21'
+  gem 'zeus', '0.13.3'
+end
+
+appraise 'rails-4-zeus-0.13' do
+  gem 'rails', '4.2.3'
+  gem 'zeus', '0.13.3'
+end

data/README.md

@@ -1,7 +1,8 @@
 # Zeus::ParallelTests
 
-[![Build Status](https://travis-ci.org/sevos/zeus-parallel_tests.png?branch=master)](https://travis-ci.org/sevos/zeus-parallel_tests)
+[![Circle CI](https://circleci.com/gh/sevos/zeus-parallel_tests.svg?style=svg)](https://circleci.com/gh/sevos/zeus-parallel_tests)
 [![Dependency Status](https://gemnasium.com/sevos/zeus-parallel_tests.png)](https://gemnasium.com/sevos/zeus-parallel_tests)
+[![Gem Version](https://badge.fury.io/rb/zeus-parallel_tests.svg)](http://badge.fury.io/rb/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,
@@ -86,7 +87,7 @@ This will create two files in your project:
 
 ### RVM
 
-For RVM users it is recommended to install rvm-bundler gem.
+For RVM users it is recommended to install rubygems-bundler gem.
 
 ## Usage
 

data/Rakefile

@@ -1,17 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-namespace :travis do
-  RSpec::Core::RakeTask.new(:spec) do |task|
-    file_list = FileList['spec/**/*_spec.rb']
-
-    %w(slow).each do |exclude|
-      file_list = file_list.exclude("spec/#{exclude}/**/*_spec.rb")
-    end
-
-    task.pattern = file_list
-  end
-end
+task default: :spec

data/bin/zeus-parallel_tests

@@ -2,25 +2,23 @@
 
 require 'fileutils'
 
-unless ARGV == ["init"]
-  puts "Usage:"
+unless ARGV == ['init']
+  puts 'Usage:'
   puts "  zeus-parallel_specs init\t\tInitializes custom plan and script/spec"
   exit 1
 end
 
 def copy(file, target_dir)
-  templates_dir = File.expand_path("../../lib/zeus/parallel_tests/templates/", __FILE__)
+  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)
   puts "Creating #{dest_file}"
-  if File.exists?(dest_file)
-    print "File exists, overwrite? [y/n} "
-    unless $stdin.gets.chomp == "y"
-      puts "skipped"
-    end
+  if File.exist?(dest_file)
+    print 'File exists, overwrite? [y/n} '
+    puts 'skipped' unless $stdin.gets.chomp == 'y'
   end
   FileUtils.cp(source_file, dest_file)
 end
 
-copy "custom_plan.rb", "./"
-copy "zeus.json", "./"
+copy 'custom_plan.rb', './'
+copy 'zeus.json', './'

data/circle.yml

@@ -0,0 +1,39 @@
+dependencies:
+  pre:
+    - echo rvm_autoupdate_flag=0 >> ~/.rvmrc
+    - rvm install 2.2
+    - rvm install 2.1
+    - rvm install 2.0
+    - rvm install 1.9
+
+  cache_directories:
+    - /home/ubuntu/.rvm/gems/ruby-2.2.0
+    - /home/ubuntu/.rvm/gems/ruby-2.1.5
+    - /home/ubuntu/.rvm/gems/ruby-2.0.0-p598
+    - /home/ubuntu/.rvm/gems/ruby-1.9.3-p551
+
+  override:
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
+    - rvm-exec 2.2 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
+    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
+    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
+    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
+    - rvm-exec 2.1 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
+    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
+    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
+    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
+    - rvm-exec 2.0 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
+    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.15.gemfile'
+    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.15.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.15.gemfile'
+    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_3_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_3_zeus_0.13.gemfile'
+    - rvm-exec 1.9 bash -c 'bundle check --gemfile=gemfiles/rails_4_zeus_0.13.gemfile || bundle install --gemfile=gemfiles/rails_4_zeus_0.13.gemfile'
+
+test:
+  override:
+    - rvm-exec 2.2 bash -c 'bundle exec appraisal rspec'
+    - rvm-exec 2.1 bash -c 'bundle exec appraisal rspec'
+    - rvm-exec 2.0 bash -c 'bundle exec appraisal rspec'
+    - rvm-exec 1.9 bash -c 'bundle exec appraisal rspec'
+    - rvm-exec 2.2 bash -c 'bundle exec rubocop'

data/gemfiles/rails_3_zeus_0.13.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "3.2.21"
+gem "zeus", "0.13.3"
+
+gemspec :path => "../"

data/gemfiles/rails_3_zeus_0.15.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "3.2.21"
+gem "zeus", "0.15.4"
+
+gemspec :path => "../"

data/gemfiles/rails_4_zeus_0.13.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.3"
+gem "zeus", "0.13.3"
+
+gemspec :path => "../"

data/gemfiles/rails_4_zeus_0.15.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "4.2.3"
+gem "zeus", "0.15.4"
+
+gemspec :path => "../"

data/lib/zeus/parallel_tests.rb

@@ -1,4 +1,4 @@
-require "zeus/parallel_tests/version"
+require 'zeus/parallel_tests/version'
 require 'zeus/rails'
 
 require_relative 'parallel_tests/rails'

data/lib/zeus/parallel_tests/rails.rb

@@ -5,14 +5,18 @@ module Zeus
   module ParallelTests
     class Rails < ::Zeus::Rails
       def parallel_cucumber
-        exec parallel_runner_command "cucumber", ARGV
+        if ENV.key?('RAILS_ENV')
+          puts "Warning: Deleting RAILS_ENV (which is `#{ENV['RAILS_ENV']}` as Zeus will complain about it."
+          ENV.delete('RAILS_ENV')
+        end
+        exec parallel_runner_command 'cucumber', ARGV
       end
 
       def parallel_rspec
         argv = ARGV.dup
-        argv.delete("--color")  # remove this argument from list
-        argv.delete("--colour") # because it was causing bug #14
-        exec parallel_runner_command "rspec", argv
+        argv.delete('--color')  # remove this argument from list
+        argv.delete('--colour') # because it was causing bug #14
+        exec parallel_runner_command 'rspec', argv
       end
 
       def parallel_cucumber_worker
@@ -35,11 +39,13 @@ module Zeus
         end
       end
 
+      def cucumber_environment
+        require 'cucumber/rspec/disable_option_parser'
+        require 'cucumber/cli/main'
+      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
+        ::Cucumber::Cli::Main.execute(argv)
       end
 
       # End of patches for Zeus
@@ -47,20 +53,20 @@ module Zeus
       private
 
       def parallel_runner_command(suite, argv)
-        env_slave_path = %[PARALLEL_TESTS_EXECUTABLE='#{Worker.command suite}']
+        env_slave_path = %(PARALLEL_TESTS_EXECUTABLE='#{Worker.command suite}')
         "#{env_slave_path} parallel_#{suite} #{merge_argv(argv)}"
       end
 
       def merge_argv(argv)
-        argv.map { |arg|
-          arg.include?(' ') ? %{"#{arg}"} : arg
-        }.join(" ")
+        argv.map do |arg|
+          arg.include?(' ') ? %("#{arg}") : arg
+        end.join(' ')
       end
 
       def spawn_slave
         worker, workers_count, args_file = ARGV
         # Parallels spec reuse main test db instead of db with "1" appended
-        ENV['TEST_ENV_NUMBER'] = test_env_number = (worker == "1" ? nil : worker)
+        ENV['TEST_ENV_NUMBER'] = test_env_number = (worker == '1' ? nil : worker)
         ENV['PARALLEL_TEST_GROUPS'] = workers_count
 
         reconfigure_activerecord test_env_number
@@ -72,6 +78,7 @@ module Zeus
         File.readlines(path).map(&:chomp)
       end
 
+      # rubocop:disable HandleExceptions
       def reconfigure_activerecord(test_env_number)
         return unless defined?(ActiveRecord::Base)
         begin
@@ -87,6 +94,7 @@ module Zeus
         rescue ActiveRecord::AdapterNotSpecified
         end
       end
+      # rubocop:enable HandleExceptions
     end
   end
 end

data/lib/zeus/parallel_tests/version.rb

@@ -1,5 +1,5 @@
 module Zeus
   module ParallelTests
-    VERSION = "0.2.4"
+    VERSION = '0.3.0'
   end
 end

data/lib/zeus/parallel_tests/worker.rb

@@ -1,55 +1,54 @@
 require_relative '../parallel_tests'
 require 'tempfile'
 
-module Zeus::ParallelTests
-  class Worker
-    def self.run(argv, env)
-      dumped_argv = argv.dup
-      new(dumped_argv.shift, env, dumped_argv).spawn
-    end
-
-    def self.command(suite)
-      "ruby #{__FILE__} #{suite}"
-    end
-
-    def initialize(suite, env, argv)
-      @env = env
-      @argv = argv
-      @suite = suite
-    end
-
-    def spawn
-      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
+module Zeus
+  module ParallelTests
+    class Worker
+      def self.run(argv, env)
+        dumped_argv = argv.dup
+        new(dumped_argv.shift, env, dumped_argv).spawn
+      end
+
+      def self.command(suite)
+        "ruby #{__FILE__} #{suite}"
+      end
+
+      def initialize(suite, env, argv)
+        @env = env
+        @argv = argv
+        @suite = suite
+      end
+
+      def spawn
+        system %(zeus parallel_#{@suite}_worker #{parallel_tests_attributes})
+        args_file.unlink
+        $CHILD_STATUS.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
-                         file.close
                        end
-                     end
-    end
+      end
 
-    def test_env_number
-      @env['TEST_ENV_NUMBER'] != "" && @env['TEST_ENV_NUMBER'] || 1
+      def test_env_number
+        @env['TEST_ENV_NUMBER'] != '' && @env['TEST_ENV_NUMBER'] || 1
+      end
     end
   end
 end
 
-if $PROGRAM_NAME == __FILE__
-  exit Zeus::ParallelTests::Worker.run(ARGV, ENV)
-end
-
+exit Zeus::ParallelTests::Worker.run(ARGV, ENV) if $PROGRAM_NAME == __FILE__

data/spec/dummy/Guardfile

@@ -4,15 +4,15 @@
 guard 'rspec', zeus: true, parallel: true do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 
   # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { 'spec' }
+  watch('config/routes.rb')                           { 'spec/routing' }
+  watch('app/controllers/application_controller.rb')  { 'spec/controllers' }
 
   # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }

data/spec/dummy/config/application.rb

@@ -12,7 +12,7 @@ require 'rails/all'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  Bundler.require(*Rails.groups(assets: %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -42,7 +42,7 @@ module Dummy
     # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -54,12 +54,5 @@ module Dummy
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
-
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
-
   end
 end