gorgon 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    gorgon (0.6.1)
-      amqp (~> 0.9.7)
+    gorgon (0.6.2)
+      amqp (~> 1.1.0)
       awesome_print
       colorize (~> 0.5.8)
       open4 (~> 1.3.0)
@@ -13,13 +13,9 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    amq-client (0.9.12)
-      amq-protocol (>= 1.2.0)
-      eventmachine
-    amq-protocol (1.2.0)
-    amqp (0.9.10)
-      amq-client (~> 0.9.12)
-      amq-protocol (~> 1.2.0)
+    amq-protocol (1.8.0)
+    amqp (1.1.0)
+      amq-protocol (>= 1.8.0)
       eventmachine
     awesome_print (1.2.0)
     colorize (0.5.8)

data/gorgon.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "test-unit"
   s.add_development_dependency "rspec", '~>2.11.0'
 
-  s.add_runtime_dependency "amqp", '~>0.9.7'
+  s.add_runtime_dependency "amqp", '~> 1.1.0'
   s.add_runtime_dependency "awesome_print"
   s.add_runtime_dependency "open4", '~>1.3.0'
   s.add_runtime_dependency "ruby-progressbar", '~>1.0.1'

data/lib/gorgon/originator.rb

@@ -25,7 +25,7 @@ class Originator
 
       publish
       @logger.log "Originator finished successfully"
-    rescue Exception
+    rescue StandardError
       puts "Unhandled exception in originator:"
       puts $!.message
       puts $!.backtrace.join("\n")
@@ -51,8 +51,18 @@ class Originator
 
   def publish
     @logger = OriginatorLogger.new configuration[:originator_log_file]
+
+    if files.empty?
+      $stderr.puts "There are no files to test! Quitting."
+      exit 2
+    end
+
+    if !@rsync_daemon.start
+      @logger.log_error "rsync daemon didn't start!"
+      exit 1
+    end
+
     @protocol = OriginatorProtocol.new @logger
-    @rsync_daemon.start
 
     EventMachine.run do
       @logger.log "Connecting..."

data/lib/gorgon/progress_bar_view.rb

@@ -97,7 +97,7 @@ private
     @job_state.each_failed_test do |test|
       puts "\n" + ('*' * 80).magenta #light_red
       puts("File '#{test[:filename].colorize(Colors::FILENAME)}' failed/crashed at " \
-           + "'#{test[:hostname].colorize(Colors::HOST)}'\n")
+           + "'#{test[:hostname].colorize(Colors::HOST)}:#{test[:worker_id]}'\n")
       msg = build_fail_message test[:failures]
       puts "#{msg}\n"
     end
@@ -137,10 +137,7 @@ private
     result = "#{'Test name'.light_yellow}: #{failure[:test_name]}"
     result << "\n#{failure[:class].red}" if failure[:class]
     result << "\n#{'Message:'.light_yellow} \n\t#{failure[:message]}" if failure[:message]
-    if failure[:location]
-      result << "\n#{'In:'.light_yellow} \n\t"
-      result << failure[:location].join("\n\t")
-    end
+    result << "\n"
     result
   end
 end

data/lib/gorgon/rsync_daemon.rb

@@ -2,6 +2,9 @@ require "tmpdir"
 
 class RsyncDaemon
   #for now, creates a readonly rsync daemon for the current directory on the mountpath "src"
+  RSYNC_DIR_NAME = "#{Dir.tmpdir}/gorgon_rsync_daemon"
+  RSYNC_PORT = 43434
+  PID_FILE = 'rsync.pid'
 
   def initialize
     @project_directory = Dir.pwd
@@ -10,9 +13,15 @@ class RsyncDaemon
 
   def start
     return if @started
-    @tmpdir = Dir.mktmpdir("gorgon")
+
+    if !port_available?
+      puts port_busy_msg
+      return false
+    end
+    
+    Dir.mkdir(RSYNC_DIR_NAME)
     success = nil
-    Dir.chdir(@tmpdir) do
+    Dir.chdir(RSYNC_DIR_NAME) do
       File.write("rsyncd.conf", rsyncd_config_string(@project_directory))
 
       success = Kernel.system("rsync --daemon --config rsyncd.conf")
@@ -30,13 +39,14 @@ class RsyncDaemon
     return unless @started
 
     success = nil
-    Dir.chdir(@tmpdir) do
-      pid = File.read("rsync.pid")
+    Dir.chdir(RSYNC_DIR_NAME) do
+      pid = File.read(PID_FILE)
       success = Kernel.system("kill #{pid}")
     end
 
     if success
       @started = false
+      FileUtils::remove_entry_secure(RSYNC_DIR_NAME)
       return true
     else
       return false
@@ -47,8 +57,8 @@ class RsyncDaemon
 
   def rsyncd_config_string(shared_dir)
     return <<-EOF
-port = 43434
-pid file = rsync.pid
+port = #{RSYNC_PORT}
+pid file = #{PID_FILE}
 
 [src]
   path = #{@project_directory}
@@ -56,4 +66,21 @@ pid file = rsync.pid
   use chroot = false
 EOF
   end
-end
+
+  def port_available?
+    begin
+      s = TCPServer.new('localhost', RSYNC_PORT)
+      s.close
+      return true
+    rescue Errno::EADDRINUSE => _
+      return false
+    end
+  end
+
+  def port_busy_msg
+<<-MSG
+  ERROR: port #{RSYNC_PORT} is being used. Maybe another rsync daemon is running.
+  Kill pid in #{RSYNC_DIR_NAME}/#{PID_FILE} or check no other process is using that port."
+MSG
+  end
+end

data/lib/gorgon/version.rb

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

data/spec/originator_spec.rb

@@ -15,6 +15,7 @@ describe Originator do
   before do
     OriginatorLogger.stub(:new).and_return originator_logger
     RsyncDaemon.stub(:new).and_return rsync_daemon
+    Dir.stub(:[]).and_return(["file"])
     @originator = Originator.new
   end
 
@@ -42,6 +43,16 @@ describe Originator do
 
       @originator.publish
     end
+
+    it "errors and halts when there are no test files" do
+      Dir.stub(:[] => [])
+
+      $stderr.should_receive(:puts)
+      OriginatorProtocol.should_not_receive(:new)
+      rsync_daemon.should_not_receive(:start)
+
+      expect { @originator.publish }.to raise_error(SystemExit)
+    end
   end
 
   describe "#cancel_job" do

data/spec/rsync_daemon_spec.rb

@@ -3,9 +3,10 @@ require 'gorgon/rsync_daemon'
 describe RsyncDaemon do
   before(:each) do
     Kernel.stub(:system => true)
-    Dir.stub(:mktmpdir => "loltmpdir", :pwd => "/lol/hax")
+    Dir.stub(:mkdir => nil, :pwd => "/lol/hax")
     Dir.stub(:chdir).and_yield
     File.stub(:write => 100, :read => "12345")
+    FileUtils.stub(:remove_entry_secure => nil)
     @r = RsyncDaemon.new
   end
 
@@ -15,9 +16,9 @@ describe RsyncDaemon do
     @r.start
   end
 
-  it "creates a temporary directory for the configuration and pid files" do
-    Dir.should_receive(:mktmpdir).with("gorgon").and_return("loltmpdir")
-    Dir.should_receive(:chdir).with("loltmpdir")
+  it "creates a directory in temporary dir for the configuration and pid files" do
+    Dir.should_receive(:mkdir).with(RsyncDaemon::RSYNC_DIR_NAME)
+    Dir.should_receive(:chdir).with(RsyncDaemon::RSYNC_DIR_NAME)
 
     @r.start
   end
@@ -72,4 +73,4 @@ EOF
     @r.stop
     @r.start
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gorgon
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -78,7 +78,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 337737538623619091
+      hash: 3410208500792599810
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 337737538623619091
+      hash: 3410208500792599810
 requirements: []
 rubyforge_project: gorgon
 rubygems_version: 1.8.25