lsync 2.0.2 → 2.1.0

data/lib/lsync.rb

@@ -30,4 +30,11 @@ require 'optparse'
 require 'open-uri'
 
 module LSync
+	
+	def self.run_script(options = {}, &block)
+		script = LSync::Script.new(options, &block)
+		
+		script.run!
+	end
+	
 end

data/lib/lsync/controller.rb

@@ -0,0 +1,62 @@
+
+module LSync
+	class BasicController
+		def initialize(script, logger)
+			@script = script
+			@logger = logger
+		end
+
+		# The containing script.
+		attr :script
+
+		# The output logger.
+		attr :logger
+	end
+
+	# The server controller provides event handlers with a unified interface
+	# for dealing with servers and associated actions.
+	class ServerController < BasicController
+		def initialize(script, logger, server)
+			super(script, logger)
+			
+			@server = server
+		end
+
+		# The current server.
+		attr :server
+
+		# Run a given shell script on the server.
+		def run!(*function)
+			action = Action.new(function)
+			action.run_on_server(@server, @logger)
+		end
+	end
+	
+	class CopyController < BasicController
+		def initialize(script, logger, master, target)
+			super(script, logger)
+			
+			@master = ServerController.new(script, logger, master)
+			@target = ServerController.new(script, logger, target)
+		end
+		
+		# The master server controller (where the data is being copied from).
+		attr :master
+		
+		# The target server controller (where the data is being copied to).
+		attr :target
+	end
+	
+	# The directory controller provides event handlers with a unified interface
+	# for dealing with a particular backup in a particular directory.
+	class DirectoryController < CopyController
+		def initialize(script, logger, master, target, directory)
+			super(script, logger, master, target)
+
+			@directory = directory
+		end
+
+		# The directory that the data is being copied within.
+		attr :directory
+	end
+end

data/lib/lsync/event_timer.rb

@@ -39,7 +39,7 @@ module LSync
 			@fired = nil
 			@timeout = nil
 			
-			@callback = Proc.new(&block)
+			@callback = block
 			@processing = Mutex.new
 		end
 		

data/lib/lsync/script.rb

@@ -5,71 +5,29 @@ require 'lsync/action'
 require 'lsync/method'
 require 'lsync/server'
 require 'lsync/directory'
+require 'lsync/controller'
 
 module LSync
-	
-	# The server controller provides event handlers with a unified interface
-	# for dealing with servers and associated actions.
-	class ServerController
-		def initialize(script, server, logger)
-			@script = script
-			@server = server
-			@logger = logger
-		end
-		
-		# The containing script.
-		attr :script
-		
-		# The current server.
-		attr :server
-		
-		# The output logger.
-		attr :logger
-		
-		# Run a given shell script on the server.
-		def run!(*function)
-			action = Action.new(function)
-			action.run_on_server(@server, @logger)
-		end
-	end
-	
-	# The directory controller provides event handlers with a unified interface
-	# for dealing with a particular backup in a particular directory.
-	class DirectoryController < ServerController
-		def initialize(script, master, server, directory, logger)
-			super(script, server, logger)
-			
-			@master = master
-			@directory = directory
-		end
-		
-		# The master server where data is being copied from.
-		attr :master
-		
-		# The directory that the data is being copied within.
-		attr :directory
-	end
-	
 	# The main backup/synchronisation mechanism is the backup script. It specifies all
 	# servers and directories, and these are then combined specifically to produce the
 	# desired data replication behaviour.
 	class Script
 		include EventHandler
-		
+
 		def initialize(options = {}, &block)
 			@logger = options[:logger] || Logger.new($stdout)
 			@method = nil
-			
+
 			@servers = {}
 			@directories = []
 
 			@log = nil
-			
+
 			if block_given?
 				instance_eval &block
 			end
 		end
-		
+
 		# Given a name, find out which server config matches it
 		def find_named_server name
 			if @servers.key? name
@@ -79,19 +37,19 @@ module LSync
 				return @servers.values.find { |s| s["host"] == hostname }
 			end
 		end
-		
+
 		alias :[] :find_named_server
-		
+
 		# Find the master server based on the name #master= specified
 		def find_master_server
 			find_named_server(@master)
 		end
-		
+
 		# Find out the config section for the current server
 		def find_current_server
 			master = find_master_server
 			server = nil
-			
+
 			# Find out if the master server is local...
 			if master.is_local?
 				server = master
@@ -99,59 +57,61 @@ module LSync
 				# Find a server config that specifies the local host
 				server = @servers.values.find { |s| s.is_local? }
 			end
-			
+
 			return server
 		end
-		
+
 		# Register a server with the backup script.
-		def server(name, &block)
+		def server(name)
 			case name
 			when Symbol
 				host = "localhost"
 			else
 				host = name.to_s
 			end
-			
+
 			server = Server.new(host)
-			
+
 			yield server if block_given?
-			
+
 			@servers[name] = server
 		end
-		
+
 		# Backup a particular path (or paths).
-		def backup(*paths, &block)
+		def copy(*paths)
 			paths.each do |path|
 				directory = Directory.new(path)
-				
+
 				yield directory if block_given?
-				
+
 				@directories << directory
 			end
 		end
 
+		alias :backup :copy
+
 		# The script logger which will be provided all events when the script is run.
 		attr :logger, true
-		
+
 		# The master server name (e.g. symbolic or host name)
 		attr :master, true
-		
+
 		# A specific method which will perform the backup (e.g. an isntance of LSync::Method)
 		attr :method, true
-		
+
 		# All servers which are participating in the backup process.
 		attr :servers
-		
+
 		# All directories which may be synchronised.
 		attr :directories
-		
+
 		# Log data (an +IO+) specific to the current script.
 		attr :log
-		
+
 		# Run the backup process for all servers and directories specified.
 		def run!
 			start_time = Time.now
-			
+
 			# We buffer the log data so that if there is an error it is available to the notification sub-system
 			@log = StringIO.new
 			local_logger = Logger.new(@log)
@@ -173,24 +133,24 @@ module LSync
 				logger.info "Master server is #{@master}..."
 			end
 
-			master_controller = ServerController.new(self, master, logger)
+			master_controller = ServerController.new(self, logger, master)
 
 			self.try do
 				method.try do
 					master.try(master_controller) do
 						logger.info "Running backups for server #{current}..."
-						
+
 						run_backups!(master, current, logger)
 					end
 				end
 			end
-			
+
 			end_time = Time.now
 			logger.info "Backup Completed (#{end_time - start_time}s)."
 		end
-		
+
 		protected
-		
+
 		# This function runs the method for each directory and server combination specified.
 		def run_backups!(master, current, logger)
 			@servers.each do |name, server|
@@ -203,15 +163,15 @@ module LSync
 					next
 				end
 
-				server_controller = ServerController.new(self, server, logger)
+				server_controller = CopyController.new(self, logger, master, server)
 
 				server.try(server_controller) do
 					@directories.each do |directory|
-						directory_controller = DirectoryController.new(self, master, server, directory, logger)
+						directory_controller = DirectoryController.new(self, logger, master, server, directory)
 
 						directory.try(directory_controller) do
 							logger.info "\t" + ("Processing " + directory.to_s).rjust(20) + " : #{server}"
-					
+
 							method.run(master, server, directory)
 						end
 					end

data/lib/lsync/version.rb

@@ -16,8 +16,8 @@
 module LSync
   module VERSION #:nodoc:
     MAJOR = 2
-    MINOR = 0
-    TINY  = 2
+    MINOR = 1
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 2
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors: 
 - Samuel Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 +12:00
+date: 2011-07-26 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - lib/lsync/actions/generic/rotate
 - lib/lsync/actions/linux/disk
 - lib/lsync/actions/linux/terminal
+- lib/lsync/controller.rb
 - lib/lsync/directory.rb
 - lib/lsync/error.rb
 - lib/lsync/event_handler.rb