couch-replicate 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/couch_replicate.rb

@@ -1,10 +1,15 @@
 require 'restclient'
 
 module CouchReplicate
+  def self.version
+    File.read(File.expand_path(File.dirname(__FILE__) + '/../VERSION')).chomp
+  end
 
   def self.replicate(source_host, target_host, db)
-    RestClient.post("#{source_host}/_replicate",
-                    %Q|{"source":"#{db}", "target":"#{target_host}/#{db}", "continuous":true}|)
+    source = hostify(source_host)
+    target = hostify(target_host)
+    RestClient.post("#{source}/_replicate",
+                    %Q|{"source":"#{db}", "target":"#{target}/#{db}", "continuous":true}|)
   end
 
   def self.link(db, hosts)
@@ -19,8 +24,22 @@ module CouchReplicate
   end
 
   def self.nth(n, db, hosts)
+    return if n == db.length + 1
     (Array(hosts) + Array(hosts)[0..n]).each_cons(n+1) do |src, *n_hosts|
       self.replicate(src, n_hosts.last, db)
     end
   end
+
+  protected
+  def self.hostify(raw_host)
+    host = raw_host.dup
+    host.sub!(%r{/$}, '')
+    unless host =~ /\:\d+$/
+      host += ":5984"
+    end
+    unless host =~ %r{^http://}
+      host = "http://" + host
+    end
+    host
+  end
 end

data/lib/couch_replicate/command_line.rb

@@ -47,12 +47,30 @@ module CouchReplicate
         opts.on("-n", "-number [LINK_EVERY=3]", "link every n hosts") do |n|
           @options[:n] = n.to_i > 0 ? n.to_i : 3
         end
+
+        opts.separator ""
+
+        opts.on_tail("-v", "--version", "Show version") do
+          puts File.basename($0) + " "  + CouchReplicate.version
+          exit
+        end
+
+        # No argument, shows at tail.  This will print an options summary.
+        # Try it and see!
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          exit
+        end
       end
 
       begin
         options_parser.parse!(args)
         @database = args.shift
         @hosts = args
+
+        if @options[:n] && (@options[:n] == @hosts.length + 1)
+          raise OptionParser::InvalidOption.new("The number of hosts cannot equal the replication shift.")
+        end
       rescue OptionParser::InvalidOption => e
         raise e
       end

data/spec/couch_replicate_spec.rb

@@ -16,6 +16,33 @@ describe "CouchReplicate" do
     CouchReplicate.replicate(@src_host, @target_host, @db)
   end
 
+  it "should default replication to port 5984" do
+    RestClient.
+      should_receive(:post).
+      with("#{@src_host}/_replicate",
+           %Q|{"source":"#{@db}", "target":"#{@target_host}/#{@db}", "continuous":true}|)
+
+    CouchReplicate.replicate(@src_host.sub(/:5984/, ''), @target_host, @db)
+  end
+
+  it "should default replication to HTTP" do
+    RestClient.
+      should_receive(:post).
+      with("#{@src_host}/_replicate",
+           %Q|{"source":"#{@db}", "target":"#{@target_host}/#{@db}", "continuous":true}|)
+
+    CouchReplicate.replicate(@src_host.sub(/http:\/\//, ''), @target_host, @db)
+  end
+
+  it "should not care if URL ends with a slash" do
+    RestClient.
+      should_receive(:post).
+      with("#{@src_host}/_replicate",
+           %Q|{"source":"#{@db}", "target":"#{@target_host}/#{@db}", "continuous":true}|)
+
+    CouchReplicate.replicate(@src_host + '/', @target_host, @db)
+  end
+
   context "replicating to multiple hosts" do
     before(:each) do
       @host01 = 'http://couch01.example.org:5984'
@@ -66,5 +93,12 @@ describe "CouchReplicate" do
 
       CouchReplicate.nth(3, @db, [@host01, @host02, @host03, @host04, @host05])
     end
+
+    it "should do nothing when node replicate to themselves" do
+      CouchReplicate.
+        should_not_receive(:replicate)
+
+      CouchReplicate.nth(5, @db, [@host01, @host02, @host03, @host04, @host05])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch-replicate
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Chris Strom
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -04:00
+date: 2010-03-23 00:00:00 -04:00
 default_executable: couch-replicate
 dependencies: 
 - !ruby/object:Gem::Dependency