lib/gitdocs.rb in gitdocs-0.3.0 vs lib/gitdocs.rb in gitdocs-0.3.1

@@ -1,46 +1,26 @@
 require 'gitdocs/version'
 require 'gitdocs/configuration'
 require 'gitdocs/runner'
 require 'gitdocs/server'
 require 'gitdocs/cli'
+require 'gitdocs/manager'
 require 'thread'
 require 'rb-fsevent'
 require 'growl'
 require 'yajl'
 require 'dante'
+require 'socket'
 
 module Gitdocs
 
   DEBUG = ENV['DEBUG']
 
-  def self.run(config_root = nil, debug = DEBUG)
-    loop do
-      config = Configuration.new(config_root)
-      yield config if block_given?
-      puts "Gitdocs v#{VERSION}" if debug
-      puts "Using configuration root: '#{config.config_root}'" if debug
-      puts "Shares: #{config.shares.map(&:inspect).join(", ")}" if debug
-      # Start the repo watchers
-      runners = []
-      threads = config.shares.map do |share|
-        t = Thread.new(runners) { |r|
-          runner = Runner.new(share)
-          r << runner
-          runner.run
-        }
-        t.abort_on_exception = true
-        t
-      end
-      sleep 1
-      unless defined?(pid) && pid
-        # Start the web front-end
-        pid = fork { Server.new(config, *runners).start }
-        at_exit { Process.kill("KILL", pid) rescue nil }
-      end
-      puts "Watch threads: #{threads.map { |t| "Thread status: '#{t.status}', running: #{t.alive?}" }}" if debug
-      puts "Joined #{threads.size} watch threads...running" if debug
-      threads.each(&:join)
-      sleep(60)
-    end
+  def self.run(config_root = nil, debug = DEBUG, &blk)
+    @manager = Manager.new(config_root, debug, &blk)
+    @manager.run
+  end
+
+  def self.restart
+    @manager.restart
   end
 end