villein 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f55592c52186b2368ce3cdee25bc3726321ab5b
-  data.tar.gz: 6f20e0f243da17e2c400d1207069fe796a2022f0
+  metadata.gz: b5c615e2b141f002aed95140b94e8df47c7d05f1
+  data.tar.gz: e1a88330fa171bf6d9e906f3d6d39eaf4c133fc8
 SHA512:
-  metadata.gz: 202eda9a335d1239cb69f025c9239d715ca566cc710e8e2a0239bf42e1b2542b90cfea5948b65b08442770fe373b5abb2c32dbd459ca4018f8a0428f916e4f42
-  data.tar.gz: 320efc986bf0c185db5ce68dcecb296a5e5a4a9b97204927a61ba42c7b90f02d283150e2af9776d16555493de324dea15bc5b61c28e30f703bcc030ed8c2a5f8
+  metadata.gz: ad2473ae38e77bdd1b748ab2a6ee2bec54cb36ca0bbc41121cdd47eddeaadd77abb1b9e328375f8d811843e6e35e3aa2e156dd98533bf819dcfe7e0a637e59bb
+  data.tar.gz: d58a938b086694e1f005c9485301328388a07b5ca2a7b7e0897beb6103cf147bb167ae0ac75ac15d5654752138a314902894bd1b8d764ab4fb06a449dbaa8fdf

data/lib/villein/agent.rb

@@ -62,9 +62,9 @@ module Villein
 
     # Start the serf agent.
     def start!
-      raise AlreadyStarted if running?
-
       @pid_lock.synchronize do
+        raise AlreadyStarted if running?
+
         start_listening_events
         start_process
         start_watchdog
@@ -75,9 +75,9 @@ module Villein
     # Stop the serf agent.
     # After +timeout_sec+ seconds elapsed, it will attempt to KILL if the agent is still running.
     def stop!(timeout_sec = 10)
-      raise NotRunning unless running?
-
       @pid_lock.synchronize do
+        raise NotRunning unless running?
+
         Process.kill(:INT, @pid)
 
         stop_watchdog
@@ -99,13 +99,15 @@ module Villein
     end
 
     %w(member_join member_leave member_failed member_update member_reap
-       user_event query stop event).each do |event|
+       user query stop event).each do |event|
 
       define_method(:"on_#{event}") do |&block|
         add_hook(event, block)
       end
     end
 
+    alias_method :on_user_event, :on_user
+
     ##
     # Command line arguments to start serf-agent.
     def command

data/lib/villein/tags.rb

@@ -12,6 +12,10 @@ module Villein
       if value
         key = key.to_s
         value = value.to_s
+
+        # Don't do anything if same with existing value
+        return value if self[key] == value
+
         @client.set_tag(key, value)
         @tags[key] = value
       else

data/lib/villein/version.rb

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

data/spec/tags_spec.rb

@@ -42,10 +42,10 @@ describe Villein::Tags do
 
   describe "#update(hash)" do
     it "sets multiple tags at once" do
-      expect(parent).to receive(:set_tag).with('a', '1').and_return('1')
-      expect(parent).to receive(:set_tag).with('b', '2').and_return('2')
+      expect(parent).to receive(:set_tag).with('a', '0').and_return('1')
+      expect(parent).to receive(:set_tag).with('b', '1').and_return('2')
 
-      tags.update(a: 1, b: 2)
+      tags.update(a: 0, b: 1)
     end
 
     context "with nil" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: villein
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec