eternity 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f76c2109a42456676af151b6a5cef12a74af248d
-  data.tar.gz: 3868000b435fe7980807d5ea3301d87378ec4602
+  metadata.gz: 2d899599867306841878c64702cb5786909538d3
+  data.tar.gz: 70a14178c9956a8e3a44bb5cc90ac977f063486c
 SHA512:
-  metadata.gz: c56a780bfd908e067fa7477c381f0ccb5b0db796e6f8d57e52109db39ed5baa6dc16832229e7b7223add0d04fdd34da1121555c8e71490eccdfd5be0024ff6f4
-  data.tar.gz: 14a8b29628bce41a2886a5439ab10b28d8c07b523ee8886219b276d4b0f94add1340622d08d3b1183f00c8dddb037132ad35dccfcc11f4428c5c3de17900646f
+  metadata.gz: b03d8b518b7b32ae744ced5e17ddbd010c4f3495cdfd2b90f702bff7d67e26387a01d532d77e9c84381d08eb0ebe575cc1206f884fb0093875de321979cfd57d
+  data.tar.gz: 7ae3ebdff6141df8985529030e6bb5a1aec3b1de2e17fd25f1b4fe4364d06166cfbc416dce4ffa119e624aaa7bb2131db250b51ee78c38dd2a51545496c679b7

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby
 services:
-  - redis-server
+  - redis-server
+before_install:
+  - gem install bundler

data/Rakefile

@@ -5,6 +5,7 @@ Rake::TestTask.new(:spec) do |t|
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
+  t.warning = false
 end
 
 task :console do

data/eternity.gemspec

@@ -18,15 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'redic', '~> 1.5.0'
-  spec.add_dependency 'restruct', '~> 0.1.0'
-  spec.add_dependency 'class_config', '~> 0.0.2'
-  spec.add_dependency 'transparent_proxy', '~> 0.0.4'
+  spec.add_dependency 'restruct', '~> 0.1'
+  spec.add_dependency 'class_config', '~> 0.0'
+  spec.add_dependency 'transparent_proxy', '~> 0.0'
 
   if RUBY_PLATFORM == 'java'
-    spec.add_dependency 'msgpack-jruby'
+    spec.add_dependency 'msgpack-jruby', '~> 1.4'
   else
-    spec.add_dependency 'msgpack', '~> 0.5.9'
+    spec.add_dependency 'msgpack', '~> 0.7'
   end
 
   spec.add_development_dependency 'bundler', '~> 1.5'

data/lib/eternity.rb

@@ -1,4 +1,3 @@
-require 'redic'
 require 'digest/sha1'
 require 'msgpack'
 require 'class_config'

data/lib/eternity/blob.rb

@@ -62,6 +62,29 @@ module Eternity
         Eternity.connection.call('KEYS', Eternity.keyspace[:blob]['*']).count
       end
 
+      def orphan_files
+        repositories = Repository.all
+        
+        repo_commits = repositories.map { |r| r.current_commit } + 
+                       repositories.flat_map { |r| r.branches.values.map { |c| Commit.new c } }
+        
+        branch_commits = Branch.names.map { |b| Branch[b] }
+
+        used_by_type = {
+          commit: (repo_commits.flat_map { |c| [c.id] + c.history_ids } + branch_commits.flat_map { |c| [c.id] + c.history_ids }).uniq
+        }
+
+        commit_blobs = used_by_type[:commit].map { |id| Blob.read :commit, id }
+
+        [:index, :delta, :history].each do |type|
+          used_by_type[type] = commit_blobs.map { |b| b[type.to_s] }.compact
+        end
+
+        used_by_type.each_with_object({}) do |(type, used), hash|
+          hash[type] = files_of(type) - used.map { |id| file_for type, id }
+        end
+      end
+
       private
 
       def write_redis(type, sha1, serialization)
@@ -95,6 +118,10 @@ module Eternity
         File.join Eternity.blob_path, type.to_s, sha1[0..1], sha1[2..-1]
       end
 
+      def files_of(type)
+        Dir.glob File.join(Eternity.blob_path, type.to_s, '*', '*')
+      end
+
     end
     
   end

data/lib/eternity/delta.rb

@@ -18,22 +18,15 @@ module Eternity
         union(deltas).each_with_object({}) do |(collection, elements), hash|
           hash[collection] = {}
           elements.each do |id, changes|
