zeus 0.13.4.pre2 → 0.15.0

data/Gemfile.lock

@@ -0,0 +1,36 @@
+PATH
+  remote: .
+  specs:
+    zeus (0.15.0)
+      method_source (>= 0.6.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    hpricot (0.8.6)
+    method_source (0.8.2)
+    mustache (0.99.5)
+    rake (10.3.0)
+    rdiscount (2.1.7.1)
+    ronn (0.7.3)
+      hpricot (>= 0.8.2)
+      mustache (>= 0.7.0)
+      rdiscount (>= 1.5.8)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  ronn (>= 0.7.0)
+  rspec (~> 2.12.0)
+  zeus!

data/Rakefile

@@ -6,39 +6,10 @@ require 'pathname'
 ROOT_PATH = Pathname.new(File.expand_path("../../", __FILE__))
 RUBYGEM_PATH = Pathname.new(File.expand_path("../", __FILE__))
 
-task build: [:import_externals, :version, :manifest]
+task build: [:manifest]
 task default: :build
 
-task :import_externals do
-  puts "building rubygem"
-
-  Rake::Task[:clean].invoke
-
-  FileUtils.rm_r(RUBYGEM_PATH + "man") rescue nil
-  FileUtils.rm_r(RUBYGEM_PATH + "build") rescue nil
-
-  # manpages
-  FileUtils.mkdir(RUBYGEM_PATH + "man")
-  FileUtils.cp_r(ROOT_PATH + "man/build", RUBYGEM_PATH + "man")
-
-  # multi-arch binaries
-  FileUtils.cp_r(ROOT_PATH + "build", RUBYGEM_PATH + "build")
-
-  Rake::Task[:manifest].invoke
-  Rake::Task[:build].invoke
-end
-
-task :version do
-  version = File.read('../VERSION').chomp
-  File.open('lib/zeus/version.rb', 'w') { |f| f.puts <<END
-module Zeus
-  VERSION = "#{version}"
-end
-END
-  }
-end
-
-task manifest: :version do
+task :manifest do
   files = `find . -type f | sed 's|^\./||'`.lines.map(&:chomp)
   exceptions = [
     /.gitignore$/,
@@ -49,10 +20,3 @@ task manifest: :version do
   File.open('MANIFEST', 'w') {|f| f.puts files.join("\n") }
 end
 
-task :clean do
-  FileUtils.rm(RUBYGEM_PATH + "lib/zeus/version.rb") rescue nil
-  FileUtils.rm_r(RUBYGEM_PATH + "man") rescue nil
-  FileUtils.rm_r(RUBYGEM_PATH + "build") rescue nil
-  FileUtils.rm_r(RUBYGEM_PATH + "pkg") rescue nil
-end
-

data/examples/custom_plan/zeus.json

@@ -14,7 +14,6 @@
           "dbconsole": []
         },
         "test_environment": {
-          "cucumber_environment": {"cucumber": []},
           "test_helper": {"test": ["rspec", "testrb"]}
         }
       }

data/examples/zeus.json

@@ -14,7 +14,6 @@
           "dbconsole": []
         },
         "test_environment": {
-          "cucumber_environment": {"cucumber": []},
           "test_helper": {"test": ["rspec", "testrb"]}
         }
       }

data/lib/zeus.rb

@@ -1,7 +1,14 @@
 # encoding: utf-8
 require 'socket'
+
+# load exact json version from Gemfile.lock to avoid conflicts
+gemfile = "#{ENV["BUNDLE_GEMFILE"] || "Gemfile"}.lock"
+if File.exist?(gemfile) && version = File.read(gemfile)[/^    json \((.*)\)/, 1]
+  gem 'json', version
+end
 require 'json'
 require 'pty'
+require 'set'
 
 require 'zeus/load_tracking'
 require 'zeus/plan'
@@ -19,7 +26,7 @@ module Zeus
     # Yup.
     def setup_dummy_tty!
       return if self.dummy_tty
-      master, self.dummy_tty = PTY.open
+      master, self.dummy_tty = PTY.send(:open)
       Thread.new {
         loop { master.read(1024) }
       }
@@ -35,51 +42,72 @@ module Zeus
     end
 
     def go(identifier=:boot)
