nsq-cluster 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 033d98f5168d98c5ccbbcf74f07c39e664381211
-  data.tar.gz: 2bbce8696cb02e03e1957a50ceab19497f8d6a5c
+  metadata.gz: af4e1c18926766a3b124a0e962e60b9395f0330e
+  data.tar.gz: 9fc20529ef3b4d5c58e82e43617bb679d52327f9
 SHA512:
-  metadata.gz: 806ce00281ea63daec5f0cb793cd3db757cb1d7e4999c842417426de1c61b97174509eab98abf987fc51fa32ed6dd1fd55ba98ac040fb6196320b6dc7ddd0887
-  data.tar.gz: c7c335b5e6e6b984de79d7c758c45ada043f2e4fa63e5e5f44b4be716e700a3a194d549d441e576f7836858b5404c05f4e2663e7c9260a4776917b60a374c3f0
+  metadata.gz: c0d65780e1ff49e975ebb9450ada77d62551dcd405d1c030970fe84c0446d75e920a545359c5f05a04f7809887de5f79fe6318f35bb6e92a93ba7c7ca87ef550
+  data.tar.gz: 3e979a9a31a934cfd093bf4fa8dbcf14dc90960659c2d9129e9957a07207ba70c042fde6fafec1db99165b3d0a543f56ae16f816d85f796acccfb68a7c179d1f

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.0
+ruby-2.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nsq-cluster (0.1.1)
+    nsq-cluster (0.1.2)
       nsq-cluster
 
 GEM

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/nsq-cluster.rb

@@ -22,6 +22,7 @@ class NsqCluster
   def initialize(opts = {})
     opts = {
       nsqlookupd_count: 0,
+      nsqdlookupd_options: {},
       nsqd_count: 0,
       nsqadmin: false,
       nsqd_options: {},
@@ -30,7 +31,7 @@ class NsqCluster
 
     @silent = opts[:silent]
 
-    @nsqlookupd = create_nsqlookupds(opts[:nsqlookupd_count])
+    @nsqlookupd = create_nsqlookupds(opts[:nsqlookupd_count], opts[:nsqdlookupd_options])
     @nsqd = create_nsqds(opts[:nsqd_count], opts[:nsqd_options])
     @nsqadmin = create_nsqadmin if opts[:nsqadmin]
 
@@ -39,13 +40,13 @@ class NsqCluster
   end
 
 
-  def create_nsqlookupds(count)
+  def create_nsqlookupds(count, options)
     (0...count).map do |idx|
-      Nsqlookupd.new(
+      Nsqlookupd.new(options.merge({
         tcp_port: 4160 + idx * 2,
         http_port: 4161 + idx * 2,
         silent: @silent
-      )
+      }))
     end
   end
 

data/lib/nsq-cluster/nsqd.rb

@@ -10,11 +10,12 @@ class Nsqd < ProcessWrapper
 
 
   def initialize(opts = {})
-    @host = '127.0.0.1'
+    @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
 
     clear_data_directory
     create_data_directory
@@ -40,7 +41,8 @@ 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(--msg-timeout=#{@msg_timeout}),
+      %Q(--broadcast-address=#{@broadcast_address})
     ]
 
     lookupd_args = @lookupd.map do |ld|

data/lib/nsq-cluster/nsqlookupd.rb

@@ -7,9 +7,10 @@ class Nsqlookupd < ProcessWrapper
   attr_reader :host, :tcp_port, :http_port
 
   def initialize(opts = {})
-    @host = '127.0.0.1'
+    @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
 
     super
   end
@@ -23,7 +24,8 @@ class Nsqlookupd < ProcessWrapper
   def args
     [
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
-      %Q(--http-address=#{@host}:#{@http_port})
+      %Q(--http-address=#{@host}:#{@http_port}),
+      %Q(--broadcast-address=#{@broadcast_address})
     ]
   end
 

data/nsq-cluster.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nsq-cluster 0.1.1 ruby lib
+# stub: nsq-cluster 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nsq-cluster"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Brendan Schwartz"]
-  s.date = "2014-06-26"
+  s.date = "2014-07-17"
   s.description = "Setup nsqd, nsqlookupd, and nsqadmin in a jiffy. Great for testing!"
   s.email = "brendan@wistia.com"
   s.executables = ["nsq-cluster"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brendan Schwartz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nsq-cluster