nexpose 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad801dadec80e96926962637c8fa6d3cf6a338f
-  data.tar.gz: 763a538eae968c90943ccf4d9aa463fea6cf0ad8
+  metadata.gz: 0fc2b706c73a141e3ca722783d6d59bfeebc318e
+  data.tar.gz: 14807c2250fd38f7a3b42218902e8514f3f529db
 SHA512:
-  metadata.gz: 08da6caad801348db0f240fde304b5b0bd8abaa84cf3351642e8e085c23dd074075342eba8560962b901aca306505f5598d670010bcbc39937475af1f58ae96e
-  data.tar.gz: 1a2ae21afc4fad982028ff2fe531547743fa8d752591a2674ec7e944fa81131b11ee562dcb6e06a3570cac93dc918b1cf009dcf5cd79ca2b9395455112c8cb2d
+  metadata.gz: ceae9134faa08616595a2f532f1fe51d16d1a2aab57243658148ab1b1a55341e1eb42202cfa28cd6d45d33ba632dd170822a1117140be33a603f0bd4bf2837e6
+  data.tar.gz: 8efd62b961e8870c99448851fb03b42fd58ee0ccd2bdc598405587ee1a35d339a69a0f67ba2873fd1bff3331d6574ff14beabd20b55c6c0d8b85dd02c84b26ec

data/README.markdown

@@ -2,11 +2,18 @@
 
 This is the official gem package for the Ruby Nexpose API.
 
-For assistance with using the gem, to share your scripts, or to discuss different approaches, please visit the Rapid7 forums for Nexpose: https://community.rapid7.com/community/nexpose
+For assistance with using the gem, to share your scripts, or to discuss different approaches, please visit the Rapid7 forums for Nexpose: https://community.rapid7.com/community/nexpose/nexpose-apis
+
+Check out https://github.com/rapid7/nexpose-client/wiki for walk-throughs and release notes for recent versions.
+
+This gem is heavily used for internal, automated testing of the Nexpose product. It provides calls to the Nexpose XML APIs version 1.1 and 1.2 (except for some multi-tenant operations). It also includes a number of helper methods which are not currently exposed through alternate means.
+
 
 ## Contributions
 
-This package is currently a work in progress. Most of the Nexpose API is exposed, but there are some operations missing. Also, there are stylistic differences between different calls that we hope to eliminate over time. We welcome contributions to this package. We ask only that pull requests and patches adhere to our coding standards.
+We welcome contributions to this package.
+
+Our coding standards include:
 
 * Favor returning classes over key-value maps. Classes tend to be easier for users to manipulate and use.
 * Unless otherwise noted, code should adhere to the Ruby Style Guide: https://github.com/bbatsov/ruby-style-guide

data/lib/nexpose/filter.rb

@@ -153,6 +153,8 @@ module Nexpose
       ENDS_WITH = 'ENDS_WITH'
       ON_OR_BEFORE = 'ON_OR_BEFORE'
       ON_OR_AFTER = 'ON_OR_AFTER'
+      BETWEEN = 'BETWEEN'
+      EARLIER_THAN = 'EARLIER_THAN'
       WITHIN_THE_LAST = 'WITHIN_THE_LAST'
       GREATER_THAN = 'GREATER_THAN'
       LESS_THAN = 'LESS_THAN'

data/lib/nexpose/group.rb

@@ -110,9 +110,9 @@ module Nexpose
     def rescan_assets(connection)
       sites_ids = @assets.map { |d| d.site_id }.uniq
       scans = {}
-      sites_ids.each do |id|
-        to_scan = @assets.select { |d| d.site_id == id }
-        scans[id] = connection.scan_assets(to_scan)
+      sites_ids.each do |site_id|
+        to_scan = @assets.select { |d| d.site_id == site_id }
+        scans[site_id] = connection.scan_devices(to_scan)
       end
       scans
     end

data/lib/nexpose/report.rb

@@ -308,7 +308,7 @@ module Nexpose
     def self.build(connection, site_id, site_name, type, format, generate_now = false)
       name = %(#{site_name} #{type} report in #{format})
       config = ReportConfig.new(name, type, format)
-      config.frequency = Frequency.new(true, false)
+      config.frequency = Frequency.new(true, false) unless generate_now
       config.filters << Filter.new('site', site_id)
       config.save(connection, generate_now)
       config

data/lib/nexpose/scan_template.rb

@@ -58,10 +58,15 @@ module Nexpose
 
     # @return [String] Unique identifier of the scan template.
     def id
-      root = REXML::XPath.first(xml, 'ScanTemplate')
+      root = REXML::XPath.first(@xml, 'ScanTemplate')
       root.attributes['id']
     end
 
+    def id=(value)
+      root = REXML::XPath.first(@xml, 'ScanTemplate')
+      root.attributes['id'] = value
+    end
+
     # @return [String] Name or title of this scan template.
     def name
       desc = REXML::XPath.first(@xml, 'ScanTemplate/templateDescription')
@@ -349,7 +354,7 @@ module Nexpose
     def self.copy(nsc, id)
       dupe = load(nsc, id)
       dupe.id = '#NewScanTemplate#'
-      dupe.title = "#{dupe.title} Copy"
+      dupe.name = "#{dupe.name} Copy"
       dupe
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nexpose
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - HD Moore
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librex