eternity 0.0.1

data/spec/log_spec.rb

@@ -0,0 +1,57 @@
+require 'minitest_helper'
+
+describe Repository, 'Log' do
+  
+  let(:repository) { Repository.new :test }
+
+  it 'Without commits' do
+    repository.log.must_be_empty
+  end
+
+  it 'First commit' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit = repository.commit author: 'User', message: 'First commit'
+
+    repository.log.count.must_equal 1
+    repository.log.first.id.must_equal commit.id
+  end
+
+  it 'Commit sequence' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+
+    repository[:countries].insert 'UY', name: 'Uruguay'
+    commit_2 = repository.commit author: 'User', message: 'Commit 2'
+
+    repository.log.count.must_equal 2
+    repository.log[0].id.must_equal commit_2.id
+    repository.log[1].id.must_equal commit_1.id
+  end
+
+  it 'Merge' do
+    time = Time.now
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1', time: time
+    repository.push
+    
+    other_repository = Repository.new :other
+    other_repository.pull
+    
+    other_repository[:countries].insert 'UY', name: 'Uruguay'
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2', time: time + 1
+
+    other_repository.push
+
+    repository[:countries].insert 'BR', name: 'Brasil'
+    commit_3 = repository.commit author: 'User', message: 'Commit 3', time: time + 2
+
+    repository.pull
+
+    repository.log.count.must_equal 4
+    repository.log[0].id.must_equal repository.current_commit.id
+    repository.log[1].id.must_equal commit_3.id
+    repository.log[2].id.must_equal commit_2.id
+    repository.log[3].id.must_equal commit_1.id
+  end
+
+end

data/spec/minitest_helper.rb

@@ -0,0 +1,79 @@
+require 'coverage_helper'
+require 'eternity'
+require 'minitest/autorun'
+require 'timeout'
+require 'turn'
+require 'pry-nav'
+
+include Eternity
+
+Turn.config do |c|
+  c.format = :pretty
+  c.natural = true
+  c.ansi = true
+end
+
+Eternity.configure do |config|
+  config.keyspace = Restruct::Id.new :eternity_test
+  config.blob_path = File.expand_path('../../tmp', __FILE__)
+  config.blob_cache_expiration = 30
+  config.logger.level = Logger::ERROR
+end
+
+class Minitest::Spec
+  def redis
+    Eternity.redis
+  end
+
+  def digest(data)
+    Blob.digest(Blob.serialize(data))
+  end
+
+  def print_keys
+    puts Eternity.redis_keys.sort
+  end
+
+  def print_commit(commit)
+    puts "COMMIT: #{commit.author} - #{commit.message}"
+    puts "MERGE: #{commit.merge?}"
+    puts 'DELTA:'
+    puts JSON.pretty_generate(commit.delta)
+    if commit.merge?
+      puts "BASE: #{commit.base.author} - #{commit.base.message}"
+      puts 'BASE DELTA:'
+      puts JSON.pretty_generate(commit.base_delta)
+    end
+    puts 'INDEX:'
+    commit.with_index do |index|
+      index.each do |collection, collection_index|
+        puts collection
+        collection_index.ids.each do |id|
+          puts "#{id} -> #{collection_index[id].data}"
+        end
+      end
+    end
+    puts '------------------------------------'
+  end
+  
+  after do
+    Eternity.clear_redis
+    Eternity.clear_file_system
+  end
+end
+
+module Minitest::Assertions
+  def assert_equal_index(expected, commit)
+    commit.with_index do |index|
+      index.to_h.must_equal expected
+    end
+  end
+
+  def assert_have_empty_index(commit)
+    commit.with_index do |index|
+      index.must_be_empty
+    end
+  end
+end
+
+Commit.infect_an_assertion :assert_equal_index, :must_equal_index
+Commit.infect_an_assertion :assert_have_empty_index, :must_have_empty_index, :unary

data/spec/patch_spec.rb

@@ -0,0 +1,213 @@
+require 'minitest_helper'
+
+describe Patch do
+
+  let(:repo_1) { Repository.new :test_1 }
+  let(:repo_2) { Repository.new :test_2 }
+  let(:repo_3) { Repository.new :test_3 }
+  let(:commits) { Hash.new }
+
+  before do
+    # Repo 1: X---(1)---(2)---(3)---(4)---(5)---(8)---(9)---(12)---(13)---(14)
+    # Repo 2:  \                 \--(6)---(7)--/           /
+    # Repo 3:   \----------(10)-----------------(11)------/
+
+    repo_1[:countries].insert 'AR', name: 'Argentina'
+    commit repo_1, 1
+
+    repo_1[:countries].insert 'UY', name: 'Uruguay'
+    commit repo_1, 2
+
+    repo_1[:countries].insert 'BR', name: 'Brasil'
+    commit repo_1, 3
+    repo_1.push
+
+    repo_1[:countries].update 'UY', name: 'Republica Oriental del Uruguay'
+    commit repo_1, 4
+
+    repo_1[:countries].update 'AR', name: 'Argentina', number: 54
+    commit repo_1, 5
+
+    repo_2.pull
+    repo_2[:countries].insert 'CL', name: 'Chile'
+    commit repo_2, 6
+
+    repo_2[:countries].update 'AR', name: 'Republica Argentina'
+    commit repo_2, 7
+    repo_2.push
+
+    repo_1.pull
+    add_commit repo_1.current_commit, 8
+
+    repo_1[:countries].delete 'CL'
+    commit repo_1, 9
+    repo_1.push
+
+    repo_3[:countries].insert 'CO', name: 'Colombia'
+    commit repo_3, 10
+
+    repo_3[:countries].update 'CO', name: 'Colombia', number: 57
+    commit repo_3, 11
+
+    repo_1.merge commit: commits[11].id
+    add_commit repo_1.current_commit, 12
+
+    repo_1[:countries].update 'BR', name: 'Brasil', number: 55
+    commit repo_1, 13
+
+    repo_1[:countries].delete 'CO'
+    commit repo_1, 14
+  end
+
+  def commit(repo, index)
+    commits[index] = repo.commit author: repo.name, message: "Commit #{index}"
+  end
+
+  def add_commit(commit, index)
+    commits[index] = commit
+  end
+
+  describe 'Same commit' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[4], commits[4]
+
+      patch.delta.must_be_empty
+      patch.base_commit.must_equal commits[4]
+      patch.base_delta.must_be_empty
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[4], commits[4]
+
+      patch.delta.must_be_empty
+      patch.base_commit.must_equal commits[4]
+    end
+
+  end
+
+  describe 'Both initial commits' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[1], commits[11]
+
+      patch.delta.must_equal 'countries' => {
+        'CO' => {'action' => 'insert', 'data' => {'name' => 'Colombia', 'number' => 57}}
+      }
+      patch.base_commit.must_be_nil
+      patch.base_delta.must_equal 'countries' => {
+        'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}},
+        'CO' => {'action' => 'insert', 'data' => {'name' => 'Colombia', 'number' => 57}}
+      }
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[1], commits[11]
+
+      patch.delta.must_equal 'countries' => {
+        'AR' => {'action' => 'delete'},
+        'CO' => {'action' => 'insert', 'data' => {'name' => 'Colombia', 'number' => 57}}
+      }
+      patch.base_commit.must_be_nil
+    end
+
+  end
+
+  describe 'Fast forward' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[1], commits[3]
+
+      patch.delta.must_be_empty
+      patch.base_commit.must_equal commits[1]
+      patch.base_delta.must_be_empty
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[1], commits[3]
+
+      patch.delta.must_equal 'countries' => {
+        'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}},
+        'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}
+      }
+      patch.base_commit.must_equal commits[1]
+    end
+
+  end
+
+  describe 'Revert' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[4], commits[2]
+
+      patch.delta.must_be_empty
+      patch.base_commit.must_equal commits[2]
+      patch.base_delta.must_be_empty
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[4], commits[2]
+
+      patch.delta.must_equal 'countries' => {
+        'UY' => {'action' => 'update', 'data' => {'name' => 'Uruguay'}},
+        'BR' => {'action' => 'delete'}
+      }
+      patch.base_commit.must_equal commits[2]
+    end
+
+  end
+
+  describe 'Merge' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[5], commits[7]
+      
+      patch.delta.must_equal 'countries' => {
+        'AR' => {'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'number' => 54}},
+        'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
+      }
+      patch.base_commit.must_equal commits[3]
+      patch.base_delta.must_equal 'countries' => {
+        'UY' => {'action' => 'update', 'data' => {'name' => 'Republica Oriental del Uruguay'}},
+        'AR' => {'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'number' => 54}},
+        'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}},
+      }
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[5], commits[7]
+
+      patch.delta.must_equal 'countries' => {
+        'UY' => {'action' => 'update', 'data' => {'name' => 'Uruguay'}},
+        'AR' => {'action' => 'update', 'data' => {'name' => 'Republica Argentina'}},
+        'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
+      }
+      patch.base_commit.must_equal commits[3]
+    end
+
+  end
+
+  describe 'Unmerge' do
+
+    it 'Merge' do
+      patch = Patch.merge commits[9], commits[7]
+
+      patch.delta.must_be_empty
+      patch.base_commit.must_equal commits[3]
+      patch.base_delta.must_be_empty
+    end
+
+    it 'Diff' do
+      patch = Patch.diff commits[9], commits[7]
+
+      patch.delta.must_equal 'countries' => {
+        'AR' => {'action' => 'update', 'data' => {'name' => 'Republica Argentina'}},
+        'UY' => {'action' => 'update', 'data' => {'name' => 'Uruguay'}},
+        'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
+      }
+      patch.base_commit.must_equal commits[3]
+    end
+
+  end
+
+end

data/spec/pull_spec.rb

@@ -0,0 +1,292 @@
+require 'minitest_helper'
+
+describe Repository, 'Pull' do
+
+  let(:repository) { Repository.new :test }
+
+  it 'With uncommitted changes' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+
+    error = proc { repository.pull }.must_raise RuntimeError
+    error.message.must_equal "Can't pull with uncommitted changes"
+  end
+
+  it 'Invalid remote branch' do
+    error = proc { repository.pull }.must_raise RuntimeError
+    error.message.must_equal 'Branch not found: master'
+  end
+
+  it 'Without previous commit' do
+    other_repository = Repository.new :other
+    other_repository[:countries].insert 'AR', name: 'Argentina'
+    commit = other_repository.commit author: 'User', message: 'Commit 1'
+    other_repository.push
+
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    repository.current_commit.must_equal commit
+    repository.branches[repository.current_branch].must_equal commit.id
+  end
+
+  it 'Up to date' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+    
+    delta = repository.pull
+
+    delta.must_be_empty
+    repository.current_commit.must_equal commit_1
+  end
+
+  it 'Ahead of branch' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+
+    repository.push
+
+    repository[:countries].insert 'UY', name: 'Uruguay'
+    commit_2 = repository.commit author: 'User', message: 'Commit 2'
+
+    delta = repository.pull
+
+    delta.must_be_empty
+    repository.current_commit.must_equal commit_2
+  end
+
+  it 'Fast-forward' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+    
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+
+    repository[:countries].insert 'UY', name: 'Uruguay'
+    commit_2 = repository.commit author: 'User', message: 'Commit 2'
+    repository.push
+
+    other_repository.wont_be :changes?
+    other_repository.current_commit.must_equal commit_1
+    other_repository.branches[other_repository.current_branch].must_equal commit_1.id
+
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+
+    other_repository.wont_be :changes?
+    other_repository.current_commit.must_equal commit_2
+    other_repository.branches[other_repository.current_branch].must_equal commit_2.id
+  end
+
+  it 'Merge' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+    
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    
+    other_repository[:countries].insert 'UY', name: '...'
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+
+    other_repository[:countries].update 'UY', name: 'Uruguay'
+    commit_3 = other_repository.commit author: 'User', message: 'Commit 3'
+
+    other_repository.push
+
+    repository[:countries].insert 'BR', name: 'Brasil'
+    commit_4 = repository.commit author: 'User', message: 'Commit 4'
+
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_4.id, commit_3.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {
+        'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}, 
+        'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
+      }
+      commit.delta.must_be_empty
+      commit.must_equal_index 'countries' => {
+        'AR' => digest(name: 'Argentina'), 
+        'UY' => digest(name: 'Uruguay'),
+        'BR' => digest(name: 'Brasil')
+      }
+    end
+  end
+
+  it 'Merge with conflicts' do
+    repository[:countries].insert 'AR', name: 'Argentina 1'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+    
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina 1'}}}
+
+    other_repository[:countries].update 'AR', name: 'Argentina 2'
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+    other_repository.push
+
+    repository[:countries].update 'AR', name: 'Argentina 3'
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 2'}}}
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 2'}}}
+      commit.delta.must_be_empty
+      commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina 2')}
+    end
+  end
+
+  it 'Merge different changes for same object' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+
+    other_repository[:countries].update 'AR', name: 'Argentina', number: 54
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+    other_repository.push
+
+    repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
+      commit.delta.must_be_empty
+      commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG', number: 54)}
+    end
+  end
+
+  it 'Merge added same object in differents repositories' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+
+    other_repository[:countries].insert 'X', name: 'X1', code: 1
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+    other_repository.push
+
+    repository[:countries].insert 'X', name: 'X2', number: 2
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'X' => {'action' => 'update', 'data' => {'name' => 'X1', 'number' => 2, 'code' => 1}}}
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+    
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {'X' => {'action' => 'insert', 'data' => {'name' => 'X1', 'number' => 2, 'code' => 1}}}
+      commit.delta.must_be_empty
+      commit.must_equal_index 'countries' => {
+        'AR' => digest(name: 'Argentina'),
+        'X'  => digest(name: 'X1', 'number' => 2, 'code' => 1)
+      }
+    end
+  end
+
+  it 'Merge removed same object in differents repositories' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+
+    other_repository[:countries].delete 'AR'
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+    other_repository.push
+
+    repository[:countries].delete 'AR'
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    delta = repository.pull
+
+    delta.must_be_empty
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+    
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'delete'}}
+      commit.delta.must_be_empty
+      commit.must_have_empty_index
+    end
+  end
+
+  it 'Merge updated object previously removed' do
+    repository[:countries].insert 'AR', name: 'Argentina'
+    commit_1 = repository.commit author: 'User', message: 'Commit 1'
+    repository.push
+
+    other_repository = Repository.new :other
+    delta = other_repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+
+    other_repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
+    commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
+    other_repository.push
+
+    repository[:countries].delete 'AR'
+    commit_3 = repository.commit author: 'User', message: 'Commit 3'
+    delta = repository.pull
+
+    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina', 'code' => 'ARG'}}}
+
+    repository.branches[repository.current_branch].must_equal repository.current_commit.id
+
+    repository.current_commit.tap do |commit|
+      commit.must_be :merge?
+      commit.parent_ids.must_equal [commit_3.id, commit_2.id]
+      commit.base.id.must_equal commit_1.id
+      commit.base_delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG'}}}
+      commit.delta.must_be_empty
+      commit.must_equal_index 'countries' => {'AR' => digest(name: 'Argentina', code: 'ARG')}
+    end
+  end
+
+end