sonar-client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5dd2ef2da6cb21be5643f246fb559a984400639b
-  data.tar.gz: 1304d5edaaab17637bcbe18362d14b2c23a65581
+  metadata.gz: 7d8b3759eb0d676fdbcfff3fac747291e8371b0d
+  data.tar.gz: 8f28065237179666a832d1cf3e6f3f3f4a3dc91e
 SHA512:
-  metadata.gz: cf3270d0d080e0f39b09501ce6c104a029ea1fa140314af14f6e44a3ed26988edc1b4ae0848fef793887127b67ab25b3975fa394695a15685148c547e779ced2
-  data.tar.gz: 2df2543baa5d5bb6a0e87c52f7f1663392f4cd0cbc16904e26ce814d2b14859c6527c18dc090624d19c2eb1cba2759a06069f639f523bcfcac9fd9e5674b8b20
+  metadata.gz: c34e45704359cdd73976d7982e71e24e9791a7af1ada099411f6d40e8325c020de6ab10adf2c570d54c275d3f172d9f4f3ab2076202ef6babd1a2a83cace7fab
+  data.tar.gz: a913134e524d16c906ca1d92370737ddc4d92e3fc1d71a2d9229e6e090fed248c9d2c9fbda1c8777da6ef3e1ceb14080379bafa63353dbe88afc488cf179d9f2

data/.gitignore

@@ -20,6 +20,8 @@ tmp
 _yardoc
 doc/
 
+Gemfile.lock
+
 # Specific to RubyMotion
 .dat*
 .repl_history

data/lib/sonar/cli/cli.rb

@@ -8,7 +8,7 @@ module Sonar
   class CLI < Thor
     class_option 'profile', aliases: '-P', type: :string, default: File.join(File.expand_path('~'), Sonar::RCFile::FILENAME),
                             desc: 'Path to Sonar RC file', banner: 'FILE'
-    class_option 'format', type: :string, desc: 'Flat JSON or pretty printed [flat/pretty]'
+    class_option 'format', type: :string, desc: 'Flat JSON, JSON lines, or pretty printed [flat/lines/pretty]'
 
     def initialize(*)
       @config = Sonar::RCFile.instance.load_file
@@ -32,8 +32,14 @@ module Sonar
       @query = {}
       @query[type.to_sym] = term
       @query[:limit] = options['record_limit']
-      @client.search(@query).each do |data|
-        print_json(cleanup_data(data), options['format'])
+      resp = @client.search(@query)
+
+      if resp.is_a?(Sonar::Request::RequestIterator)
+        resp.each do |data|
+          print_json(cleanup_data(data), options['format'])
+        end
+      else
+        print_json(cleanup_data(resp), options['format'])
       end
     end
 
@@ -54,6 +60,12 @@ module Sonar
       case format
       when 'pretty'
         ap(json)
+      when 'lines'
+        if json.has_key?('collection')
+          json['collection'].each { |l| puts l.to_json }
+        else
+          puts 'Could not parse the response into lines.'
+        end
       else
         # TODO: use a faster JSON generator?
         puts(json.to_json)
@@ -62,31 +74,27 @@ module Sonar
 
     # Clean up whitespace and parse JSON values in responses
     def cleanup_data(data)
-      ndata = {}
-      if data[0] != 'collection'
-        return data
-      end
-
-      ncoll = []
-
-      data[1].each do |item|
-        nitem = {}
+      return data unless data.is_a?(Hash) && data.has_key?('collection')
+      data['collection'].each do |item|
         item.each_pair do |k,v|
-
           # Purge whitespace within values
-          nval = v.kind_of?(::String) ? v.strip : v
-          nkey = k.strip
+          v.is_a?(::String) ? v.strip! : v
 
           # Parse JSON values
-          if nval && nval.index('{') == 0
-            nval = JSON.parse(nval) rescue nval
+          if v.is_a?(Array)
+            v.map! do |e|
+              e = safe_parse_json(e)
+            end
+          else
+            v = safe_parse_json(v)
           end
-
-          nitem[nkey] = nval
         end
-        ncoll << nitem
       end
-      [ data[0], ncoll ]
+      data
+    end
+
+    def safe_parse_json(s)
+      JSON.parse(s) rescue s
     end
 
     # Merge Thor options with those stored in sonar.rc file

data/lib/sonar/version.rb

@@ -1,3 +1,3 @@
 module Sonar
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/sonar/cli_spec.rb

@@ -7,15 +7,39 @@ describe Sonar::CLI do
       Sonar::RCFile.instance.path = "#{fixtures_path}/sonar.rc"
     end
     it "should return the profile" do
-      output = capture(:stdout) { Sonar::CLI.start(['profile']) }
+      output = run_command('profile')
       expect(output).to match(/email@asdfasdfasfd.com/)
     end
-  end
-  context "without a config file" do
-    before do
-      Sonar::RCFile.instance.path = ""
+
+    context 'client that returns an rdns resp' do
+      before do
+        allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
+          { 'collection' => [{ 'address' => '192.168.1.1 ' }], 'more' => 'false' }
+        )
+      end
+      it 'strips whitespace from values' do
+        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')
+        expect(output).to eq('{"address":"192.168.1.1"}')
+      end
     end
-    xit "should create the missing config file" do
+    context 'client that returns sslcert reply with nested json' do
+      before do
+        allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
+          Sonar::Client.new.search(sslcert: '152a0a633aaf13f02c428ac1a3e672e895512bfd')
+        )
+      end
+      it 'parses the nested values in an array' do
+        output = run_command('search sslcert 152a0a633aaf13f02c428ac1a3e672e895512bfd')
+        expect(JSON.parse(output)['collection'].first['details'].first['subject']['ST']).to eq('California')
+      end
     end
   end
+
+  def run_command(args)
+    capture(:stdout) { Sonar::CLI.start(args.split) }.strip
+  end
 end

data/spec/spec_helper.rb

@@ -28,8 +28,6 @@ end
 RSpec.configure do |c|
   c.include APIMatchers::RSpecMatchers
 
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-
   #
   # Add gem specific configuration for easy access
   #
@@ -50,6 +48,19 @@ RSpec.configure do |c|
   end
 end
 
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
+  end
+
+  result
+end
+
 def fixtures_path
   File.expand_path('../fixtures', __FILE__)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonar-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Paul Deardorff & HD Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
@@ -233,7 +233,6 @@ files:
 - .rspec
 - .rubocop.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,94 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sonar-client (0.0.3)
-      awesome_print
-      faraday_middleware (~> 0.9.0)
-      hashie (~> 2.0.3)
-      multi_json
-      thor
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.0)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    api_matchers (0.5.1)
-      activesupport (>= 3.2.5)
-      nokogiri (>= 1.5.2)
-      rspec (>= 2.14)
-    awesome_print (1.6.1)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
-    hashie (2.0.5)
-    i18n (0.7.0)
-    json (1.8.2)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    rake (10.4.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.2.1)
-    shoulda-matchers (2.7.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    simplecov-rcov (0.2.3)
-      simplecov (>= 0.4.1)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    vcr (2.8.0)
-    webmock (1.8.11)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.7.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  api_matchers
-  bundler
-  rake
-  rspec
-  shoulda
-  simplecov
-  simplecov-rcov
-  sonar-client!
-  vcr (~> 2.8.0)
-  webmock (~> 1.8.0)
-  yard