zeus 0.15.4 → 0.15.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2f28b5877e1a9f2d864f994db8ec997e2bfd2e88
+  data.tar.gz: 7e71058d4c5171c6992f5074e5f1df204392019f
+SHA512:
+  metadata.gz: 4c369f05160ce2dbbb0b631af280f73bc19bdfa524109e03d33c9ef0216f33b0c47e1289d248e7d7b462c275d7960da72acfee86f2dd2c05f47682278cc0a4da
+  data.tar.gz: 266f75f0595297687016d2af1d7d7319f62f83a45a8ed815c56c73a2385bd40e46b75478c5f3221dc358a752283b1e0455abb4fe00bbbaefcc64d567db136c73

data/Gemfile

@@ -3,5 +3,9 @@ source 'https://rubygems.org'
 # NOTE: Avoid putting development deps in gemspec
 gemspec development_group: :gem_build_tools
 
-gem 'rspec', '~> 3.1', groups: [:test, :development]
+group :test, :development do
+  gem 'rspec', '~> 3.1'
+  gem 'pry', '~> 0.10'
+end
+
 gem 'rake', group: :gem_build_tools

data/Gemfile.lock

@@ -1,33 +1,44 @@
 PATH
   remote: .
   specs:
-    zeus (0.15.4)
+    zeus (0.15.10)
       method_source (>= 0.6.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.1)
     diff-lcs (1.2.5)
     method_source (0.8.2)
-    rake (10.3.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    pry (0.10.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    rake (11.1.2)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.4)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    slop (3.6.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.6)
+  pry (~> 0.10)
   rake
   rspec (~> 3.1)
   zeus!
+
+BUNDLED WITH
+   1.12.3

data/bin/pry

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'pry' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('pry', 'pry')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/zeus.rb

@@ -65,17 +65,11 @@ module Zeus
           master.send_io(remote)
 
           # Now I need to tell the master about my PID and ID
-          local.write "P:#{Process.pid}:#{identifier}\0"
+          local.write "P:#{Process.pid}:#{@parent_pid || 0}:#{identifier}\0"
           local.send_io(feature_pipe_r)
           feature_pipe_r.close
 
-          # Now we run the action and report its success/fail status to the master.
-          features = Zeus::LoadTracking.features_loaded_by {
-            run_action(local, identifier, feature_pipe_w)
-          }
-
-          # the master wants to know about the files that running the action caused us to load.
-          Thread.new { notify_features(feature_pipe_w, features) }
+          run_action(local, identifier, feature_pipe_w)
 
           # We are now 'connected'. From this point, we may receive requests to fork.
           children = Set.new
@@ -93,15 +87,20 @@ module Zeus
             messages.split("\0").each do |new_identifier|
               new_identifier =~ /^(.):(.*)/
               code, ident = $1, $2
+
+              forked_from = Process.pid
+
               pid = fork
               if pid
                 # We're in the parent. Record the child:
                 children << pid
               elsif code == "S"
                 # Child, supposed to start another step:
+                @parent_pid = forked_from
                 throw(:boot_step, ident.to_sym)
               else
                 # Child, supposed to run a command:
+                @parent_pid = forked_from
                 return [ident.to_sym, local]
               end
             end
@@ -137,7 +136,7 @@ module Zeus
 
         plan.after_fork
         client_terminal = local.recv_io
-        local.write "P:#{Process.pid}:\0"
+        local.write "P:#{Process.pid}:#{@parent_pid}:\0"
         local.close
 
         $stdin.reopen(client_terminal)
@@ -194,20 +193,27 @@ module Zeus
     end
 
     def run_action(socket, identifier, feature_pipe_w)
-      loaded = false
-      begin
+      # Now we run the action and report its success/fail status to the master.
+      features, err = Zeus::LoadTracking.features_loaded_by do
         plan.after_fork unless identifier == :boot
         plan.send(identifier)
-        loaded = true
-        socket.write "R:OK\0"
-      rescue Exception => e
-        report_error_to_master(socket, e)
+      end
 
-        # Report any setup-time failures back to the Zeus master:
-        unless loaded
-          notify_features(feature_pipe_w, Zeus::LoadTracking.all_features)
+      if err
+        # If we received an error, report features to the master syncronously.
+        # We need to do this before reporting the error to the master
+        # otherwise it will kill us before we can report features.
+        begin
+          notify_features(feature_pipe_w, features)
+          feature_pipe_w.close
+        ensure
+          report_error_to_master(socket, err)
         end
-        feature_pipe_w.close
+      else
+        # If we booted successfully, report features in a new thread
+        # so we can immediately begin listening for commands.
+        socket.write "R:OK\0"
+        Thread.new { notify_features(feature_pipe_w, features) }
       end
     end
   end

data/lib/zeus/load_tracking.rb

@@ -1,23 +1,47 @@
 module Zeus
   class LoadTracking
     class << self
-
       def features_loaded_by(&block)
-        old_features = all_features()
-        yield
-        new_features = all_features() - old_features
-        return new_features
+        old_features = all_features
+
+        # Catch exceptions so we can determine the features
+        # that were being loaded at the time of the exception.
+        err_features = []
+        begin
+          yield
+        rescue SyntaxError => err
+          # SyntaxErrors are a bit weird in that the file containing
+          # the error is not in the backtrace, only the error message.
+          match = /\A([^:]+):\d+: syntax error/.match(err.message)
+          err_features << match[1] if match
+        rescue Exception => err
+          # Just capture this to add to the err_features list
+        end
+
+        if err && err.backtrace
+          err_features += err.backtrace.map { |b| b.split(':').first }
+                             .select { |f| f.start_with?('/') }
+                             .take_while { |f| f != __FILE__ }
+        end
+
+        new_features = all_features + err_features - old_features
+        new_features.uniq!
+
+        [new_features, err]
       end
 
+      # Check the load path first to see if the file getting loaded is already
+      # loaded. Otherwise, add the file to the $untracked_features array which
+      # then gets added to $LOADED_FEATURES array.
       def add_feature(file)
-        path = if File.exist?(File.expand_path(file))
-          File.expand_path(file)
-        else
-          find_in_load_path(file)
+        full_path = File.expand_path(file)
+
+        if find_in_load_path(full_path) || File.exist?(full_path)
+          add_extra_feature(full_path)
         end
-        add_extra_feature(path) if path
       end
 
+      # $LOADED_FEATURES global variable is used internally by Rubygems
       def all_features
         untracked = defined?($untracked_features) ? $untracked_features : []
         $LOADED_FEATURES + untracked
@@ -30,18 +54,20 @@ module Zeus
         $untracked_features << path
       end
 
-      def find_in_load_path(file)
-        $LOAD_PATH.map { |path| "#{path}/#{file}" }.detect{ |file| File.exist? file }
+      def find_in_load_path(file_path)
+        $LOAD_PATH.detect { |path| path == file_path }
       end
     end
   end
 end
 
+
 module Kernel
 
   def load(file, *a)
     Kernel.load(file, *a)
   end
+  private :load
 
   class << self
     alias_method :__load_without_zeus, :load

data/lib/zeus/m.rb

@@ -194,12 +194,9 @@ module Zeus
 
         # directly run the tests from here and exit with the status of the tests passing or failing
         case framework
-        when :minitest5
-          nerf_test_unit_autorunner
-          exit(Minitest.run(test_arguments) ? 0 : 1)
-        when :minitest_old
-          nerf_test_unit_autorunner
-          exit(MiniTest::Unit.runner.run(test_arguments).to_i)
+        when :minitest5, :minitest_old
+          ARGV.replace(test_arguments)
+          exit
         when :testunit1, :testunit2
           exit Test::Unit::AutoRunner.run(false, nil, test_arguments)
         else
@@ -348,13 +345,6 @@ module Zeus
         end
       end
 
-      def nerf_test_unit_autorunner
-        return unless defined?(Test::Unit::Runner)
-        if Test::Unit::Runner.class_variable_get("@@installed_at_exit")
-          Test::Unit::Runner.class_variable_set("@@stop_auto_run", true)
-        end
-      end
-
       # Fail loudly if this isn't supported
       def not_supported
         abort "This test framework is not supported! Please open up an issue at https://github.com/qrush/m !"

data/lib/zeus/rails.rb

@@ -131,6 +131,13 @@ module Zeus
       require 'rails/commands/console'
 
       if defined?(Pry)
+        # Adding Rails Console helpers to Pry.
+        if (3..4).include?(::Rails::VERSION::MAJOR)
+          require 'rails/console/app'
+          require 'rails/console/helpers'
+          TOPLEVEL_BINDING.eval('self').extend ::Rails::ConsoleMethods
+        end
+
         Pry.start
       else
         ::Rails::Console.start(::Rails.application)
@@ -174,20 +181,6 @@ module Zeus
     end
 
     def test_helper
-      # don't let minitest setup another exit hook
-      begin
-        require 'minitest/unit'
-        if defined?(Minitest::Runnable)
-          # Minitest 5
-          MiniTest.class_variable_set('@@installed_at_exit', true)
-        elsif defined?(MiniTest)
-          # Old versions of Minitest
-          MiniTest::Unit.class_variable_set("@@installed_at_exit", true)
-        end
-      rescue LoadError
-        # noop
-      end
-
       if ENV['RAILS_TEST_HELPER']
         require ENV['RAILS_TEST_HELPER']
       else
@@ -209,22 +202,30 @@ module Zeus
       # if there are two test frameworks and one of them is RSpec,
       # then "zeus test/rspec/testrb" without arguments runs the
       # RSpec suite by default.
-      if (argv.empty? || spec_file?(argv)) && defined?(RSpec)
-        # disable autorun in case the user left it in spec_helper.rb
-        RSpec::Core::Runner.disable_autorun!
-        argv = ["spec"] if argv.empty?
-        exit RSpec::Core::Runner.run(argv)
+      if using_rspec?(argv)
+        ARGV.replace(argv)
+        RSpec::Core::Runner.invoke
       else
+        require 'minitest/autorun' if using_minitest?
+        # Minitest and old Test::Unit
         Zeus::M.run(argv)
       end
     end
 
     private
 
+    def using_rspec?(argv)
+      defined?(RSpec) && (argv.empty? || spec_file?(argv))
+    end
+
+    def using_minitest?
+      defined?(:MiniTest) || defined?(:Minitest)
+    end
+
     SPEC_DIR_REGEXP = %r"(^|/)spec"
     SPEC_FILE_REGEXP = /.+_spec\.rb$/
 
-    def spec_file? argv
+    def spec_file?(argv)
       argv.any? do |arg|
         arg.match(Regexp.union(SPEC_DIR_REGEXP, SPEC_FILE_REGEXP))
       end

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.15.4"
+  VERSION = "0.15.10"
 end

data/man/build/zeus

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ZEUS" "1" "September 2014" "" ""
+.TH "ZEUS" "1" "January 2016" "" ""
 .
 .SH "NAME"
 \fBzeus\fR \- boot rails in under a second

data/man/build/zeus-init

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ZEUS\-INIT" "1" "April 2014" "" ""
+.TH "ZEUS\-INIT" "1" "January 2016" "" ""
 .
 .SH "NAME"
 \fBzeus\-init\fR \- Generate a template zeus\.json

data/man/build/zeus-init.txt

@@ -14,4 +14,4 @@ DESCRIPTION
 
 
 
-				  April 2014			  ZEUS-INIT(1)
+				 January 2016			  ZEUS-INIT(1)

data/man/build/zeus-start

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ZEUS\-START" "1" "April 2014" "" ""
+.TH "ZEUS\-START" "1" "January 2016" "" ""
 .
 .SH "NAME"
 \fBzeus\-start\fR \- Start a zeus server

data/man/build/zeus-start.txt

@@ -15,4 +15,4 @@ DESCRIPTION
 
 
 
-				  April 2014			 ZEUS-START(1)
+				 January 2016			 ZEUS-START(1)

data/man/build/zeus.txt

@@ -75,4 +75,4 @@ BUILTIN COMMANDS
 
 
 
-				September 2014			       ZEUS(1)
+				 January 2016			       ZEUS(1)

data/spec/assets/exit.rb

@@ -0,0 +1 @@
+exit(1)

data/spec/assets/invalid_syntax.rb

@@ -0,0 +1,2 @@
+# This file has invalid syntax and will cause a LoadError when required
+foo(

data/spec/assets/load.rb

@@ -0,0 +1,2 @@
+# This is a single ruby file that doesn't do anything
+# on require.

data/spec/assets/raise.rb

@@ -0,0 +1,3 @@
+def raise_it(e)
+  raise e.new('Raising!')
+end

data/spec/assets/require.rb

@@ -0,0 +1,2 @@
+# This is a single ruby file that doesn't do anything
+# on require.

data/spec/assets/require_relative.rb

@@ -0,0 +1,2 @@
+# This is a single ruby file that doesn't do anything
+# on require.

data/spec/assets/runtime_error.rb

@@ -0,0 +1,2 @@
+# Loading this file triggers a runtime error
+raise "You can't catch me!"

data/spec/assets/single_file.rb

@@ -0,0 +1,2 @@
+# This is a single ruby file that doesn't do anything
+# on require.

data/spec/fake_mini_test.rb

@@ -1,20 +1,31 @@
-module MiniTest
-  module Unit
+module Minitest
+  class Runnable
+  end
+end
+
+class MiniTest
+  class Unit
     class TestCase
     end
   end
 end
 
 def stub_mini_test_methods
-  allow(MiniTest::Unit::TestCase).to receive(:test_suites).and_return([fake_suite])
-  allow(MiniTest::Unit).to receive(:runner).and_return(fake_runner)
+  allow(Minitest::Runnable).to receive(:runnables).and_return([fake_mt5_suite])
+  allow(MiniTest::Unit::TestCase).to receive(:test_suite).and_return([fake_mt_old_suite])
 end
 
 def fake_runner
- @runner ||= double("Runner", :run => 0)
+  @runner ||= double("Runner", :run => 0)
+end
+
+def fake_mt5_suite
+  @suite ||= double("TestSuite",
+                  :runnable_methods => [test_method],
+                  :instance_method => fake_instance_method(test_method))
 end
 
-def fake_suite
+def fake_mt_old_suite
   @suite ||= double("TestSuite",
                   :test_methods => [test_method],
                   :instance_method => fake_instance_method(test_method))

data/spec/load_tracking_spec.rb

@@ -0,0 +1,105 @@
+require 'zeus/load_tracking'
+
+describe "Zeus::LoadTracking" do
+  let(:test_filename) { __FILE__ }
+  let(:test_dirname)  { File.dirname(test_filename) }
+
+  class MyError < StandardError; end
+
+  describe '.add_feature' do
+    context 'already in load path' do
+      before do
+        # add the dir path of the tempfile to LOAD_PATH
+        $LOAD_PATH  << test_dirname
+      end
+
+      after { $LOAD_PATH.delete test_dirname }
+
+      it 'adds full filepath to $untracked_features' do
+        Zeus::LoadTracking.add_feature(test_filename)
+
+        expect($untracked_features).to include(__dir__ + "/load_tracking_spec.rb")
+      end
+    end
+
+    context 'not in load path' do
+      it 'adds full filepath to $untracked_features' do
+        Zeus::LoadTracking.add_feature(test_filename)
+
+        expect($untracked_features).to include(__dir__ + "/load_tracking_spec.rb")
+      end
+    end
+
+    context '.features_loaded_by' do
+      it 'returns list of new files loaded when block executes' do
+        new_files, = Zeus::LoadTracking.features_loaded_by do
+          $untracked_features << "an_untracked_feature.rb"
+        end
+
+        expect(new_files).to eq(["an_untracked_feature.rb"])
+      end
+    end
+  end
+
+  describe '.features_loaded_by' do
+    def expect_to_load(expect_features, expect_err=NilClass)
+      new_files, err = Zeus::LoadTracking.features_loaded_by do
+        yield
+      end
+
+      expect(new_files.sort).to eq(expect_features.sort)
+      expect(err).to be_instance_of(expect_err)
+    end
+
+    def expand_asset_path(path)
+      File.join(__dir__, 'assets', path)
+    end
+
+    context 'loading valid code' do
+      it 'tracks successful require_relative' do
+        expect_to_load([expand_asset_path('require_relative.rb')]) do
+          require_relative 'assets/require_relative'
+        end
+      end
+
+      it 'tracks successful require' do
+        expect_to_load([expand_asset_path('require.rb')]) do
+          require expand_asset_path('require')
+        end
+      end
+
+      it 'tracks loads' do
+        expect_to_load([expand_asset_path('load.rb')]) do
+          load expand_asset_path('load.rb')
+        end
+      end
+    end
+
+    context 'loading invalid code' do
+      it 'tracks requires that raise a SyntaxError' do
+        expect_to_load([expand_asset_path('invalid_syntax.rb')], SyntaxError) do
+          require expand_asset_path('invalid_syntax')
+        end
+      end
+
+      it 'tracks requires that raise a RuntimeError' do
+        expect_to_load([expand_asset_path('runtime_error.rb')], RuntimeError) do
+          require expand_asset_path('runtime_error')
+        end
+      end
+
+      it 'tracks requires that exit' do
+        expect_to_load([expand_asset_path('exit.rb')], SystemExit) do
+          require expand_asset_path('exit')
+        end
+      end
+
+      it 'tracks requires that throw in a method call' do
+        expect_to_load([expand_asset_path('raise.rb')], MyError) do
+          require expand_asset_path('raise')
+          raise_it(MyError)
+        end
+      end
+    end
+  end
+end

data/spec/m_spec.rb

@@ -1,11 +1,36 @@
-require 'spec_helper'
+require 'zeus/rails'
 require 'fake_mini_test'
 
 module Zeus::M
   describe Runner do
     let(:test_method) { fake_test_method }
 
+    matcher :exit_with_code do |exp_code|
+      actual = nil
+      match do |block|
+        begin
+          block.call
+        rescue SystemExit => e
+          actual = e.status
+        end
+        actual and actual == exp_code
+      end
+      failure_message do |_block|
+        "expected block to call exit(#{exp_code}) but exit" +
+          (actual.nil? ? " not called" : "(#{actual}) was called")
+      end
+      failure_message_when_negated do |_block|
+        "expected block not to call exit(#{exp_code})"
+      end
+      description do
+        "expect block to call exit(#{exp_code})"
+      end
+    end
+
     before(:each) do
+      allow(Dir).to receive(:glob).and_return(["path/to/file.rb"])
+      allow(Kernel).to receive(:load)
+
       stub_mini_test_methods
     end
 
@@ -15,17 +40,16 @@ module Zeus::M
       it "escapes the question mark when using line number" do
         argv = ["path/to/file.rb:2"]
 
-        expect(fake_runner).to receive(:run).with(["-n", "/(test_my_test_method\\?)/"])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+        expect(ARGV).to eq(["-n", "/(test_my_test_method\\?)/"])
       end
 
       it "does not escape regex on explicit names" do
         argv = ["path/to/file.rb", "--name", fake_special_characters_test_method]
 
-        allow(fake_runner).to receive(:run).with(["-n", "test_my_test_method?"])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+
+        expect(ARGV).to eq(["-n", "test_my_test_method?"])
       end
     end
 
@@ -33,9 +57,9 @@ module Zeus::M
       it "runs the test" do
         argv = ["path/to/file.rb"]
 
-        allow(fake_runner).to receive(:run).with([])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+
+        expect(ARGV).to eq([])
       end
     end
 
@@ -44,7 +68,6 @@ module Zeus::M
         argv = ["path/to/file.rb:100"]
 
         expect(STDERR).to receive(:write).with(/No tests found on line 100/)
-        expect(fake_runner).to_not receive :run
 
         expect(lambda { Runner.new(argv).run }).to_not exit_with_code(0)
       end
@@ -52,9 +75,8 @@ module Zeus::M
       it "runs the test if the correct line number is given" do
         argv = ["path/to/file.rb:2"]
 
-        expect(fake_runner).to receive(:run).with(["-n", "/(#{fake_test_method})/"])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+        expect(ARGV).to eq(["-n", "/(#{fake_test_method})/"])
       end
     end
 
@@ -62,17 +84,15 @@ module Zeus::M
       it "runs the specified tests when using a pattern in --name option" do
         argv = ["path/to/file.rb", "--name", "/#{fake_test_method}/"]
 
-        expect(fake_runner).to receive(:run).with(["-n", "/#{fake_test_method}/"])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+        expect(ARGV).to eq(["-n", "/#{fake_test_method}/"])
       end
 
       it "runs the specified tests when using a pattern in -n option" do
         argv = ["path/to/file.rb", "-n", "/method/"]
 
-        expect(fake_runner).to receive(:run).with(["-n", "/method/"])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+        expect(ARGV).to eq(["-n", "/method/"])
       end
 
       it "aborts if no test matches the given pattern" do
@@ -87,9 +107,8 @@ module Zeus::M
       it "runs the specified tests when using a name (no pattern)" do
         argv = ["path/to/file.rb", "-n", "#{fake_test_method}"]
 
-        expect(fake_runner).to receive(:run).with(["-n", fake_test_method])
-
         expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
+        expect(ARGV).to eq(["-n", fake_test_method])
       end
 
       it "aborts if no test matches the given test name" do

data/spec/rails_spec.rb

@@ -1,17 +1,14 @@
-require 'spec_helper'
+require 'zeus/rails'
 
 module Zeus
   describe Rails do
     subject(:rails) { Rails.new }
 
-    describe "#test_helper" do
-      before(:each) do
-        # Zeus::Rails#test_helper will require minitest/unit by default.
-        # We need to catch it first, before setting expectations on
-        # helper_file requires below.
-        expect(rails).to receive(:require).with("minitest/unit")
-      end
+    def mock_file_existence(file, result)
+      expect(File).to receive(:exists?).with(file).and_return(result)
+    end
 
+    describe "#test_helper" do
       context "when ENV['RAILS_TEST_HELPER'] is set" do
         it "loads the test helper file from the environment variable" do
           helper = "a_test_helper"
@@ -84,5 +81,48 @@ module Zeus
         end
       end
     end
+
+    describe "#test" do
+      def expect_minitest_autorun
+        # Zeus::Rails#test_helper will require minitest/unit by default.
+        # We need to catch it first, before setting expectations on
+        # helper_file requires below.
+        expect_any_instance_of(Rails).to receive(:require).with("minitest/autorun")
+      end
+
+      context 'minitest' do
+        before do
+          module Zeus::M
+          end
+          expect(Zeus::M).to receive(:run)
+        end
+
+        it "requires autorun when testing with new minitest" do
+          module ::Minitest
+          end
+          expect_minitest_autorun
+
+          rails.test
+        end
+
+        it "requires autorun when testing with old minitest" do
+          expect_minitest_autorun
+
+          rails.test
+        end
+      end
+
+      context 'rspec' do
+        before do
+          class ::RSpec::Core::Runner
+          end
+        end
+
+        it "calls rspec core runner" do
+          expect(RSpec::Core::Runner).to receive(:invoke)
+          rails.test(['test_spec.rb'])
+        end
+      end
+    end
   end
 end

data/zeus.gemspec

@@ -5,7 +5,7 @@
 version = begin
             require File.expand_path('../lib/zeus/version', __FILE__)
             Zeus::VERSION
-          rescue LoadError
+          rescue LoadError, NameError
             "0.0.0"
           end
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://zeus.is"
 
   gem.files         = files
-  gem.extensions    = ["ext/inotify-wrapper/extconf.rb"]
+  gem.extensions    = []
   gem.executables   = ['zeus']
   gem.test_files    = []
   gem.name          = "zeus"

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.15.4
-  prerelease: 
+  version: 0.15.10
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-21 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Boot any rails app in under a second
@@ -48,13 +43,17 @@ email:
 - burke@libbey.me
 executables:
 - zeus
-extensions:
-- ext/inotify-wrapper/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
+- Gemfile
+- Gemfile.lock
+- MIT-LICENSE
+- Rakefile
+- bin/pry
+- bin/rake
+- bin/rspec
 - bin/zeus
-- build/fsevents-wrapper
 - build/zeus-darwin-amd64
 - build/zeus-linux-386
 - build/zeus-linux-amd64
@@ -62,61 +61,56 @@ files:
 - examples/custom_plan/custom_plan.rb
 - examples/custom_plan/zeus.json
 - examples/zeus.json
-- ext/inotify-wrapper/extconf.rb
-- ext/inotify-wrapper/inotify-wrapper.cpp
-- Gemfile
-- Gemfile.lock
+- lib/zeus.rb
 - lib/zeus/load_tracking.rb
+- lib/zeus/m.rb
 - lib/zeus/m/test_collection.rb
 - lib/zeus/m/test_method.rb
-- lib/zeus/m.rb
 - lib/zeus/plan.rb
 - lib/zeus/rails.rb
 - lib/zeus/version.rb
-- lib/zeus.rb
 - man/build/zeus
 - man/build/zeus-init
 - man/build/zeus-init.txt
 - man/build/zeus-start
 - man/build/zeus-start.txt
 - man/build/zeus.txt
-- MIT-LICENSE
-- Rakefile
+- spec/assets/exit.rb
+- spec/assets/invalid_syntax.rb
+- spec/assets/load.rb
+- spec/assets/raise.rb
+- spec/assets/require.rb
+- spec/assets/require_relative.rb
+- spec/assets/runtime_error.rb
+- spec/assets/single_file.rb
 - spec/fake_mini_test.rb
+- spec/load_tracking_spec.rb
 - spec/m_spec.rb
 - spec/rails_spec.rb
-- spec/spec_helper.rb
 - zeus.gemspec
 homepage: http://zeus.is
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3287208852062006683
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3287208852062006683
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Zeus is an intelligent preloader for ruby applications. It allows normal
   development tasks to be run in a fraction of a second.
 test_files: []

data/ext/inotify-wrapper/extconf.rb

@@ -1,24 +0,0 @@
-if /linux/ =~ RUBY_PLATFORM
-  open("Makefile", "wb") do |f|
-    f.write <<-EOF
-CXX = g++
-CXXFLAGS = -O3 -g -Wall
-
-inotify-wrapper: inotify-wrapper.o
-	$(CXX) $(CXXFLAGS) $< -o $@
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $< -o $@
-
-install:
-	# do nothing
-    EOF
-  end
-else
-  open("Makefile", "wb") do |f|
-    f.write <<-EOF
-install:
-	# do nothing
-    EOF
-  end
-end

data/ext/inotify-wrapper/inotify-wrapper.cpp

@@ -1,117 +0,0 @@
-#include <map>
-#include <string>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/inotify.h>
-
-#include <errno.h>
-
-#define EVENT_SIZE (sizeof (struct inotify_event))
-#define EVENT_BUF_LEN (1024 * (EVENT_SIZE + 16))
-
-using namespace std;
-
-static int _inotify_fd;
-static map<int, string> _WatchedFiles;
-static map<string, bool> _FileIsWatched;
-
-// static int inotifyFlags = IN_ATTRIB | IN_MODIFY | IN_MOVE_SELF | IN_DELETE_SELF;
-static int inotifyFlags = IN_ATTRIB | IN_MODIFY | IN_MOVE_SELF | IN_DELETE_SELF;
-
-void maybeAddFileToWatchList(string file)
-{
-  if (_FileIsWatched[file]) return;
-
-  int wd = inotify_add_watch(_inotify_fd, file.c_str(), inotifyFlags);
-  int attempts = 0;
-  // Files are momentarily inaccessible when they are rewritten. I couldn't
-  // find a good way to deal with this, so we poll 'deleted' files for 0.25s or so
-  // to see if they reappear.
-  while (wd == -1 && errno == ENOENT) {
-    usleep(10000);
-    wd = inotify_add_watch(_inotify_fd, file.c_str(), inotifyFlags);
-    if (attempts++ == 25) break; // try for at most about a quarter of a second
-  }
-  if (wd != -1) {
-    _WatchedFiles[wd] = file;
-    _FileIsWatched[file] = true;
-  }
-}
-
-// This essentially removes a file from the watchlist then
-// immediately re-adds it. This is because when a file is rewritten,
-// as so many editors love to do, the watchdescriptor no longer refers to
-// the file, so re must re-watch the path.
-void replaceFileInWatchList(int wd, string file)
-{
-  _FileIsWatched.erase(file);
-  _WatchedFiles.erase(wd);
-  inotify_rm_watch(_inotify_fd, wd);
-  maybeAddFileToWatchList(file);
-}
-
-void handleStdin()
-{
-  char line[2048];
-  if (fgets(line, sizeof(line), stdin) == NULL) return;
-  line[strlen(line)-1] = 0;
-
-  maybeAddFileToWatchList(string(line));
-}
-
-void handleInotify()
-{
-  int length;
-  int i = 0;
-  char buffer[EVENT_BUF_LEN];
-  string filename;
-
-  length = read(_inotify_fd, buffer, EVENT_BUF_LEN);
-  if (length < 0) return;
-
-  while (i < length) {
-    struct inotify_event *event = (struct inotify_event *) &buffer[i];
-    string file = _WatchedFiles[event->wd];
-    if (file != "") {
-      printf("%s\n", file.c_str());
-      fflush(stdout);
-      replaceFileInWatchList(event->wd, file);
-    }
-
-    i += EVENT_SIZE + event->len;
-  }
-}
-
-void go()
-{
-  fd_set rfds;
-  int retval;
-
-  for (;;) {
-    FD_ZERO(&rfds);
-    FD_SET(0, &rfds);
-    FD_SET(_inotify_fd, &rfds);
-
-    retval = select(_inotify_fd+1, &rfds, NULL, NULL, NULL);
-
-    if (retval == -1) {
-      // perror("select");
-    } else if (retval) {
-      if(feof(stdin)) break;
-      if (FD_ISSET(0, &rfds))           handleStdin();
-      if (FD_ISSET(_inotify_fd, &rfds)) handleInotify();
-    }
-  }
-}
-
-
-int main(int argc, const char *argv[])
-{
-  _inotify_fd = inotify_init();
-  go();
-}

data/spec/spec_helper.rb

@@ -1,38 +0,0 @@
-require 'zeus/rails'
-
-RSpec::Matchers.define :exit_with_code do |exp_code|
-  actual = nil
-  match do |block|
-    begin
-      block.call
-    rescue SystemExit => e
-      actual = e.status
-    end
-    actual and actual == exp_code
-  end
-  failure_message do |block|
-    "expected block to call exit(#{exp_code}) but exit" +
-      (actual.nil? ? " not called" : "(#{actual}) was called")
-  end
-  failure_message_when_negated do |block|
-    "expected block not to call exit(#{exp_code})"
-  end
-  description do
-    "expect block to call exit(#{exp_code})"
-  end
-end
-
-def stub_system_methods
-  allow(Dir).to receive(:glob).and_return(["path/to/file.rb"])
-  allow(Kernel).to receive(:load)
-end
-
-def mock_file_existence(file, result)
-  expect(File).to receive(:exists?).with(file).and_return(result)
-end
-
-RSpec.configure do |config|
-  config.before(:each) do
-    stub_system_methods
-  end
-end