villein 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5c615e2b141f002aed95140b94e8df47c7d05f1
-  data.tar.gz: e1a88330fa171bf6d9e906f3d6d39eaf4c133fc8
+  metadata.gz: 2aaa35f865062a4e4d80919f3098dd66c6c0e19f
+  data.tar.gz: 9e1a7327b766558819f3481211182626032dc7f3
 SHA512:
-  metadata.gz: ad2473ae38e77bdd1b748ab2a6ee2bec54cb36ca0bbc41121cdd47eddeaadd77abb1b9e328375f8d811843e6e35e3aa2e156dd98533bf819dcfe7e0a637e59bb
-  data.tar.gz: d58a938b086694e1f005c9485301328388a07b5ca2a7b7e0897beb6103cf147bb167ae0ac75ac15d5654752138a314902894bd1b8d764ab4fb06a449dbaa8fdf
+  metadata.gz: 2917a0fa0ed13cc0424dab7970e5e270f36569a6951432be0d2469cced125e0a324945ed0c8879c4ff4de807551100645be253293362da3dba376274a059850b
+  data.tar.gz: 1900c81bbeb2ff22b927fa8b7ea38f2e43709afd8dd0a9046d5a39eb559031b9c51cf4478a4413861d021f713880bb4cb03091034ce81d7e701dd6624c5031ba

data/.travis.yml

@@ -17,7 +17,7 @@ notifications:
     - travis-ci@sorah.jp
 before_script:
   - mkdir -p vendor/serf
-  - curl -o vendor/serf/serf.zip https://dl.bintray.com/mitchellh/serf/0.5.0_linux_amd64.zip
+  - curl -L -o vendor/serf/serf.zip https://dl.bintray.com/mitchellh/serf/0.5.0_linux_amd64.zip
   - unzip -d vendor/serf vendor/serf/serf.zip
   - export PATH=$PWD/vendor/serf:$PATH
 script: bundle exec rspec -fd ./spec

data/lib/villein/agent.rb

@@ -54,6 +54,13 @@ module Villein
       !!@exitstatus
     end
 
+    ##
+    # Return true when the agent has received events at least once.
+    # Useful to wait serf for ready to use.
+    def ready?
+      running? && @event_received
+    end
+
     ##
     # Returns true when the serf agent is running (it has started and not dead yet).
     def running?
@@ -65,6 +72,8 @@ module Villein
       @pid_lock.synchronize do
         raise AlreadyStarted if running?
 
+        @event_received = false
+
         start_listening_events
         start_process
         start_watchdog
@@ -91,6 +100,12 @@ module Villein
       end
     end
 
+    ##
+    # Blocks until #ready? become true.
+    def wait_for_ready
+      sleep 0.1 until ready?
+    end
+
     ##
     # Add +at_exit+ hook to safely stop at exit of current ruby process.
     # Note that +Kernel#.at_exit+ hook won't run when Ruby has crashed.
@@ -233,6 +248,8 @@ module Villein
       event_payload = JSON.parse(json)
       event = Event.new(event_payload['env'], payload: event_payload['input'])
 
+      @event_received = true
+
       call_hooks event.type.gsub(/-/, '_'), event
       call_hooks 'event', event
     rescue JSON::ParserError

data/lib/villein/version.rb

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

data/spec/agent_spec.rb

@@ -41,9 +41,12 @@ describe Villein::Agent do
 
     agent.start!
 
+    Thread.new { agent.wait_for_ready }.join(5)
+
     expect(agent.dead?).to be_false
     expect(agent.running?).to be_true
     expect(agent.started?).to be_true
+    expect(agent.ready?).to be_true
     expect(agent.pid).to be_a(Fixnum)
 
     agent.stop!
@@ -51,6 +54,7 @@ describe Villein::Agent do
     expect(agent.dead?).to be_false
     expect(agent.running?).to be_false
     expect(agent.started?).to be_false
+    expect(agent.ready?).to be_false
     expect(agent.pid).to be_nil
 
     expect(received).to eq [true, nil]

metadata

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