pickynode 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2f21a70079af8acd312bcbbb122f05bdc0ca054
-  data.tar.gz: 48fb9df7143e0a11489a1cad359a35fecafecea1
+  metadata.gz: d49df9c54a1dd3799f0b66b74f75f217560f283d
+  data.tar.gz: 5cba4b0edea26ba858cb83dd2128d4b4cc45b71d
 SHA512:
-  metadata.gz: 9667d99ae31c13442a9145f03d638aef0d6aee68c8b7ef275a30c6f905b61f5cc4824586a966d97f7722b324faf244913442a52ec3c74a6991e3c6492af9936c
-  data.tar.gz: 8361af0fda851ecad2af80f872bfcd87650dbd475958ea541f10aa08f588c24686cb5a7177850aef4f0521cd1e135509f5cf6accc6344a73da8e3ba0aea4c5bf
+  metadata.gz: 01e9aa203431912c58a97b78920c685e146f5150d0d1ee18d70999c702b17ec092bdfe480905345a1dace8318ee6fecb3c990ef3ca17c5041b5388ddad1ba52d
+  data.tar.gz: d09e13a8f1cb105907833dc8fa69fdff3063a6e7791d70200b72d6ad8319e5639d01da3ee1775d1ff41d81a1f1dfa036bf3108f0b8b2349f546b428ba9755df8

data/Gemfile

@@ -7,4 +7,5 @@ gem 'awesome_print', '~> 1.7'
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.6'
 gem 'rubocop', '~> 0.48'
+gem 'simplecov', '~> 0.14', require: false, group: :test
 gem 'trollop', '~> 2.1'

data/Gemfile.lock

@@ -4,6 +4,8 @@ GEM
     ast (2.3.0)
     awesome_print (1.7.0)
     diff-lcs (1.3)
+    docile (1.1.5)
+    json (2.1.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
@@ -30,6 +32,11 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.8.1)
+    simplecov (0.14.1)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.1)
     trollop (2.1.2)
     unicode-display_width (1.2.1)
 
@@ -41,6 +48,7 @@ DEPENDENCIES
   rake (~> 12.0)
   rspec (~> 3.6)
   rubocop (~> 0.48)
+  simplecov (~> 0.14)
   trollop (~> 2.1)
 
 RUBY VERSION

data/README.md

@@ -45,17 +45,17 @@ pickynode --disconnect=USER_AGENT_FILTER
 ### Help:
 
 ```
-pickynode v0.1.1
+pickynode v0.1.2
 Options:
   -a, --add=<s>           Add node type
   -c, --connect=<s>       Connect to node type
   -b, --ban=<s>           Ban node type
   -d, --debug             Debug mode
+  -i, --info              Local node info
   -o, --output            Output commands
-  -i, --disconnect=<s>    Disconnect from node type
+  -s, --disconnect=<s>    Disconnect from node type
   -v, --version           Print version and exit
   -h, --help              Show this message
-
 ```
 
 The --add and --connect commands pull data from Bitnodes.

data/bin/pickynode

@@ -9,6 +9,7 @@ opts = Trollop.options do
   opt :connect, 'Connect to node type', type: :string
   opt :ban, 'Ban node type', type: :string
   opt :debug, 'Debug mode'
+  opt :info, 'Local node info'
   opt :output, 'Output commands'
   opt :disconnect, 'Disconnect from node type', type: :string
 end

data/lib/pickynode.rb

@@ -9,7 +9,7 @@ require 'uri'
 # Allows you to easily add/ban/connect/disconnect nodes
 # based on User Agent.
 class Pickynode
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 
   def initialize(opts = {})
     @opts = opts
@@ -50,6 +50,10 @@ class Pickynode
     ap addr_types
   end
 
+  def info
+    ap getinfo
+  end
+
   def run
     add(@opts[:add])
     connect(@opts[:connect])
@@ -57,9 +61,8 @@ class Pickynode
     ban(@opts[:ban])
     disconnect(@opts[:disconnect])
 
-    return unless @opts.values.select { |v| v }.empty?
-
-    display
+    info if @opts[:info]
+    display if @opts.values.select { |v| v }.empty?
   end
 
   def clear_cache
@@ -99,6 +102,12 @@ class Pickynode
     Net::HTTP.get(URI.parse('https://bitnodes.21.co/api/v1/snapshots/latest/'))
   end
 
+  def getinfo
+    JSON.parse(`bitcoin-cli getinfo`)
+  rescue JSON::ParserError
+    {}
+  end
+
   def getpeerinfo
     `bitcoin-cli getpeerinfo`
   end

data/pickynode.gemspec

@@ -24,4 +24,5 @@ bitcoin nodes they connect to."
   s.add_development_dependency 'rspec', '~> 3.6'
   s.add_development_dependency 'rake', '~> 12.0'
   s.add_development_dependency 'rubocop', '~> 0.48'
+  s.add_development_dependency 'simplecov', '~> 0.14'
 end

data/spec/mocks.rb

@@ -12,6 +12,22 @@ BITNODES_SNAPSHOT = <<-HEREDOC
 }
 HEREDOC
 
+NODE_INFO = <<-HEREDOC
+{
+  "version": 1020500,
+  "protocolversion": 70012,
+  "blocks": 467548,
+  "timeoffset": 0,
+  "connections": 154,
+  "proxy": "",
+  "difficulty": 559970892890.8381,
+  "testnet": false,
+  "paytxfee": 0.00000000,
+  "relayfee": 0.00001000,
+  "errors": ""
+}
+HEREDOC
+
 PEER_INFO = <<-HEREDOC
 [
   {

data/spec/pickynode_spec.rb

@@ -19,6 +19,12 @@ describe Pickynode do
       ipv6_ip => '/SecondClient/' }
   end
 
+  # String to simulate a json error.
+  let(:json_error) { 'An error occurred.' }
+
+  # Parsed information from getinfo.
+  let(:parsed_node_info) { JSON.parse(NODE_INFO) }
+
   subject { Pickynode.new(opts) }
 
   describe '.add' do
@@ -39,11 +45,18 @@ describe Pickynode do
       subject.add(false)
       subject.add(nil)
     end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:bitnodes_snapshot).once
+        .and_return(json_error)
+      expect(subject).to_not receive(:run_cmd)
+      subject.add('Anything')
+    end
   end
 
   describe '.ban' do
     it 'should ban nodes based on user agent' do
-      expect(subject).to receive(:getpeerinfo).once
+      expect(subject).to receive(:`).once
         .and_return(PEER_INFO)
       expect(URI).to receive(:parse).with('https://131.114.88.218:33422')
         .and_call_original
@@ -64,6 +77,13 @@ describe Pickynode do
       subject.ban(false)
       subject.ban(nil)
     end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:`).once
+        .and_return(json_error)
+      expect(subject).to_not receive(:run_cmd)
+      subject.ban('Anything')
+    end
   end
 
   describe '.connect' do
@@ -84,11 +104,18 @@ describe Pickynode do
       subject.connect(false)
       subject.connect(nil)
     end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:bitnodes_snapshot).once
+        .and_return(json_error)
+      expect(subject).to_not receive(:run_cmd)
+      subject.connect('Anything')
+    end
   end
 
   describe '.disconnect' do
     it 'should disconnect nodes based on user agent' do
-      expect(subject).to receive(:getpeerinfo).once
+      expect(subject).to receive(:`).once
         .and_return(PEER_INFO)
       expect(subject).to receive(:run_cmd)
         .with(%(bitcoin-cli disconnectnode "#{ipv6_ip}"))
@@ -104,14 +131,46 @@ describe Pickynode do
       subject.disconnect(false)
       subject.disconnect(nil)
     end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:`).once
