incremental_backup 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f406c74bc2c38c08092f0d93b5156c78c196aa4
-  data.tar.gz: 22dfd35797a0b24abbf3a5752161e5dece0fc394
+  metadata.gz: 55816485677ef959a89ab2b21baaae7d5f253c06
+  data.tar.gz: 65f9e303fd3ad201d4dfd146581c86e275bdea95
 SHA512:
-  metadata.gz: fd12559460f18568aa9adcb0644ff48db2d88cc12e3f814e646fcfbdc17114a18b9ee0fd3430517aaa18b5bd5a6965ab8a8fed6582ee217fb0624c52d0f4fb3a
-  data.tar.gz: 8a5c7554e2d044590aa27f241f62fe4cd6c8ad49bd6af084c399d759f94c5c82bca674ca7272c6b044ee40bd78b73501c04206f236070950b6c8b6b010af5d82
+  metadata.gz: a87c946b7933ad50fc901d1b61623eef3e5659239fdc71173ba35bff18a5bb0c7d2e2f46c268cdba1a06599831807220fff38b798796403f2fe8dc46a320807d
+  data.tar.gz: f037901df777dd755a40e40233d345732173c4901314df66fc5d7b27527fc638e4064732d06069fcce89fa9c7c9dd9348f4f6fd0d6f1cfbb5d7923255eb5236a

data/lib/incremental_backup/lock.rb

@@ -11,10 +11,9 @@ module IncrementalBackup
     def initialize task
       @task = task
 
-      if File.exists? path
+      @lock_file = File.open(path, File::RDWR|File::CREAT, 0644)
+      unless @lock_file.flock(File::LOCK_EX|File::LOCK_NB)
         self.failed = true
-      else
-        FileUtils.touch path
       end
     end
 
@@ -44,7 +43,7 @@ module IncrementalBackup
 
     # Release lock
     def release
-      FileUtils.rm path
+      @lock_file.close if @lock_file
     end
 
     private

data/lib/incremental_backup/version.rb

@@ -1,3 +1,3 @@
 module IncrementalBackup
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/unit/lock_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe IncrementalBackup::Lock do
+
+  # Mocks
+  let(:task) { double("task", logger: logger, settings: settings) }
+  let(:logger) { double("logger", info: nil) }
+  let(:settings) { double("settings", settings_path: settings_path, task_id: task_id) }
+
+  # Settings
+  let(:settings_path) { File.join __dir__, "..", "tmp" }
+  let(:task_id) { "example_task" }
+
+
+  it 'can run' do
+    ran = false
+    IncrementalBackup::Lock.create task do
+      ran = true
+    end
+    ran.should be_true
+  end
+
+  it 'can lock' do
+    ran_outer = false
+    ran_inner = false
+
+    IncrementalBackup::Lock.create task do
+      ran_outer = true
+      IncrementalBackup::Lock.create task do
+        ran_inner = true
+      end
+    end
+    ran_outer.should be_true
+    ran_inner.should be_false
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: incremental_backup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Lasse Skindstad Ebert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -133,6 +133,7 @@ files:
 - live_example/example_task.rb
 - live_example/exclude.file
 - spec/spec_helper.rb
+- spec/unit/lock_spec.rb
 - spec/unit/task_settings_spec.rb
 - spec/unit/task_spec.rb
 - spec/unit/version_spec.rb
@@ -162,6 +163,7 @@ summary: incremental_backup can make incremental backups by hour/day/week/month/
   remotely through ssh and rsync
 test_files:
 - spec/spec_helper.rb
+- spec/unit/lock_spec.rb
 - spec/unit/task_settings_spec.rb
 - spec/unit/task_spec.rb
 - spec/unit/version_spec.rb