nchan_tools 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a8230e83733a4948ee9cc9df50eea8b698f2762e7f70a054f9708c98bb7ea1
-  data.tar.gz: 16ab41364f02c7996441a8f461bd969d9c11af023936e64f0be1f912f81ece88
+  metadata.gz: 65a7cdf81145f3dde05ac13e82dc9dcc09063eff263ec642a6b9e3682db033d1
+  data.tar.gz: 5d8d9ff2c06a5ebd982a123be59a3ed13310b99c7daa869e86e30832f69ee509
 SHA512:
-  metadata.gz: 8f2f505b79a22588f37f38f12aa0c461cf5d9db9f3c89375f6a70a9a0df3b8a62f2b778425fbb71bc4b7eb9b8b4fdf275c08cf365dd9d89b57e5396ed5312e1e
-  data.tar.gz: 6c4bfe8a215370d37319144375b633bbbb868d1f50ac4dc1f6c2736dce057f78edd30e3995d7be34a5534d80f0ee4cd50f5d0633b63da085c28620c24751a979
+  metadata.gz: b771ba51b4108c2c01805e06730590c79f5150180d62bad58662e7f6f6f1ed250257c94acf992274292195381262ca01164f249df147ba3eabd149f0ad730259
+  data.tar.gz: 5b422326b465e2df1f70315edad5dda73766c861aa18f4d65cbc64093bbf229a2a0845de7f207620751442e6a6b47887ebfd44f5002757ef2abf6c690220b0fe

data/exe/nchan-redis-debug

@@ -4,32 +4,26 @@ require "redis"
 require "optparse"
 require 'nchan_tools/rdsck'
 
-$opt = {
+opt = {
   url: "redis://127.0.0.1:6379/",
   verbose: false,
   command: nil
 }
 
-def dbg(...)
-  if $opt[:verbose]
-    print("# ")
-    puts(...)
-  end
-end
-
 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
@@ -46,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

@@ -1,10 +1,19 @@
 class Rdsck
   attr_accessor :url, :verbose, :namespace
   attr_accessor :redis, :masters
+  
+  def dbg(*args)
+    if @verbose
+      print("# ")
+      puts(*args)
+    end
+  end
+  
   def initialize(opt)
     @url=opt[:url]
     @verbose=opt[:verbose]
     @namespace=opt[:namespace]
+    @channel_id=opt[:channel_id]
   end
   
   def cluster?
@@ -13,7 +22,8 @@ class Rdsck
   
   def connect
     begin
-      @redis=Redis.new url: $opt[:url]
+      puts "connect to #{@url}"
+      @redis=Redis.new url: @url
       mode = redis.info["redis_mode"]
     rescue StandardError => e
       STDERR.puts e.message
@@ -23,7 +33,8 @@ class Rdsck
     if mode == "cluster"
       @redis.close
       begin
-        @redis=Redis.new cluster: [$opt[:url]]
+        puts "cluster-connect to #{@url}"
+        @redis=Redis.new cluster: [@url]
         @redis.ping
       rescue StandardError => e
         STDERR.puts e.message
@@ -49,7 +60,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
   
@@ -90,7 +101,7 @@ class Rdsck
     EOF
     
     results = []
-    batch_size=2
+    batch_size=500
     masters.each do |m|
       hash = m.script "load", script
       cursor, pattern = "0", "{channel:*}"

data/lib/nchan_tools/version.rb

@@ -1,3 +1,3 @@
 module NchanTools
-  VERSION = "0.1.6"
+  VERSION = "0.1.11"
 end

data/nchan_tools.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "celluloid"
   spec.add_dependency "celluloid-io"
   spec.add_dependency "HDRHistogram"
+  spec.add_dependency "redis", "~>4.2.0"
   
   spec.add_dependency "websocket-driver"
   spec.add_dependency 'websocket-extensions'
@@ -38,6 +39,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'http-2'
   end  
   spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nchan_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.11
 platform: ruby
 authors:
 - Leo Ponomarev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
@@ -182,30 +196,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: publishing, subscribing, testing, and benchmarking utilities for Nchan.
 email:
 - leo@nchan.io