scvcs 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a173a5a1b0f59c777e51c85de59d81a62d61728
-  data.tar.gz: 7ac0ea8b723fb11a451d32f9e86945352953cbf9
+  metadata.gz: b9dca6d85f495e3e2caaf4e9601b99c842a9694f
+  data.tar.gz: aee84f0d4319ba5e2879a762578fc61f04c5c26a
 SHA512:
-  metadata.gz: 8d45f6206a16e4dfc06b55080fc16dbf73c82fc98759c65b38efbecb784401f27fb111cdc4a5a42ec2a38f721d83fc95049231fa415005930c245f491d7b7a36
-  data.tar.gz: 50e6dbe0c627a2bccfaab030a33c084a58db707efe39f57d8e9851adea77274d7e12b7bc4086f0b5d2b4b8fedf13ab6656d7d86c786aa10b33c914727a4bfb6b
+  metadata.gz: 3d7a9010feac00b2454fb97c42e04e08434764fa7bfb776014e296c383b55ea92bd54632fa545098d4e9e078f4ce9dbbd3ddde31ebcf42792aa60ede129df464
+  data.tar.gz: d1a016f82d25d0ff3aede9f674e356b9d1345f3d6e46341f20f1e5edb13306bcf1b37300a4d708fcf1ed79a431a68ed1f57edcda71e1801d2397b0a958a7f676

data/README.md

@@ -20,9 +20,6 @@ The project itself is split into two parts: [**VCSToolkit**](https://github.com/
 
 Features
 ========
-*Note: The examples below use the form `scv <command>`, but if you want to test it right now, follow the 3 steps in the **Try it!** section and use `./run_scv <command>`.*
-
-Currently implemented features:
 
 ---
 `scv init`
@@ -106,14 +103,47 @@ Shows the current value of `<key>`. A key of the form `one.two.three` can be use
 
 Sets the option `key` to `value`. As in the previous command, you can use the `one.two.three` form to reference nested properties. If the key doesn't exist it is created.
 
+---
+`scv server`
+
+Starts an HTTP server to serve as a remote. The server listens on 0.0.0.0 (all addresses) on port 4242.
+So the remote's address is (for example) `http://localhost:4242`.
+
+---
+`scv remote add <name> <address>`
+
+Adds a remote repository. `<address>` is the HTTP url to a server started with `scv server`
+
+---
+`scv remote delete <name>`
+
+Removes a remote.
+
+---
+`scv remote fetch <name> <remote branch> [<local branch>]`
+
+Fetches remote history. Does not merge automatically and fails if it cannot do a Fast-Forward.
+
+---
+`scv remote pull <name> <remote branch> [<local branch>]`
+
+Fetches the remote history to a local branch with a name of `<remote_name>~<remote_branch>` (for example `origin~master`) and after that merges that branch to `<local branch>`.
+
+The changes of the merge are not committed.
+
+---
+`scv remote push <name> <local branch> [<remote branch>]`
+
+Pushes local history to remote and updates the remote branch to point to the newest commit.
+Fails if it cannot do a Fast-Forward.
+
 
 Try it!
 =======
-Since there are a lot of features currently missing, SCV is not yet available on RubyGems.
+SCV is on RubyGems by the name `scvcs`, because, unfortunately, `scv` was already taken.
 
-1. Clone this repository
-2. `bundle install`
-3. `./run_scv help`
+`gem install scvcs`
+`scv help`
 
 .scv structure
 ================
@@ -149,4 +179,4 @@ Contributions are most welcome, but I doubt there will be any :)
 
 If you are interested in learning more about this you can ask me on Twitter [@stormbreakerbg](https://twitter.com/stormbreakerbg).
 
-![SCV](http://static3.wikia.nocookie.net/__cb20080906211455/starcraft/images/2/24/SCV_SC2_Cncpt1.jpg)
+![SCV](http://static3.wikia.nocookie.net/__cb20080906211455/starcraft/images/2/24/SCV_SC2_Cncpt1.jpg)

data/bin/commands/status.rb

@@ -1,32 +1,48 @@
 desc 'Shows the created, modified and deleted files'
-arg_name ''
+arg_name '[<commit>]'
 command :status do |c|
   c.action do |global_options, options, args|
     repository = global_options[:repository]
-    commit_id  = repository.branch_head
-    commit     = commit_id ? repository[commit_id] : nil
-    status     = repository.status commit,
-                                   ignore: [/^\.|\/\./]
 
-    if repository.head.nil?
-      puts "# No commits"
+
+    if args.empty?
+      commit_id = repository.branch_head
+      commit    = commit_id ? repository[commit_id] : nil
+      status    = repository.status commit,
+                                    ignore: [/^\.|\/\./]
+      commit_status = false
     else
-      puts "# On branch #{repository.head}"
-      puts "# On commit #{commit.id.yellow}" if commit
+      source_commit_id   = repository[args[0], :commit].parents[0]
+      source_commit      = source_commit_id ? repository[source_commit_id] : nil
+      destination_commit = repository[:head, :commit]
+
+      status = repository.commit_status source_commit,
+                                        destination_commit,
+                                        ignore: [/^\.|\/\./]
+      commit_status = true
     end
 
-    if repository.config['merge'] and repository.config['merge']['parents']
-      parents = repository.config['merge']['parents']
+    unless commit_status
+      if repository.head.nil?
+        puts "# No commits"
+      else
+        puts "# On branch #{repository.head}"
+        puts "# On commit #{commit.id.yellow}" if commit
+      end
 
-      puts
-      puts "# Next commit parents:"
+      if repository.config['merge'] and repository.config['merge']['parents']
+        parents = repository.config['merge']['parents']
 
-      parents.each do |commit_id|
-        puts "#     - #{commit_id.yellow}"
+        puts
+        puts "# Next commit parents:"
+
+        parents.each do |commit_id|
+          puts "#     - #{commit_id.yellow}"
+        end
       end
-    end
 
-    puts
+      puts
+    end
 
     if status.none? { |_, files| files.any? }
       puts "# No changes"

data/lib/scv/version.rb

@@ -1,3 +1,3 @@
 module SCV
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scvcs
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Georgy Angelov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vcs_toolkit