au 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa95d04570850dee2f2925f15f73e3bcec71cece8d85fd3a96eed234615df6e9
-  data.tar.gz: a2ad2985e381758e42dda23e14781d47fcb16dabcf2539a720e67c5823f1fb0b
+  metadata.gz: a1f863f4f77ac12d48c9cc1fce11cf11745fe17752eff77e6d7800d78bfbac33
+  data.tar.gz: ef650acf468825bc91bf40653c748dce3d8fc95917e66d6df178b8c29f391d6e
 SHA512:
-  metadata.gz: 0a3430e195cd66c77a7b8e6228e459d6c75fa3bb0d42f4d1e305d152b37b6c63d714e05a2410314d2144916e6871202576ecc2089d66b1fa56aebb2c8064e5ef
-  data.tar.gz: 07d9fa7e97ca6b3f80937ee5a0e16d3e2480935fe11e5caf62708030b7d4ef7c2b07125f97245d1bcb856b7c3ac68fd84648e2d5816e2dc3ac5372f0622e9945
+  metadata.gz: f77dc0459d3585eb6a974650ccf2ffeef1aed8893a897ca52a8c3793ab1cdf220f7135c424e9718cbe374ea60df309217d0027f6839678cc5cae55cfbc2b657c
+  data.tar.gz: b1a17e0618cc0e5b87aa6e52ec77b2f796958d21c226cd96f88ea72362a96e5121543037a63e6925f83435b43f97d6d35e99ea0676e0b0ebfa09ea3c23275837

data/.gitignore

@@ -207,3 +207,6 @@ $RECYCLE.BIN/
 
 # au playground
 test_tmp/**/*
+
+end-to-end_test_repo/**/*
+end-to-end_test_repo2/**/*

data/Design_Document.md

@@ -0,0 +1,90 @@
+## Design Document
+
+A simple get-started [tutorial video](https://www.useloom.com/share/6372bf5d22b8482299f3c788559d4173).
+
+```bash
+## Design Document
+
+A simple get-started [tutorial video](https://www.useloom.com/share/6372bf5d22b8482299f3c788559d4173).
+
+Commands:
+
+  au cat COMMIT_ID PATH
+
+    # Display file from a provided commit.
+
+  au checkout COMMIT_ID
+
+    # Check out a commit. Similar behavior with git checkout.
+
+  au clone REMOTE_PATH [optional: LOCAL_PATH]
+
+    # Copy an existing repo from the provided remote path.
+
+  au commit [-m MESSAGE]
+
+    # Commit already staged files. Use -m to provide commit message.
+
+  au diff PATH
+
+    # Display diff between the file state from HEAD and from presence.
+
+  au heads
+
+    # Display ids of commits that don't have children.
+
+  au help [COMMAND]
+
+    # Describe available commands or one specific command
+
+  au init
+
+    # Start tracking current directory
+
+  au log
+
+    # Display parent commits. Only true lineage is displayed, meaning that
+
+    # the second parents from merged commits are ignored.
+
+  au merge COMMIT_ID
+
+    # Merge with provided commit to the current commit.
+
+    # Commit will be created automatically unless conflict happens.
+
+    # User is responsible for committing after resovling conflicts.
+
+  au pull REMOTE_PATH
+
+    # Pull changes from remote repo. 
+
+    # Merge will not happen since branching is not supported.
+
+  au push REMOTE_PATH
+
+    # Push changes to remote repo.
+
+    # Merge will not happen since branching is not supported.
+
+  au reset
+
+    # Remove all history from the project.
+
+  au stage PATH
+
+    # Stage one or more files for commit. If a dir path is provided, all files within the
+
+    # dir are staged.
+
+  au status
+
+    # Check current status of repo. Displays staged and unstaged files, as well as
+
+    # current HEAD ID.
+
+  au unstage PATHS
+
+    # Remove one or more files from the staging area.
+
+```

data/Gemfile.lock

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

data/README.md

@@ -26,64 +26,6 @@ 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.
 
-## Design Document
-
-A simple get-started [tutorial video](https://www.useloom.com/share/6372bf5d22b8482299f3c788559d4173).
-
-```
-Commands:
-  au cat COMMIT_ID PATH
-    # Display file from a provided commit.
-
-  au checkout COMMIT_ID
-    # Check out a commit. Similar behavior with git checkout.
-
-  au clone REMOTE_PATH [optional: LOCAL_PATH]
-    # Copy an existing repo from the provided remote path.
-
-  au commit [-m MESSAGE]
-    # Commit already staged files. Use -m to provide commit message.
-
-  au diff PATH
-    # Display diff between the file state from HEAD and from presence.
-
-  au heads
-    # Display ids of commits that don't have children.
-
-  au help [COMMAND]
-    # Describe available commands or one specific command
-
-  au init
-    # Start tracking current directory
-
-  au log
-    # Display parent commits. Only true lineage is displayed, meaning that
-    # the second parents from merged commits are ignored.
-
-  au merge COMMIT_ID
-    # Merge with provided commit.
-
-  au pull REMOTE_PATH
-    # Pull changes from remote repo.
-
-  au push REMOTE_PATH
-    # Push changes to remote repo.
-
-  au reset
-    # Remove all history from the project.
-
-  au stage PATH
-    # Stage one or more files for commit. If a dir path is provided, all files within the
-    # dir are staged.
-
-  au status
-    # Check current status of repo. Displays staged and unstaged files, as well as
-    # current HEAD ID.
-
-  au unstage PATHS
-    # Remove one or more files from the staging area.
-```
-
 ## Development Build
 
 This project uses bundler to manage production and development dependencies (see more in 'depenedencies' section).
@@ -98,6 +40,8 @@ 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.
 
+Use `ruby -Ilib:test test/end-to-end_test.rb` to run end-to-end 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

@@ -137,7 +137,7 @@ module Au
 
     desc "merge COMMIT", "Merge with provided commit"
     def merge(commit_id)
-      Repository.instance.merge(commit_id)
+      puts Repository.instance.merge(commit_id)
     end
 
     desc "pull REMOTE_PATH", "Pull changes from remote repo"

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/repository.rb

@@ -62,10 +62,10 @@ module Au
 
     def merge(commit_to_merge)
       commit_id = Commit.merge(@head, commit_to_merge)
-      return false if commit_id.nil?
+      return nil if commit_id.nil?
       # checkout to new commit
       checkout(commit_id)
-      true
+      commit_id
     end
 
     def commit(commit_message)

data/lib/au/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: au
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Edward Du
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2018-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -109,6 +109,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- Design_Document.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt