nexpose 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd3b5a70f4342a50d856fede506bd98df0dc3eb
-  data.tar.gz: dbdcbcd5fa044c89254d8708ba5c1c51a2c0ca8e
+  metadata.gz: 97718b1d0d16bf0e2ad6e438aa6f42d3f9819608
+  data.tar.gz: 7b14f541974dc33fecea2bf23165bc4357505cc9
 SHA512:
-  metadata.gz: 55eae9f2e3a7127ed26d893fcb8d03a63c1ec30bb7fd3f3e841bfd7589c58809289a0f9507fafb185570df673cf0810674d043fdd0c8208e093844f5f046ec18
-  data.tar.gz: ac462779de54270a9cde72dcb7bae47a22f3d36b34f4d094f067cd2fc74afc1f48c812b4b0981761b2d7eef886a4a42789b9fc8a7523175cd043039acfdfd8d8
+  metadata.gz: fdf329312d95a5a88ae2f468ed8f40632352e8e1ddffd65e2e4a37c1a501ddf0460b92a49136cbcf6385004ac6ff0a568cfa8b7414d3047be1a16d7343481319
+  data.tar.gz: 91353294a3b338454116b731471de961abeb215956519688e6ed4f531ee18bd14dc14b024b7868b31c245a13db1d77983a6bd42a06619ad1b4062ad3c36332f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nexpose (1.0.0)
+    nexpose (1.2.0)
       rex (~> 2.0, >= 2.0.8)
 
 GEM
@@ -17,7 +17,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)
@@ -27,7 +27,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)

data/lib/nexpose/discovery.rb

@@ -30,12 +30,24 @@ module Nexpose
   class DiscoveryConnection < APIObject
     include XMLUtils
 
+    module CollectionMethod
+      DIRECTORY_WATCHER = 'DIRECTORY_WATCHER'
+      SYSLOG = 'SYSLOG'
+    end
+
+    module EventSource
+      INFOBLOX_TRINZIC = 'INFOBLOX_TRINZIC'
+      MICROSOFT_DHCP = 'MICROSOFT_DHCP'
+    end
+
     module Protocol
       HTTP  = 'HTTP'
       HTTPS = 'HTTPS'
       LDAP  = 'LDAP'
       LDAPS = 'LDAPS'
       SERVICE_PROXY = 'SERVICE_PROXY'
+      TCP = 'TCP'
+      UDP = 'UDP'
     end
 
     module Type
@@ -83,6 +95,12 @@ module Nexpose
     # The exchange password to connect for exchange powershell connections
     attr_accessor :exchange_password
 
+    # The collection method (e.g. for DHCP discovery connections)
+    attr_accessor :collection_method
+
+    # The event source (e.g. for DHCP discovery connections)
+    attr_accessor :event_source
+
     # Whether or not the connection is active.
     # Discovery is only possible when the connection is active.
     attr_accessor :status
@@ -188,6 +206,8 @@ module Nexpose
       xml.attributes['exchange-username'] = @exchange_username if @exchange_username
       xml.attributes['exchange-password'] = @exchange_password if @exchange_password
       xml.attributes['type']              = @type if @type
+      xml.attributes['collectionmethod']  = @collection_method if @collection_method
+      xml.attributes['eventsource']       = @event_source if @event_source
       xml.attributes['engine-id'] = @engine_id if @engine_id && @engine_id != -1
       xml.attributes['id'] = @id if @id && @id != -1
       xml

data/lib/nexpose/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - HD Moore
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rex
@@ -231,4 +231,3 @@ signing_key:
 specification_version: 4
 summary: Ruby API for Rapid7 Nexpose
 test_files: []
-has_rdoc: