au 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747b7a38e077a90fcae85a25a41debea6a9c66f6e8c66605e4d298268bdd21cd
-  data.tar.gz: 82a01914628d92827535d2d587681d260e73369133366c752ce4985895e8dd7d
+  metadata.gz: aa95d04570850dee2f2925f15f73e3bcec71cece8d85fd3a96eed234615df6e9
+  data.tar.gz: a2ad2985e381758e42dda23e14781d47fcb16dabcf2539a720e67c5823f1fb0b
 SHA512:
-  metadata.gz: b82d4e806d17cf8c6429967461e437612a7927931a1db214a387e870ade5458e6f2e4e58f4a9f41b0989b9e725e0b78247a5a7c96f2dc6e1109173436e6a978b
-  data.tar.gz: 2917e2d460448b99a06308e2e1daed33a89a03ffc5bc3828611e1cea0ecaeba0eb9d0b8e4f325326649537ae1b079bd15b007bd1725444a3851bacb17c4322eb
+  metadata.gz: 0a3430e195cd66c77a7b8e6228e459d6c75fa3bb0d42f4d1e305d152b37b6c63d714e05a2410314d2144916e6871202576ecc2089d66b1fa56aebb2c8064e5ef
+  data.tar.gz: 07d9fa7e97ca6b3f80937ee5a0e16d3e2480935fe11e5caf62708030b7d4ef7c2b07125f97245d1bcb856b7c3ac68fd84648e2d5816e2dc3ac5372f0622e9945

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    au (0.1.1)
+    au (0.2.0)
       colorize
       thor
 

data/README.md

@@ -26,7 +26,7 @@ To install
 **any older version will error**. If your system comes with an older version, please either
 update your Ruby installation or use [rbenv](https://github.com/rbenv/rbenv). You may need to use `sudo`. Additionally, if you are on an outdated Ruby installation, please make sure your load path is updated for Ruby executable.
 
-## Usage
+## Design Document
 
 A simple get-started [tutorial video](https://www.useloom.com/share/6372bf5d22b8482299f3c788559d4173).
 
@@ -96,6 +96,8 @@ Again, this project requires Ruby 2.5.0 or higher.
 
 Unit specs are written in RSpec. Use `bundle exec rspec` to run all unit specs.
 
+Use `ruby -Ilib:test test/integration_test.rb` to run integration test.
+
 To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Dependencies

data/bin/au

@@ -86,7 +86,7 @@ module Au
 
     desc "heads", "Show current HEAD"
     def heads
-      Repository.instance.heads
+      puts Repository.instance.heads
     end
 
     desc "diff PATH", "Diff between tracked version and current version"
@@ -142,28 +142,23 @@ module Au
 
     desc "pull REMOTE_PATH", "Pull changes from remote repo"
     def pull(remote_repo_root)
-      remote = nil
       begin
-        remote = Repository.instance(remote_repo_root, false)
-      rescue
-        puts "Remote path is invalid!"
-        return
+        remote = Repository.new(remote_repo_root, false)
+        Repository.instance.pull(remote)
+      rescue => e
+        puts e.message
       end
-      Repository.instance.pull(remote)
     end
 
     desc "push REMOTE_PATH", "Push changes to remote repo"
     def push(remote_repo_root)
-      remote = nil
       begin
-        remote = Repository.instance(remote_repo_root, false)
-      rescue
-        puts "Remote path is invalid!"
-        return
+        remote = Repository.new(remote_repo_root, false)
+        Repository.instance.push(remote)
+      rescue => e
+        puts e.message
       end
-      Repository.instance.push(remote)
     end
-
   end
 end
 

data/lib/au.rb

@@ -7,6 +7,6 @@ require 'au/models/diff'
 require 'au/models/document'
 require 'au/models/repository'
 require 'au/models/staging'
-
+require 'pry'
 module Au
 end

data/lib/au/models/commit.rb

@@ -217,9 +217,10 @@ module Au
 
     private
 
-    def self.db(repo_path = nil)
+    def self.db(repo_path = Repository.path)
       # in this pstore file, each key is a commit id
-      @db ||= PStore.new(File.join(Repository.path(repo_path), 'commits.pstore'))
+      @db ||= {}
+      @db[repo_path] ||= PStore.new(File.join(repo_path, 'commits.pstore'))
     end
 
     def self.build_commit_id

data/lib/au/models/repository.rb

@@ -97,7 +97,7 @@ module Au
 
     def pull(remote_repo)
       # Initialize local and remote db and commit list
-      remote_commit_db = Commit.db(remote_repo.root)
+      remote_commit_db = Commit.db(remote_repo.path)
       remote_commit_list = remote_commit_db.transaction do
         remote_commit_db.roots
       end
@@ -124,31 +124,35 @@ module Au
 
       # Find documents and their diff_id in those commits that only existed remotely
       remote_diff_id_to_add_list = {}
-      commits_to_add.each do |commit| 
-        commit[:doc_diff_ids].each do |doc_path, diff_id| 
+      commits_to_add.each do |_, commit|
+        commit[:doc_diff_ids].each do |doc_path, diff_id|
           remote_diff_id_to_add_list[doc_path] = diff_id
         end
       end
 
-      # Write these information to remote
+      # Write these information to local
       remote_diff_id_to_add_list.each do |doc_path, diff_id|
         diff_pstore_remote = PStore.new(diff_db_name_remote(doc_path, remote_repo.path))
         diff_pstore_remote.transaction(true) do
           diff_pstore_local = PStore.new(diff_db_name_remote(doc_path, @path))
           diff_pstore_local.transaction do
-            if diff_pstore_local[doc_path] == nil
-              diff_pstore_local[doc_path] = diff_pstore_remote[doc_path]
-            elsif diff_pstore_local[doc_path] != diff_pstore_remote[doc_path]
+            if diff_pstore_local[diff_id] == nil
+              diff_pstore_local[diff_id] = diff_pstore_remote[diff_id]
+            elsif diff_pstore_local[diff_id] != diff_pstore_remote[diff_id]
               raise "Error: Remote and local reposiroty have different content in a same diff"
             end
           end
         end
       end
+
+      # Find heads that only exist on remote repo
+      heads_to_add = remote_repo.heads.reject{|x| heads.include?(x)}
+      heads_to_add.each{|x| update_leaves_pstore(x)}
     end
 
     def push(remote_repo)
       # Initialize local and remote db and commit list
-      remote_commit_db = Commit.db(remote_repo.root)
+      remote_commit_db = Commit.db(remote_repo.path)
       remote_commit_list = remote_commit_db.transaction do
         remote_commit_db.roots
       end
@@ -164,8 +168,8 @@ module Au
       # Find commits that only exist locally
       commit_id_to_add_list = local_commit_list.reject{|x| remote_commit_list.include?(x)}
       commits_to_add = {}
-      remote_commit_db.transaction(true) do
-        commit_id_to_add_list.each{|commit_id| commits_to_add[commit_id] = remote_commit_db[commit_id]}
+      local_commit_db.transaction(true) do
+        commit_id_to_add_list.each{|commit_id| commits_to_add[commit_id] = local_commit_db[commit_id]}
       end
 
       # Write those commits to remote commit db
@@ -175,8 +179,8 @@ module Au
 
       # Find documents and their diff_id in those commits that only existed locally
       local_diff_id_to_add_list = {}
-      commits_to_add.each do |commit| 
-        commit[:doc_diff_ids].each do |doc_path, diff_id| 
+      commits_to_add.each do |_, commit|
+        commit[:doc_diff_ids].each do |doc_path, diff_id|
           local_diff_id_to_add_list[doc_path] = diff_id
         end
       end
@@ -187,14 +191,17 @@ module Au
         diff_pstore_local.transaction(true) do
           diff_pstore_remote = PStore.new(diff_db_name_remote(doc_path, remote_repo.path))
           diff_pstore_remote.transaction do
-            if diff_pstore_remote[doc_path] == nil
-              diff_pstore_remote[doc_path] = diff_pstore_local[doc_path]
-            elsif diff_pstore_local[doc_path] != diff_pstore_remote[doc_path]
+            if diff_pstore_remote[diff_id] == nil
+              diff_pstore_remote[diff_id] = diff_pstore_local[diff_id]
+            elsif diff_pstore_local[diff_id] != diff_pstore_remote[diff_id]
               raise "Error: Remote and local reposiroty have different content in a same diff"
             end
           end
         end
       end
+      # Find heads that only exist on remote repo
+      heads_to_add = heads.reject{|x| remote_repo.heads.include?(x)}
+      heads_to_add.each{|x| remote_repo.update_leaves_pstore(x)}
     end
 
     # def clone
@@ -207,20 +214,30 @@ module Au
       end
     end
 
-    private
-
-    def diff_db_name_remote(file_path, remote_path)
-      paths = [Repository(remote_path, false).path, "diff_#{file_path.gsub('/', '.')}.pstore"].compact
-      File.join(*paths)
-    end
-
-    
     def update_head_var
       @head = @head_pstore.transaction(true) do
         @head_pstore[:head]
       end
     end
 
+    def update_leaves_pstore(commit_id)
+      @leaves_pstore.transaction do
+        commit = Commit.find(commit_id)
+        if commit
+          parent_commit_id_1, parent_commit_id_2 = commit.parent_id_1, commit.parent_id_2
+          @leaves_pstore.delete(parent_commit_id_1)
+          @leaves_pstore.delete(parent_commit_id_2)
+          @leaves_pstore[commit_id] = 1
+        end
+      end
+    end
+
+    private
+    def diff_db_name_remote(file_path, remote_path)
+      paths = [remote_path, "diff_#{file_path.gsub('/', '.')}.pstore"].compact
+      File.join(*paths)
+    end
+
     def update_head_pstore(commit_id)
       @head = @head_pstore.transaction do
         @head_pstore[:head] = commit_id
@@ -239,18 +256,6 @@ module Au
       end
     end
 
-    def update_leaves_pstore(commit_id)
-      @leaves_pstore.transaction do
-        commit = Commit.find(commit_id)
-        if commit
-          parent_commit_id_1, parent_commit_id_2 = commit.parent_id_1, commit.parent_id_2
-          @leaves_pstore.delete(parent_commit_id_1)
-          @leaves_pstore.delete(parent_commit_id_2)
-          @leaves_pstore[commit_id] = 1
-        end
-      end
-    end
-
     def self.resolve_conflict_fname
       File.join(Repository.instance.path, 'resolve_conflict')
     end

data/lib/au/models/staging.rb

@@ -24,9 +24,10 @@ module Au
 
     def self.stage(relative_paths, last_commit = Repository.head)
       relative_paths = relative_paths.each_with_object([]) do |staged_path, accum|
-        if File.directory?(staged_path)
-          Dir.glob('**/*', base: staged_path) do |sub_path|
-            accum << (File.join(staged_path, sub_path)) unless File.directory?(sub_path)
+        if File.directory?(File.join(Repository.root, staged_path))
+          Dir.glob('**/*', base: File.join(Repository.root, staged_path)) do |sub_path|
+            accum << (File.join(staged_path, sub_path)) unless File.directory?(File.join(
+                Repository.root, staged_path, sub_path))
           end
         else
           accum << staged_path

data/lib/au/version.rb

@@ -1,3 +1,3 @@
 module Au
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Edward Du