sonar-client 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4dc46841e0ddf4f091d927804c15b77b5ad95d33
-  data.tar.gz: 50cfb040770c7b69ef437e09edc48adf1d08fa81
+SHA256:
+  metadata.gz: e013916a1cf6c42fbd99d568ee88529cc7ac581b83aad80a4b62e4c2175aec7e
+  data.tar.gz: fb2e18d3b290f1dffb370448c603f3853fd380635ca79c5e8936e124f24fdcd5
 SHA512:
-  metadata.gz: 27c4336fe464f3f988df579531b2795318a12b08055b8fa049cd32104a3a7d1de577480fcc3c96c93cb1739d223ff24f28ee7e7599b052393d9e98996424cffb
-  data.tar.gz: 4f237e0a682fdaf8e90a9c8f63c630a4e4da90e0566550f0f1ff5659edcb99fc10be33c50f8a112d7c03ecde8ccb93230cfc93e8e0053c04e4cd5438ddeb2ca5
+  metadata.gz: 61c7694ca76d748ad6354f0010ab0891f28d4ed28999e4d57b32d15d5e816e0bf5fd57d311fac06937a19be937a1295016bdf44b9823faa748e51eeaf5b8f71f
+  data.tar.gz: 6dc07ee303279815e6b88f662be748292875d198f72759a828b4032ce012c27b9915869e89ba197b057261c5e7208db59075959fbef4b0db830cb891b6ad8142

data/.travis.yml

@@ -2,9 +2,14 @@ language: ruby
 sudo: false
 cache: bundler
 rvm:
-  - 2.2.2
-  - jruby-9.1.5.0
+  - '2.4.5'
+  - '2.5.5'
+  - '2.6.5'
+  - '2.7.1'
+  - 'jruby-head'
 before_install:
+  - gem install bundler
+  - gem update bundler
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - rake --version
 before_script:

data/lib/sonar/cli/cli.rb

@@ -3,11 +3,10 @@
 require 'thor'
 require 'sonar/cli/rcfile'
 require 'sonar/search'
+require 'sonar/request'
 require 'awesome_print'
 require 'table_print'
 
-include Sonar::Search
-
 module Sonar
   class CLI < Thor
     class_option 'format', type: :string, desc: 'Flat JSON (include empty collections), JSON lines of collection data (default), or pretty printed [flat/lines/pretty]'
@@ -35,10 +34,10 @@ module Sonar
       types = [type]
 
       if type == 'all'
-        if term =~ IS_IP
-          types = ip_search_type_names
+        if term =~ Search::IS_IP
+          types = @client.ip_search_type_names
         else
-          types = domain_search_type_names
+          types = @client.domain_search_type_names
         end
       end
 
@@ -55,7 +54,7 @@ module Sonar
     desc 'types', 'List all Sonar query types'
     def types
       tp.set :io, $stdout
-      tp QUERY_TYPES, :name, { description: { width: 100 } }, :input
+      tp Search::QUERY_TYPES, :name, { description: { width: 100 } }, :input
     end
 
     desc 'config', 'Sonar config file location'
@@ -83,6 +82,21 @@ module Sonar
       end
     end
 
+    def handle_search_response(resp)
+      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
+
+      raise Search::SearchError.new("Encountered #{errors} errors while searching") if errors > 0
+    end
+
     # Clean up whitespace and parse JSON values in responses
     def cleanup_data(data)
       return data unless data.is_a?(Hash) && data.has_key?('collection')

data/lib/sonar/search.rb

@@ -48,21 +48,6 @@ module Sonar
       QUERY_TYPES.map { |type| type[:name] }
     end
 
-    def handle_search_response(resp)
-      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
-
-      raise Search::SearchError.new("Encountered #{errors} errors while searching") if errors > 0
-    end
-
     ##
     # Get search
     #

data/lib/sonar/version.rb

@@ -1,3 +1,3 @@
 module Sonar
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

data/sonar-client.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday_middleware', '~> 0.9.0'
-  spec.add_dependency 'hashie', '~> 2.0.3'
+  spec.add_dependency 'faraday_middleware'
+  spec.add_dependency 'hashie'
   spec.add_dependency 'multi_json'
   spec.add_dependency 'thor'
   spec.add_dependency 'awesome_print'