-            changes.each do |change|
-              current_change = change
-              if hash[collection][id]
-                current_change = TrackFlatter.flatten [hash[collection][id], change]
-                if current_change && [INSERT, UPDATE].include?(current_change['action'])
-                  base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
-                  current_change['data'] = ConflictResolver.resolve hash[collection][id]['data'] || base_data,
-                                                                    change['data'],
-                                                                    base_data
-                end
-              elsif hash[collection].key?(id) && change['action'] == DELETE
-                current_change = nil
+            current_change = TrackFlatter.flatten changes
+            if current_change 
+              if current_change['action'] == UPDATE
+                base_data = base_index[collection].include?(id) ? base_index[collection][id].data : {}
+                current_change['data'] = changes.select { |c| c['data'] }
+                                                .inject(base_data) { |d,c| ConflictResolver.resolve d, c['data'], base_data }
               end
               hash[collection][id] = current_change
             end
-            hash[collection].delete id unless hash[collection][id]
           end
           hash.delete collection if hash[collection].empty?
         end        

data/lib/eternity/patch.rb

@@ -22,7 +22,7 @@ module Eternity
         @base_commit ||= Commit.base_of current_commit, target_commit
       end
 
-      def delta 
+      def delta
         @delta ||= TransparentProxy.new { calculate_delta }
       end
 
@@ -47,12 +47,12 @@ module Eternity
       def calculate_delta
         base_commit.with_index do |base_index|
           current_commit.with_index do |current_index|
-            
+
             current_delta = Delta.merge current_history.reverse.map(&:delta), base_index
             target_delta = Delta.merge target_history.reverse.map(&:delta), base_index
             revert_delta = Delta.revert current_delta, base_index
 
-            merged_delta = merge_deltas current_delta, target_delta, revert_delta, base_index
+            merged_delta = merge_deltas target_delta, revert_delta, base_index
 
             merged_delta.each_with_object({}) do |(collection, elements), hash|
               hash[collection] = {}
@@ -92,7 +92,7 @@ module Eternity
         super
       end
 
-      def merge_deltas(current_delta, target_delta, revert_delta, base_index)
+      def merge_deltas(target_delta, revert_delta, base_index)
         remaining_delta = Delta.merge remaining_history.reverse.map(&:delta), base_index
         Delta.merge [revert_delta, target_delta, remaining_delta], base_index
       end
@@ -106,7 +106,7 @@ module Eternity
 
       private
 
-      def merge_deltas(current_delta, target_delta, revert_delta, base_index)
+      def merge_deltas(target_delta, revert_delta, base_index)
         Delta.merge [revert_delta, target_delta], base_index
       end
 

data/lib/eternity/version.rb

@@ -1,3 +1,3 @@
 module Eternity
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/delta_spec.rb

@@ -313,4 +313,70 @@ describe 'Delta' do
 
   end
 
+  it 'Insert -> Delete -> Update' do
+    #                 P         P     M
+    # REPO 1: (*)----(1)-------(4)---(7)
+    #           \       \         \  /
+    # REPO 2:    \-(2)--(3)---(5)--(6)
+    #                    M          MP
+
+    repo_1[:countries].insert 'AR', name: 'Argentina'
+    repo_1.commit author: 'User 1', message: 'Commit 1'
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+    }
+
+    repo_1.push
+
+    repo_2[:countries].insert 'UY', name: 'Uruguay'
+    repo_2.commit author: 'User 2', message: 'Commit 2'
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'UY' => digest(name: 'Uruguay'),
+    }
+
+    delta = repo_2.pull
+    delta.must_equal 'countries' => {
+      'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina'}}
+    }
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina'),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    repo_1[:countries].delete 'AR'
+    repo_1.commit author: 'User 1', message: 'Commit 4'
+    repo_1.current_commit.must_equal_index Hash.new
+
+    repo_1.push
+
+    repo_2[:countries].update 'AR', name: 'Argentina', number: 54
+    repo_2.commit author: 'User 2', message: 'Commit 5'
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    delta = repo_2.pull
+    delta.must_be_empty
+
+    repo_2.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'UY' => digest(name: 'Uruguay')
+    }
+
+    repo_2.push
+
+    delta = repo_1.pull
+    delta.must_equal 'countries' => {
+      'AR' => {'action' => 'insert', 'data' => {'name' => 'Argentina', 'number' => 54}},
+      'UY' => {'action' => 'insert', 'data' => {'name' => 'Uruguay'}},
+    }
+
+    repo_1.current_commit.must_equal_index 'countries' => {
+      'AR' => digest(name: 'Argentina', number: 54),
+      'UY' => digest(name: 'Uruguay')
+    }
+  end
+
 end

metadata

@@ -1,85 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: eternity
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: redic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: restruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: transparent_proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.9
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement