[CHEF-3919] Removed Chef::Version::Cookbook code and replaced by a Chef::Version::Platform class, reverting Chef::Version class changes

1 files changed, 14 insertions, 11 deletions

diff --git a/lib/chef/version/cookbook.rb b/lib/chef/version/platform.rb
index 391d46563c..2921341cd2 100644
--- a/lib/chef/version/cookbook.rb
+++ b/lib/chef/version/platform.rb
@@ -18,20 +18,23 @@ require 'chef/version_class'
 
 class Chef
   class Version
-    class Cookbook < Chef::Version
+    class Platform < Chef::Version
 
       protected
 
-      def parse(str='')
-        msg = "'#{str.to_s}' does not match 'x.y.z' or 'x.y'"
-        begin
-          super
-        rescue Chef::Exceptions::InvalidVersion => e
-          raise Chef::Exceptions::InvalidCookbookVersion.new( msg )
-        end
-        if str.to_s =~ /^(\d+)$/
-          raise Chef::Exceptions::InvalidCookbookVersion.new( msg )
-        end
+      def parse(str="")
+        @major, @minor, @patch =
+          case str.to_s
+          when /^(\d+)\.(\d+)\.(\d+)$/
+            [ $1.to_i, $2.to_i, $3.to_i ]
+          when /^(\d+)\.(\d+)$/
+            [ $1.to_i, $2.to_i, 0 ]
+          when /^(\d+)$/
+            [ $1.to_i, 0, 0 ]
+          else
+            msg = "'#{str.to_s}' does not match 'x.y.z', 'x.y' or 'x'"
+            raise Chef::Exceptions::InvalidPlatformVersion.new( msg )
+          end
       end
 
     end