nchan_tools 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec4e4cc624f57a6d6a6684bf71db8d75b58a4e2e823e258490b9be66eb5de396
-  data.tar.gz: bea9e679190cff5749804e8f8e3ef14ca825edd197ef0381d4c8225f87a07ca8
+  metadata.gz: e17f44cb591b9f74d1791e1f9ec8574613fbc840c6aac91953c8a526a8a63006
+  data.tar.gz: 405aabdbc70b14571c6cc545ca13f0ea7e5ad65b130ab37194fee1ed7ccf7d5c
 SHA512:
-  metadata.gz: 38c2d66f98c4eb30a48968197d16513ba080d68bdaf417f884fd4af72f7d63ab0788c46554d636f1a5e6c344861e7c08d885432e9e5e6d44cdb0bd1b630bc4de
-  data.tar.gz: 02fb75182dacf15033c6d5fe3b0191b9c62063aec06fe67942ba2b6c0559368ce86af93b0ab507f3924e524a180e6bed9b2a7dd7b77fbdeca3af702abb141807
+  metadata.gz: 31e391ad81b9a43519d014a538f77b87b25706a009180b83239eea014c174497d8d7e3c9ca26d173b075cd42cba4e82ab92dc696ce459058080a325c29f808e3
+  data.tar.gz: 66654049eaf6f7f26e16fd98df88b1570a5d80f7168cc2f774e5d7168ae4d42a668b1384c3280fd82b8473f78e63ec4774b005f9971be4db7e9a2d4d65a01264

data/exe/nchan-redis-debug

@@ -4,25 +4,26 @@ require "redis"
 require "optparse"
 require 'nchan_tools/rdsck'
 
-$opt = {
+opt = {
   url: "redis://127.0.0.1:6379/",
   verbose: false,
   command: nil
 }
 
 opt_parser=OptionParser.new do |opts|
-  opts.on("--url", "--url REDIS_URL (#{$opt[:url]})", "Redis server and port..") do |v|
-    $opt[:url]=v
+  opts.on("--url", "--url REDIS_URL (#{opt[:url]})", "Redis server and port..") do |v|
+    opt[:url]=v
   end
   opts.on("-q", "--quiet", "output only results without any other information") do
-    $opt[:quiet]=false
+    opt[:quiet]=false
+    opts[:verbose] = !opt[:quiet]
   end
   opts.on("--list-channels", "list all Nchan channels on Redis server or cluster") do |v|
-    $opt[:command]=:filter_channels
+    opt[:command]=:filter_channels
   end
   opts.on("--filter-channels-min-subscribers=[NUMBER]") do |v|
-    $opt[:command]=:filter_channels
-    $opt[:min_subscribers]=v.to_i
+    opt[:command]=:filter_channels
+    opt[:min_subscribers]=v.to_i
   end
 end
 opt_parser.banner= <<~EOB
@@ -39,16 +40,16 @@ opt_parser.banner= <<~EOB
 EOB
 opt_parser.parse!
 
-rdsck = Rdsck.new $opt
+rdsck = Rdsck.new opt
 if not rdsck.connect
-  STDERR.puts "failed to connect to #{$opt[:url]}"
+  STDERR.puts "failed to connect to #{opt[:url]}"
   exit 1
 end
 
-case $opt[:command]
+case opt[:command]
 when :filter_channels
-  puts "# scanning for channels #{$opt[:min_subscribers] && "with subscribers >= #{$opt[:min_subscribers]}"}"
-  chans = rdsck.filter_channels(min_subscribers: $opt[:min_subscribers])
+  puts "# scanning for channels #{opt[:min_subscribers] && "with subscribers >= #{opt[:min_subscribers]}"}"
+  chans = rdsck.filter_channels(min_subscribers: opt[:min_subscribers])
   puts "# found #{chans.count} channel#{chans.count != 1 && "s"}#{chans.count == 0 ? "." : ":"}"
   puts chans.join("\n")
 else

data/lib/nchan_tools/rdsck.rb

@@ -3,7 +3,7 @@ class Rdsck
   attr_accessor :redis, :masters
   
   def dbg(*args)
-    if $opt[:verbose]
+    if @verbose
       print("# ")
       puts(*args)
     end
@@ -13,6 +13,7 @@ class Rdsck
     @url=opt[:url]
     @verbose=opt[:verbose]
     @namespace=opt[:namespace]
+    @channel_id=opt[:channel_id]
   end
   
   def cluster?
@@ -21,7 +22,7 @@ class Rdsck
   
   def connect
     begin
-      @redis=Redis.new url: $opt[:url]
+      @redis=Redis.new url: @url
       mode = redis.info["redis_mode"]
     rescue StandardError => e
       STDERR.puts e.message
@@ -31,7 +32,7 @@ class Rdsck
     if mode == "cluster"
       @redis.close
       begin
-        @redis=Redis.new cluster: [$opt[:url]]
+        @redis=Redis.new cluster: [@url]
         @redis.ping
       rescue StandardError => e
         STDERR.puts e.message
@@ -57,7 +58,7 @@ class Rdsck
   end
   
   def key(subkey=nil)
-    k = "{channel:#{$opt[:namespace]}/#{$opt[:channel_id]}}"
+    k = "{channel:#{@namespace}/#{@channel_id}}"
     return subkey ? "#{k}:#{subkey}" : k
   end
   

data/lib/nchan_tools/version.rb

@@ -1,3 +1,3 @@
 module NchanTools
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nchan_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Leo Ponomarev