lsync 2.3.2 → 2.3.3

data/bin/lsync-prune

@@ -248,7 +248,7 @@ ARGV.options do |o|
 	o.separator ""
 
 	o.on_tail("--copy", "Display copyright information") do
-		puts "#{script_name}. Copyright (c) 2008-2009 Samuel Williams. Released under the GPLv3."
+		puts "#{script_name}. Copyright (c) 2007-2011 Samuel Williams. Released under the MIT license."
 		puts "See http://www.oriontransfer.co.nz/ for more information."
 
 		exit

data/lib/lsync.rb

@@ -33,17 +33,26 @@ require 'fileutils'
 require 'optparse'
 
 require 'open-uri'
+require 'lockfile'
 
 module LSync
-	
+
+	# Run a prepared backup script using a lockfile.
 	def self.run_script(options = {}, &block)
 		script = LSync::Script.new(options, &block)
-		
+		lockfile_path = $0 + ".lock"
+
 		script.on(:failure) do |error|
 			LSync::log_error(error, logger)
 		end
 		
-		script.run!
+		begin
+			Lockfile.new(lockfile_path, :retries => 0) do
+				script.run!
+			end
+		rescue Lockfile::MaxTriesLockError
+			raise LockError.new("Lockfile #{lockfile_path} could not be acquired.")
+		end
 	end
 	
 end

data/lib/lsync/error.rb

@@ -39,6 +39,10 @@ module LSync
 	class ScriptError < Error
 	end
 
+	# Indicates that a backup could not be run because it was already locked.
+	class LockError < Error
+	end
+
 	# Indicates that there has been a major backup method error.
 	class BackupMethodError < Error
 	end

data/lib/lsync/script.rb

@@ -147,10 +147,14 @@ module LSync
 		# Log data (an +IO+) specific to the current script.
 		attr :log
 
+	public
+
 		# Run the backup process for all servers and directories specified.
 		def run!(options = {})
 			start_time = Time.now
 
+			logger.info "===== Starting backup at #{start_time} ====="
+
 			# 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)
@@ -178,8 +182,8 @@ module LSync
 			end
 
 			end_time = Time.now
-			logger.info "===== Finished ====="
 			logger.info "[Time]: (#{end_time - start_time}s)."
+			logger.info "===== Finished backup at #{end_time} ====="
 		end
 
 		protected

data/lib/lsync/version.rb

@@ -22,7 +22,7 @@ module LSync
   module VERSION
     MAJOR = 2
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lsync
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Samuel Williams
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 1
         - 2
-        - 3
-        version: 1.2.3
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -49,10 +49,24 @@ dependencies:
         version: 1.4.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: lockfile
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: 
 email: samuel.williams@oriontransfer.co.nz
 executables: 
-- lsync-mount
+- lsync-disk
 - lsync-prune
 - lsync-rotate
 extensions: []
@@ -60,7 +74,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/lsync-mount
+- bin/lsync-disk
 - bin/lsync-prune
 - bin/lsync-rotate
 - lib/lsync/client.rb