[CHEF-3919] cookbook version specific code factored out from Chef::Version, new classes created: Chef::Version::Cookbook and Chef::VersionConstraint::Cookbook

1 files changed, 39 insertions, 0 deletions

diff --git a/lib/chef/version/cookbook.rb b/lib/chef/version/cookbook.rb
new file mode 100644
index 0000000000..391d46563c
--- /dev/null
+++ b/lib/chef/version/cookbook.rb
@@ -0,0 +1,39 @@
+# Author:: Xabier de Zuazo (<xabier@onddo.com>)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'chef/version_class'
+
+class Chef
+  class Version
+    class Cookbook < 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
+      end
+
+    end
+  end
+end