au 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e518fc6352a564efdca3da72b466c5d9b77eb2c735305e1d584383206088671
-  data.tar.gz: e0ff19709aa951e5f5e02f7902bafcfe20310dcd18e28b7587cf72e610796e91
+  metadata.gz: 747b7a38e077a90fcae85a25a41debea6a9c66f6e8c66605e4d298268bdd21cd
+  data.tar.gz: 82a01914628d92827535d2d587681d260e73369133366c752ce4985895e8dd7d
 SHA512:
-  metadata.gz: 68e8f95de2d98f317389027fb69433fbbdd3fd4cf5043ddb2ddb0ce910e43f6c15adfa3adc809073ea44f2793608200b4f952ad8021eb106e4ec743fa69c637c
-  data.tar.gz: 92d5ac6ef1685e887c2e0daf0498068bdf448418429c97fb6f81739e759a41d02bd28beadc9fbf82c91c528489498dcfe8aad65988cade54b34b5192bbc001cc
+  metadata.gz: b82d4e806d17cf8c6429967461e437612a7927931a1db214a387e870ade5458e6f2e4e58f4a9f41b0989b9e725e0b78247a5a7c96f2dc6e1109173436e6a978b
+  data.tar.gz: 2917e2d460448b99a06308e2e1daed33a89a03ffc5bc3828611e1cea0ecaeba0eb9d0b8e4f325326649537ae1b079bd15b007bd1725444a3851bacb17c4322eb

data/Gemfile.lock

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

data/README.md

@@ -15,10 +15,21 @@ literal translation of which can be loosely interpreted as 'wow' (as in Jay Chou
 
 ## Installation
 
+For your convenience (and sanity), this library is released on https://rubygems.org/ at https://rubygems.org/gems/au.
+
+To install
+
     $ gem install au
 
+
+**This project ONLY supports Ruby 2.5.0 and above**. Due to the Integer class changes in Ruby 2.5.0,
+**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
 
+A simple get-started [tutorial video](https://www.useloom.com/share/6372bf5d22b8482299f3c788559d4173).
+
 ```
 Commands:
   au cat COMMIT_ID PATH
@@ -73,21 +84,27 @@ Commands:
     # Remove one or more files from the staging area.
 ```
 
-## Development
+## Development Build
+
+This project uses bundler to manage production and development dependencies (see more in 'depenedencies' section).
+
+Again, this project requires Ruby 2.5.0 or higher.
 
 `gem install bundler` to install bundler
 
 `bundle install` to install all dependencies
 
-`bundle exec rspec` to run rspec tests
+Unit specs are written in RSpec. Use `bundle exec rspec` to run all unit specs.
+
+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
 
-`bundle exec au init` to init
+This project has the following produciton dependencies:
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+* Thor - We use thor to save time with the chores in handling cmd flags and documentation.
+* Colorize - We use colorize to give our cmd output colors.
 
-To install this gem onto your local machine, run `bundle exec rake install`. 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).
 
 ## Contributing
 

data/bin/au

@@ -20,7 +20,7 @@ module Au
       puts 'Welcome to AU. Your project is now tracked.'
     end
 
-    desc "clone remote PATH and target PATH", "Copy an existing repo"
+    desc "clone remote REMOTE_PATH", "Copy an existing repo"
     def clone(remote_repo_root, target_repo_root = nil)
       # default target path is the same with rename's name in current working directory
       target_repo_root = File.join(Dir.pwd, File.basename(remote_repo_root)) if target_repo_root.nil?
@@ -89,7 +89,7 @@ module Au
       Repository.instance.heads
     end
 
-    desc "diff PATH", "Display between tracked version and current version"
+    desc "diff PATH", "Diff between tracked version and current version"
     def diff(file_path)
       diff = Repository.diff(file_path)
       if diff.present?

data/lib/au/models/commit.rb

@@ -181,23 +181,6 @@ module Au
       end
     end
 
-    def self.lowest_common_ancestor(parent_commit_1, parent_commit_2)
-      # keys are commit id, values are Array of number of hops
-      all_ancestors_of_parent_1 = self.gen_ancestor_set(parent_commit_1, Set.new, skip_first=true)
-      all_ancestors_of_parent_2 = self.gen_ancestor_set(parent_commit_2, Set.new, skip_first=true)
-
-      common_ancestors = all_ancestors_of_parent_1 & all_ancestors_of_parent_2
-      raise 'no common ancestors' if common_ancestors.size.zero?
-
-      while common_ancestors.size != 1
-        picked_ancestor = common_ancestors.first
-        ancestors_to_be_removed_set = gen_ancestor_set(picked_ancestor, Set.new, skip_first=true)
-        common_ancestors -= ancestors_to_be_removed_set
-      end
-
-      common_ancestors.first
-    end
-
     # returns a tempfile with the content of the document at the recorded diff of commit.
     def cat(file_path)
       diff_id = doc_diff_ids[file_path]
@@ -255,5 +238,23 @@ module Au
       end
       commit_id_set
     end
+
+    def self.lowest_common_ancestor(parent_commit_1, parent_commit_2)
+      # keys are commit id, values are Array of number of hops
+      all_ancestors_of_parent_1 = self.gen_ancestor_set(parent_commit_1, Set.new, skip_first=true)
+      all_ancestors_of_parent_2 = self.gen_ancestor_set(parent_commit_2, Set.new, skip_first=true)
+
+      common_ancestors = all_ancestors_of_parent_1 & all_ancestors_of_parent_2
+      raise 'no common ancestors' if common_ancestors.size.zero?
+
+      while common_ancestors.size != 1
+        picked_ancestor = common_ancestors.first
+        ancestors_to_be_removed_set = gen_ancestor_set(picked_ancestor, Set.new, skip_first=true)
+        common_ancestors -= ancestors_to_be_removed_set
+      end
+
+      common_ancestors.first
+    end
+
   end
 end

data/lib/au/models/document.rb

@@ -2,7 +2,6 @@ require 'pstore'
 require 'tempfile'
 require 'digest/md5'
 require 'fileutils'
-require_relative '../models/diff'
 
 module Au
   class Document
@@ -97,7 +96,8 @@ module Au
     end
 
     def abs_path
-      File.join(Repository.root, path)
+      paths = [Repository.root, path].compact
+      File.join(*paths)
     end
 
   end

data/lib/au/models/repository.rb

@@ -26,10 +26,14 @@ module Au
 
     def self.instance(path = nil, create = false)
       return @single_instance unless @single_instance.nil?
-      @single_instance = new(path, create)
+      begin
+        @single_instance = new(path, create)
+      rescue
+        Kernel.abort("Fetal error: Repository not found. ")
+      end
     end
 
-    def initialize(path, create = false, remote_path = nil)
+    def initialize(path, create = false)
       if path.nil?
         working_dir = Dir.pwd
         # little bit different with mercurial 0.1
@@ -106,19 +110,19 @@ module Au
         raise "Error: Root commits do not match."
       end
 
-      # Find commits that only exist locally
+      # Find commits that only exist on remote repo
       commit_id_to_add_list = remote_commit_list.reject{|x| local_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]}
       end
 
-      # Write those commits to remote commit db
+      # Write those commits to local commit db
       local_commit_db.transaction do
         commits_to_add.each{|commit_id, data| local_commit_db[commit_id] = data}
       end
 
-      # Find documents and their diff_id in those commits that only existed locally
+      # 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| 

data/lib/au/models/staging.rb

@@ -41,6 +41,7 @@ module Au
       relative_paths
     end
 
+    # private
     def self.filter_stageable(last_commit, relative_paths)
       tracked_docs_md5 = last_commit&.tracked_docs_md5 || {}
       relative_paths.reject do |relative_path|
@@ -65,6 +66,16 @@ module Au
     end
 
     def self.unstage(file_paths)
+      file_paths = file_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)
+          end
+        else
+          accum << staged_path
+        end
+      end
+
       stage_db.transaction do
         file_paths.each do |file_path|
           stage_db.delete(file_path)
@@ -73,7 +84,8 @@ module Au
     end
 
     def self.abs_path(relative_path)
-      File.join(Repository.root, relative_path)
+      paths = [Repository.root, relative_path].compact
+      File.join(*paths)
     end
 
     def self.project_file_paths

data/lib/au/version.rb

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

data/lib/au.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Edward Du
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor