spec_run_queue 0.0.2 → 0.0.4

data/README.markdown

@@ -39,6 +39,7 @@ In order to trigger a queue run, you need your editor to insert a YAML dump of t
 TODO
 ====
 
+* Check for Gemfile to bundle exec the spec bin
 * Genericify and configure the runner
 * Include code or a plugin for the vim script I'm using to inject instructions into the queue
 * Investigate a custom rspec runner in place of the current shell execution method

data/bin/redis_runner

@@ -15,7 +15,7 @@ end
 
 runner = SpecRunQueue::SystemRunner.new(rspec_major_version)
 runner.add_notifier SpecRunQueue::Notifier::Growl.new(:password => "gr0wl")
-runner.add_notifier SpecRunQueue::Notifier::Stdout.new()
+# runner.add_notifier SpecRunQueue::Notifier::Stdout.new()
 
 queue = SpecRunQueue::Queue::Redis.new(runner)
 queue.run

data/lib/spec_run_queue.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'yaml'
-require 'ruby-growl'
 
 module SpecRunQueue
 end

data/lib/spec_run_queue/notifier/growl.rb

@@ -1,3 +1,5 @@
+require 'ruby-growl'
+
 module SpecRunQueue
   module Notifier
     class Growl < Base
@@ -22,7 +24,7 @@ module SpecRunQueue
       end
 
       def growl
-        @growl ||= Growl.new "127.0.0.1", "rspec-growl", ["rspec-growl Notification"], nil, config[:password]
+        @growl ||= ::Growl.new "127.0.0.1", "rspec-growl", ["rspec-growl Notification"], nil, config[:password]
       end
 
       def short_message

data/lib/spec_run_queue/queue/base.rb

@@ -10,14 +10,32 @@ module SpecRunQueue
       end
 
       def run
-        while (raw_instruction = queue_fetch)
-          instruction = YAML.load(raw_instruction[1])
-          runner.run_spec(instruction)
+        with_reconnect do
+          while (raw_instruction = queue_fetch)
+            instruction = YAML.load(raw_instruction[1])
+            runner.run_spec(instruction)
+          end
         end
       end
 
+      def self.run_rescue_exceptions
+        []
+      end
+
       private
 
+      def with_reconnect
+        begin
+          yield
+        # rescue *self.class.run_rescue_exceptions => e
+        rescue => e
+          $stderr.puts "exception #{e.class} occurred, reconnecting..."
+          sleep(1)
+          connect
+          retry
+        end
+      end
+
       def connect
         raise "Abstract method"
       end

data/lib/spec_run_queue/queue/redis.rb

@@ -1,3 +1,4 @@
+require 'digest/md5'
 require 'redis'
 
 module SpecRunQueue
@@ -6,9 +7,13 @@ module SpecRunQueue
       attr_reader :redis
 
       def self.queue_key
-        "rspec" 
+        @queue_key ||= ["spec_run_queue", Digest::MD5.hexdigest(Dir.pwd)].join(':') 
       end
 
+      # def self.run_rescue_exceptions
+        # [Errno::EAGAIN]
+      # end
+
       private
 
       def connect

data/lib/spec_run_queue/system_runner.rb

@@ -29,9 +29,10 @@ module SpecRunQueue
       end
 
       begin
-        cmd = "#{rspec_bin} -f progress --drb" 
+        cmd = "#{rspec_bin} -f nested --drb" 
         cmd << " -l #{instruction[:line]}" if instruction[:line]
         cmd << " #{instruction[:target]}"
+        puts "Running command #{cmd}"
         output = run_cmd(cmd)
 
         output_to_notifiers(output)
@@ -46,7 +47,14 @@ module SpecRunQueue
     private
 
     def run_cmd(cmd)
-      `#{cmd}`
+      specs = IO.popen cmd
+      output = ""
+      while line = specs.gets
+        output += line
+        puts line
+      end
+
+      output
     end
 
     def output_to_notifiers(output, options = {})

data/lib/spec_run_queue/version.rb

@@ -1,3 +1,3 @@
 module SpecRunQueue
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/spec/queue/redis_spec.rb

@@ -3,23 +3,25 @@ require 'spec_run_queue/queue/redis'
 
 describe SpecRunQueue::Queue::Redis do
   before(:each) do
+    Dir.stub!(:pwd).and_return("/tmp")
+    @queue_key = "spec_run_queue:d42b9c57d24cf5db3bd8d332dc35437f" # /tmp hashed
     @redis_mock = mock("Redis", :del => true, :blpop => true)
     ::Redis.stub!(:new).and_return(@redis_mock)
     @runner_mock = mock("Runner")
     @redis_queue = SpecRunQueue::Queue::Redis.new(@runner_mock)
   end
 
-  it "should have 'rspec' as the key" do
-    SpecRunQueue::Queue::Redis.queue_key.should == "rspec"
+  it "should have 'spec_run_queue:<md5string>' as the key" do
+    SpecRunQueue::Queue::Redis.queue_key.should == @queue_key
   end
 
   it "should reset the queue by deleting the queue key" do
-    @redis_mock.should_receive(:del).with("rspec")
+    @redis_mock.should_receive(:del).with(@queue_key)
     SpecRunQueue::Queue::Redis.new(@runner_mock)
   end
 
   it "should blpop instructions off the redis queue" do
-    @redis_mock.should_receive(:blpop).with("rspec", 0).and_return(nil)
+    @redis_mock.should_receive(:blpop).with(@queue_key, 0).and_return(nil)
     @redis_queue.run
   end
 end

data/spec/system_runner_spec.rb

@@ -65,12 +65,12 @@ describe SpecRunQueue::SystemRunner do
     end
 
     it "should call to run the spec" do
-      runner.should_receive(:run_cmd).with("spec -f progress --drb foo_spec.rb")
+      runner.should_receive(:run_cmd).with("spec -f nested --drb foo_spec.rb")
       runner.run_spec(:target => "foo_spec.rb")
     end
 
     it "should send the output from the run to all the notifiers" do
-      runner.should_receive(:run_cmd).with("spec -f progress --drb foo_spec.rb").and_return("spec output")
+      runner.should_receive(:run_cmd).with("spec -f nested --drb foo_spec.rb").and_return("spec output")
       foo_notifier.should_receive(:notify).with("spec output", {})
       bar_notifier.should_receive(:notify).with("spec output", {})
       runner.run_spec(:target => "foo_spec.rb")
@@ -78,7 +78,7 @@ describe SpecRunQueue::SystemRunner do
 
     context "with a line number" do
      it "should call to run the spec using the -l flag" do
-      runner.should_receive(:run_cmd).with("spec -f progress --drb -l 42 foo_spec.rb")
+      runner.should_receive(:run_cmd).with("spec -f nested --drb -l 42 foo_spec.rb")
       runner.run_spec(:target => "foo_spec.rb", :line => 42)
      end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spec_run_queue
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Brendon Murphy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -07:00
+date: 2011-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: []