gitrb 0.1.4 → 0.1.5

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.1.4'
+  s.version = '0.1.5'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'

data/lib/gitrb/repository.rb

@@ -53,7 +53,6 @@ module Gitrb
 
     # Switch branch
     def branch=(branch)
-      raise 'Forbidden from within a transaction' if in_transaction?
       @transaction.synchronize do
         @branch = branch
         load
@@ -72,7 +71,6 @@ module Gitrb
 
     # Clear cached objects
     def clear
-      raise 'Forbidden from within a transaction' if in_transaction?
       @transaction.synchronize do
         @objects.clear
         load
@@ -104,15 +102,19 @@ module Gitrb
     #   repository.transaction { repository['a'] = 'b' }
     #
     def transaction(message = '', author = nil, committer = nil)
-      start_transaction
-      result = yield
-      commit(message, author, committer)
-      result
-    rescue
-      rollback_transaction
-      raise
-    ensure
-      finish_transaction
+      @transaction.synchronize do
+        begin
+          start_transaction
+          result = yield
+          commit(message, author, committer)
+          result
+        rescue
+          rollback_transaction
+          raise
+        ensure
+          finish_transaction
+        end
+      end
     end
 
     # Write a commit object to disk and set the head of the current branch.
@@ -332,7 +334,6 @@ module Gitrb
     # Tries to get lock on lock file, load the this repository if
     # has changed in the repository.
     def start_transaction
-      @transaction.lock
       file = File.open("#{head_path}.lock", 'w')
       file.flock(File::LOCK_EX)
       @lock[Thread.current.object_id] = file
@@ -345,7 +346,6 @@ module Gitrb
     def rollback_transaction
       @objects.clear
       load
-      finish_transaction
     end
 
     # Finish the transaction.
@@ -355,7 +355,6 @@ module Gitrb
       @lock[Thread.current.object_id].close rescue nil
       @lock.delete(Thread.current.object_id)
       File.unlink("#{head_path}.lock") rescue nil
-      @transaction.unlock
     end
 
     def get_type(id, expected)

data/test/repository_spec.rb

@@ -284,14 +284,28 @@ describe Gitrb do
 
   it 'should forbid branch switching from within transaction' do
     repo.transaction do
-      lambda { repo.branch = 'test' }.should raise_error(RuntimeError)
+      lambda { repo.branch = 'test' }.should raise_error(ThreadError)
     end
   end
 
   it 'should forbid clearing from within transaction' do
     repo.transaction do
-      lambda { repo.clear }.should raise_error(RuntimeError)
+      lambda { repo.clear }.should raise_error(ThreadError)
     end
   end
 
+  it 'should forbid nested transactions' do
+    repo.transaction do
+      lambda { repo.transaction {} }.should raise_error(ThreadError)
+    end
+  end
+
+  it 'should be in transaction' do
+    repo.should_not be_in_transaction
+    repo.transaction do
+      repo.should be_in_transaction
+    end
+    repo.should_not be_in_transaction
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Daniel Mendler