georgi-git_store 0.2.4 → 0.3

data/test/benchmark.rb

@@ -3,7 +3,7 @@ require 'grit'
 require 'benchmark'
 require 'fileutils'
 
-REPO = File.expand_path(File.dirname(__FILE__) + '/repo')
+REPO = '/tmp/git-store'
 
 FileUtils.rm_rf REPO
 FileUtils.mkpath REPO
@@ -21,7 +21,7 @@ Benchmark.bm 20 do |x|
     store.transaction { store['aa'] = rand.to_s }
   end
   x.report 'load 1000 objects' do
-    GitStore.new('.')
+    GitStore.new('.').values { |v| v }
   end
   x.report 'load 1000 with grit' do
     Grit::Repo.new('.').tree.contents.each { |e| e.data }

data/test/commit_spec.rb

@@ -0,0 +1,82 @@
+require "#{File.dirname(__FILE__)}/../lib/git_store"
+require 'pp'
+
+describe GitStore::Commit do
+  
+  REPO = '/tmp/git_store_test'
+
+  attr_reader :store
+
+  before(:each) do
+    FileUtils.rm_rf REPO
+    Dir.mkdir REPO
+    Dir.chdir REPO
+    `git init`
+    @store = GitStore.new(REPO)
+  end
+
+  it "should dump in right format" do
+    time = Time.now    
+    timestamp = "#{ time.to_i } #{ time.to_s.split[4] }"
+
+    commit = GitStore::Commit.new(nil)
+    commit.tree = @store.root.id
+    commit.author = "hanni #{timestamp}"
+    commit.committer = "hanni #{timestamp}"
+    commit.message = "This is a message"
+
+    commit.dump.should == "tree #{@store.root.id}
+author hanni #{timestamp}
+committer hanni #{timestamp}
+
+This is a message"
+  end
+
+  it "should be readable by git binary" do
+    time = Time.local(2009, 4, 20)
+    author = store.user_info("hans <hans@email.de>", time)
+    
+    store['a'] = "Yay"
+    commit = store.commit("Commit Message", author, author)
+
+    IO.popen("git log") do |io|
+      io.gets.should == "commit #{commit.id}\n"
+      io.gets.should == "Author: hans <hans@email.de>\n"
+      io.gets.should == "Date:   Mon Apr 20 00:00:00 2009 +0200\n"
+      io.gets.should == "\n"
+      io.gets.should == "    Commit Message\n"
+    end
+  end
+
+  it "should diff 2 commits" do
+    store['x'] = 'a'
+    store['y'] = "
+First Line.
+Second Line.
+Last Line.
+"
+    a = store.commit
+
+    store.delete('x')
+    store['y'] = "
+First Line.
+Last Line.
+Another Line.
+"
+    store['z'] = 'c'
+
+    b = store.commit
+
+    diff = b.diff(a)
+
+    diff[0].a_path.should == 'x'
+    diff[0].deleted_file.should be_true
+
+    diff[1].a_path.should == 'y'
+    diff[1].diff.should == "--- a/y\n+++ b/y\n@@ -1,4 +1,4 @@\n \n First Line.\n-Second Line.\n Last Line.\n+Another Line."
+
+    diff[2].a_path.should == 'z'
+    diff[2].new_file.should be_true
+  end
+  
+end

data/test/git_store_spec.rb

@@ -1,210 +1,239 @@
 require "#{File.dirname(__FILE__)}/../lib/git_store"
+require "#{File.dirname(__FILE__)}/helper"
+require 'pp'
 
 describe GitStore do
 
-  #REPO = File.expand_path(File.dirname(__FILE__) + '/repo')
   REPO = '/tmp/git_store_test'
 
+  attr_reader :store
+
   before(:each) do
     FileUtils.rm_rf REPO
     Dir.mkdir REPO
     Dir.chdir REPO
-  end
-
-  def store
-    @store
+    
+    `git init`
+    @store = GitStore.new(REPO)
   end
   
   def file(file, data)
     FileUtils.mkpath(File.dirname(file))
     open(file, 'w') { |io| io << data }
-    if @use_git
-      `git add #{file}`
-      `git commit -m 'added #{file}'`
-      File.unlink(file)
-    end
+    
+    `git add #{file}`
+    `git commit -m 'added #{file}'`
+    File.unlink(file)
+  end
+  
+  it 'should fail to initialize without a valid git repository' do
+    lambda {
+      GitStore.new('/')
+    }.should raise_error(ArgumentError)
   end
 
-  shared_examples_for 'all stores' do
-    it 'should find modified entries' do
-      store['a'] = 'Hello'
+  it 'should find modified entries' do
+    store['a'] = 'Hello'
 
-      store.root.should be_modified
-      store.root.table['a'].should be_modified
+    store.root.should be_modified
 
-      store.commit
+    store.commit
+    
+    store.root.should_not be_modified
 
-      store['a'] = 'Bello'
+    store['a'] = 'Bello'
 
-      store.root.table['a'].should be_modified
-    end
+    store.root.should be_modified
+  end
 
-    it 'should load a repo' do
-      file 'a', 'Hello'
-      file 'b', 'World'
-   
-      store.load
+  it 'should load a repo' do
+    file 'a', 'Hello'
+    file 'b', 'World'
+    
+    store.load
 
-      store['a'].should == 'Hello'
-      store['b'].should == 'World'
-    end
+    store['a'].should == 'Hello'
+    store['b'].should == 'World'
+  end
 
-    it 'should load folders' do
-      file 'x/a', 'Hello'
-      file 'y/b', 'World'
+  it 'should load folders' do
+    file 'x/a', 'Hello'
+    file 'y/b', 'World'
     
-      store.load
-      store['x'].should be_kind_of(GitStore::Tree)
-      store['y'].should be_kind_of(GitStore::Tree)
+    store.load
+    store['x'].should be_kind_of(GitStore::Tree)
+    store['y'].should be_kind_of(GitStore::Tree)
 
-      store['x']['a'].should == 'Hello'
-      store['y']['b'].should == 'World'
-    end
+    store['x']['a'].should == 'Hello'
+    store['y']['b'].should == 'World'
+  end
 
-    it 'should load yaml' do
-      file 'x/a.yml', '[1, 2, 3, 4]'
+  it 'should load yaml' do
+    file 'x/a.yml', '[1, 2, 3, 4]'
 
-      store.load
+    store.load
     
-      store['x']['a.yml'].should == [1,2,3,4]    
-      store['x']['a.yml'] = [1,2,3,4,5]
-    end
+    store['x']['a.yml'].should == [1,2,3,4]    
+    store['x']['a.yml'] = [1,2,3,4,5]
+  end
+
+  it 'should save yaml' do
+    store['x/a.yml'] = [1,2,3,4,5]      
+    store['x/a.yml'].should == [1,2,3,4,5]
+  end
 
-    it 'should resolve paths' do
-      file 'x/a', 'Hello'
-      file 'y/b', 'World'
+  it 'should detect modification' do    
+    store.transaction do
+      store['x/a'] = 'a'
+    end
     
-      store.load
+    store.load
     
-      store['x/a'].should == 'Hello'
-      store['y/b'].should == 'World'
-
-      store['y/b'] = 'Now this'
+    store['x/a'].should == 'a'
 
-      store['y']['b'].should == 'Now this'        
+    store.transaction do
+      store['x/a'] = 'b'
+      store['x'].should be_modified
+      store.root.should be_modified
     end
 
-    it 'should create new trees' do
-      store['new/tree'] = 'This tree'
-      store['this', 'tree'] = 'Another'    
-      store['new/tree'].should == 'This tree'
-      store['this/tree'].should == 'Another'
-    end
+    store.load
 
-    it 'should delete entries' do
-      store['a'] = 'Hello'
-      store.delete('a')
-    
-      store['a'].should be_nil
-    end
+    store['x/a'].should == 'b'
   end
 
-  describe 'with Git' do
-    before(:each) do
-      `git init`
-      @use_git = true
-      @store = GitStore.new(REPO)
-    end
+  it 'should resolve paths' do
+    file 'x/a', 'Hello'
+    file 'y/b', 'World'
+    
+    store.load
+    
+    store['x/a'].should == 'Hello'
+    store['y/b'].should == 'World'
 
-    it_should_behave_like 'all stores'
+    store['y/b'] = 'Now this'
 
-    it 'should have a head commit' do
-      file 'a', 'Hello'
+    store['y']['b'].should == 'Now this'        
+  end
 
-      store.read_head.should_not be_nil
-      File.should be_exist(store.object_path(store.read_head))
-    end
+  it 'should create new trees' do
+    store['new/tree'] = 'This tree'
+    store['new/tree'].should == 'This tree'
+  end
 
-    it 'should detect changes' do
-      file 'a', 'Hello'
+  it 'should delete entries' do
+    store['a'] = 'Hello'
+    store.delete('a')
+    
+    store['a'].should be_nil
+  end
 
-      store.should be_changed
-    end
+  it 'should have a head commit' do
+    file 'a', 'Hello'
 
-    it 'should rollback a transaction' do
-      file 'a/b', 'Hello'
-      file 'c/d', 'World'
+    store.load
+    store.head.should_not be_nil
+  end
 
-      begin
-        store.transaction do
-          store['a/b'] = 'Changed'
-          store['x/a'] = 'Added'
-          raise
-        end
-      rescue
-      end
+  it 'should detect changes' do
+    file 'a', 'Hello'
 
-      store['a/b'].should == 'Hello'
-      store['c/d'].should == 'World'
-      store['x/a'].should be_nil
-    end
+    store.should be_changed
+  end
 
-    it 'should commit a transaction' do
-      file 'a/b', 'Hello'
-      file 'c/d', 'World'
+  it 'should rollback a transaction' do
+    file 'a/b', 'Hello'
+    file 'c/d', 'World'
 
+    begin
       store.transaction do
         store['a/b'] = 'Changed'
         store['x/a'] = 'Added'
+        raise
       end
+    rescue
+    end
 
-      store.load
-    
-      store['a/b'].should == 'Changed'
-      store['c/d'].should == 'World'
-      store['x/a'].should == 'Added'
+    store['a/b'].should == 'Hello'
+    store['c/d'].should == 'World'
+    store['x/a'].should be_nil
+  end
+
+  it 'should commit a transaction' do
+    file 'a/b', 'Hello'
+    file 'c/d', 'World'
+
+    store.transaction do
+      store['a/b'] = 'Changed'
+      store['x/a'] = 'Added'
     end
 
-    it 'should allow only one transaction' do
-      file 'a/b', 'Hello'
+    a = git_ls_tree(store['a'].id)
+    x = git_ls_tree(store['x'].id)
 
-      ready = false
+    a.should == [["100644", "blob", "b653cf27cef08de46da49a11fa5016421e9e3b32", "b"]]
+    x.should == [["100644", "blob", "87d2b203800386b1cc8735a7d540a33e246357fa", "a"]]      
 
-      store.transaction do
-        Thread.start do
-          store.transaction do
-            store['a/b'] = 'Changed by second thread'
-          end
-          ready = true
-        end
-        store['a/b'] = 'Changed'
-      end
-    
-      sleep 0.01 until ready
+    git_show(a[0][2]).should == 'Changed'
+    git_show(x[0][2]).should == 'Added'
+  end
+  
+  it "should save blobs" do
+    store['a'] = 'a'
+    store['b'] = 'b'
+    store['c'] = 'c'
 
-      store.load
-    
-      store['a/b'].should == 'Changed by second thread'
-    end
+    store.commit
 
-    it 'should commit added files' do
-      store.load
-      store['c'] = 'Hello'
-      store['d'] = 'World'
-      store.commit
+    a = store.id_for('blob', 'a')
+    b = store.id_for('blob', 'b')
+    c = store.id_for('blob', 'c')
 
-      `git checkout`
+    git_show(a).should == 'a'
+    git_show(b).should == 'b'
+    git_show(c).should == 'c'
+  end  
 
-      File.should be_exist('c')
-      File.should be_exist('d')
+  it 'should allow only one transaction' do
+    file 'a/b', 'Hello'
 
-      File.read('c').should == 'Hello'
-      File.read('d').should == 'World'
-    end
-  end
+    ready = false
 
-  describe 'without Git' do
-    before(:each) do
-      @use_git = false
-      @store = GitStore::FileStore.new(REPO)
+    store.transaction do
+      Thread.start do
+        store.transaction do
+          store['a/b'] = 'Changed by second thread'
+        end
+        ready = true
+      end
+      store['a/b'] = 'Changed'
     end
 
-    it_should_behave_like 'all stores'
+    sleep 0.01 until ready
+
+    store.load
+    
+    store['a/b'].should == 'Changed by second thread'
+  end
+  
+  it 'should find all objects' do
+    store.load
+    store['c'] = 'Hello'
+    store['d'] = 'World'
+    store.commit
+
+    store.to_a.should == [['c', 'Hello'], ['d', 'World']]
   end
 
-  it 'should fail to initialize without a valid git repository' do
-    lambda {
-      GitStore.new(REPO)
-    }.should raise_error(ArgumentError)
+  it "should load commits" do
+    store['a'] = 'a'
+    store.commit 'added a'
+
+    store['b'] = 'b'
+    store.commit 'added b'
+
+    store.commits[0].message.should == 'added b'
+    store.commits[1].message.should == 'added a'
   end
+
 end