+        .and_return(json_error)
+      expect(subject).to_not receive(:run_cmd)
+      subject.disconnect('Anything')
+    end
   end
 
   describe '.display' do
     it 'should display connected nodes' do
-      expect(subject).to receive(:getpeerinfo).and_return(PEER_INFO)
+      expect(subject).to receive(:`).once
+        .and_return(PEER_INFO)
       expect(subject).to receive(:ap).with(node_hash).and_return(node_hash)
       expect(subject.display).to eq(node_hash)
     end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:`).once
+        .and_return(json_error)
+      expect(subject).to receive(:ap).with({}).and_return({})
+      expect(subject.display).to eq({})
+    end
+  end
+
+  describe '.info' do
+    it 'should display local node info' do
+      expect(subject).to receive(:`).once
+        .and_return(NODE_INFO)
+      expect(subject).to receive(:ap).with(parsed_node_info)
+        .and_return(parsed_node_info)
+      expect(subject.info).to eq(parsed_node_info)
+    end
+
+    it 'should recover gracefully if json is malformed' do
+      expect(subject).to receive(:`).once
+        .and_return(json_error)
+      expect(subject).to receive(:ap).with({}).and_return({})
+      expect(subject.info).to eq({})
+    end
   end
 
   describe '.run' do
@@ -119,6 +178,7 @@ describe Pickynode do
       let(:opts) do
         {
           debug: true,
+          info: true,
           add: 'Wanted',
           connect: 'Now',
           ban: 'Nefarious',
@@ -126,10 +186,11 @@ describe Pickynode do
         }
       end
 
-      it 'should call add, connect, ban and disconnect' do
+      it 'should call add, connect, ban, disconnect and info' do
         expect(subject).to receive(:bitnodes_snapshot).once
           .and_return(BITNODES_SNAPSHOT)
-        expect(subject).to receive(:getpeerinfo).and_return(PEER_INFO)
+        expect(subject).to receive(:getpeerinfo).once
+          .and_return(PEER_INFO)
         expect(subject).to receive(:add).with(opts[:add])
           .and_call_original
         expect(subject).to receive(:connect).with(opts[:connect])
@@ -138,9 +199,24 @@ describe Pickynode do
           .and_call_original
         expect(subject).to receive(:disconnect).with(opts[:disconnect])
           .and_call_original
+        expect(subject).to receive(:info)
         expect(subject).to_not receive(:display)
         subject.run
       end
+
+      it 'should recover gracefully if json is malformed' do
+        expect(subject).to receive(:bitnodes_snapshot).at_least(1)
+          .and_return(json_error)
+        expect(subject).to receive(:getpeerinfo).at_least(1)
+          .and_return(json_error)
+        expect(subject).to receive(:`)
+          .and_return(json_error)
+        expect(subject).to receive(:info)
+          .and_call_original
+        expect(subject).to receive(:ap).with({})
+        expect(subject).to_not receive(:run_cmd)
+        subject.run
+      end
     end
 
     context 'without opts' do
@@ -149,12 +225,21 @@ describe Pickynode do
       end
 
       it 'should call display' do
-        expect(subject).to receive(:getpeerinfo).once
+        expect(subject).to receive(:`).once
           .and_return(PEER_INFO)
         expect(subject).to receive(:ap).with(node_hash).and_return(node_hash)
         expect(subject).to receive(:display).and_call_original
         subject.run
       end
+
+      it 'should recover gracefully if json is malformed' do
+        expect(subject).to receive(:`).once
+          .and_return(json_error)
+        expect(subject).to_not receive(:run_cmd)
+        expect(subject).to_not receive(:info)
+        expect(subject).to receive(:ap).with({}).and_return({})
+        subject.run
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
 require File.join('bundler', 'setup')
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require 'rspec'
 require 'pickynode'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pickynode
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh Ellithorpe
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.48'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: Some people are picky about the bitcoin nodes they connect to.
 email: quest@mac.com
 executables: