zeus 0.15.3 → 0.15.4

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in zeus.gemspec
-gemspec
+# NOTE: Avoid putting development deps in gemspec
+gemspec development_group: :gem_build_tools
+
+gem 'rspec', '~> 3.1', groups: [:test, :development]
+gem 'rake', group: :gem_build_tools

data/Gemfile.lock

@@ -1,36 +1,33 @@
 PATH
   remote: .
   specs:
-    zeus (0.15.3)
+    zeus (0.15.4)
       method_source (>= 0.6.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.1.3)
-    hpricot (0.8.6)
+    diff-lcs (1.2.5)
     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)
+    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)
+      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)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (~> 1.6)
   rake
-  ronn (>= 0.7.0)
-  rspec (~> 2.12.0)
+  rspec (~> 3.1)
   zeus!

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

@@ -102,6 +102,7 @@ void go()
     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();
     }

data/lib/zeus/m.rb

@@ -126,10 +126,8 @@ module Zeus
       def parse
         # With no arguments,
         if @argv.empty?
-          # Just shell out to `rake test`.
-          require 'rake'
-          Rake::Task['test'].invoke
-          exit
+          @files = []
+          add_file("test")
         else
           parse_options! @argv
 

data/lib/zeus/rails.rb

@@ -206,9 +206,13 @@ module Zeus
     end
 
     def test(argv=ARGV)
-      if spec_file?(argv) && defined?(RSpec)
+      # 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)
       else
         Zeus::M.run(argv)

data/lib/zeus/version.rb

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

data/spec/fake_mini_test.rb

@@ -6,24 +6,18 @@ module MiniTest
 end
 
 def stub_mini_test_methods
-  MiniTest::Unit::TestCase.stub!(:test_suites).and_return [fake_suite]
-  MiniTest::Unit.stub!(:runner).and_return fake_runner
+  allow(MiniTest::Unit::TestCase).to receive(:test_suites).and_return([fake_suite])
+  allow(MiniTest::Unit).to receive(:runner).and_return(fake_runner)
 end
 
 def fake_runner
- @runner ||= stub("Runner", :run => 0)
+ @runner ||= double("Runner", :run => 0)
 end
 
 def fake_suite
-  @suite ||= stub("TestSuite",
-                  :test_methods => [fake_test_method],
-                  :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))
+  @suite ||= double("TestSuite",
+                  :test_methods => [test_method],
+                  :instance_method => fake_instance_method(test_method))
 end
 
 def fake_test_method
@@ -35,7 +29,7 @@ def fake_special_characters_test_method
 end
 
 def fake_instance_method(name=fake_test_method)
-  @instance_method ||=  stub("InstanceMethod",
+  @instance_method ||=  double("InstanceMethod",
                              :source_location => ["path/to/file.rb", 2],
                              :source => "def #{name} \n assert true \n end")
 end

data/spec/m_spec.rb

@@ -3,106 +3,102 @@ require 'fake_mini_test'
 
 module Zeus::M
   describe Runner do
+    let(:test_method) { fake_test_method }
+
+    before(:each) 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
+      let(:test_method) { fake_special_characters_test_method }
 
       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\\?)/"])
+        expect(fake_runner).to receive(:run).with(["-n", "/(test_my_test_method\\?)/"])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
       end
 
       it "does not escape regex on explicit names" do
         argv = ["path/to/file.rb", "--name", fake_special_characters_test_method]
 
-        fake_runner.should_receive(:run).with(["-n", "test_my_test_method?"])
+        allow(fake_runner).to receive(:run).with(["-n", "test_my_test_method?"])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
       end
     end
-  end
-
-  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
+    context "given no option" do
+      it "runs the test" do
         argv = ["path/to/file.rb"]
 
-        fake_runner.should_receive(:run).with([])
+        allow(fake_runner).to receive(:run).with([])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
       end
     end
 
     context "given a line number" do
-      it "aborts if no test is found" do
+      it "aborts if no test is found on that line number" do
         argv = ["path/to/file.rb:100"]
 
-        STDERR.should_receive(:write).with(/No tests found on line 100/)
-        fake_runner.should_not_receive :run
+        expect(STDERR).to receive(:write).with(/No tests found on line 100/)
+        expect(fake_runner).to_not receive :run
 
-        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to_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})/"])
+        expect(fake_runner).to receive(:run).with(["-n", "/(#{fake_test_method})/"])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to exit_with_code(0)
       end
     end
 
-    context "specifying test name" do
+    context "given a specific 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}/"])
+        expect(fake_runner).to receive(:run).with(["-n", "/#{fake_test_method}/"])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to 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/"])
+        expect(fake_runner).to receive(:run).with(["-n", "/method/"])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to 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
+        expect(STDERR).to receive(:write).with(%r{No test name matches \'/garbage/\'})
+        expect(fake_runner).to_not receive :run
 
-        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to_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])
+        expect(fake_runner).to receive(:run).with(["-n", fake_test_method])
 
-        lambda { Runner.new(argv).run }.should exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to 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
+        expect(STDERR).to receive(:write).with(%r{No test name matches \'method\'})
+        expect(fake_runner).to_not receive :run
 
-        lambda { Runner.new(argv).run }.should_not exit_with_code(0)
+        expect(lambda { Runner.new(argv).run }).to_not exit_with_code(0)
       end
     end
   end

data/spec/rails_spec.rb

@@ -4,69 +4,84 @@ module Zeus
   describe Rails do
     subject(:rails) { Rails.new }
 
-    context "#test_helper" do
+    describe "#test_helper" do
       before(:each) do
-        rails.should_receive(:require).with("minitest/unit")
+        # 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
 
-      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")
+      context "when ENV['RAILS_TEST_HELPER'] is set" do
+        it "loads the test helper file from the environment variable" do
+          helper = "a_test_helper"
+          allow(ENV).to receive(:[]).with("RAILS_TEST_HELPER").and_return(helper)
 
-        rails.test_helper
-        ENV.clear
+          expect(rails).to receive(:require).with(helper)
+          rails.test_helper
+        end
       end
 
-      it "requires rails_helper when using rspec 3.0+" do
-        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", true)
+      context "when using rspec" do
+        context "3.0+" do
+          it "requires rails_helper" do
+            mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", true)
 
-        rails.should_receive(:require).with("rails_helper")
+            expect(rails).to receive(:require).with("rails_helper")
 
-        rails.test_helper
-      end
+            rails.test_helper
+          end
+        end
 
-      it "when spec_helper exists spec_helper is required" do
-        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
-        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", true)
+        it "requires spec_helper" do
+          mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
+          mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", true)
 
-        rails.should_receive(:require).with("spec_helper")
+          expect(rails).to receive(:require).with("spec_helper")
 
-        rails.test_helper
+          rails.test_helper
+        end
       end
 
-      it "when minitest_helper exists minitest_helper is required" do
-        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
-        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
-        mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", true)
+      context "when using minitest" do
+        it "requires minitest_helper" do
+          mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
+          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")
+          expect(rails).to receive(:require).with("minitest_helper")
 
-        rails.test_helper
+          rails.test_helper
+        end
       end
 
-      it "when there is no rspec helpers or minitest_helper, test_helper is required" do
-        mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
-        mock_file_existence(ROOT_PATH + "/spec/spec_helper.rb", false)
-        mock_file_existence(ROOT_PATH + "/test/minitest_helper.rb", false)
+      context "when there are no rspec or minitest helpers" do
+        it "requires test_helper" do
+          mock_file_existence(ROOT_PATH + "/spec/rails_helper.rb", false)
+          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")
+          expect(rails).to receive(:require).with("test_helper")
 
-        rails.test_helper
+          rails.test_helper
+        end
       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'
+    describe "#gem_is_bundled?" do
+      context "for a bundled gem" do
+        it "returns the bundled gem's version" do
+          allow(File).to receive(: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)
+  ")
+          expect(gem_is_bundled?('rake')).to eq '10.0.4'
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -10,11 +10,11 @@ RSpec::Matchers.define :exit_with_code do |exp_code|
     end
     actual and actual == exp_code
   end
-  failure_message_for_should do |block|
+  failure_message 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|
+  failure_message_when_negated do |block|
     "expected block not to call exit(#{exp_code})"
   end
   description do
@@ -23,12 +23,12 @@ RSpec::Matchers.define :exit_with_code do |exp_code|
 end
 
 def stub_system_methods
-  Dir.stub!(:glob).and_return(["path/to/file.rb"])
-  Kernel.stub!(:load).and_return
+  allow(Dir).to receive(:glob).and_return(["path/to/file.rb"])
+  allow(Kernel).to receive(:load)
 end
 
 def mock_file_existence(file, result)
-  File.should_receive(:exists?).with(file).and_return(result)
+  expect(File).to receive(:exists?).with(file).and_return(result)
 end
 
 RSpec.configure do |config|

data/zeus.gemspec

@@ -27,9 +27,7 @@ Gem::Specification.new do |gem|
   gem.version       = version
   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"
+
+  gem.add_development_dependency "bundler", '~> 1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,72 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2015-01-21 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: rake
+  name: method_source
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.6.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.6'
   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
-  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
+        version: '1.6'
 description: Boot any rails app in under a second
 email:
 - burke@libbey.me
@@ -134,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3094523066757945393
+      hash: -3287208852062006683
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -143,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3094523066757945393
+      hash: -3287208852062006683
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23