nsq-cluster 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 015851fe49eb29d22f4afc4f0ee6c6fa69e2e19b
-  data.tar.gz: f833d2ce707634be785a50d78dde5cd216d13b9a
+  metadata.gz: 4c7c5f98ff83cca318e2639e007161bd439b2316
+  data.tar.gz: d7af273c0b9f9e74b700fd5a3fb22c676fdbccb9
 SHA512:
-  metadata.gz: 2ed8304c61b2f85622875c33c2e47bb2ee4c8646613d6eea23a09a714cdbd210fbbb2560de6deabfe8f1e8009fab2c87f15723dfc35f0caac98af90058a164ed
-  data.tar.gz: 3fe8ef5498d1077714e9bd49eebe6c747221339cf31d43f94001f6fb42fcc8985fcb28bdad9bd7ad94fdcf24e1d7d19efdaed5ca9f5e29ce651b59b12e003cb3
+  metadata.gz: 11b7c8b3a6db1d70e72cd20117d5987bc2e880eac5f9783eae0bcceaa127e943f71cf771458ac9935012560674172879328a678b6398402b0fd4440a2d786488
+  data.tar.gz: cb329273e0e9e6fbba661aebc397270c2e1f4eb4406f7a076f643c166d1ebfbf83479fe91715a321d2d8e6d03adf89e1c35c56b4eaf18b4a7fcf6e472db3a881

data/README.md

@@ -17,6 +17,11 @@ cluster.nsqd.last.start
 cluster.destroy
 ```
 
+## Compatibility
+
+- Version 2.x of `nsq-cluster` is compatible with NSQ >= 1.0.
+- Version 1.x of `nsq-cluster` is compatible with NSQ < 1.0.
+
 ## Flags for nsqd and nsqlookupd
 
 Optionally, you can pass in flags for nsqd and nsqlookupd like this:

data/lib/nsq-cluster.rb

@@ -94,7 +94,7 @@ class NsqCluster
   end
 
 
-  def block_until_running(timeout = 3)
+  def block_until_running(timeout = 10)
     puts "Waiting for cluster to launch..." if @verbose
     begin
       Timeout::timeout(timeout) do

data/lib/nsq-cluster/nsqd.rb

@@ -49,7 +49,7 @@ class Nsqd < ProcessWrapper
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--data-path=#{data_path}),
-      %Q(--worker-id=#{id}),
+      %Q(--node-id=#{id}),
       %Q(--broadcast-address=#{@broadcast_address})
     ]
 
@@ -142,9 +142,9 @@ class Nsqd < ProcessWrapper
 
   def nsqd_post(action, params)
     if params[:topic] && params[:channel]
-      post "#{action}_channel", topic: params[:topic], channel: params[:channel]
+      post "channel/#{action}", topic: params[:topic], channel: params[:channel]
     elsif params[:topic]
-      post "#{action}_topic", topic: params[:topic]
+      post "topic/#{action}", topic: params[:topic]
     else
       raise 'you must specify a topic or topic and channel'
     end

data/lib/nsq-cluster/nsqlookupd.rb

@@ -87,9 +87,9 @@ class Nsqlookupd < ProcessWrapper
 
   def nsqlookupd_post(action, params)
     if params[:topic] && params[:channel]
-      post "#{action}_channel", topic: params[:topic], channel: params[:channel]
+      post "channel/#{action}", topic: params[:topic], channel: params[:channel]
     elsif params[:topic]
-      post "#{action}_topic", topic: params[:topic]
+      post "topic/#{action}", topic: params[:topic]
     else
       raise 'you must specify a topic or topic and channel'
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Wistia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
@@ -44,56 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rainbow
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: rspec-legacy_formatters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.5'
 description: Setup nsqd, nsqlookupd, and nsqadmin in a jiffy. Great for testing!
 email: dev@wistia.com
 executables:
@@ -132,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily setup and manage a local NSQ cluster