Merge pull request #15 from iconara/small_styling_fixes

Small styling fixes

.travis.yml

@@ -2,9 +2,9 @@ language: ruby
 script: rspec
 bundler_args: --without development
 rvm:
-  - 1.9.3
   - 2.0.0
-  - jruby-19mode
+  - 2.2.2
+  - jruby-9.0.0.0
 
   ## jruby-head has some issues on travis, here the error:
   ## The command "rvm install jruby-head --binary" failed and exited with 1 during setup.

lib/etcd/heartbeat.rb

@@ -41,4 +41,4 @@ def heartbeat_command
     end
 
   end
-end
+end

lib/etcd/loggable.rb

@@ -10,4 +10,4 @@ def reset_logger!(level=Logger::WARN)
       log
     end
   end
-end
+end

lib/etcd/node.rb

@@ -9,10 +9,10 @@ class Node
 
     class << self
       def parse_node_data(attrs)
-        { 
-          :name => attrs["name"], 
-          :id => id = attrs["id"], 
-          :peer_urls => attrs["peerURLs"], 
+        {
+          :id          => attrs["id"],
+          :name        => attrs["name"],
+          :peer_urls   => attrs["peerURLs"],
           :client_urls => attrs["clientURLs"]
         }
       end
@@ -31,12 +31,12 @@ def check_required(opts)
       raise ArgumentError, "Client URL is required!" unless opts[:client_urls] && opts[:client_urls].any?
       raise ArgumentError, "Node ID is required!" unless opts[:id]
     end
-    
+
     def update_status
       begin
         leader_data = request_data(:get, leader_uri)
-        @status    = :running
-        @is_leader = (leader_data["id"] == @id)
+        @status     = :running
+        @is_leader  = (leader_data["id"] == @id)
       rescue HTTPClient::TimeoutError, Errno::ECONNREFUSED => e
         @status = :down
       end
@@ -54,7 +54,7 @@ def name_with_status
       print_status = @is_leader ? "leader" : status
       "#{name} (#{print_status})"
     end
-    
+
     def to_json
       { :name => name, :id => id, :client_urls => client_urls, :peer_urls => peer_urls }.to_json
     end

lib/etcd/version.rb

@@ -2,4 +2,4 @@
 
 module Etcd
   VERSION = '1.0.0'.freeze
-end
+end

sh/cluster

@@ -1 +1,2 @@
-./spec/resources/etcd-cluster $1
+#!/usr/bin/env bash
+./spec/resources/etcd-cluster $1

spec/etcd/node_spec.rb

@@ -3,19 +3,19 @@
 
 module Etcd
   describe Node do
-    
+
     let :node_data do
       [
        {"id" => "14306b09b8d69fc4","name" => "node1","peerURLs"=> ["http://127.0.0.1:7001"],"clientURLs" => ["http://127.0.0.1:4001"]},
        {"id" => "d2356cd527a56a4","name" => "node2","peerURLs" => ["http://127.0.0.1:7002"],"clientURLs" => ["http://127.0.0.1:4002"]}
       ]
     end
-    
+
     def default_node(opts = {})
       data = Etcd::Node.parse_node_data(node_data[0])
       Etcd::Node.new(data.merge(opts))
     end
-    
+
     describe '#initialize' do
       it "works with all required parameters" do
         default_node({}).should_not be_nil

spec/integration/etcd_spec.rb

@@ -24,7 +24,7 @@
     ClusterController.start_cluster
     sleep 2 # wait a little for the cluster to come up
   end
-  
+
   after(:all) do
     ClusterController.stop_cluster
   end
@@ -65,10 +65,10 @@
     client.update(key, 'qux', 'bar').should eq(true)
   end
 
-  # FIXME: this test does not pass consistently. There seem to issues 
+  # FIXME: this test does not pass consistently. There seem to issues
   # with the leader re-election handling (causing Errno::ECONNREFUSED)
   it "has heartbeat, that resets observed watches" do
-    client = Etcd::Client.test_client(:heartbeat_freq => 0.2)
+    client = Etcd::Client.test_client(:heartbeat_freq => 0.1)
     puts client.cluster.nodes.map(&:inspect)
     client.cluster.nodes.map(&:status).uniq.should eq([:running])
     changes = Queue.new
@@ -96,7 +96,7 @@
     a.join
     changes.size.should eq(2)
 
-    # restore cluster    
+    # restore cluster
     ClusterController.stop_cluster
     ClusterController.start_cluster
     sleep 2

spec/resources/cluster_controller.rb

@@ -16,4 +16,4 @@ def self.start_cluster
   def self.stop_cluster
     `#{sh_path}/cluster stop`
   end
-end
+end

spec/resources/etcd-cluster

@@ -37,7 +37,7 @@ class EtcdCluster
       end
     end
   end
-  
+
   def logs
     cmd = "tail -f tmp/etcd/node1.out tmp/etcd/node2.out tmp/etcd/node3.out"
     exec(cmd)
@@ -58,8 +58,8 @@ class EtcdCluster
 
   def start_node(num)
     node_name  = "node#{num}"
-    server_url = "http://127.0.0.1:#{SERVER_PORT_BASE + num}" 
-    client_url = "http://127.0.0.1:#{CLIENT_PORT_BASE + num}" 
+    server_url = "http://127.0.0.1:#{SERVER_PORT_BASE + num}"
+    client_url = "http://127.0.0.1:#{CLIENT_PORT_BASE + num}"
     all_nodes  = 1.upto(NODE_COUNT).map { |i| "node#{i}=http://127.0.0.1:#{SERVER_PORT_BASE + i}" }
 
     cmd = %Q(#{bin_path} --debug \

spec/support/client_helper.rb

@@ -19,5 +19,5 @@ def healthy_cluster(uri = "http://127.0.0.1:4001")
     nodes.map{|node| node.status = :running}
     nodes.first.is_leader = true
     cluster
-  end  
+  end
 end

spec/support/cluster_helper.rb

@@ -13,7 +13,7 @@ def status_data
      ]
    }
   end
-  
+
   # cluster config hashes below map member client URLs to the leader client URL
 
   def healthy_cluster_config