gorgon 0.6.0 → 0.6.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gorgon (0.6.0.rc2)
+    gorgon (0.6.1)
       amqp (~> 0.9.7)
       awesome_print
       colorize (~> 0.5.8)
@@ -21,7 +21,7 @@ GEM
       amq-client (~> 0.9.12)
       amq-protocol (~> 1.2.0)
       eventmachine
-    awesome_print (1.1.0)
+    awesome_print (1.2.0)
     colorize (0.5.8)
     diff-lcs (1.1.3)
     eventmachine (1.0.3)

data/lib/gorgon/originator_logger.rb

@@ -9,7 +9,7 @@ class OriginatorLogger
 
   def log_message(payload)
     if payload[:action] == "start"
-      log("Started running '#{payload[:filename]}' at '#{payload[:hostname]}'")
+      log("Started running '#{payload[:filename]}' at '#{payload[:hostname]}:#{payload[:worker_id]}'")
     elsif payload[:action] == "finish"
       print_finish(payload)
     elsif payload[:type] == "crash" || payload[:type] == "exception"
@@ -23,7 +23,7 @@ class OriginatorLogger
   private
 
   def print_finish(payload)
-    msg = "Finished running '#{payload[:filename]}' at '#{payload[:hostname]}'"
+    msg = "Finished running '#{payload[:filename]}' at '#{payload[:hostname]}:#{payload[:worker_id]}'"
     msg << failure_message(payload[:failures]) if payload[:type] == "fail"
     log msg
   end

data/lib/gorgon/version.rb

@@ -1,3 +1,3 @@
 module Gorgon
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/spec/listener_spec.rb

@@ -97,8 +97,8 @@ describe Listener do
 
     describe "#poll" do
 
-      let(:empty_queue) { {:payload => :queue_empty} }
-      let(:job_payload) { {:payload => Yajl::Encoder.encode({:type => "job_definition"}) } }
+      let(:empty_queue) { [nil, nil, nil] }
+      let(:job_payload) { [nil, nil, Yajl::Encoder.encode({:type => "job_definition"})] }
       before do
         listener.stub(:run_job)
       end
@@ -135,9 +135,7 @@ describe Listener do
       end
 
       context "ping message pending on queue" do
-        let(:ping_payload) {{
-            :payload => Yajl::Encoder.encode({:type => "ping", :reply_exchange_name => "name",
-                                               :body => {}}) }}
+        let(:ping_payload) { [nil, nil, Yajl::Encoder.encode({:type => "ping", :reply_exchange_name => "name", :body => {}}) ] }
 
         before do
           queue.stub!(:pop => ping_payload)
@@ -165,7 +163,7 @@ describe Listener do
         let(:gem_command_handler) { stub("GemCommandHandler", :handle => nil)  }
         let(:configuration) { {:worker_slots => 3} }
         before do
-          queue.stub!(:pop => {:payload => Yajl::Encoder.encode(payload)})
+          queue.stub!(:pop => [nil, nil, Yajl::Encoder.encode(payload)])
           listener.stub(:configuration).and_return(configuration)
         end
 

data/spec/originator_logger_spec.rb

@@ -11,16 +11,18 @@ describe OriginatorLogger do
     it "prints start messages" do
       payload = {:action => "start",
                  :hostname => "host",
-                 :filename => "filename"}
-      originator_logger.should_receive(:log).with("Started running 'filename' at 'host'")
+                 :filename => "filename",
+                 :worker_id => "a_worker_id"}
+      originator_logger.should_receive(:log).with("Started running 'filename' at 'host:a_worker_id'")
       originator_logger.log_message(payload)
     end
 
     it "prints finish messages" do
       payload = {:action => "finish",
                  :hostname => "host",
-                 :filename => "filename"}
-      originator_logger.should_receive(:log).with("Finished running 'filename' at 'host'")
+                 :filename => "filename",
+                 :worker_id => "a_worker_id"}
+      originator_logger.should_receive(:log).with("Finished running 'filename' at 'host:a_worker_id'")
       originator_logger.log_message(payload)
     end
 
@@ -29,11 +31,12 @@ describe OriginatorLogger do
                  :type => "fail",
                  :hostname => "host",
                  :filename => "filename",
+                 :worker_id => "a_worker_id",
                  :failures => [
                    "failure"
                  ]}
 
-      originator_logger.should_receive(:log).with("Finished running 'filename' at 'host'failure\n")
+      originator_logger.should_receive(:log).with("Finished running 'filename' at 'host:a_worker_id'failure\n")
       originator_logger.log_message(payload)
     end
   end

data/spec/originator_protocol_spec.rb

@@ -39,13 +39,13 @@ describe OriginatorProtocol do
 
     it "opens a reply and exchange queue" do
       UUIDTools::UUID.stub!(:timestamp_create).and_return 1
-      channel.should_receive(:queue).once.with("reply_queue_1")
+      channel.should_receive(:queue).once.with("reply_queue_1", :auto_delete => true)
       @originator_p.connect @conn_information
     end
 
     it "opens a reply exchange and binds reply queue to it" do
       UUIDTools::UUID.stub!(:timestamp_create).and_return 1
-      channel.should_receive(:direct).with("reply_exchange_1")
+      channel.should_receive(:direct).with("reply_exchange_1", :auto_delete => true)
       queue.should_receive(:bind).with(exchange)
       @originator_p.connect @conn_information
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -322,15 +322,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 337737538623619091
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 337737538623619091
 requirements: []
 rubyforge_project: gorgon
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Distributed testing for ruby with centralized management