nexpose 3.3.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0a541a3881e177817bd44ffd71e0372d327c53
-  data.tar.gz: 810e7389172b58708ac6569e94c83dcb08ffc73d
+  metadata.gz: 39e2356f1f4c706ae6ddc840a382d3806f493252
+  data.tar.gz: 11a99aeaa814b730aff7393cbf96461b3e99736b
 SHA512:
-  metadata.gz: c7553f4f8723d41cc0e19a19bf81e1ae0dc1041e1ef1c87729c1c14408992351c3c45ea449c311872bd06896f4d9eb2e04d4f8d003a590d37e59661a797788a7
-  data.tar.gz: 533a132b22a6cf35ae454690ece01e0ef6bb87ccfecb677b791645a10ff6aa0deb80d5d02d687d1f0754976a272dab4f824b9467c3ff0f311e10663963cfbe49
+  metadata.gz: ba45928103e112ce123c7d4ac3ee8a86b9d098626c0d1b0fb548f598fc12bdbd83907c66c4c76187d9053e006c22341cfe807c2e9fd6843a2cea9453156cd691
+  data.tar.gz: af675b050afd242ddc246e6282ea40fd1122f2b9db0c230a8411713fd6c53ffb583727027d66ba1dc897f59adae1c30f8b58b30da656055bbdef4b1347502ecc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (3.3.1)
+    nexpose (4.0.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    multi_json (1.11.0)
+    multi_json (1.10.1)
     parser (2.2.0.3)
       ast (>= 1.1, < 3.0)
     powerpack (0.1.0)
@@ -25,7 +25,7 @@ GEM
       rspec-core (~> 3.2.0)
       rspec-expectations (~> 3.2.0)
       rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.2)
+    rspec-core (3.2.1)
       rspec-support (~> 3.2.0)
     rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -64,3 +64,6 @@ DEPENDENCIES
   simplecov (~> 0.9.1)
   vcr (~> 2.9.3)
   webmock (~> 1.20.4)
+
+BUNDLED WITH
+   1.12.0

data/lib/nexpose/filter.rb

@@ -102,8 +102,8 @@ module Nexpose
       # Valid Values (See Value::IPType): IPv4, IPv6
       IP_ALT_ADDRESS_TYPE = 'IP_ALT_ADDRESS_TYPE'
 
-      # Valid Operators: IN, NOT_IN
-      IP_RANGE = 'IP_RANGE'
+      # Valid Operators: IS, IS_NOT, IN_RANGE, NOT_IN_RANGE
+      IP_ADDRESS = 'IP_ADDRESS'
 
       # Valid Operators: IS, IS_NOT, IN_RANGE
       # Valid Values: Integers from 1 to 65535
@@ -185,6 +185,7 @@ module Nexpose
       IN = 'IN'
       NOT_IN = 'NOT_IN'
       IN_RANGE = 'IN_RANGE'
+      NOT_IN_RANGE = 'NOT_IN_RANGE'
       STARTS_WITH = 'STARTS_WITH'
       ENDS_WITH = 'ENDS_WITH'
       ON_OR_BEFORE = 'ON_OR_BEFORE'

data/lib/nexpose/scan.rb

@@ -440,7 +440,7 @@ module Nexpose
     #
     # @param [Fixnum] site_id Site ID of the site to import the scan into.
     # @param [String] zip_file Path to a previously exported scan archive.
-    # @return [String] An empty string on success.
+    # @return [Fixnum] The scan ID on success.
     #
     def import_scan(site_id, zip_file)
       data = Rexlite::MIME::Message.new
@@ -461,7 +461,7 @@ module Nexpose
       response = http.request(post)
       case response
       when Net::HTTPOK
-        response.body
+        response.body.empty? ? response.body : response.body.to_i
       when Net::HTTPUnauthorized
         raise Nexpose::PermissionError.new(response)
       else

data/lib/nexpose/version.rb

@@ -1,4 +1,4 @@
 module Nexpose
   # The latest version of the Nexpose gem
-  VERSION = '3.3.2'
+  VERSION = '4.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 4.0.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,9 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose
 test_files: []
-has_rdoc: