recog 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce44c3b625cc253b8729d4aac5677dbda2f71c46
-  data.tar.gz: b4ab896d1fc5e06370a73fc51efc339e24e13794
+  metadata.gz: 5967636c56e64027e73963a64574380b85c6af88
+  data.tar.gz: a06812e81e6c16b3fc8237d50040ad61d27a7adf
 SHA512:
-  metadata.gz: 4bad5f89498020b13dc9d667004f6d07ab1a39aec9feaefd39a75714bfbf16fef7a180dfd0c8c949b06b2409b680a976a487d450037948a728b5c82269396ec9
-  data.tar.gz: 1056e591a107d473509c8f9c99058c399ad2d604eb0aa77401722a8c9dc88e4179e3eda201beca530c306c0013ca9ed79249d6ecadcc6ebfc54f37128551cabe
+  metadata.gz: f9a3360742a7156517f2069c5e7dc12223504c0cfd935db0fde50fbe2ec5f5ce2a6c4c968f26b3b34276ee707835f53461c2e04fb0468b77d49d360ce8dc8fd6
+  data.tar.gz: 5e0677ff0170f1c4fbac6a0a9a9d2513f5332a652a6bec2f21fbd92a3ca8ec803c585d3415d64cd59124065655516fd04e832728e8d4869e691a17e0faa567a1

data/.travis.yml

@@ -7,4 +7,4 @@ rvm:
 matrix:
   allow_failures:
     - rvm: jruby
-script: bundle exec rspec spec
+script: bundle exec rspec spec features

data/README.md

@@ -48,13 +48,13 @@ The <example/> element should contain a successful match for the fingerprint's `
 
 the <param/> elements contain a `pos` attribute, which indicates what capture field from the `pattern` should be extracted, or `0` for a static string. The `name` attribute is the key that will be reported in the case of a successful match and the `value` will either be a static string for `pos` values of `0` or missing and taken from the captured field.
 
-Once a fingerprint has been added, the <examples/> entries can be tested by executing `bin/recog_verify.rb` against the fingerprint file:
+Once a fingerprint has been added, the <examples/> entries can be tested by executing `bin/recog_verify` against the fingerprint file:
 
-    $ bin/recog_verify.rb xml/ssh_banners.xml
+    $ bin/recog_verify xml/ssh_banners.xml
 
 Matches can be tested on the command-line in a similar fashion:
 
-    $ echo 'OpenSSH_6.6p1 Ubuntu-2ubuntu1' | bin/recog_match.rb xml/ssh_banners.xml -
+    $ echo 'OpenSSH_6.6p1 Ubuntu-2ubuntu1' | bin/recog_match xml/ssh_banners.xml -
     MATCH: {"service.version"=>"6.6p1", "openssh.comment"=>"Ubuntu-2ubuntu1", "service.vendor"=>"OpenBSD", "service.family"=>"OpenSSH", "service.product"=>"OpenSSH", "data"=>"OpenSSH_6.6p1 Ubuntu-2ubuntu1"}
 
 

data/features/match.feature

@@ -1,14 +1,14 @@
 Feature: Match
   Scenario: Finds matches
-    When I run `recog_match.rb matching_banners_fingerprints.xml banners.xml`
+    When I run `recog_match matching_banners_fingerprints.xml banners.xml`
     Then it should pass with:
       """
-      MATCH: {"pureftpd.config"=>"[privsep] [TLS] ", "service.family"=>"Pure-FTPd", "service.product"=>"Pure-FTPd", "data"=>"---------- Welcome to Pure-FTPd [privsep] [TLS] ----------"}
-      MATCH: {"os.vendor"=>"Sun", "os.family"=>"Solaris", "os.product"=>"Solaris", "os.device"=>"General", "host.name"=>"polaris", "os.version"=>"5.8", "data"=>"polaris FTP server (SunOS 5.8) ready."}
+      MATCH: {"matched"=>"Pure-FTPd Config data can be zero or more of: [privsep] [TLS]", "pureftpd.config"=>"[privsep] [TLS] ", "service.family"=>"Pure-FTPd", "service.product"=>"Pure-FTPd", "data"=>"---------- Welcome to Pure-FTPd [privsep] [TLS] ----------"}
+      MATCH: {"matched"=>"SunOS/Solaris", "os.vendor"=>"Sun", "os.family"=>"Solaris", "os.product"=>"Solaris", "os.device"=>"General", "host.name"=>"polaris", "os.version"=>"5.8", "data"=>"polaris FTP server (SunOS 5.8) ready."}
       """
 
   Scenario: Fails at finding matches
-    When I run `recog_match.rb failing_banners_fingerprints.xml banners.xml`
+    When I run `recog_match failing_banners_fingerprints.xml banners.xml`
     Then it should pass with:
       """
       FAIL: ---------- Welcome to Pure-FTPd [privsep] [TLS] ----------

data/features/verify.feature

@@ -1,20 +1,20 @@
 Feature: Verify
   Scenario: No tests
-    When I run `recog_verify.rb no_tests.xml`
+    When I run `recog_verify no_tests.xml`
     Then it should pass with:
       """
       SUMMARY: Test completed with 0 successful, 0 warnings, and 0 failures
       """
 
   Scenario: Successful tests
-    When I run `recog_verify.rb successful_tests.xml`
+    When I run `recog_verify successful_tests.xml`
     Then it should pass with:
       """
       SUMMARY: Test completed with 4 successful, 0 warnings, and 0 failures
       """
 
   Scenario: Tests with warnings
-    When I run `recog_verify.rb tests_with_warnings.xml`
+    When I run `recog_verify tests_with_warnings.xml`
     Then it should pass with:
       """
       WARN: 'Pure-FTPd' has no test cases
@@ -22,7 +22,7 @@ Feature: Verify
       """
 
   Scenario: Tests with failures
-    When I run `recog_verify.rb tests_with_failures.xml`
+    When I run `recog_verify tests_with_failures.xml`
     Then it should pass with:
       """
       FAIL: 'foo test' failed to match "bar" with (?-mix:^foo$)'

data/lib/recog/version.rb

@@ -1,3 +1,3 @@
 module Recog
-  VERSION = '1.0.15'
+  VERSION = '1.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recog
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Rapid7 Research
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -115,9 +115,9 @@ description: Recog is a framework for identifying products, services, operating
 email:
 - research@rapid7.com
 executables:
-- recog_export.rb
-- recog_match.rb
-- recog_verify.rb
+- recog_export
+- recog_match
+- recog_verify
 extensions: []
 extra_rdoc_files: []
 files:
@@ -130,9 +130,9 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/recog_export.rb
-- bin/recog_match.rb
-- bin/recog_verify.rb
+- bin/recog_export
+- bin/recog_match
+- bin/recog_verify
 - features/match.feature
 - features/support/env.rb
 - features/verify.feature