sonar-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 820db139f2824907be22a0f34c228fa5d9175f33
-  data.tar.gz: 5d3f107c6d8e627891c4de9e3b2e4886dcb19d8e
+  metadata.gz: 46f4c95ec260a3eb4b212c2f85c4bee5893dc461
+  data.tar.gz: 4a574ae9f388f0db79f28e80e9dc69b9c97de3eb
 SHA512:
-  metadata.gz: d1ceabcd6de7dfbf8e8d985413ed05e3c873a4e94df64ef3be6ffbb01330a6f455df8f9104c7b4b165b8d7cbad591ac518f7ea4f84465a48cf9f87531dd43f5b
-  data.tar.gz: d3b32283cb878fbad817379ce73d3ecf520701295a133c755d3c5c0adfa5731b4d484369f411b36e663083d53e517c94b57bddd3e0e30be83eb8827ca1447128
+  metadata.gz: 8056aa52de648957853d67ad2ebcdb8168e4ee586dc8dfe0bdab2e6ef9d638f6caac2ae142c4eceffd9c598f0e17e402179bfad8a71df5d700b94dbce477b852
+  data.tar.gz: 66db84c021545e129f001839cb8de8e56b221175bbbb202df443d8f35e92ee5dd344c34dbb5ec034599abededc92f805a9d4cdea2b979d9c28a3a180aca684c0

data/bin/sonar

@@ -5,7 +5,9 @@ require 'bundler/setup'
 require 'sonar'
 
 begin
-  exit(Sonar::CLI.start(ARGV))
+  Sonar::CLI.start(ARGV)
+rescue Sonar::Search::SearchError => e
+  exit 1
 rescue Interrupt
   puts 'Quitting...'
 end

data/lib/sonar/cli/cli.rb

@@ -46,7 +46,7 @@ module Sonar
         print_json(cleanup_data(resp), options['format'])
       end
 
-      return errors
+      raise Search::SearchError.new("Encountered #{errors} errors while searching") if errors > 0
     end
 
     desc 'types', 'List all Sonar query types'

data/lib/sonar/search.rb

@@ -18,6 +18,12 @@ module Sonar
       'whois_ip'    => 'Whois (IP)'
     }
 
+    ##
+    # Generic exception for errors encountered while searching
+    ##
+    class SearchError < StandardError
+    end
+
     ##
     # Get search
     #

data/lib/sonar/version.rb

@@ -1,3 +1,3 @@
 module Sonar
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/sonar/cli_spec.rb

@@ -6,13 +6,8 @@ describe Sonar::CLI do
     before do
       Sonar::RCFile.instance.path = "#{fixtures_path}/sonar-stock.rc"
     end
-    it 'warns user of missing config values when trying to search' do
-      output, _ =  run_command('search rdns 8.8.8.8')
-      expect(output).to match(/Could not authenticate/)
-    end
-    it 'exits non-zero when errors are encountered' do
-      _, ret = run_command('search rdns 8.8.8.8')
-      expect(ret).to eq(1)
+    it 'throws an exception because of errors' do
+      expect { run_command('search rdns 8.8.8.8') }.to raise_error(Sonar::Search::SearchError)
     end
   end
 
@@ -21,7 +16,7 @@ describe Sonar::CLI do
       Sonar::RCFile.instance.path = "#{fixtures_path}/sonar.rc"
     end
     it "should return the profile" do
-      output, _ =  run_command('profile')
+      output =  run_command('profile')
       expect(output).to match(/email@asdfasdfasfd.com/)
     end
 
@@ -32,11 +27,11 @@ describe Sonar::CLI do
         )
       end
       it 'strips whitespace from values' do
-        output, _ =  run_command('search rdns 8.8.8.8')
+        output =  run_command('search rdns 8.8.8.8')
         expect(output).to eq('{"collection":[{"address":"192.168.1.1"}],"more":"false"}')
       end
       it 'can return lines format' do
-        output, _ =  run_command('search --format lines rdns 8.8.8.8')
+        output =  run_command('search --format lines rdns 8.8.8.8')
         expect(output).to eq('{"address":"192.168.1.1"}')
       end
     end
@@ -47,7 +42,7 @@ describe Sonar::CLI do
         )
       end
       it 'parses the nested values in an array' do
-        output, _ =  run_command('search sslcert 152a0a633aaf13f02c428ac1a3e672e895512bfd')
+        output =  run_command('search sslcert 152a0a633aaf13f02c428ac1a3e672e895512bfd')
         expect(JSON.parse(output)['collection'].first['details'].first['subject']['ST']).to eq('California')
       end
     end
@@ -58,7 +53,7 @@ describe Sonar::CLI do
         )
       end
       xit 'parses the nested value as a string' do
-        output, _ =  run_command('search processed 8.8.8.')
+        output =  run_command('search processed 8.8.8.')
         expect(JSON.parse(output)['collection'].first['value']['ip']).to eq('8.8.8.8')
       end
     end
@@ -70,7 +65,7 @@ describe Sonar::CLI do
           )
         end
         it 'matches exactly with --exact' do
-          output, _ =  run_command('search fdns 208.118.227.20 --exact')
+          output =  run_command('search fdns 208.118.227.20 --exact')
           expect(JSON.parse(output)['collection'].size).to be >= 1
           expect(JSON.parse(output)['collection'].any? { |c| c['name'] == '208.118.227.20' }).to be(true)
         end
@@ -82,7 +77,7 @@ describe Sonar::CLI do
           )
         end
         it 'matches exactly without --exact' do
-          output, _ =  run_command('search fdns 208.118.227.20')
+          output =  run_command('search fdns 208.118.227.20')
           expect(JSON.parse(output)['collection'].size).to be >  1
         end
       end
@@ -90,8 +85,6 @@ describe Sonar::CLI do
   end
 
   def run_command(args)
-    ret = 0
-    output, _ =  capture(:stdout) { ret = Sonar::CLI.start(args.split) }.strip
-    [output, ret]
+    capture(:stdout) { ret = Sonar::CLI.start(args.split) }.strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonar-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Paul Deardorff & HD Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware