eternity 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0981a07c6d2750de190de34fd06fa69bc36294a
-  data.tar.gz: 48446c1ea896d5d99089ca1b1409d883c666490d
+  metadata.gz: e33df6192a238b152d5a61364a026db81e0eeee5
+  data.tar.gz: '085e7cb59a99d46c74de967a9ba3a7426adc6c6c'
 SHA512:
-  metadata.gz: 51c887426e9faae2f4c2dbaf51003b24f0afbe5e1e3627fd9a70348163c29484f6ab3ea5f6c0ad6bdb2845549afd6e07c92222ae3f741abd45caf83aeb081fb6
-  data.tar.gz: 98df7c4d6301a44c4a100f1a8517a220bede1ce1af42cd3b3fb7e228266c5a65ff0736335d666711a10bdfb3643ba500ce07e5b6c78dfa719afee85c9a0f5864
+  metadata.gz: c7db74759d279ece10211946a72a031cc08a3f0f8d73ba94cea6829a59e9b4c19a8c2fcac334932cf640c5311495e7530725e326d94863ef3db9c86a340ea01a
+  data.tar.gz: 850d7b98eed7fc1073ee4373c6dbdf72428e84839359c6c4a83157183799ef25e6c6e39b30d4b56c4df7cbd7d91581e2e33d941ddc3a3cd7b5e0e2ba0b5e6cc6

data/lib/eternity/repository.rb

@@ -92,7 +92,7 @@ module Eternity
 
         current[:branch] = branch
 
-        Patch.diff(original_commit, current_commit).delta
+        Patch.diff original_commit, current_commit
       end
     end
 
@@ -128,7 +128,7 @@ module Eternity
       Eternity.logger.info(self.class) { "Pull #{name} (#{target_commit.id})" }
 
       if current_commit == target_commit || current_commit.fast_forward?(target_commit)
-        {}
+        Patch.merge current_commit, target_commit
       elsif target_commit.fast_forward?(current_commit)
         checkout commit: target_commit.id
       else 
@@ -213,7 +213,7 @@ module Eternity
                 index:   write_index(patch.delta),
                 base:    patch.base_commit.id
 
-        patch.delta
+        patch
       end
     end
 

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '3.0.1'
+  VERSION = '4.0.0'
 end

data/spec/checkout_spec.rb

@@ -18,9 +18,11 @@ describe Repository, 'Checkout' do
       repository.current_branch.must_equal 'master'
       repository.current_commit.must_equal commit_2
 
-      delta = repository.checkout branch: :test_branch
-
-      delta.must_equal 'countries' => {'UY' => {'action' => 'delete'}}
+      patch = repository.checkout branch: :test_branch
+      
+      patch.current_commit.must_equal commit_2
+      patch.target_commit.must_equal commit_1
+      patch.delta.must_equal 'countries' => {'UY' => {'action' => 'delete'}}
 
       repository.current_branch.must_equal 'test_branch'
       repository.current_commit.must_equal commit_1
@@ -36,9 +38,11 @@ describe Repository, 'Checkout' do
       
       Branch[:test_branch] = commit.id
 
-      delta = repository.checkout branch: :test_branch
-
-      delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+      patch = repository.checkout branch: :test_branch
+      
+      patch.current_commit.must_be_nil
+      patch.target_commit.must_equal commit
+      patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
 
       repository.current_branch.must_equal 'test_branch'
       repository.current_commit.must_equal commit
@@ -65,9 +69,11 @@ describe Repository, 'Checkout' do
       repository.current_commit.must_equal commit_2
       repository.branches.to_h.must_equal 'master' => commit_2.id
 
-      delta = repository.checkout commit: commit_1.id
-
-      delta.must_equal 'countries' => {'UY' => {'action' => 'delete'}}
+      patch = repository.checkout commit: commit_1.id
+      
+      patch.current_commit.must_equal commit_2
+      patch.target_commit.must_equal commit_1
+      patch.delta.must_equal 'countries' => {'UY' => {'action' => 'delete'}}
 
       repository.current_branch.must_equal 'master'
       repository.current_commit.must_equal commit_1
@@ -86,9 +92,11 @@ describe Repository, 'Checkout' do
       repository[:countries].insert 'UY', name: 'Uruguay'
       commit_2 = repository.commit author: 'User', message: 'Commit 2'
 
-      delta = repository.checkout commit: nil
-
-      delta.must_equal 'countries' => {
+      patch = repository.checkout commit: nil
+      
+      patch.current_commit.must_equal commit_2
+      patch.target_commit.must_be_nil
+      patch.delta.must_equal 'countries' => {
         'AR' => {'action' => 'delete'},
         'UY' => {'action' => 'delete'}
       }

data/spec/delta_spec.rb

@@ -36,7 +36,8 @@ describe 'Delta' do
 
     repo_1.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     commit_6 = repo_2.current_commit # Merge
 
     delta.must_equal 'countries' => {
@@ -52,7 +53,8 @@ describe 'Delta' do
 
     repo_2.push
 
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
 
     repo_1.current_commit.must_equal commit_6
 
@@ -70,7 +72,8 @@ describe 'Delta' do
 
     repo_1.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     commit_9 = repo_2.current_commit # Merge
 
     delta.must_equal 'countries' => {
@@ -89,7 +92,8 @@ describe 'Delta' do
 
     repo_2.push
 
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
 
     repo_1.current_commit.must_equal commit_10
 
@@ -102,7 +106,8 @@ describe 'Delta' do
     repo_3[:countries].insert 'UY', name: 'Uruguay'
     commit_11 = repo_3.commit author: 'User 3', message: 'Commit 11'
 
-    delta = repo_3.checkout commit: commit_10.id
+    patch = repo_3.checkout commit: commit_10.id
+    delta = patch.delta
 
     repo_3.current_commit.must_equal commit_10
 
@@ -125,7 +130,8 @@ describe 'Delta' do
     repo_1.commit author: 'User 1', message: 'Added Argentina'
     repo_1.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
     }
@@ -137,7 +143,8 @@ describe 'Delta' do
     repo_2[:countries].insert 'BR', name: 'Brasil'
     repo_2.commit author: 'User 2', message: 'Added Brasil'
     
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_be_empty
 
     repo_2.current_commit.must_equal_index 'countries' => {
@@ -150,7 +157,8 @@ describe 'Delta' do
     repo_1[:countries].insert 'UY', name: 'Uruguay'
     repo_1.commit author: 'User 1', message: 'Added Uruguay'
     
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}}
     }
@@ -166,7 +174,8 @@ describe 'Delta' do
     repo_2[:countries].insert 'CL', name: 'Chile'
     repo_2.commit author: 'User 2', message: 'Added Chile'
     
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
     }
@@ -183,7 +192,8 @@ describe 'Delta' do
     repo_1[:countries].update 'UY', name: 'Republica Oriental del Uruguay'
     repo_1.commit author: 'User 1', message: 'Updated Uruguay'
     
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'CL' => {'action' => 'insert', 'data' => {'name' => 'Chile'}}
     }
@@ -200,7 +210,8 @@ describe 'Delta' do
     repo_2[:countries].delete 'CL'
     repo_2.commit author: 'User 2', message: 'Deleted Chile'
     
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'UY' => {'action' => 'update', 'data' => {'name' => 'Republica Oriental del Uruguay'}}
     }
@@ -216,7 +227,8 @@ describe 'Delta' do
     repo_1[:countries].insert 'CO', name: 'Colombia'
     repo_1.commit author: 'User 1', message: 'Added Colombia'
     
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'CL' => {'action' => 'delete'}
     }
@@ -242,7 +254,8 @@ describe 'Delta' do
     repo_1.commit author: 'User 1', message: 'Commit 1'
     repo_1.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
     }
@@ -251,7 +264,8 @@ describe 'Delta' do
       'AR' => digest(name: 'Argentina'),
     }
 
-    delta = repo_3.pull
+    patch = repo_3.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
     }
@@ -270,7 +284,8 @@ describe 'Delta' do
     repo_3.commit author: 'User 3', message: 'Commit 4'
     repo_3.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
     }
@@ -282,7 +297,8 @@ describe 'Delta' do
 
     repo_2.push
 
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'number' => 54}},
       'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}
@@ -300,7 +316,8 @@ describe 'Delta' do
     repo_1.commit author: 'User 1', message: 'Commit 7'
     repo_1.push
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'BR' => {'action' => 'insert', 'data' => {'name' => 'Brasil'}},
       'UY' => {'action' => 'delete'}
@@ -334,7 +351,8 @@ describe 'Delta' do
       'UY' => digest(name: 'Uruguay'),
     }
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
     }
@@ -357,7 +375,8 @@ describe 'Delta' do
       'UY' => digest(name: 'Uruguay')
     }
 
-    delta = repo_2.pull
+    patch = repo_2.pull
+    delta = patch.delta
     delta.must_be_empty
 
     repo_2.current_commit.must_equal_index 'countries' => {
@@ -367,7 +386,8 @@ describe 'Delta' do
 
     repo_2.push
 
-    delta = repo_1.pull
+    patch = repo_1.pull
+    delta = patch.delta
     delta.must_equal 'countries' => {
       'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina', 'number' => 54}},
       'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}},

data/spec/merge_spec.rb

@@ -13,10 +13,10 @@ describe Repository, 'Merge' do
   end
 
   def merge(id, repo, target_id)
-    delta = repo.merge commit: commits[target_id].id
+    patch = repo.merge commit: commits[target_id].id
     commits[id] = repo.current_commit
-    yield delta['countries'] if block_given?
-    delta
+    yield patch.delta['countries'], patch.current_commit, patch.target_commit if block_given?
+    patch
   end
 
   def checkout(id, repo)
@@ -52,8 +52,10 @@ describe Repository, 'Merge' do
         update 'AR', name: 'Argentina'
       end
 
-      merge 5, repo_2, 4 do |delta|
+      merge 5, repo_2, 4 do |delta, current_commit, target_commit|
         delta.must_be_nil
+        current_commit.must_equal commits[2]
+        target_commit.must_equal commits[4]
       end
 
       assert_index 5, 'AR' => digest(name: 'Argentina'),
@@ -119,15 +121,19 @@ describe Repository, 'Merge' do
         update 'AR', name: 'Argentina', code: 'ARG'
       end
 
-      merge 6, repo_2, 5 do |delta|
+      merge 6, repo_2, 5 do |delta, current_commit, target_commit|
         delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'code' => 'ARG'}
+        current_commit.must_equal commits[3]
+        target_commit.must_equal commits[5]
       end
 
       assert_index 6, 'AR' => digest(name: 'Republica Argentina', code: 'ARG'),
                       'UY' => digest(name: 'Uruguay')
 
-      merge 7, repo_1, 3 do |delta|
+      merge 7, repo_1, 3 do |delta, current_commit, target_commit|
         delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina', 'code' => 'ARG'}
+        current_commit.must_equal commits[5]
+        target_commit.must_equal commits[3]
       end
 
       assert_index 7, 'AR' => digest(name: 'Republica Argentina', code: 'ARG'),
@@ -166,6 +172,35 @@ describe Repository, 'Merge' do
       assert_index 6, 'AR' => digest(name: 'Argentina', code: 'ARG')
     end
 
+    it 'case 5' do
+      skip
+      commit 1, repo_1 do
+        insert 'AR', name: 'Argentina'
+      end
+
+      checkout 1, repo_2
+
+      commit 2, repo_2 do
+        insert 'UY', name: 'Uruguay'
+      end
+
+      commit 3, repo_1 do
+        update 'AR', name: 'Republica Argentina'
+      end
+
+      merge 4, repo_2, 3 do |delta|
+        delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Republica Argentina'}
+      end
+
+      commit 5, repo_1 do
+        update 'AR', name: 'Argentina'
+      end
+
+      merge 6, repo_1, 4 do |delta|
+        delta['AR'].must_equal 'action' => 'update', 'data' => {'name' => 'Argentina'}
+      end
+    end
+
   end
 
   it 'Merge deleted element in two commits' do

data/spec/pull_spec.rb

@@ -22,9 +22,12 @@ describe Repository, 'Pull' do
     commit = other_repository.commit author: 'User', message: 'Commit 1'
     other_repository.push
 
-    delta = repository.pull
+    patch = repository.pull
+
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit
 
-    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
@@ -34,9 +37,12 @@ describe Repository, 'Pull' do
     commit_1 = repository.commit author: 'User', message: 'Commit 1'
     repository.push
     
-    delta = repository.pull
+    patch = repository.pull
+
+    patch.delta.must_be_empty
+    patch.current_commit.must_equal commit_1
+    patch.target_commit.must_equal commit_1
 
-    delta.must_be_empty
     repository.current_commit.must_equal commit_1
   end
 
@@ -49,9 +55,12 @@ describe Repository, 'Pull' do
     repository[:countries].insert 'UY', name: 'Uruguay'
     commit_2 = repository.commit author: 'User', message: 'Commit 2'
 
-    delta = repository.pull
+    patch = repository.pull
+
+    patch.delta.must_be_empty
+    patch.current_commit.must_equal commit_2
+    patch.target_commit.must_equal commit_1
 
-    delta.must_be_empty
     repository.current_commit.must_equal commit_2
   end
 
@@ -61,9 +70,11 @@ describe Repository, 'Pull' do
     repository.push
     
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
     repository[:countries].insert 'UY', name: 'Uruguay'
     commit_2 = repository.commit author: 'User', message: 'Commit 2'
@@ -73,9 +84,11 @@ describe Repository, 'Pull' do
     other_repository.current_commit.must_equal commit_1
     other_repository.branches[other_repository.current_branch].must_equal commit_1.id
 
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+    patch.delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+    patch.current_commit.must_equal commit_1
+    patch.target_commit.must_equal commit_2
 
     other_repository.wont_be :changes?
     other_repository.current_commit.must_equal commit_2
@@ -88,9 +101,11 @@ describe Repository, 'Pull' do
     repository.push
     
     other_repository = Repository.new :other
-    delta = other_repository.pull
-
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch = other_repository.pull
+    
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
     
     other_repository[:countries].insert 'UY', name: '...'
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
@@ -103,9 +118,11 @@ describe Repository, 'Pull' do
     repository[:countries].insert 'BR', name: 'Brasil'
     commit_4 = repository.commit author: 'User', message: 'Commit 4'
 
-    delta = repository.pull
+    patch = repository.pull
 
-    delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+    patch.delta.must_equal 'countries' => {'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}}}
+    patch.current_commit.must_equal commit_4
+    patch.target_commit.must_equal commit_3
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
@@ -128,9 +145,11 @@ describe Repository, 'Pull' do
     repository.push
     
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina 1'}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina 1'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
     other_repository[:countries].update 'AR', name: 'Argentina 2', number: 54
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
@@ -138,9 +157,11 @@ describe Repository, 'Pull' do
 
     repository[:countries].update 'AR', name: 'Argentina 3'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
-    delta = repository.pull
+    patch = repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 3', 'number' => 54}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina 3', 'number' => 54}}}
+    patch.current_commit.must_equal commit_3
+    patch.target_commit.must_equal commit_2
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
@@ -159,9 +180,11 @@ describe Repository, 'Pull' do
     repository.push
 
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
     other_repository[:countries].update 'AR', name: 'Argentina', number: 54
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
@@ -169,9 +192,11 @@ describe Repository, 'Pull' do
 
     repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
-    delta = repository.pull
+    patch = repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'update', 'data' => {'name' => 'Argentina', 'code' => 'ARG', 'number' => 54}}}
+    patch.current_commit.must_equal commit_3
+    patch.target_commit.must_equal commit_2
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
@@ -190,9 +215,11 @@ describe Repository, 'Pull' do
     repository.push
 
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.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'
@@ -200,9 +227,11 @@ describe Repository, 'Pull' do
 
     repository[:countries].insert 'X', name: 'X2', number: 2
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
-    delta = repository.pull
+    patch = repository.pull
 
-    delta.must_equal 'countries' => {'X' => {'action' => 'update', 'data' => {'name' => 'X2', 'number' => 2, 'code' => 1}}}
+    patch.delta.must_equal 'countries' => {'X' => {'action' => 'update', 'data' => {'name' => 'X2', 'number' => 2, 'code' => 1}}}
+    patch.current_commit.must_equal commit_3
+    patch.target_commit.must_equal commit_2
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
     
@@ -224,9 +253,11 @@ describe Repository, 'Pull' do
     repository.push
 
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
     other_repository[:countries].delete 'AR'
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
@@ -235,9 +266,11 @@ describe Repository, 'Pull' do
     repository[:countries].delete 'AR'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
 
-    delta = repository.pull
+    patch = repository.pull
 
-    delta.must_be_empty
+    patch.delta.must_be_empty
+    patch.current_commit.must_equal commit_3
+    patch.target_commit.must_equal commit_2
 
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
     
@@ -256,9 +289,11 @@ describe Repository, 'Pull' do
     repository.push
 
     other_repository = Repository.new :other
-    delta = other_repository.pull
+    patch = other_repository.pull
 
-    delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.delta.must_equal 'countries' => {'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}}
+    patch.current_commit.must_be_nil
+    patch.target_commit.must_equal commit_1
 
     other_repository[:countries].delete 'AR'
     commit_2 = other_repository.commit author: 'User', message: 'Commit 2'
@@ -267,10 +302,12 @@ describe Repository, 'Pull' do
     repository[:countries].update 'AR', name: 'Argentina', code: 'ARG'
     commit_3 = repository.commit author: 'User', message: 'Commit 3'
     
-    delta = repository.pull
-
-    delta.must_be_empty
+    patch = repository.pull
 
+    patch.delta.must_be_empty
+    patch.current_commit.must_equal commit_3
+    patch.target_commit.must_equal commit_2
+    
     repository.branches[repository.current_branch].must_equal repository.current_commit.id
 
     repository.current_commit.tap do |commit|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: restruct