-      $0 = "zeus slave: #{identifier}"
-
-      setup_dummy_tty!
-      master = setup_master_socket!
-      feature_pipe_r, feature_pipe_w = IO.pipe
-
-      # I need to give the master a way to talk to me exclusively
-      local, remote = UNIXSocket.pair(Socket::SOCK_STREAM)
-      master.send_io(remote)
-
-      # Now I need to tell the master about my PID and ID
-      local.write "P:#{Process.pid}:#{identifier}\0"
-      local.send_io(feature_pipe_r)
-
-      # Now we run the action and report its success/fail status to the master.
-      features = Zeus::LoadTracking.features_loaded_by {
-        run_action(local, identifier)
-      }
-
-      # the master wants to know about the files that running the action caused us to load.
-      Thread.new { notify_features(feature_pipe_w, features) }
-
-      # We are now 'connected'. From this point, we may receive requests to fork.
-      children = Set.new
-      loop do
-        messages = local.recv(2**16)
-
-        # Reap any child runners or slaves that might have exited in
-        # the meantime. Note that reaping them like this can leave <=1
-        # zombie process per slave around while the slave waits for a
-        # new command.
-        children.each do |pid|
-          children.delete(pid) if Process.waitpid(pid, Process::WNOHANG)
-        end
+      # Thanks to the magic of fork, this following line will return
+      # many times: Every time the parent step receives a request to
+      # run a command.
+      if run_command = boot_steps(identifier)
+        ident, local = run_command
+        return command(ident, local)
+      end
+    end
 
-        messages.split("\0").each do |new_identifier|
-          new_identifier =~ /^(.):(.*)/
-          code, ident = $1, $2
-          pid = nil
-          if code == "S"
-            children << fork { go(ident.to_sym) }
-          else
-            children << fork { command(ident.to_sym, local) }
+    def boot_steps(identifier)
+      while true
+        boot_step = catch(:boot_step) do
+          $0 = "zeus slave: #{identifier}"
+
+          setup_dummy_tty!
+          master = setup_master_socket!
+          feature_pipe_r, feature_pipe_w = IO.pipe
+
+          # I need to give the master a way to talk to me exclusively
+          local, remote = UNIXSocket.pair(Socket::SOCK_STREAM)
+          master.send_io(remote)
+
+          # Now I need to tell the master about my PID and ID
+          local.write "P:#{Process.pid}:#{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) }
+
+          # We are now 'connected'. From this point, we may receive requests to fork.
+          children = Set.new
+          while true
+            messages = local.recv(2**16)
+
+            # Reap any child runners or slaves that might have exited in
+            # the meantime. Note that reaping them like this can leave <=1
+            # zombie process per slave around while the slave waits for a
+            # new command.
+            children.each do |pid|
+              children.delete(pid) if Process.waitpid(pid, Process::WNOHANG)
+            end
+
+            messages.split("\0").each do |new_identifier|
+              new_identifier =~ /^(.):(.*)/
+              code, ident = $1, $2
+              pid = fork
+              if pid
+                # We're in the parent. Record the child:
+                children << pid
+              elsif code == "S"
+                # Child, supposed to start another step:
+                throw(:boot_step, ident.to_sym)
+              else
+                # Child, supposed to run a command:
+                return [ident.to_sym, local]
+              end
+            end
           end
         end
+        identifier = boot_step
       end
     end
 
@@ -94,11 +122,15 @@ module Zeus
       remote.close
       sock.close
 
-      pid_and_arguments = local.recv(2**16) # if starting client before boot slave is latched, we get stuck here. We also get stuck here in #182.
-      pid_and_arguments.chomp!("\0")
-      pid_and_arguments =~ /(.*?):(.*)/
-      client_pid, arguments = $1.to_i, $2
-      arguments.chomp!("\0")
+      pid_and_argument_count = local.recv(2**16)
+      pid_and_argument_count.chomp("\0") =~ /(.*?):(.*)/
+      client_pid, argument_count = $1.to_i, $2.to_i
+      arg_io = local.recv_io
+      arguments = arg_io.read.chomp("\0").split("\0")
+
+      if arguments.length != argument_count
+        raise "Argument count mismatch: Expected #{argument_count}, got #{arguments.length}"
+      end
 
       pid = fork {
         $0 = "zeus command: #{identifier}"
@@ -111,7 +143,7 @@ module Zeus
         $stdin.reopen(client_terminal)
         $stdout.reopen(client_terminal)
         $stderr.reopen(client_terminal)
-        ARGV.replace(JSON.parse(arguments))
+        ARGV.replace(arguments)
 
         plan.send(identifier)
       }
@@ -161,13 +193,22 @@ module Zeus
       local.write str
     end
 
-    def run_action(socket, identifier)
-      plan.after_fork unless identifier == :boot
-      plan.send(identifier)
-      socket.write "R:OK\0"
-    rescue Exception => e
-      report_error_to_master(socket, e)
+    def run_action(socket, identifier, feature_pipe_w)
+      loaded = false
+      begin
+        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)
+
+        # Report any setup-time failures back to the Zeus master:
+        unless loaded
+          notify_features(feature_pipe_w, Zeus::LoadTracking.all_features)
+        end
+        feature_pipe_w.close
+      end
     end
-
   end
 end

data/lib/zeus/load_tracking.rb

@@ -18,13 +18,13 @@ module Zeus
         add_extra_feature(path) if path
       end
 
-      private
-
       def all_features
         untracked = defined?($untracked_features) ? $untracked_features : []
         $LOADED_FEATURES + untracked
       end
 
+      private
+
       def add_extra_feature(path)
         $untracked_features ||= []
         $untracked_features << path

data/lib/zeus/m.rb

@@ -198,9 +198,7 @@ module Zeus
         case framework
         when :minitest
           nerf_test_unit_autorunner
-          exit_code = nil
-          at_exit { exit false if exit_code && exit_code != 0 }
-          exit_code = MiniTest::Unit.runner.run test_arguments
+          exit(MiniTest::Unit.runner.run(test_arguments).to_i)
         when :testunit1, :testunit2
           exit Test::Unit::AutoRunner.run(false, nil, test_arguments)
         else
@@ -221,7 +219,7 @@ module Zeus
           abort_with_no_test_found_by_line_number if @tests_to_run.empty?
 
           # assemble the regexp to run these tests,
-          test_names = @tests_to_run.map(&:name).join('|')
+          test_names = @tests_to_run.map(&:escaped_name).join('|')
 
           # set up the args needed for the runner
           ["-n", "/(#{test_names})/"]
@@ -248,7 +246,7 @@ module Zeus
         # For every test ordered by line number,
         # spit out the test name and line number where it starts,
         tests.by_line_number do |test|
-          message << "#{sprintf("%0#{tests.column_size}s", test.name)}: zeus test #{@files[0]}:#{test.start_line}\n"
+          message << "#{sprintf("%0#{tests.column_size}s", test.escaped_name)}: zeus test #{@files[0]}:#{test.start_line}\n"
         end
 
         # fail like a good unix process should.
@@ -256,7 +254,7 @@ module Zeus
       end
 
       def test_name_to_s
-        @test_name.is_a?(Regexp)? "/#{@test_name.source}/" : @test_name
+        @test_name.is_a?(Regexp)? "/#{Regexp.escape(@test_name.source)}/" : Regexp.escape(@test_name)
       end
 
       def user_specified_name?

data/lib/zeus/m/test_method.rb

@@ -30,6 +30,10 @@ module Zeus
         # Shove the given attributes into a new databag
         new(test_method, start_line, end_line)
       end
+
+      def escaped_name
+        Regexp.escape(name)
+      end
     end
   end
 end

data/lib/zeus/rails.rb

@@ -7,13 +7,13 @@ ROOT_PATH = File.expand_path(Dir.pwd)
 RAILS_PATH = find_rails_path(ROOT_PATH)
 ENV_PATH  = File.expand_path('config/environment',  RAILS_PATH)
 BOOT_PATH = File.expand_path('config/boot',  RAILS_PATH)
-APP_PATH  = File.expand_path('config/application',  RAILS_PATH)
+APP_PATH  = File.expand_path('config/application',  RAILS_PATH) unless defined? APP_PATH
 
 require 'zeus'
 
 def gem_is_bundled?(gem)
   gemfile_lock_contents = File.read(ROOT_PATH + "/Gemfile.lock")