@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency "yard"
-  spec.add_development_dependency "vcr", '~> 2.8.0'
+  spec.add_development_dependency "vcr", '~> 4.0.0'
   spec.add_development_dependency "shoulda"
-  spec.add_development_dependency "webmock", '~> 1.8.0'
+  spec.add_development_dependency "webmock", '~> 3.5.1'
   spec.add_development_dependency "api_matchers"
 end

data/spec/sonar/cli_spec.rb

@@ -58,27 +58,27 @@ describe Sonar::CLI do
       end
     end
     describe 'searching with #exact --exact option' do
-      context 'client that returns fdns for rapid7 IP exact' do
+      context 'client that returns fdns for rapid7 exact' do
         before do
           allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
-            Sonar::Client.new.search(fdns: '208.118.227.20', exact: true)
+            Sonar::Client.new.search(fdns: 'rapid7.com', exact: true)
           )
         end
         it 'matches exactly with --exact' do
-          output =  run_command('search fdns 208.118.227.20 --exact')
+          output =  run_command('search fdns rapid7.com --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)
+          expect(JSON.parse(output)['collection'].map{ |x| x['name'] }.uniq).to eq ['rapid7.com']
         end
       end
       context 'client that returns fdns for rapid7 IP' do
         before do
           allow_any_instance_of(Sonar::Client).to receive(:search).and_return(
-            Sonar::Client.new.search(fdns: '208.118.227.20')
+            Sonar::Client.new.search(fdns: 'rapid7.com')
           )
         end
-        it 'matches exactly without --exact' do
-          output =  run_command('search fdns 208.118.227.20')
-          expect(JSON.parse(output)['collection'].size).to be >  1
+        it 'matches many domains without --exact' do
+          output =  run_command('search fdns rapid7.com')
+          expect(JSON.parse(output)['collection'].map{ |x| x['name'] }.uniq.size).to be >  1
         end
       end
     end

data/spec/sonar/search_spec.rb

@@ -2,23 +2,26 @@
 require 'spec_helper'
 
 describe Sonar::Search do
+  let(:dummy_class) {
+    Class.new { extend Sonar::Search }
+  }
   let(:client) { Sonar::Client.new }
 
   describe "#ip_search_type_names" do
     it 'includes rdns' do
-      expect(subject.ip_search_type_names).to include('rdns')
+      expect(dummy_class.ip_search_type_names).to include('rdns')
     end
     it 'does not include fdns' do
-      expect(subject.ip_search_type_names).to_not include('fdns')
+      expect(dummy_class.ip_search_type_names).to_not include('fdns')
     end
   end
 
   describe "#domain_search_type_names" do
     it 'includes fdns' do
-      expect(subject.domain_search_type_names).to include('fdns')
+      expect(dummy_class.domain_search_type_names).to include('fdns')
     end
     it 'does not include rdns' do
-      expect(subject.domain_search_type_names).to_not include('rdns')
+      expect(dummy_class.domain_search_type_names).to_not include('rdns')
     end
   end
 
@@ -38,7 +41,7 @@ describe Sonar::Search do
       end
       it "should match when #exact is false" do
         resp = client.search(fdns: ".rapid7.com", exact: false)
-        expect(resp["collection"].size).to be > 0 
+        expect(resp["collection"].size).to be > 0
       end
     end
 
@@ -107,16 +110,16 @@ describe Sonar::Search do
       it "returns hashie response of search" do
         expect(resp.class).to eq(Hashie::Mash)
       end
-      it "finds fdnsname 208.118.227.10 for rapid7.com" do
-        expect(resp['collection'].any? { |x| x['address'] == '208.118.227.10' }).to be(true)
+      it "finds fdnsname multiple IP addresses for rapid7.com" do
+        expect(resp['collection'].select { |x| x['address'] }.size).to be >= 2
       end
     end
 
     context "fdnsip" do
       let(:resp) { client.search(fdns: '208.118.227.10') }
 
-      it "finds fdnsip rapid7.com at 208.118.227.10" do
-        expect(resp['collection'].any? { |x| x['address'].match('rapid7') }).to be(true)
+      it "finds fdnsip rapid7 domains at 208.118.227.10" do
+        expect(resp['collection'].any? { |x| x['address'].match('rapidseven') }).to be(true)
       end
     end
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sonar-client
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul Deardorff & HD Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: api_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: API Wrapper for Sonar