manager.rb in sanford-0.2.0

- old
+ new
@@ -1,45 +1,36 @@
-# The Manager class is responsible for managing sanford's server process. Given
-# a host, it can start and stop the host's server process. This is done using
-# the Daemons gem and `run_proc`. The class provides a convenience method on the
-# class called `call`, which will find a host, build a new manager and call the
-# relevant action (this is what the rake tasks use).
-#
 require 'daemons'
 
-require 'sanford/config'
-require 'sanford/exceptions'
+require 'sanford/host_data'
 require 'sanford/server'
 
 module Sanford
 
   class Manager
-    attr_reader :host, :process_name
 
     def self.call(action, options = nil)
       options ||= {}
-      options[:host]  ||= ENV['SANFORD_HOST']
       options[:ip]    ||= ENV['SANFORD_IP']
       options[:port]  ||= ENV['SANFORD_PORT']
 
-      host_class = if (host_class_or_name = options.delete(:host))
-        Sanford.config.find_host(host_class_or_name)
-      else
-        Sanford.config.hosts.first
-      end
-      raise(Sanford::NoHostError.new(host_class_or_name)) if !host_class
-      self.new(host_class, options).call(action)
+      name = options.delete(:host) || ENV['SANFORD_HOST']
+      service_host = name ? Sanford.hosts.find(name) : Sanford.hosts.first
+      raise(Sanford::NoHostError.new(name)) if !service_host
+
+      self.new(service_host, options).call(action)
     end
 
-    def initialize(host_class, options = {})
-      @host = host_class.new(options)
+    attr_reader :host, :process_name
+
+    def initialize(service_host, options = {})
+      @host = Sanford::HostData.new(service_host, options)
       @process_name = [ self.host.ip, self.host.port, self.host.name ].join('_')
     end
 
     def call(action)
-      options = self.default_options.merge({ :ARGV => [ action.to_s ] })
-      FileUtils.mkdir_p(options[:dir])
-      ::Daemons.run_proc(self.process_name, options) do
+      daemons_options = self.default_options.merge({ :ARGV => [ action.to_s ] })
+      FileUtils.mkdir_p(daemons_options[:dir])
+      ::Daemons.run_proc(self.process_name, daemons_options) do
         server = Sanford::Server.new(self.host)
         server.start
         server.join_thread
       end
     end