gitrb 0.1.3 → 0.1.4

data/gitrb.gemspec

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

data/lib/gitrb/repository.rb

@@ -33,6 +33,7 @@ module Gitrb
       @logger  = options[:logger] || Logger.new(nil)
       @encoding = options[:encoding] || DEFAULT_ENCODING
       @lock = {}
+      @transaction = Mutex.new
 
       @path = options[:path]
       @path.chomp!('/')
@@ -52,13 +53,16 @@ module Gitrb
 
     # Switch branch
     def branch=(branch)
-      @branch = branch
-      load
+      raise 'Forbidden from within a transaction' if in_transaction?
+      @transaction.synchronize do
+        @branch = branch
+        load
+      end
     end
 
     # Has our repository been changed on disk?
     def changed?
-      head.nil? || head.id != read_head_id
+      !head || head.id != read_head_id
     end
 
     # Load the repository, if it has been changed on disk.
@@ -66,9 +70,18 @@ module Gitrb
       load if changed?
     end
 
+    # Clear cached objects
+    def clear
+      raise 'Forbidden from within a transaction' if in_transaction?
+      @transaction.synchronize do
+        @objects.clear
+        load
+      end
+    end
+
     # Is there any transaction going on?
     def in_transaction?
-      @lock[Thread.current.object_id]
+      !!@lock[Thread.current.object_id]
     end
 
     # Diff
@@ -286,14 +299,6 @@ module Gitrb
       User.new(name, email)
     end
 
-    def dup
-      super.instance_eval do
-        @objects = Trie.new
-        load
-        self
-      end
-    end
-
     private
 
     def check_git_version
@@ -327,6 +332,7 @@ 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
@@ -349,6 +355,7 @@ 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)
@@ -359,7 +366,7 @@ module Gitrb
 
     def load_packs
       @packs   = Trie.new
-      @objects = Trie.new
+      @objects = Synchronized.new(Trie.new)
 
       packs_path = "#{@path}/objects/pack"
       if File.directory?(packs_path)
@@ -382,7 +389,7 @@ module Gitrb
         @head = nil
         @root = Tree.new(:repository => self)
       end
-      @logger.debug "gitrb: Reloaded, head is #{@head ? head.id : 'nil'}"
+      @logger.debug "gitrb: Reloaded, head is #{head ? head.id : 'nil'}"
     end
 
     # Returns the hash value of an object string.
@@ -425,6 +432,5 @@ module Gitrb
     def legacy_loose_object?(buf)
       buf[0].ord == 0x78 && ((buf[0].ord << 8) | buf[1].ord) % 31 == 0
     end
-
   end
 end

data/lib/gitrb/util.rb

@@ -18,4 +18,26 @@ module Gitrb
       end
     end
   end
+
+  class Synchronized
+    def initialize(obj)
+      @obj = obj
+      @mutex = Mutex.new
+    end
+
+    def method_missing(*args)
+      @mutex.synchronize { @obj.send(*args) }
+    end
+  end
+end
+
+# str[0] returns a 1-char string in Ruby 1.9 but a
+# Fixnum in 1.8.  Monkeypatch a fix if we're on 1.8.
+if !1.respond_to?(:ord)
+  class Fixnum
+    def ord
+      self
+    end
+  end
 end
+

data/lib/gitrb.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'logger'
 require 'enumerator'
 require 'stringio'
+require 'thread'
 
 require 'gitrb/util'
 require 'gitrb/gitobject'
@@ -17,13 +18,3 @@ require 'gitrb/pack'
 require 'gitrb/commit'
 require 'gitrb/trie'
 require 'gitrb/repository'
-
-# str[0] returns a 1-char string in Ruby 1.9 but a
-# Fixnum in 1.8.  Monkeypatch a fix if we're on 1.8.
-if !1.respond_to?(:ord)
-  class Fixnum
-    def ord
-      self
-    end
-  end
-end

data/test/repository_spec.rb

@@ -151,12 +151,6 @@ describe Gitrb do
     repo.head.should_not be_nil
   end
 
-  it 'should detect changes' do
-    file 'a', 'Hello'
-
-    repo.should be_changed
-  end
-
   it 'should rollback a transaction' do
     file 'a/b', 'Hello'
     file 'c/d', 'World'
@@ -271,4 +265,33 @@ describe Gitrb do
     tag.message.should =~ /message/
   end
 
+  it 'should detect changes and refresh' do
+    file 'a', 'data'
+    repo.root['a'].should be_nil
+    repo.should be_changed
+    repo.refresh
+    repo.should_not be_changed
+    repo.root['a'].data.should == 'data'
+  end
+
+  it 'should clear cache' do
+    file 'a', 'data'
+    repo.refresh
+    repo.root['a'].data.should == 'data'
+    repo.clear
+    repo.root['a'].data.should == 'data'
+  end
+
+  it 'should forbid branch switching from within transaction' do
+    repo.transaction do
+      lambda { repo.branch = 'test' }.should raise_error(RuntimeError)
+    end
+  end
+
+  it 'should forbid clearing from within transaction' do
+    repo.transaction do
+      lambda { repo.clear }.should raise_error(RuntimeError)
+    end
+  end
+
 end

metadata

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