sonar-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6439efe4c0387e7b4fd2bea9cade77e0abe674f0
-  data.tar.gz: 1221b6ed4df40d9f5a10ec3678fc6f00390f66f3
+  metadata.gz: 820db139f2824907be22a0f34c228fa5d9175f33
+  data.tar.gz: 5d3f107c6d8e627891c4de9e3b2e4886dcb19d8e
 SHA512:
-  metadata.gz: 6640801e46ab2c8f2982278cd3d8fb9e6f5a58fcce398712d2e0b9e3a514a82f5e58efbdf6aef86e9ae1395307fd4098da13bb142166269f8d034ef25cda255f
-  data.tar.gz: ac9d274760ba75c9c8b720ba78bc7ae644f568528b59302132302a951cf92240b5f5736d7ee5a86b6f629acf5f7ec3197d7c09d770f91016c02c567ee66fb06b
+  metadata.gz: d1ceabcd6de7dfbf8e8d985413ed05e3c873a4e94df64ef3be6ffbb01330a6f455df8f9104c7b4b165b8d7cbad591ac518f7ea4f84465a48cf9f87531dd43f5b
+  data.tar.gz: d3b32283cb878fbad817379ce73d3ecf520701295a133c755d3c5c0adfa5731b4d484369f411b36e663083d53e517c94b57bddd3e0e30be83eb8827ca1447128

data/bin/sonar

@@ -5,7 +5,7 @@ require 'bundler/setup'
 require 'sonar'
 
 begin
-  Sonar::CLI.start(ARGV)
+  exit(Sonar::CLI.start(ARGV))
 rescue Interrupt
   puts 'Quitting...'
 end

data/lib/sonar/cli/cli.rb

@@ -35,13 +35,18 @@ module Sonar
       @query[:exact] = options['exact']
       resp = @client.search(@query)
 
+      errors = 0
       if resp.is_a?(Sonar::Request::RequestIterator)
         resp.each do |data|
+          errors += 1 if data.key?('errors') || data.key?('error')
           print_json(cleanup_data(data), options['format'])
         end
       else
+        errors += 1 if resp.key?('errors') || resp.key?('error')
         print_json(cleanup_data(resp), options['format'])
       end
+
+      return errors
     end
 
     desc 'types', 'List all Sonar query types'

data/lib/sonar/version.rb

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

data/spec/sonar/cli_spec.rb

@@ -7,9 +7,13 @@ describe Sonar::CLI 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')
+      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)
+    end
   end
 
   context "with a valid profile" do
@@ -17,7 +21,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
 
@@ -28,11 +32,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
@@ -43,7 +47,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
@@ -54,7 +58,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
@@ -66,7 +70,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
@@ -78,7 +82,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
@@ -86,6 +90,8 @@ describe Sonar::CLI do
   end
 
   def run_command(args)
-    capture(:stdout) { Sonar::CLI.start(args.split) }.strip
+    ret = 0
+    output, _ =  capture(:stdout) { ret = Sonar::CLI.start(args.split) }.strip
+    [output, ret]
   end
 end

metadata

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