zeus 0.12.0 → 0.13.0.preview1

data/Rakefile

@@ -38,8 +38,8 @@ END
   }
 end
 
-task :manifest do
-  files = `find . -type file | sed 's|^\./||'`.lines.map(&:chomp)
+task manifest: :version do
+  files = `find . -type f | sed 's|^\./||'`.lines.map(&:chomp)
   exceptions = [
     /.gitignore$/,
     /^MANIFEST$/,

data/examples/custom_plan/custom_plan.rb

@@ -0,0 +1,11 @@
+require 'zeus/rails'
+
+class CustomPlan < Zeus::Rails
+
+  # def my_custom_command
+  #  # see https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
+  # end
+
+end
+
+Zeus.plan = CustomPlan.new

data/examples/custom_plan/zeus.json

@@ -0,0 +1,23 @@
+{
+  "command": "ruby -rubygems -r./custom_plan -eZeus.go",
+
+  "plan": {
+    "boot": {
+      "default_bundle": {
+        "development_environment": {
+          "prerake": {"rake": []},
+          "runner": ["r"],
+          "console": ["c"],
+          "server": ["s"],
+          "generate": ["g"],
+          "destroy": ["d"],
+          "dbconsole": []
+        },
+        "test_environment": {
+          "cucumber_environment": {"cucumber": []},
+          "test_helper": {"test": ["rspec", "testrb"]}
+        }
+      }
+    }
+  }
+}

data/examples/zeus.json

@@ -10,6 +10,7 @@
           "console": ["c"],
           "server": ["s"],
           "generate": ["g"],
+          "destroy": ["d"],
           "dbconsole": []
         },
         "test_environment": {

data/lib/zeus.rb

@@ -4,12 +4,10 @@ require 'json'
 require 'pty'
 
 require 'zeus/load_tracking'
+require 'zeus/plan'
+require 'zeus/version'
 
 module Zeus
-  class Plan
-    def after_fork ; end
-  end
-
   class << self
     attr_accessor :plan, :dummy_tty, :master_socket
 
@@ -64,9 +62,9 @@ module Zeus
           new_identifier =~ /^(.):(.*)/
           code, ident = $1, $2
           if code == "S"
-            fork { plan.after_fork ; go(ident.to_sym) }
+            fork { go(ident.to_sym) }
           else
-            fork { plan.after_fork ; command(ident.to_sym, local) }
+            fork { command(ident.to_sym, local) }
           end
         end
       end
@@ -92,6 +90,7 @@ module Zeus
 
       pid = fork {
         $0 = "zeus command: #{identifier}"
+
         plan.after_fork
         client_terminal = local.recv_io
         local.write "P:#{Process.pid}:\0"
@@ -107,6 +106,8 @@ module Zeus
 
       kill_command_if_client_quits!(pid, client_pid)
 
+      at_exit{ Process.kill(:TERM, client_pid) }
+
       Process.wait(pid)
       code = $?.exitstatus || 0
 
@@ -151,6 +152,7 @@ module Zeus
     end
 
     def run_action(socket, identifier)
+      plan.after_fork unless identifier == :boot
       plan.send(identifier)
       socket.write "R:OK\0"
     rescue Exception => e

data/lib/zeus/load_tracking.rb

@@ -51,3 +51,14 @@ module Kernel
     end
   end
 end
+
+require 'yaml'
+module YAML
+  class << self
+    alias_method :__load_file_without_zeus, :load_file
+    def load_file(file, *a)
+      Zeus::LoadTracking.add_feature(file)
+      __load_file_without_zeus(file, *a)
+    end
+  end
+end

data/lib/zeus/m.rb

@@ -99,7 +99,7 @@ module Zeus
   ### M, your metal test runner
   # Maybe this gem should have a longer name? Metal?
   module M
-    VERSION = "1.2.1" unless defined?(VERSION)
+    M::VERSION = "1.2.1" unless defined?(M::VERSION)
 
     # Accept arguments coming from bin/m and run tests.
     def self.run(argv)
@@ -177,51 +177,90 @@ module Zeus
             @line = line
           end
 
+          opts.on '-n', '--name NAME', String, 'Name or pattern for test methods to run.' do |name|
+            if name[0] == "/" && name[-1] == "/"
+              @test_name = Regexp.new(name[1..-2])
+            else
+              @test_name = name
+            end
+          end
+
           opts.parse! argv
         end
       end
 
       def execute
-        # Locate tests to run that may be inside of this line. There could be more than one!
-        all_tests = tests
-        if @line
-          tests_to_run = all_tests.within(@line)
-        end
+        generate_tests_to_run
 
-        # If we didn't find any tests,
-        if tests_to_run == []
-          # Otherwise we found no tests on this line, so you need to pick one.
-          message = "No tests found on line #{@line}. Valid tests to run:\n\n"
+        test_arguments = build_test_arguments
 
-          # 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"
-          end
+        # directly run the tests from here and exit with the status of the tests passing or failing
+        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
+        when :testunit1, :testunit2
+          exit Test::Unit::AutoRunner.run(false, nil, test_arguments)
+        else
+          not_supported
+        end
+      end
 
-          # fail like a good unix process should.
-          abort message
+      def generate_tests_to_run
+        # Locate tests to run that may be inside of this line. There could be more than one!
+        all_tests = tests
+        if @line
+          @tests_to_run = all_tests.within(@line)
         end
+      end
 
+      def build_test_arguments
         if @line
+          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(&:name).join('|')
 
           # set up the args needed for the runner
-          test_arguments = ["-n", "/(#{test_names})/"]
+          ["-n", "/(#{test_names})/"]
+        elsif user_specified_name?
+          abort_with_no_test_found_by_name unless tests.contains?(@test_name)
+
+          test_names = test_name_to_s
+          ["-n", test_names]
         else
-          test_arguments = []
+          []
         end
+      end
 
-        # directly run the tests from here and exit with the status of the tests passing or failing
-        case framework
-        when :minitest
-          exit MiniTest::Unit.runner.run test_arguments
-        when :testunit1, :testunit2
-          exit Test::Unit::AutoRunner.run(false, nil, test_arguments)
-        else
-          not_supported
+      def abort_with_no_test_found_by_line_number
+        abort_with_valid_tests_msg "No tests found on line #{@line}. "
+      end
+
+      def abort_with_no_test_found_by_name
+        abort_with_valid_tests_msg "No test name matches '#{test_name_to_s}'. "
+      end
+
+      def abort_with_valid_tests_msg message=""
+        message << "Valid tests to run:\n\n"
+        # 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"
         end
+
+        # fail like a good unix process should.
+        abort message
+      end
+
+      def test_name_to_s
+        @test_name.is_a?(Regexp)? "/#{@test_name.source}/" : @test_name
+      end
+
+      def user_specified_name?
+        !@test_name.nil?
       end
 
       def framework
@@ -301,6 +340,13 @@ 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/m/test_collection.rb

@@ -10,7 +10,7 @@ module Zeus
       extend Forwardable
       # This should act like an array, so forward some common methods over to the
       # internal collection
-      def_delegators :@collection, :size, :<<, :each
+      def_delegators :@collection, :size, :<<, :each, :empty?
 
       def initialize(collection = nil)
         @collection = collection || []
@@ -40,6 +40,13 @@ module Zeus
         # the block into the sorted collection
         sort_by(&:start_line).each(&block)
       end
+
+      def contains? test_name
+        @collection.each do |test|
+          return true if test_name.match(test.name)
+        end
+        false
+      end
     end
   end
 end

data/lib/zeus/plan.rb

@@ -0,0 +1,6 @@
+module Zeus
+  class Plan
+    def after_fork ; end
+  end
+end
+

data/lib/zeus/rails.rb

@@ -4,6 +4,16 @@ BOOT_PATH = File.expand_path('config/boot',  ROOT_PATH)
 APP_PATH  = File.expand_path('config/application',  ROOT_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
+end
+
+if version = gem_is_bundled?('method_source')
+  gem 'method_source', version
+end
+
 require 'zeus/m'
 
 module Zeus
@@ -36,9 +46,10 @@ module Zeus
             ENV['RAILS_ENV'] = nil
             ENV['RUBYOPT'] = nil # bundler sets this to require bundler :|
             puts "zeus test #{file_list_string}"
-            system "zeus test #{file_list_string}"
+            ret = system "zeus test #{file_list_string}"
             ENV['RAILS_ENV'] = rails_env
             ENV['RUBYOPT'] = rubyopt
+            ret
           end
           self
         end
@@ -100,21 +111,27 @@ module Zeus
     end
 
     def generate
-      begin
-        require 'rails/generators'
-        ::Rails.application.load_generators
-      rescue LoadError # Rails 3.0 doesn't require this block to be run, but 3.2+ does
-      end
+      load_rails_generators
       require 'rails/commands/generate'
     end
 
+    def destroy
+      load_rails_generators
+      require 'rails/commands/destroy'
+    end
+
     def runner
       require 'rails/commands/runner'
     end
 
     def console
-      require 'rails/commands/console'
-      ::Rails::Console.start(::Rails.application)
+      if defined?(Pry) && IRB == Pry
+        require "pry"
+        Pry.start 
+      else
+        require 'rails/commands/console'
+        ::Rails::Console.start(::Rails.application)
+      end 
     end
 
     def dbconsole
@@ -164,7 +181,7 @@ module Zeus
     end
 
     def test
-      if defined?(RSpec)
+      if spec_file?(ARGV) && defined?(RSpec)
         exit RSpec::Core::Runner.run(ARGV)
       else
         Zeus::M.run(ARGV)
@@ -185,6 +202,15 @@ module Zeus
 
     private
 
+    SPEC_FILE_REGEXP = /.+_spec\.rb$/
+    def spec_file? argv
+      SPEC_FILE_REGEXP.match(first_ruby_file argv) != nil
+    end
+
+    def first_ruby_file argv
+      argv.find { |e| /.+\.rb$/ =~ e }
+    end
+
     def restart_girl_friday
       return unless defined?(GirlFriday::WorkQueue)
       # The Actor is run in a thread, and threads don't persist post-fork.
@@ -206,6 +232,12 @@ module Zeus
       end
     end
 
+    def load_rails_generators
+      require 'rails/generators'
+      ::Rails.application.load_generators
+    rescue LoadError # Rails 3.0 doesn't require this block to be run, but 3.2+ does
+    end
+
   end
 end
 

data/lib/zeus/version.rb

@@ -0,0 +1,3 @@
+module Zeus
+  VERSION = "0.13.0.preview1"
+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 2012" "" ""
+.TH "ZEUS" "1" "December 2012" "" ""
 .
 .SH "NAME"
 \fBzeus\fR \- boot rails in under a second
@@ -13,10 +13,10 @@
 Zeus makes working with large codebases much less painful\.
 .
 .P
-To use Zeus with Ruby on Rails 3\.0+, Just run \fBzeus init\fR in your project directory, then run \fBzeus start\fR, then run \fBzeus commands\fR in a different shell to see a list of available commands\.
+To use Zeus with Ruby on Rails 3\.0+, Just run \fBzeus start\fR in your project directory\. It will output a list of available commands, including tasks to spawn consoles, servers, tests, and rake tasks\.
 .
 .P
-See \fBhttps://github\.com/burke/zeus/blob/master/docs/ruby/modifying\.md\fR for information on modifying the boot process that Zeus uses by default\.
+See \fBhttps://github\.com/burke/zeus/blob/master/docs/ruby/modifying\.md\fR for information on modifying the boot process that Zeus uses by default and adding custom tasks\.
 .
 .SH "SLIGHTLY MORE TECHNICAL DESCRIPTION"
 Zeus is a language\-agnostic application checkpointer for non\-multithreaded applications\.

data/man/build/zeus.txt

@@ -11,13 +11,13 @@ SYNOPSIS
 DESCRIPTION
        Zeus makes working with large codebases much less painful.
 
-       To use Zeus with Ruby on Rails 3.0+, Just run zeus init in your project
-       directory, then run zeus start, then run zeus commands in  a  different
-       shell to see a list of available commands.
+       To  use	Zeus  with  Ruby  on  Rails  3.0+, Just run zeus start in your
+       project directory. It will output a list of available commands, includ-
+       ing tasks to spawn consoles, servers, tests, and rake tasks.
 
        See    https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
-       for information on  modifying  the  boot  process  that	Zeus  uses  by
-       default.
+       for information on modifying the boot process that Zeus uses by default
+       and adding custom tasks.
 
 SLIGHTLY MORE TECHNICAL DESCRIPTION
        Zeus  is  a  language-agnostic  application checkpointer for non-multi-
@@ -62,4 +62,4 @@ BUILTIN COMMANDS
 
 
 
-				September 2012			       ZEUS(1)
+				 December 2012			       ZEUS(1)

data/spec/fake_mini_test.rb

@@ -0,0 +1,31 @@
+module MiniTest
+  module Unit
+    class TestCase
+    end
+  end
+end
+
+def stub_mini_test_methods
+  MiniTest::Unit::TestCase.stub!(:test_suites).and_return [fake_suite]
+  MiniTest::Unit.stub!(:runner).and_return fake_runner
+end
+
+def fake_runner
+ @runner ||= stub("Runner", :run => 0)
+end
+
+def fake_suite
+  @suite ||= stub("TestSuite",
+                  :test_methods => [fake_test_method],
+                  :instance_method => fake_instance_method)
+end
+
+def fake_test_method
+  "test_method"
+end
+
+def fake_instance_method
+  @instance_method ||=  stub("InstanceMethod",
+                             :source_location => ["path/to/file.rb", 2],
+                             :source => "def #{fake_test_method} \n assert true \n end")
+end

data/spec/m_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+require 'fake_mini_test'
+
+describe Zeus::M::Runner do
+  Runner = Zeus::M::Runner
+
+  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"]
+
+      fake_runner.should_receive(:run).with([])
+
+      lambda { Runner.new(argv).run }.should exit_with_code(0)
+    end
+  end
+
+  context "given a line number" do
+    it "aborts if no test is found" do
+      argv = ["path/to/file.rb:100"]
+
+      STDERR.should_receive(:write).with(/No tests found on line 100/)
+      fake_runner.should_not_receive :run
+
+      lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+    end
+
+    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})/"])
+
+      lambda { Runner.new(argv).run }.should exit_with_code(0)
+    end
+  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}/"]
+
+      fake_runner.should_receive(:run).with(["-n", "/#{fake_test_method}/"])
+
+      lambda { Runner.new(argv).run }.should exit_with_code(0)
+    end
+
+    it "runs the specified tests when using a pattern in -n option" do
+      argv = ["path/to/file.rb", "-n", "/method/"]
+
+      fake_runner.should_receive(:run).with(["-n", "/method/"])
+
+      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/"]
+
+      STDERR.should_receive(:write).with(%r{No test name matches \'/garbage/\'})
+      fake_runner.should_not_receive :run
+
+      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}"]
+
+      fake_runner.should_receive(:run).with(["-n", fake_test_method])
+
+      lambda { Runner.new(argv).run }.should exit_with_code(0)
+    end
+
+    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

data/spec/spec_helper.rb

@@ -0,0 +1,38 @@
+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|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual and actual == exp_code
+  end
+  failure_message_for_should do |block|
+    "expected block to call exit(#{exp_code}) but exit" +
+      (actual.nil? ? " not called" : "(#{actual}) was called")
+  end
+  failure_message_for_should_not 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
+  Dir.stub!(:glob).and_return(["path/to/file.rb"])
+  Kernel.stub!(:load).and_return
+end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    stub_system_methods
+  end
+end

data/zeus.gemspec

@@ -27,5 +27,7 @@ Gem::Specification.new do |gem|
   gem.version       = version
   gem.license       = "MIT"
 
-  gem.add_dependency "method_source", ">= 0.6.7"
+  gem.add_development_dependency "rspec", '~>2.12.0'
+
+  gem.add_runtime_dependency "method_source", ">= 0.6.7"
 end

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.12.0
-  prerelease: 
+  version: 0.13.0.preview1
+  prerelease: 7
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
@@ -41,6 +57,8 @@ files:
 - build/zeus-darwin-amd64
 - build/zeus-linux-386
 - build/zeus-linux-amd64
+- examples/custom_plan/custom_plan.rb
+- examples/custom_plan/zeus.json
 - examples/zeus.json
 - ext/fsevents-wrapper/fsevents-wrapper
 - ext/inotify-wrapper/extconf.rb
@@ -52,6 +70,7 @@ files:
 - 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
@@ -61,6 +80,9 @@ files:
 - man/build/zeus.txt
 - MIT-LICENSE
 - Rakefile
+- spec/fake_mini_test.rb
+- spec/m_spec.rb
+- spec/spec_helper.rb
 - zeus.gemspec
 homepage: http://zeus.is
 licenses:
@@ -78,9 +100,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23