pickynode 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d49df9c54a1dd3799f0b66b74f75f217560f283d
-  data.tar.gz: 5cba4b0edea26ba858cb83dd2128d4b4cc45b71d
+  metadata.gz: f730e5368a59d75e087733cfb5cac8f39ee2205c
+  data.tar.gz: a2f0fa712034104a4b8142a46f350212964ee888
 SHA512:
-  metadata.gz: 01e9aa203431912c58a97b78920c685e146f5150d0d1ee18d70999c702b17ec092bdfe480905345a1dace8318ee6fecb3c990ef3ca17c5041b5388ddad1ba52d
-  data.tar.gz: d09e13a8f1cb105907833dc8fa69fdff3063a6e7791d70200b72d6ad8319e5639d01da3ee1775d1ff41d81a1f1dfa036bf3108f0b8b2349f546b428ba9755df8
+  metadata.gz: e10e3558312a30d47fb11421d3567ccf0c443fd9be43512450cef620f559d4262e1047dec7c084390b4a6ee4f30265983aa053d4a13e81fa7a1023f68f54b88f
+  data.tar.gz: 7bee810ab2b249a92e6cc159b44300cff1f88f94179f8a67a2538ce435ac74dc1b2f8ef9be5912ea2350b1f9825ae8d2a1dec56fe86adb21408457c440a444e9

data/.rubocop.yml

@@ -1,4 +1,8 @@
+ClassLength:
+  Enabled: false
 Metrics/BlockLength:
   ExcludedMethods: ['describe', 'context']
 Style/IndentHeredoc:
-  Enabled: false
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false

data/README.md

@@ -45,7 +45,7 @@ pickynode --disconnect=USER_AGENT_FILTER
 ### Help:
 
 ```
-pickynode v0.1.2
+pickynode v0.1.3
 Options:
   -a, --add=<s>           Add node type
   -c, --connect=<s>       Connect to node type
@@ -54,6 +54,7 @@ Options:
   -i, --info              Local node info
   -o, --output            Output commands
   -s, --disconnect=<s>    Disconnect from node type
+  -l, --limit=<i>         Limit number of nodes to add/connect
   -v, --version           Print version and exit
   -h, --help              Show this message
 ```

data/bin/pickynode

@@ -12,6 +12,8 @@ opts = Trollop.options do
   opt :info, 'Local node info'
   opt :output, 'Output commands'
   opt :disconnect, 'Disconnect from node type', type: :string
+  opt :limit, 'Limit number of nodes to add/connect', type: :integer
 end
 
+Trollop.die :limit, 'must be positive' if opts[:limit] && opts[:limit] <= 0
 Pickynode.new(opts).run

data/lib/pickynode.rb

@@ -9,16 +9,23 @@ require 'uri'
 # Allows you to easily add/ban/connect/disconnect nodes
 # based on User Agent.
 class Pickynode
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   def initialize(opts = {})
     @opts = opts
   end
 
-  def add(filter)
+  def add(filter, limit = nil)
     return unless filter
+
+    raise 'Limit must be greater than 0' unless valid_limit?(limit)
+
+    count = 0
     bitnode_addr_types.each do |k, v|
-      run_cmd(%(bitcoin-cli addnode "#{k}" "add")) if v.include?(filter)
+      next unless v.include?(filter)
+      run_cmd(%(bitcoin-cli addnode "#{k}" "add"))
+      count += 1
+      break if limit == count
     end
   end
 
@@ -32,10 +39,17 @@ class Pickynode
     end
   end
 
-  def connect(filter)
+  def connect(filter, limit = nil)
     return unless filter
+
+    raise 'Limit must be greater than 0' unless valid_limit?(limit)
+
+    count = 0
     bitnode_addr_types.each do |k, v|
-      run_cmd(%(bitcoin-cli addnode "#{k}" "onetry")) if v.include?(filter)
+      next unless v.include?(filter)
+      run_cmd(%(bitcoin-cli addnode "#{k}" "onetry"))
+      count += 1
+      break if limit == count
     end
   end
 
@@ -55,14 +69,13 @@ class Pickynode
   end
 
   def run
-    add(@opts[:add])
-    connect(@opts[:connect])
+    add(@opts[:add], @opts[:limit])
+    connect(@opts[:connect], @opts[:limit])
 
     ban(@opts[:ban])
     disconnect(@opts[:disconnect])
 
-    info if @opts[:info]
-    display if @opts.values.select { |v| v }.empty?
+    display_info
   end
 
   def clear_cache
@@ -72,6 +85,11 @@ class Pickynode
 
   private
 
+  def display_info
+    info if @opts[:info]
+    display if @opts.values.select { |v| v }.empty?
+  end
+
   def run_cmd(cmd)
     puts "Running #{cmd}" if @opts[:output] || @opts[:debug]
     `#{cmd}` unless @opts[:debug]
@@ -111,4 +129,9 @@ class Pickynode
   def getpeerinfo
     `bitcoin-cli getpeerinfo`
   end
+
+  def valid_limit?(limit)
+    return true unless limit
+    limit > 0
+  end
 end

data/spec/pickynode_spec.rb

@@ -52,6 +52,33 @@ describe Pickynode do
       expect(subject).to_not receive(:run_cmd)
       subject.add('Anything')
     end
+
+    it 'should raise an error if the limit is <= 0' do
+      expect { subject.add('Anything', 0) }
+        .to raise_error('Limit must be greater than 0')
+      expect { subject.add('Anything', -5) }
+        .to raise_error('Limit must be greater than 0')
+    end
+
+    context 'with a limit' do
+      it 'should respect a limit parameter of 1' do
+        expect(subject).to receive(:bitnodes_snapshot).once
+          .and_return(BITNODES_SNAPSHOT)
+        expect(subject).to receive(:run_cmd)
+          .with('bitcoin-cli addnode "88.99.199.87:8333" "add"')
+        subject.add('i', 1)
+      end
+
+      it 'should respect a limit parameter greater than 1' do
+        expect(subject).to receive(:bitnodes_snapshot).once
+          .and_return(BITNODES_SNAPSHOT)
+        expect(subject).to receive(:run_cmd)
+          .with('bitcoin-cli addnode "88.99.199.87:8333" "add"')
+        expect(subject).to receive(:run_cmd)
+          .with(%(bitcoin-cli addnode "#{ipv6_ip}" "add"))
+        subject.add('i', 2)
+      end
+    end
   end
 
   describe '.ban' do
@@ -111,6 +138,33 @@ describe Pickynode do
       expect(subject).to_not receive(:run_cmd)
       subject.connect('Anything')
     end
+
+    it 'should raise an error if the limit is <= 0' do
+      expect { subject.connect('Anything', 0) }
+        .to raise_error('Limit must be greater than 0')
+      expect { subject.connect('Anything', -5) }
+        .to raise_error('Limit must be greater than 0')
+    end
+
+    context 'with a limit' do
+      it 'should respect a limit parameter of 1' do
+        expect(subject).to receive(:bitnodes_snapshot).once
+          .and_return(BITNODES_SNAPSHOT)
+        expect(subject).to receive(:run_cmd)
+          .with('bitcoin-cli addnode "88.99.199.87:8333" "onetry"')
+        subject.connect('i', 1)
+      end
+
+      it 'should respect a limit parameter greater than 1' do
+        expect(subject).to receive(:bitnodes_snapshot).once
+          .and_return(BITNODES_SNAPSHOT)
+        expect(subject).to receive(:run_cmd)
+          .with('bitcoin-cli addnode "88.99.199.87:8333" "onetry"')
+        expect(subject).to receive(:run_cmd)
+          .with(%(bitcoin-cli addnode "#{ipv6_ip}" "onetry"))
+        subject.connect('i', 2)
+      end
+    end
   end
 
   describe '.disconnect' do
@@ -182,7 +236,8 @@ describe Pickynode do
           add: 'Wanted',
           connect: 'Now',
           ban: 'Nefarious',
-          disconnect: 'Fools'
+          disconnect: 'Fools',
+          limit: 1
         }
       end
 
@@ -191,9 +246,9 @@ describe Pickynode do
           .and_return(BITNODES_SNAPSHOT)
         expect(subject).to receive(:getpeerinfo).once
           .and_return(PEER_INFO)
-        expect(subject).to receive(:add).with(opts[:add])
+        expect(subject).to receive(:add).with(opts[:add], opts[:limit])
           .and_call_original
-        expect(subject).to receive(:connect).with(opts[:connect])
+        expect(subject).to receive(:connect).with(opts[:connect], opts[:limit])
           .and_call_original
         expect(subject).to receive(:ban).with(opts[:ban])
           .and_call_original

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickynode
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Josh Ellithorpe