-  gemfile_lock_contents.scan(/\b#{gem} \(([^=~><]+?)\)/).flatten.first
+  gemfile_lock_contents.scan(/^\s*#{gem} \(([^=~><]+?)\)/).flatten.first
 end
 
 if version = gem_is_bundled?('method_source')
@@ -24,14 +24,6 @@ require 'zeus/m'
 
 module Zeus
   class Rails < Plan
-    def deprecated
-      puts "Zeus 0.11.0 changed zeus.json. You'll have to rm zeus.json && zeus init."
-    end
-    alias_method :spec_helper, :deprecated
-    alias_method :testrb,      :deprecated
-    alias_method :rspec,       :deprecated
-
-
     def after_fork
       reconnect_activerecord
       restart_girl_friday
@@ -136,11 +128,11 @@ module Zeus
     end
 
     def console
-      require 'rails/commands/console'
       if defined?(Pry) && IRB == Pry
         require "pry"
         Pry.start
       else
+        require 'rails/commands/console'
         ::Rails::Console.start(::Rails.application)
       end
     end
@@ -182,12 +174,24 @@ module Zeus
     end
 
     def test_helper
-      if File.exists?(ROOT_PATH + "/spec/spec_helper.rb")
-        require 'spec_helper'
-      elsif File.exist?(ROOT_PATH + "/test/minitest_helper.rb")
-        require 'minitest_helper'
+      # don't let minitest setup another exit hook
+      begin
+        require 'minitest/unit'
+        MiniTest::Unit.class_variable_set("@@installed_at_exit", true)
+      rescue LoadError
+        # noop
+      end
+
+      if ENV['RAILS_TEST_HELPER']
+        require ENV['RAILS_TEST_HELPER']
       else
-        require 'test_helper'
+        if File.exists?(ROOT_PATH + "/spec/spec_helper.rb")
+          require 'spec_helper'
+        elsif File.exists?(ROOT_PATH + "/test/minitest_helper.rb")
+          require 'minitest_helper'
+        else
+          require 'test_helper'
+        end
       end
     end
 
@@ -201,20 +205,6 @@ module Zeus
       end
     end
 
-    def cucumber_environment
-      require 'cucumber/rspec/disable_option_parser'
-      require 'cucumber/cli/main'
-      @cucumber_runtime = Cucumber::Runtime.new
-    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
-
-
     private
 
     SPEC_DIR_REGEXP = %r"(^|/)spec"

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.13.4.pre2"
+  VERSION = "0.15.0"
 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" "May 2013" "" ""
+.TH "ZEUS" "1" "April 2014" "" ""
 .
 .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" "March 2013" "" ""
+.TH "ZEUS\-INIT" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBzeus\-init\fR \- Generate a template zeus\.json

data/man/build/zeus-init.txt

@@ -14,4 +14,4 @@ DESCRIPTION
 
 
 
-				  March 2013			  ZEUS-INIT(1)
+				  April 2014			  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" "March 2013" "" ""
+.TH "ZEUS\-START" "1" "April 2014" "" ""
 .
 .SH "NAME"
 \fBzeus\-start\fR \- Start a zeus server

data/man/build/zeus-start.txt

@@ -15,4 +15,4 @@ DESCRIPTION
 
 
 
-				  March 2013			 ZEUS-START(1)
+				  April 2014			 ZEUS-START(1)

data/man/build/zeus.txt

@@ -72,4 +72,4 @@ BUILTIN COMMANDS
 
 
 
-				   May 2013			       ZEUS(1)
+				  April 2014			       ZEUS(1)

data/spec/fake_mini_test.rb

@@ -20,12 +20,23 @@ def fake_suite
                   :instance_method => fake_instance_method)
 end
 
+def fake_suite_with_special_characters
+  @suite ||= stub("TestSuite",
+                  :test_methods => [fake_special_characters_test_method],
+                  :instance_method => fake_instance_method(fake_special_characters_test_method))
+end
+
 def fake_test_method
   "test_method"
 end
 
-def fake_instance_method
+def fake_special_characters_test_method
+  "test_my_test_method?"
+end
+
+def fake_instance_method(name=fake_test_method)
   @instance_method ||=  stub("InstanceMethod",
                              :source_location => ["path/to/file.rb", 2],
-                             :source => "def #{fake_test_method} \n assert true \n end")
+                             :source => "def #{name} \n assert true \n end")
 end
+

data/spec/m_spec.rb

@@ -1,83 +1,110 @@
 require 'spec_helper'
 require 'fake_mini_test'
 
-describe Zeus::M::Runner do
-  Runner = Zeus::M::Runner
+module Zeus::M
+  describe Runner do
 
-  before do
-    stub_mini_test_methods
-  end
+    context "given a test with a question mark" do
+      before do
+        MiniTest::Unit::TestCase.stub!(:test_suites).and_return [fake_suite_with_special_characters]
+        MiniTest::Unit.stub!(:runner).and_return fake_runner
+      end
+
+      it "escapes the question mark when using line number" do
+        argv = ["path/to/file.rb:2"]
+
+        fake_runner.should_receive(:run).with(["-n", "/(test_my_test_method\\?)/"])
+
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
 
-  context "no option is given" do
-    it "runs the test without giving any option" do
-      argv = ["path/to/file.rb"]
+      it "escapes the question mark from explicit names" do
+        argv = ["path/to/file.rb", "--name", fake_special_characters_test_method]
 
-      fake_runner.should_receive(:run).with([])
+        fake_runner.should_receive(:run).with(["-n", "test_my_test_method\\?"])
 
-      lambda { Runner.new(argv).run }.should exit_with_code(0)
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
     end
   end
 
-  context "given a line number" do
-    it "aborts if no test is found" do
-      argv = ["path/to/file.rb:100"]
+  describe Runner do
+    before do
+      stub_mini_test_methods
+    end
+
+    context "no option is given" do
+      it "runs the test without giving any option" do
+        argv = ["path/to/file.rb"]
 
-      STDERR.should_receive(:write).with(/No tests found on line 100/)
-      fake_runner.should_not_receive :run
+        fake_runner.should_receive(:run).with([])
 
-      lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
     end
 
-    it "runs the test if the correct line number is given" do
-      argv = ["path/to/file.rb:2"]
+    context "given a line number" do
+      it "aborts if no test is found" do
+        argv = ["path/to/file.rb:100"]
 
-      fake_runner.should_receive(:run).with(["-n", "/(#{fake_test_method})/"])
+        STDERR.should_receive(:write).with(/No tests found on line 100/)
+        fake_runner.should_not_receive :run
 
-      lambda { Runner.new(argv).run }.should exit_with_code(0)
-    end
-  end
+        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+      end
 
-  context "specifying test name" do
-    it "runs the specified tests when using a pattern in --name option" do
-      argv = ["path/to/file.rb", "--name", "/#{fake_test_method}/"]
+      it "runs the test if the correct line number is given" do
+        argv = ["path/to/file.rb:2"]
 
-      fake_runner.should_receive(:run).with(["-n", "/#{fake_test_method}/"])
+        fake_runner.should_receive(:run).with(["-n", "/(#{fake_test_method})/"])
 
-      lambda { Runner.new(argv).run }.should exit_with_code(0)
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
     end
 
-    it "runs the specified tests when using a pattern in -n option" do
-      argv = ["path/to/file.rb", "-n", "/method/"]
+    context "specifying test name" do
+      it "runs the specified tests when using a pattern in --name option" do
+        argv = ["path/to/file.rb", "--name", "/#{fake_test_method}/"]
 
-      fake_runner.should_receive(:run).with(["-n", "/method/"])
+        fake_runner.should_receive(:run).with(["-n", "/#{fake_test_method}/"])
 
-      lambda { Runner.new(argv).run }.should exit_with_code(0)
-    end
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
 
-    it "aborts if no test matches the given pattern" do
-      argv = ["path/to/file.rb", "-n", "/garbage/"]
+      it "runs the specified tests when using a pattern in -n option" do
+        argv = ["path/to/file.rb", "-n", "/method/"]
 
-      STDERR.should_receive(:write).with(%r{No test name matches \'/garbage/\'})
-      fake_runner.should_not_receive :run
+        fake_runner.should_receive(:run).with(["-n", "/method/"])
 
-      lambda { Runner.new(argv).run }.should_not exit_with_code(0)
-    end
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
 
-    it "runs the specified tests when using a name (no pattern)" do
-      argv = ["path/to/file.rb", "-n", "#{fake_test_method}"]
+      it "aborts if no test matches the given pattern" do
+        argv = ["path/to/file.rb", "-n", "/garbage/"]
 
-      fake_runner.should_receive(:run).with(["-n", fake_test_method])
+        STDERR.should_receive(:write).with(%r{No test name matches \'/garbage/\'})
+        fake_runner.should_not_receive :run
 
-      lambda { Runner.new(argv).run }.should exit_with_code(0)
-    end
+        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+      end
+
+      it "runs the specified tests when using a name (no pattern)" do
+        argv = ["path/to/file.rb", "-n", "#{fake_test_method}"]
 
-    it "aborts if no test matches the given test name" do
-      argv = ["path/to/file.rb", "-n", "method"]
+        fake_runner.should_receive(:run).with(["-n", fake_test_method])
 
-      STDERR.should_receive(:write).with(%r{No test name matches \'method\'})
-      fake_runner.should_not_receive :run
+        lambda { Runner.new(argv).run }.should exit_with_code(0)
+      end
 
-      lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+      it "aborts if no test matches the given test name" do
+        argv = ["path/to/file.rb", "-n", "method"]
+
+        STDERR.should_receive(:write).with(%r{No test name matches \'method\'})
+        fake_runner.should_not_receive :run
+
+        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+      end
     end
   end
+
 end

data/spec/rails_spec.rb

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module Zeus
+  describe Rails do
+    subject(:rails) { Rails.new }
+
+    context "#test_helper" do
+      before(:each) do
+        rails.should_receive(:require).with("minitest/unit")
+      end
+
+      it "when ENV['RAILS_TEST_HELPER'] is set helper is loaded from variable" do
+        ENV['RAILS_TEST_HELPER'] = "a_test_helper"
+        rails.should_receive(:require).with("a_test_helper")
+
+        rails.test_helper
+        ENV.clear
+      end
+
+      it "when spec_helper exists spec_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", true)
+
+        rails.should_receive(:require).with("spec_helper")
+
+        rails.test_helper
+      end
+
+      it "when minitest_helper exists minitest_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
+        mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", true)
+
+        rails.should_receive(:require).with("minitest_helper")
+
+        rails.test_helper
+      end
+
+      it "when there is no spec_helper or minitest_helper, test_helper is required" do
+        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
+        mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", false)
+
+        rails.should_receive(:require).with("test_helper")
+
+        rails.test_helper
+      end
+    end
+
+    context "#gem_is_bundled?" do
+      it "returns gem version from Gemfile.lock" do
+        File.stub(:read).and_return("
+GEM
+  remote: https://rubygems.org/
+  specs:
+    exception_notification-rake (0.0.6)
+      exception_notification (~> 3.0.1)
+      rake (>= 0.9.0)
+    rake (10.0.4)
+")
+        gem_is_bundled?('rake').should == '10.0.4'
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 require 'zeus/rails'
 
-module Zeus::M
-  VERSION = "0.0.0.test"
-end
-
 RSpec::Matchers.define :exit_with_code do |exp_code|
   actual = nil
   match do |block|
@@ -31,6 +27,10 @@ def stub_system_methods
   Kernel.stub!(:load).and_return
 end
 
+def mock_file_existence(file, result)
+  File.should_receive(:exists?).with(file).and_return(result)
+end
+
 RSpec.configure do |config|
   config.before(:each) do
     stub_system_methods

data/zeus.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT"
 
   gem.add_development_dependency "rspec", '~> 2.12.0'
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "ronn", '>= 0.7.0'
 
   gem.add_runtime_dependency "method_source", ">= 0.6.7"

metadata

@@ -1,64 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  prerelease: 7
-  version: 0.13.4.pre2
+  version: 0.15.0
+  prerelease: 
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
-  name: rspec
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
-    none: false
-  name: ronn
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ronn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: method_source
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.7
-    none: false
-  name: method_source
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.7
-    none: false
 description: Boot any rails app in under a second
 email:
 - burke@libbey.me
@@ -76,10 +92,10 @@ files:
 - examples/custom_plan/custom_plan.rb
 - examples/custom_plan/zeus.json
 - examples/zeus.json
-- ext/fsevents-wrapper/fsevents-wrapper
 - ext/inotify-wrapper/extconf.rb
 - ext/inotify-wrapper/inotify-wrapper.cpp
 - Gemfile
+- Gemfile.lock
 - lib/zeus/load_tracking.rb
 - lib/zeus/m/test_collection.rb
 - lib/zeus/m/test_method.rb
@@ -98,6 +114,7 @@ files:
 - Rakefile
 - spec/fake_mini_test.rb
 - spec/m_spec.rb
+- spec/rails_spec.rb
 - spec/spec_helper.rb
 - zeus.gemspec
 homepage: http://zeus.is
@@ -108,17 +125,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
+      segments:
+      - 0
+      hash: -829104412674281211
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
-  none: false
+      version: '0'
+      segments:
+      - 0
+      hash: -829104412674281211
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23