nsq-cluster 0.2.7 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b47dc619bd8a8ea2247893e68b3da23c6303b1f7
-  data.tar.gz: 852cfe562564cd6b793576ee17840e7b0de1e35b
+  metadata.gz: 5fbeebffe7f886384eb99c3c7bbb3a07a66dfb58
+  data.tar.gz: ef5db16daa418743ba8b9e32c3529cfc526b017b
 SHA512:
-  metadata.gz: a7306f2913bfd847d960f1cab03918ab57a6cdc21a84f6c3adecdac7d2dc59416650c244c21d5e4e77fd42ddc2634bf647b9d503e85fda716d74592adf144f09
-  data.tar.gz: 1f886a10b6cc6a8ecedf32c38b4b196ca9e297cf29e42ddaec22dba1e98d1c90681b1fa531b8bcacbda019e81f8b6e6815b6264f8862520f94adb493a22d3707
+  metadata.gz: 298fd3698cc0d43ec147f2740c88ec68c4c5c0fc19c3c180440d65dcce4777a6177b38247da7429cecba540a5a17c7c4a35d02afb34a2a49630fed193bec5fbc
+  data.tar.gz: 22ffb6980ead07c4397e4116fb54606a5a8df284989ee247bf80f7959c358d5598546ec23de6dca8bae76d3dfe10a2263b55d66856f26fed9e74474121775de9

data/README.md

@@ -6,12 +6,15 @@ Easily start up a local NSQ cluster. This is great for testing.
 # Start a cluster of 3 nsqd's and 2 nsqlookupd's
 cluster = NsqCluster.new(nsqd_count: 3, nsqlookupd_count: 2)
 
-# Optionaally, block until the cluster is up and running
+# Optionally, block until the cluster is up and running
 cluster.block_until_running
 
 # Stop the 3rd nsqd instance
 cluster.nsqd.last.stop
 
+# Wait until it's stopped
+cluster.nsqd.last.block_until_stopped
+
 # Start it back up again
 cluster.nsqd.last.start
 
@@ -19,6 +22,21 @@ cluster.nsqd.last.start
 cluster.destroy
 ```
 
+## Flags for nsqd and nsqlookupd
+
+Optionally, you can pass in flags for nsqd and nsqlookupd like this:
+
+```ruby
+NsqCluster.new(
+  nsqd_count: 1,
+  nsqlookupd_count: 1,
+  nsqd_options: { verbose: true },
+  nsqlookupd_options: { verbose: true }
+)
+```
+
+## Send commands to nsqd
+
 Available methods that map to [`nsqd`'s](http://nsq.io/components/nsqd.html) HTTP endpoints.
 
 ```ruby
@@ -49,6 +67,8 @@ nsqd.ping
 nsqd.info
 ```
 
+## Send commands to nsqlookup
+
 Available methods that map to [`nsqlookupd`'s](http://nsq.io/components/nsqlookupd.html) HTTP endpoints.
 
 ```ruby
@@ -78,4 +98,4 @@ nsqlookupd.ping
 
 # Get general info
 nsqlookupd.info
-```
+```

data/bin/nsq-cluster

@@ -9,7 +9,7 @@ options = {
   nsqd_count: 1,
   nsqlookupd_count: 1,
   nsqadmin: true,
-  silent: false
+  verbose: true
 }
 
 OptionParser.new do |opts|

data/lib/nsq-cluster.rb

@@ -28,10 +28,10 @@ class NsqCluster
       nsqd_count: 0,
       nsqadmin: false,
       nsqd_options: {},
-      silent: true
+      verbose: false
     }.merge(opts)
-    @silent = opts[:silent]
 
+    @verbose = opts[:verbose]
     @nsqlookupd = create_nsqlookupds(opts[:nsqlookupd_count], opts[:nsqdlookupd_options])
     @nsqd = create_nsqds(opts[:nsqd_count], opts[:nsqd_options])
     @nsqadmin = create_nsqadmin if opts[:nsqadmin]
@@ -49,31 +49,35 @@ class NsqCluster
 
   def create_nsqlookupds(count, options)
     (0...count).map do |idx|
-      Nsqlookupd.new(options.merge({
-        tcp_port: 4160 + idx * 2,
-        http_port: 4161 + idx * 2,
-        silent: @silent
-      }))
+      Nsqlookupd.new(
+        options.merge({
+          tcp_port: 4160 + idx * 2,
+          http_port: 4161 + idx * 2
+        }),
+        @verbose
+      )
     end
   end
 
 
   def create_nsqds(count, options)
     (0...count).map do |idx|
-      Nsqd.new(options.merge({
-        tcp_port: 4150 + idx * 2,
-        http_port: 4151 + idx * 2,
-        nsqlookupd: @nsqlookupd,
-        silent: @silent
-      }))
+      Nsqd.new(
+        options.merge({
+          tcp_port: 4150 + idx * 2,
+          http_port: 4151 + idx * 2,
+          nsqlookupd: @nsqlookupd,
+        }),
+        @verbose
+      )
     end
   end
 
 
   def create_nsqadmin
     Nsqadmin.new(
-      nsqlookupd: @nsqlookupd,
-      silent: @silent
+      { nsqlookupd: @nsqlookupd },
+      @verbose
     )
   end
 
@@ -90,11 +94,11 @@ class NsqCluster
 
 
   def block_until_running(timeout = 3)
-    puts "Waiting for cluster to launch..." unless @silent
+    puts "Waiting for cluster to launch..." if @verbose
     begin
       Timeout::timeout(timeout) do
         all_services.each {|service| service.block_until_running}
-        puts "Cluster launched." unless @silent
+        puts "Cluster launched." if @verbose
       end
     rescue Timeout::Error
       raise "Cluster did not fully launch within #{timeout} seconds."
@@ -103,11 +107,11 @@ class NsqCluster
 
 
   def block_until_stopped(timeout = 10)
-    puts "Waiting for cluster to stop..." unless @silent
+    puts "Waiting for cluster to stop..." if @verbose
     begin
       Timeout::timeout(timeout) do
         all_services.each{|service| service.block_until_stopped}
-        puts "Cluster stopped." unless @silent
+        puts "Cluster stopped." if @verbose
       end
     rescue Timeout::Error
       raise "Cluster did not fully stop within #{timeout} seconds."

data/lib/nsq-cluster/nsqadmin.rb

@@ -6,12 +6,16 @@ class Nsqadmin < ProcessWrapper
 
   attr_reader :host, :http_port
 
-  def initialize(opts = {})
+  def initialize(opts = {}, verbose = false)
+    super
+
     @host = '127.0.0.1'
-    @http_port = opts[:http_port] || 4171
-    @lookupd = opts[:nsqlookupd] || []
+    @http_port = opts.delete(:http_port) || 4171
+    @lookupd = opts.delete(:nsqlookupd) || []
 
-    super
+    @extra_args = opts.map do |key, value|
+      "--#{key.to_s.gsub('_', '-')}=#{value}"
+    end
   end
 
 
@@ -37,7 +41,7 @@ class Nsqadmin < ProcessWrapper
       %Q(--lookupd-http-address=#{ld.host}:#{ld.http_port})
     end
 
-    base_args + lookupd_args
+    base_args + @extra_args + lookupd_args
   end
 
 end

data/lib/nsq-cluster/nsqd.rb

@@ -9,18 +9,21 @@ class Nsqd < ProcessWrapper
   attr_reader :host, :tcp_port, :http_port
 
 
-  def initialize(opts = {})
-    @host = opts[:host] || '127.0.0.1'
-    @tcp_port = opts[:tcp_port] || 4150
-    @http_port = opts[:http_port] || 4151
-    @lookupd = opts[:nsqlookupd] || []
-    @msg_timeout = opts[:msg_timeout] || '60s'
-    @broadcast_address = opts[:broadcast_address] || @host
+  def initialize(opts = {}, verbose = false)
+    super
+
+    @host = opts.delete(:host) || '127.0.0.1'
+    @tcp_port = opts.delete(:tcp_port) || 4150
+    @http_port = opts.delete(:http_port) || 4151
+    @lookupd = opts.delete(:nsqlookupd) || []
+    @broadcast_address = opts.delete(:broadcast_address) || @host
+
+    @extra_args = opts.map do |key, value|
+      "--#{key.to_s.gsub('_', '-')}=#{value}"
+    end
 
     clear_data_directory
     create_data_directory
-
-    super
   end
 
 
@@ -41,7 +44,6 @@ class Nsqd < ProcessWrapper
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--data-path=#{data_path}),
       %Q(--worker-id=#{worker_id}),
-      %Q(--msg-timeout=#{@msg_timeout}),
       %Q(--broadcast-address=#{@broadcast_address})
     ]
 
@@ -49,7 +51,7 @@ class Nsqd < ProcessWrapper
       %Q(--lookupd-tcp-address=#{ld.host}:#{ld.tcp_port})
     end
 
-    base_args + lookupd_args
+    base_args + @extra_args + lookupd_args
   end
 
 

data/lib/nsq-cluster/nsqlookupd.rb

@@ -6,13 +6,17 @@ class Nsqlookupd < ProcessWrapper
 
   attr_reader :host, :tcp_port, :http_port
 
-  def initialize(opts = {})
-    @host = opts[:host] || '127.0.0.1'
-    @tcp_port = opts[:tcp_port] || 4160
-    @http_port = opts[:http_port] || 4161
-    @broadcast_address = opts[:broadcast_address] || @host
-
+  def initialize(opts = {}, verbose = false)
     super
+
+    @host = opts.delete(:host) || '127.0.0.1'
+    @tcp_port = opts.delete(:tcp_port) || 4160
+    @http_port = opts.delete(:http_port) || 4161
+    @broadcast_address = opts.delete(:broadcast_address) || @host
+
+    @extra_args = opts.map do |key, value|
+      "--#{key.to_s.gsub('_', '-')}=#{value}"
+    end
   end
 
 
@@ -26,7 +30,7 @@ class Nsqlookupd < ProcessWrapper
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--broadcast-address=#{@broadcast_address})
-    ]
+    ] + @extra_args
   end
 
 

data/lib/nsq-cluster/process_wrapper.rb

@@ -1,9 +1,10 @@
 class ProcessWrapper
   HTTPCHECK_INTERVAL = 0.01
 
+  attr_reader :pid
 
-  def initialize(opts = {})
-    @silent = opts[:silent]
+  def initialize(opts = {}, verbose = false)
+    @verbose = verbose
   end
 
 
@@ -51,10 +52,10 @@ class ProcessWrapper
 
 
   def output
-    if @silent
-      '/dev/null'
-    else
+    if @verbose
       :out
+    else
+      '/dev/null'
     end
   end
 
@@ -82,7 +83,7 @@ class ProcessWrapper
     until http_port_open? do
       sleep HTTPCHECK_INTERVAL
     end
-    puts "HTTP port #{http_port} responded to /ping." unless @silent
+    puts "HTTP port #{http_port} responded to /ping." if @verbose
   end
 
 
@@ -90,20 +91,16 @@ class ProcessWrapper
     until !http_port_open? do
       sleep HTTPCHECK_INTERVAL
     end
-    puts "HTTP port #{http_port} stopped responding to /ping." unless @silent
+    puts "HTTP port #{http_port} stopped responding to /ping." if @verbose
   end
 
 
   def http_port_open?
     begin
       response = Net::HTTP.get_response(URI("http://#{host}:#{http_port}/ping"))
-      if response.is_a?(Net::HTTPSuccess)
-        true
-      else
-        false
-      end
+      return response.is_a?(Net::HTTPSuccess)
     rescue Errno::ECONNREFUSED
-      false
+      return false
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable