dev-consul 0.6.4.2 → 0.6.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df9bc7bd362c366f8aa6d7956255a4e01f3380be
-  data.tar.gz: bdc1b8342a183553b56ad18a5bda91d7d022fbef
+  metadata.gz: 2029c024629f6905adb767d67b2bc3bb593763ff
+  data.tar.gz: 1a3e128053da30c1e21c52907c5ea350383eb2e5
 SHA512:
-  metadata.gz: 1670510daddc655943ea67d44151501eab71ca83847d91f7d2d5e4b4fc9974430f5f8ef01948b06d4f83a973768e3a191cc1b4d480d15bd25af06ed2475d8b68
-  data.tar.gz: 598c080288de08dd7c6f7924c8ed9e478bb9c49b6b5ab68ea4fc50bc3b6afe440936597941a76250682e6b1993d01609e5618e65d06ce21cadf1f5c9214cd9dc
+  metadata.gz: 9068614d369eba883ae5648b5cb332d7b150ffb519b78ee08721e523d5956640621a0b3263aa808a55c18ea596da69be54258af3286857a96ae06cff3ccd45f5
+  data.tar.gz: 3eba8bc39d4d00044b5dee1ea8a37594b04b499dcf740be1025603385310714b7c36eec0a8e765626be6e1800403d9d6b216e53366bea28e1b49d473086760c5

data/Rakefile

@@ -10,11 +10,11 @@ task :fetch do
 end
 
 task :run do
-  Dev::Consul.run
+  Dev::Consul.run.wait
 end
 
 task :wait do
-  Dev::Consul.wait
+  Dev::Consul.block
 end
 
 task :default => [:run, :wait]

data/lib/dev/consul.rb

@@ -36,72 +36,84 @@ module Dev
         File.join(bindir, "consul_#{VERSION}_#{platform}_#{architecture}")
       end
 
-      def output(arg = nil)
-        @thread[:output] = arg unless @thread.nil? || arg.nil?
-        @thread[:output] unless @thread.nil?
+      attr_reader :output
+
+      ## Logging helper
+      def log(*message)
+        return unless output.is_a?(IO)
+
+        output.write(message.join(' ') + "\n")
+        output.flush
       end
 
-      def run
-        puts "Starting #{bin}"
+      def run(**options)
+        @output = options.fetch(:output, $stdout)
+        log "Starting #{bin}"
+
 
         ## Fork a child process for Consul from a thread
+        @stopped = false
         @thread = Thread.new do
           IO.popen("#{bin} agent -dev -advertise=127.0.0.1", 'r+') do |io|
             Thread.current[:process] = io.pid
-            puts "Started #{bin} (#{io.pid})"
+            log "Started #{bin} (#{io.pid})"
 
             ## Stream output
             loop do
               break if io.eof?
               chunk = io.readpartial(1024)
 
-              if Thread.current[:output]
-                Thread.current[:output].write(chunk)
-                Thread.current[:output].flush
-              end
+              next unless output.is_a?(IO)
+              output.write(chunk)
+              output.flush
             end
           end
         end
 
-        @thread[:output] = $stdout
+        self
+      end
 
+      def wait
         ## Wait for the service to become ready
         loop do
-          begin
-            leader = Net::HTTP.get('localhost', '/v1/status/leader', 8500)
+          break if @stopped || @thread.nil? || !@thread.alive?
 
-            if leader == '""'
-              puts 'Waiting for Consul HTTP API to be ready'
+          leader =
+            begin
+              Net::HTTP.get('localhost', '/v1/status/leader', 8500)
+            rescue Errno::ECONNREFUSED
+              log 'Waiting for Consul HTTP API to be ready'
               sleep 1
-
               next
             end
 
-            puts 'Consul HTTP API is ready!'
-            break
-
-          rescue Errno::ECONNREFUSED
-            puts 'Waiting for Consul HTTP API to be ready'
+          if leader == '""'
+            log 'Waiting for RAFT to initialize'
             sleep 1
+            next
           end
+
+          log 'Consul HTTP API is ready!'
+          break
         end
       end
 
-      def wait
+      def block
         @thread.join unless @thread.nil?
       end
 
       def stop
         unless @thread.nil?
           unless @thread[:process].nil?
-            puts "Stop #{bin} (#{@thread[:process]})"
-            Process.kill('INT', @thread[:process])
+            log "Stop #{bin} (#{@thread[:process]})"
+            Process.kill('TERM', @thread[:process])
           end
 
           @thread.join
         end
 
         @thread = nil
+        @stopped = true
       end
     end
   end

data/lib/dev/consul/version.rb

@@ -1,6 +1,6 @@
 module Dev
   module Consul
-    RELEASE = '2'.freeze
+    RELEASE = '3'.freeze
     VERSION = '0.6.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-consul
 version: !ruby/object:Gem::Version
-  version: 0.6.4.2
+  version: 0.6.4.3
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zipruby