gitrb 0.0.1 → 0.0.2

data/README.md

@@ -1 +1,25 @@
-This is a ruby git implementation based on git_store by Matthias Georgi.
+GitRb - Native ruby interface to git
+====================================
+
+GitRb is a native interface to git. It is based on git_store by Matthias Georgi.
+
+### Installation
+
+GitStore can be installed as gem easily:
+
+    $ gem sources -a http://gemcutter.org
+    $ sudo gem install gitrb
+
+### Usage Example
+
+    require 'gitrb'
+
+    repo = Gitrb::Repository.new(:path => '/tmp/repository', :create => true)
+    repo.transaction do
+      repo.root['textfile1'] = Gitrb::Blob.new(:data => 'text')
+      repo.root['textfile2'] = Gitrb::Blob.new(:data => 'text')
+    end
+
+    puts repo.root['textfile1'].data
+    puts repo.root['textfile2'].data
+

data/gitrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'gitrb'
-  s.version = '0.0.1'
+  s.version = '0.0.2'
   s.summary = 'Pure ruby git implementation'
   s.author = 'Daniel Mendler'
   s.email = 'mail@daniel-mendler.de'
@@ -17,6 +17,7 @@ LICENSE
 README.md
 Rakefile
 gitrb.gemspec
+lib/gitrb.rb
 lib/gitrb/blob.rb
 lib/gitrb/commit.rb
 lib/gitrb/diff.rb

data/lib/gitrb/object.rb

@@ -25,6 +25,8 @@ module Gitrb
   end
 
   class Reference
+    undef_method :id, :type rescue nil
+
     def initialize(properties = {})
       @properties = properties
       @object = nil
@@ -32,7 +34,7 @@ module Gitrb
 
     def method_missing(name, *args, &block)
       if @object
-        instance_eval "def self.#{name}(*args, &block); @object.#{name}(*args, &block); end"
+        instance_eval %{def self.#{name}(*args, &block); @object.send("#{name}", *args, &block); end}
         @object.send(name, *args, &block)
       elsif name == :type && (mode = @properties['mode'] || @properties[:mode])
         mode = mode.to_i(8)

data/lib/gitrb/pack.rb

@@ -40,29 +40,10 @@ module Gitrb
       end
     end
 
-    def [](*idx)
-      idx = idx[0] if idx.length == 1
-      case idx
-      when Range
-        offset = idx.first
-        len = idx.last - idx.first + idx.exclude_end? ? 0 : 1
-      when Fixnum
-        offset = idx
-        len = nil
-      when Array
-        offset, len = idx
-      else
-        raise RuntimeError, "invalid index param: #{idx.class}"
-      end
-      if @offset != offset
-        @file.seek(offset + @global_offset)
-      end
-      @offset = offset + len ? len : 1
-      if not len
-        @file.read(1).getord(0)
-      else
-        @file.read(len)
-      end
+    def [](offset, len)
+      @file.seek(offset + @global_offset) if @offset != offset
+      @offset = offset + len
+      @file.read(len)
     end
   end
 

data/lib/gitrb/repository.rb

@@ -81,47 +81,18 @@ module Gitrb
     # Example:
     #   repository.transaction { repository['a'] = 'b' }
     #
-    def transaction(message = "")
+    def transaction(message = '', author = nil, committer = nil)
       start_transaction
       result = yield
-      commit(message)
+      commit(message, author, committer)
       result
     rescue
-      rollback
+      rollback_transaction
       raise
     ensure
       finish_transaction
     end
 
-    # Start a transaction.
-    #
-    # Tries to get lock on lock file, load the this repository if
-    # has changed in the repository.
-    def start_transaction
-      file = File.open("#{head_path}.lock", "w")
-      file.flock(File::LOCK_EX)
-      Thread.current['gitrb_repository_lock'] = file
-      refresh
-    end
-
-    # Rerepository the state of the repository.
-    #
-    # Any changes made to the repository are discarded.
-    def rollback
-      @objects.clear
-      load
-      finish_transaction
-    end
-
-    # Finish the transaction.
-    #
-    # Release the lock file.
-    def finish_transaction
-      Thread.current['gitrb_repository_lock'].close rescue nil
-      Thread.current['gitrb_repository_lock'] = nil
-      File.unlink("#{head_path}.lock") rescue nil
-    end
-
     # Write a commit object to disk and set the head of the current branch.
     #
     # Returns the commit object
@@ -150,7 +121,7 @@ module Gitrb
     def log(limit = 10, start = nil, path = nil)
       args = ['--format=tformat:%H%n%P%n%T%n%an%n%ae%n%at%n%cn%n%ce%n%ct%n%x00%s%n%b%x00', "-#{limit}", ]
       args << start if start
-      args << "--" << path if path
+      args << "--" << path if path && !path.empty?
       log = git_log(*args).split(/\n*\x00\n*/)
       commits = []
       log.each_slice(2) do |data, message|
@@ -294,6 +265,35 @@ module Gitrb
 
     protected
 
+    # Start a transaction.
+    #
+    # Tries to get lock on lock file, load the this repository if
+    # has changed in the repository.
+    def start_transaction
+      file = File.open("#{head_path}.lock", "w")
+      file.flock(File::LOCK_EX)
+      Thread.current['gitrb_repository_lock'] = file
+      refresh
+    end
+
+    # Rerepository the state of the repository.
+    #
+    # Any changes made to the repository are discarded.
+    def rollback_transaction
+      @objects.clear
+      load
+      finish_transaction
+    end
+
+    # Finish the transaction.
+    #
+    # Release the lock file.
+    def finish_transaction
+      Thread.current['gitrb_repository_lock'].close rescue nil
+      Thread.current['gitrb_repository_lock'] = nil
+      File.unlink("#{head_path}.lock") rescue nil
+    end
+
     def get_type(id, expected)
       object = get(id)
       raise NotFound, "Wrong type #{object.type}, expected #{expected}" if object && object.type != expected

data/lib/gitrb/tree.rb

@@ -68,63 +68,63 @@ module Gitrb
       id
     end
 
-    # Read entry with specified name.
-    def get(name)
-      @children[name]
-    end
-
-    # Write entry with specified name.
-    def put(name, value)
-      raise RuntimeError, "no blob or tree" if !(Blob === value || Tree === value)
-      value.repository = repository
-      @modified = true
-      @children[name] = value
-      value
-    end
-
-    # Remove entry with specified name.
-    def remove(name)
-      @modified = true
-      @children.delete(name.to_s)
-    end
-
     # Does this key exist in the children?
-    def has_key?(name)
-      @children.has_key?(name.to_s)
-    end
-
-    def normalize_path(path)
-      (path[0, 1] == '/' ? path[1..-1] : path).split('/')
+    def exists?(name)
+      self[name] != nil
     end
 
-    # Read a value on specified path.
+    # Read an entry on specified path.
     def [](path)
+      path = normalize_path(path)
       return self if path.empty?
-      normalize_path(path).inject(self) do |tree, key|
-        raise RuntimeError, 'Not a tree' if tree.type != 'tree'
-        tree.get(key) or return nil
+      entry = @children[path.first]
+      if path.size == 1
+        entry
+      elsif entry
+        raise RuntimeError, 'Not a tree' if entry.type != 'tree'
+        entry[path[1..-1]]
       end
     end
 
-    # Write a value on specified path.
-    def []=(path, value)
-      list = normalize_path(path)
-      tree = list[0..-2].to_a.inject(self) do |tree, name|
+    # Write an entry on specified path.
+    def []=(path, entry)
+      path = normalize_path(path)
+      if path.empty?
+        raise RuntimeError, 'Empty path'
+      elsif path.size == 1
+        raise RuntimeError, 'No blob or tree' if entry.type != 'tree' && entry.type != 'blob'
+        entry.repository = repository
+        @modified = true
+        @children[path.first] = entry
+      else
+        tree = @children[path.first]
+        if !tree
+          tree = @children[path.first] = Tree.new(:repository => repository)
+          @modified = true
+        end
         raise RuntimeError, 'Not a tree' if tree.type != 'tree'
-        tree.get(name) || tree.put(name, Tree.new(:repository => repository))
+        tree[path[1..-1]] = entry
       end
-      tree.put(list.last, value)
     end
 
-    # Delete a value on specified path.
+    # Delete a entry on specified path.
     def delete(path)
-      list = normalize_path(path)
-
-      tree = list[0..-2].to_a.inject(self) do |tree, key|
-        tree.get(key) or return
+      path = normalize_path(path)
+      if path.empty?
+        raise RuntimeError, 'Empty path'
+      elsif path.size == 1
+        @modified = true
+        @children.delete(path.first)
+      else
+        tree = @children[path.first]
+        raise RuntimeError, 'Not a tree' if tree.type != 'tree'
+        tree.delete(path[1..-1])
       end
+    end
 
-      tree.remove(list.last)
+    # Move a entry
+    def move(path, dest)
+      self[dest] = delete(path)
     end
 
     # Iterate over all children
@@ -146,6 +146,12 @@ module Gitrb
 
     private
 
+    def normalize_path(path)
+      return path if Array === path
+      path = path.to_s
+      (path[0, 1] == '/' ? path[1..-1] : path).split('/')
+    end
+
     # Read the contents of a raw git object.
     def parse(data)
       @children.clear

data/lib/gitrb.rb

@@ -0,0 +1 @@
+require 'gitrb/repository'

data/test/repository_spec.rb

@@ -105,6 +105,14 @@ describe Gitrb do
     repo.root['a'].should be_nil
   end
 
+  it 'should move entries' do
+    repo.root['a/b/c'] = Gitrb::Blob.new(:data => 'Hello')
+    repo.root['a/b/c'].data.should == 'Hello'
+    repo.root.move('a/b/c', 'x/y/z')
+    repo.root['a/b/c'].should be_nil
+    repo.root['x/y/z'].data.should == 'Hello'
+  end
+
   it 'should have a head commit' do
     file 'a', 'Hello'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gitrb
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +01:00
+date: 2009-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,7 @@ files:
 - README.md
 - Rakefile
 - gitrb.gemspec
+- lib/gitrb.rb
 - lib/gitrb/blob.rb
 - lib/gitrb/commit.rb
 - lib/gitrb/diff.rb