cpe 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cpe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cpe"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Wuest"]

data/lib/cpe.rb

@@ -14,13 +14,13 @@
 #
 #   cpe = Cpe.parse "cpe:/o:microsoft:windows_xp:::pro"
 #   cpe.vendor # => "microsoft"
-#   cpe.to_s # => "cpe:/o:microsoft:windows_xp:::pro:"
+#   cpe.generate # => "cpe:/o:microsoft:windows_xp:::pro:"
 #
 # === Generating CPE string
 #   cpe = Cpe.new :part => Cpe::OS
 #   cpe.vendor = "microsoft"
 #   cpe.product = "windows_xp"
-#   cpe.to_s # => "cpe:/o:microsoft:windows_xp::::"
+#   cpe.generate # => "cpe:/o:microsoft:windows_xp::::"
 class Cpe
 	# Part type.  Can be /o (Cpe::OS), /a (Cpe::Application), /h (Cpe::Hardware)
 	attr_accessor :part
@@ -56,10 +56,10 @@ class Cpe
 
 	# 
 	# Check that at least Part and one other piece of information have been
-	# collected, and generate CPE string.
+	# collected, and return generated CPE string.
 	#
-	def to_s
-		raise KeyError unless /\/[oah]/.match @part
+	def generate
+		raise KeyError unless /\/[oah]/.match @part 
 		raise KeyError if @vendor.to_s.empty? and @product.to_s.empty? and @version.to_s.empty? and @update.to_s.empty? and @edition.to_s.empty? and @language.to_s.empty?
 		return ["cpe", @part, @vendor, @product, @version, @update, @edition, @language].join(":").downcase
 	end

data/test/test_cpe.rb

@@ -26,20 +26,20 @@ class TestCpe < Test::Unit::TestCase
 
 	def test_generation
 		cpe = Cpe.new :part => Cpe::OS, :vendor => "microsoft", :product => "windows_xp", :edition => "pro"
-		assert_equal cpe.to_s, "cpe:/o:microsoft:windows_xp:::pro:"
+		assert_equal cpe.generate, "cpe:/o:microsoft:windows_xp:::pro:"
 
 		cpe = Cpe.new :part => Cpe::Application, :vendor => "ACME", :product => "Product", :version => "1.0", :update => "update2", :edition => "-", :language => "en-us"
-		assert_equal cpe.to_s, "cpe:/a:acme:product:1.0:update2:-:en-us"
+		assert_equal cpe.generate, "cpe:/a:acme:product:1.0:update2:-:en-us"
 
 		cpe = Cpe.new :part => Cpe::Hardware, :vendor => "cisco", :product => "router", :version => 3825
-		assert_equal cpe.to_s, "cpe:/h:cisco:router:3825:::"
+		assert_equal cpe.generate, "cpe:/h:cisco:router:3825:::"
 
 		assert_raises(ArgumentError) { Cpe.new :part => 2 }
 		assert_nothing_raised { Cpe.new }
 
-		assert_raises(KeyError) { Cpe.new.to_s }
-		assert_raises(KeyError) { Cpe.new(:part => Cpe::OS).to_s }
-		assert_raises(KeyError) { Cpe.new(:vendor => "redhat").to_s }
-		assert_nothing_raised { Cpe.new(:vendor => "redhat", :part => Cpe::OS).to_s }
+		assert_raises(KeyError) { Cpe.new.generate }
+		assert_raises(KeyError) { Cpe.new(:part => Cpe::OS).generate }
+		assert_raises(KeyError) { Cpe.new(:vendor => "redhat").generate }
+		assert_nothing_raised { Cpe.new(:vendor => "redhat", :part => Cpe::OS).generate }
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &11396320 !ruby/object:Gem::Requirement
+  requirement: &25157560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11396320
+  version_requirements: *25157560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &11413360 !ruby/object:Gem::Requirement
+  requirement: &25157000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *11413360
+  version_requirements: *25157000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11412000 !ruby/object:Gem::Requirement
+  requirement: &25156280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11412000
+  version_requirements: *25156280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11409060 !ruby/object:Gem::Requirement
+  requirement: &25155580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *11409060
+  version_requirements: *25155580
 description: Library for parsing and generating Common Platform Enumeration strings
   (see http://cpe.mitre.org/)
 email: chris@chriswuest.com
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3747455494260107595
+      hash: -2763396924108230200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: