specjour 0.1.15 → 0.1.16

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/lib/specjour/db_scrub.rb

@@ -6,6 +6,7 @@ module Specjour
     def scrub
       connect_to_database
       if pending_migrations?
+        Rake::Task['db:test:purge'].invoke
         Rake::Task['db:schema:load'].invoke
       else
         purge_tables

data/lib/specjour/dispatcher.rb

@@ -2,6 +2,7 @@ module Specjour
   class Dispatcher
     require 'dnssd'
     Thread.abort_on_exception = true
+    include SocketHelpers
 
     attr_reader :project_path, :managers, :manager_threads, :hosts
     attr_accessor :worker_size
@@ -73,10 +74,6 @@ module Specjour
       printer.worker_size = worker_size
     end
 
-    def hostname
-      @hostname ||= Socket.gethostname
-    end
-
     def printer
       @printer ||= begin
         p = Printer.new
@@ -95,7 +92,7 @@ module Specjour
 
     def resolve_reply(reply)
       DNSSD.resolve!(reply) do |resolved|
-        resolved_ip = Specjour.ip_from_hostname(resolved.target)
+        resolved_ip = ip_from_hostname(resolved.target)
         uri = URI::Generic.build :scheme => reply.service_name, :host => resolved_ip, :port => resolved.port
         fetch_manager(uri)
         resolved.service.stop if resolved.service.started?

data/lib/specjour/manager.rb

@@ -2,6 +2,7 @@ module Specjour
   class Manager
     require 'dnssd'
     include DRbUndumped
+    include SocketHelpers
 
     attr_accessor :project_name, :specs_to_run
     attr_reader :worker_size, :batch_size, :dispatcher_uri, :registered_projects, :bonjour_service, :worker_pids
@@ -26,7 +27,7 @@ module Specjour
     end
 
     def dispatcher_uri=(uri)
-      uri.host = Specjour.ip_from_hostname(uri.host)
+      uri.host = ip_from_hostname(uri.host)
       @dispatcher_uri = uri
     end
 

data/lib/specjour/socket_helpers.rb

@@ -0,0 +1,11 @@
+module Specjour
+  module SocketHelpers
+    def ip_from_hostname(hostname)
+      Socket.getaddrinfo(hostname, nil, Socket::AF_INET, Socket::SOCK_STREAM).first.fetch(3)
+    end
+
+    def hostname
+      @hostname ||= Socket.gethostname
+    end
+  end
+end

data/lib/specjour/worker.rb

@@ -1,6 +1,7 @@
 module Specjour
   class Worker
     include Protocol
+    include SocketHelpers
     attr_accessor :printer_uri
     attr_reader :project_path, :specs_to_run, :number, :batch_size
 

data/lib/specjour.rb

@@ -21,9 +21,10 @@ module Specjour
   autoload :MarshalableFailureFormatter, 'specjour/marshalable_failure_formatter'
   autoload :Printer, 'specjour/printer'
   autoload :RsyncDaemon, 'specjour/rsync_daemon'
+  autoload :SocketHelpers, 'specjour/socket_helpers'
   autoload :Worker, 'specjour/worker'
 
-  VERSION = "0.1.15".freeze
+  VERSION = "0.1.16".freeze
 
   class Error < StandardError; end
 
@@ -40,8 +41,4 @@ module Specjour
   def self.log?
     logger.level != Logger::UNKNOWN
   end
-
-  def self.ip_from_hostname(hostname)
-    Socket.getaddrinfo(hostname, nil, Socket::AF_INET, Socket::SOCK_STREAM).first.fetch(3)
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Sandro Turriate
@@ -100,6 +100,7 @@ files:
 - lib/specjour/printer.rb
 - lib/specjour/protocol.rb
 - lib/specjour/rsync_daemon.rb
+- lib/specjour/socket_helpers.rb
 - lib/specjour/tasks/dispatch.rake
 - lib/specjour/tasks/specjour.rb
 - lib/specjour/worker.rb