nsq-cluster 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4c7c5f98ff83cca318e2639e007161bd439b2316
-  data.tar.gz: d7af273c0b9f9e74b700fd5a3fb22c676fdbccb9
+SHA256:
+  metadata.gz: 888ca42c33599c1c905e2fe7277fb2c95f9bceaa02e3304e729b06309a9d6cc8
+  data.tar.gz: aaca00aaf0818575a178bb290a68cef339534212bc9b134b5a860912d0cd0185
 SHA512:
-  metadata.gz: 11b7c8b3a6db1d70e72cd20117d5987bc2e880eac5f9783eae0bcceaa127e943f71cf771458ac9935012560674172879328a678b6398402b0fd4440a2d786488
-  data.tar.gz: cb329273e0e9e6fbba661aebc397270c2e1f4eb4406f7a076f643c166d1ebfbf83479fe91715a321d2d8e6d03adf89e1c35c56b4eaf18b4a7fcf6e472db3a881
+  metadata.gz: 562184f09a1eca56b1aa8120498b425fd1289fc86a6fc616982f65e84e7882d247c0a0b0c926a3029c497023c3c68da3a87b0dbf2a706265b1ace6124ab006c4
+  data.tar.gz: 321ee7ce0f0c21f24e707f6379867e4e3ead0172b14cef40824e0001d24ad45f41d023d5dac06522a9c579c5f243b7e36062ac3a5e48ffd62dc66cd9c2bb9615

data/README.md

@@ -17,11 +17,6 @@ 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/nsqd.rb

@@ -8,6 +8,13 @@ class Nsqd < ProcessWrapper
 
   attr_reader :host, :tcp_port, :http_port, :id, :base_port
 
+  # Returns true if nsqd's version is < 1.0
+  def self.version_is_pre_1?
+    @version_is_pre_1 ||= (
+      `nsqd -version`.index('nsqd v0') == 0
+    )
+  end
+
 
   def initialize(opts = {}, verbose = false)
     super
@@ -49,15 +56,20 @@ class Nsqd < ProcessWrapper
       %Q(--tcp-address=#{@host}:#{@tcp_port}),
       %Q(--http-address=#{@host}:#{@http_port}),
       %Q(--data-path=#{data_path}),
-      %Q(--node-id=#{id}),
       %Q(--broadcast-address=#{@broadcast_address})
     ]
 
+    if Nsqd.version_is_pre_1?
+      node_args = [%Q(--worker-id=#{id})]
+    else
+      node_args = [%Q(--node-id=#{id})]
+    end
+
     lookupd_args = @lookupd.map do |ld|
       %Q(--lookupd-tcp-address=#{ld.host}:#{ld.tcp_port})
     end
 
-    base_args + @extra_args + lookupd_args
+    base_args + node_args + @extra_args + lookupd_args
   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 "channel/#{action}", topic: params[:topic], channel: params[:channel]
+      post "#{action}_channel", topic: params[:topic], channel: params[:channel]
     elsif params[:topic]
-      post "topic/#{action}", topic: params[:topic]
+      post "#{action}_topic", topic: params[:topic]
     else
       raise 'you must specify a topic or topic and channel'
     end

data/lib/nsq-cluster/process_wrapper.rb

@@ -100,6 +100,7 @@ class ProcessWrapper
   def http_port_open?
     begin
       response = Net::HTTP.get_response(URI("http://#{host}:#{http_port}/ping"))
+
       return response.is_a?(Net::HTTPSuccess)
     rescue Errno::ECONNREFUSED
       return false

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nsq-cluster
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Wistia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +60,7 @@ homepage: http://github.com/wistia/nsq-cluster
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Easily setup and manage a local NSQ cluster
 test_files: []