cpe 0.1.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.3.0

data/cpe.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cpe"
-  s.version = "0.1.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wuest"]
-  s.date = "2012-02-24"
+  s.date = "2012-02-27"
   s.description = "Library for parsing and generating Common Platform Enumeration strings (see http://cpe.mitre.org/)"
   s.email = "chris@chriswuest.com"
   s.extra_rdoc_files = [
@@ -25,6 +25,8 @@ Gem::Specification.new do |s|
     "VERSION",
     "cpe.gemspec",
     "lib/cpe.rb",
+    "test/cpe-test-invalid",
+    "test/cpe-test-valid",
     "test/helper.rb",
     "test/test_cpe.rb"
   ]

data/lib/cpe.rb

@@ -3,6 +3,19 @@
 #  Copyright (c) Chris Wuest <chris@chriswuest.com>
 #  Expectr is freely distributable under the terms of an MIT-style license.
 #  See LICENSE.txt or http://www.opensource.org/licenses/mit-license.php.
+#
+
+# Fixes for Ruby pre-1.9
+if RUBY_VERSION =~ /^1.[^9]/
+	#
+	# Ruby does not implement KeyError before 1.9
+	#
+	class KeyError < IndexError
+		def initialize message = nil
+			super message || "Key not found"
+		end
+	end
+end
 
 # == Description
 # Cpe is a small library built to simplify working with the Common Platform
@@ -64,19 +77,24 @@ class Cpe
 		return ["cpe", @part, @vendor, @product, @version, @update, @edition, @language].join(":").downcase
 	end
 
+	# 
+	# Test for equality of generated CPE strings
+	def == cpe
+		raise ArgumentError unless cpe.kind_of? Cpe
+		self.generate == cpe.generate
+	end
+
 	#
 	# Parse pre-existing CPE string and return new Cpe object
 	#
-	# String parsing is permissive regarding the number of trailing colons
+	# String parsing is permissive regarding the number of trailing colons and whitespace
 	# provided, filling in empty strings if needed.
 	#
-	# === Bugs
-	#
-	# * Presently unable to pass File object as input
-	#
 	def Cpe.parse cpe
-		raise ArgumentError unless cpe.kind_of? String
-		raise ArgumentError, "CPE malformed" unless /^cpe:\/[hoa]:/.match cpe and !/ /.match cpe
+		raise ArgumentError unless cpe.kind_of? String or cpe.kind_of? File
+		cpe = cpe.read if cpe.kind_of? File
+		cpe = cpe.downcase.chomp
+		raise ArgumentError, "CPE malformed" unless /^cpe:\/[hoa]:/.match cpe and !/[\s\n]/.match cpe
 
 		data = Hash.new
 		discard, data[:part], data[:vendor], data[:product], data[:version],

data/test/cpe-test-invalid

@@ -0,0 +1 @@
+cpe:/i:redhat:enterprise_linux:3::as

data/test/cpe-test-valid

@@ -0,0 +1 @@
+cpe:/o:redhat:enterprise_linux:3

data/test/test_cpe.rb

@@ -34,6 +34,9 @@ class TestCpe < Test::Unit::TestCase
 		cpe = Cpe.new :part => Cpe::Hardware, :vendor => "cisco", :product => "router", :version => 3825
 		assert_equal cpe.generate, "cpe:/h:cisco:router:3825:::"
 
+		assert_nothing_raised { Cpe.parse File.open('test/cpe-test-valid') }
+		assert_raises(ArgumentError) { Cpe.parse File.open('test/cpe-test-invalid') }
+
 		assert_raises(ArgumentError) { Cpe.new :part => 2 }
 		assert_nothing_raised { Cpe.new }
 
@@ -42,4 +45,13 @@ class TestCpe < Test::Unit::TestCase
 		assert_raises(KeyError) { Cpe.new(:vendor => "redhat").generate }
 		assert_nothing_raised { Cpe.new(:vendor => "redhat", :part => Cpe::OS).generate }
 	end
+
+	def test_equality
+		cpe_a = Cpe.new :part => Cpe::OS, :vendor => "redhat", :product => "enterprise_linux", :version => 3
+		cpe_b = Cpe.parse "cpe:/o:redhat:enterprise_linux:3"
+		cpe_c = Cpe.parse File.open('test/cpe-test-valid')
+
+		assert_equal cpe_a, cpe_b
+		assert_equal cpe_a, cpe_c
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpe
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &25157560 !ruby/object:Gem::Requirement
+  requirement: &8605640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25157560
+  version_requirements: *8605640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &25157000 !ruby/object:Gem::Requirement
+  requirement: &8674700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *25157000
+  version_requirements: *8674700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25156280 !ruby/object:Gem::Requirement
+  requirement: &8673600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *25156280
+  version_requirements: *8673600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25155580 !ruby/object:Gem::Requirement
+  requirement: &8672980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *25155580
+  version_requirements: *8672980
 description: Library for parsing and generating Common Platform Enumeration strings
   (see http://cpe.mitre.org/)
 email: chris@chriswuest.com
@@ -72,6 +72,8 @@ files:
 - VERSION
 - cpe.gemspec
 - lib/cpe.rb
+- test/cpe-test-invalid
+- test/cpe-test-valid
 - test/helper.rb
 - test/test_cpe.rb
 homepage: http://github.com/cwuest/ruby-cpe
@@ -89,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2763396924108230200
+      hash: -2413955384257435782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: