confetti 0.9.3 → 0.9.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    confetti (0.9.3)
+    confetti (0.9.4)
       mustache (~> 0.11.2)
 
 GEM

data/lib/confetti/templates/version_helper.rb

@@ -12,14 +12,16 @@ module Confetti
         elsif str.match /^(\d)+[.](\d)+[.](\d)+$/
           str
         elsif str.match /^((\d)+[.])*(\d)+$/
-          fix_version(str)
+          extend_version(str)
+        elsif str.match /^([\d\w]+)[.]([\d\w]+)[.]([\d\w]+)$/
+          deletter_version(str)
         else
           raise VersionError, "need a valid version number of the form 0.0.0"
         end
       end
 
       private
-        def fix_version(str)
+        def extend_version(str)
           segments = str.split('.')
 
           segments << '0' if segments.length == 1
@@ -27,6 +29,22 @@ module Confetti
 
           segments[0,3].join '.'
         end
+
+        def deletter_version(str)
+          segments = str.split('.')
+          new_parts = []
+
+          segments.each do |seg|
+            unless /\d+/ =~ seg
+              seg.gsub!(/\w/, '')
+              seg = '0' if seg.length == 0
+            end
+
+            new_parts << seg
+          end
+
+          new_parts.join '.'
+        end
     end
   end
 end

data/lib/confetti/version.rb

@@ -1,3 +1,3 @@
 module Confetti
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/spec/templates/version_helper_spec.rb

@@ -31,5 +31,9 @@ describe Confetti::Template::VersionHelper do
     it "should truncate extra digits if string has too many segments" do
       normalize_version('1.2.3.4.5').should == "1.2.3"
     end
+
+    it "should switch letters out for numbers" do
+      normalize_version('1.3.a').should == "1.3.0"
+    end
   end
 end

data/spec/templates/windows_phone7_manifest_spec.rb

@@ -158,6 +158,11 @@ describe Confetti::Template::WindowsPhone7Manifest do
       @config.version_string = "2012.05.20"
       @template.version.should == "2012.0.2.0"
     end
+
+    it "should ensure letters are converted to numbers" do
+      @config.version_string = "1.3.a"
+      @template.version.should == "1.3.0.0"
+    end
   end
 
   describe "author" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Andrew Lunny