Merge pull request #39 from HackerHappyHour/support-non-delimited-pre…

…releases

Support non delimited prereleases

__tests__/__data__/parser.js

@@ -5,7 +5,9 @@ exports.parseTagScenarios = [
   ['%X.Y%-foobar', '1.0.0-rc.1', '1.0-rc.1-foobar'],
   ['%X%-foobar', '1.0.0-rc1', '1-rc1-foobar'],
   ['%X%-foobar', '1.0.0-rc.1', '1-rc.1-foobar'],
-  ['%X%-foobar', '1.0.0', '1-foobar']
+  ['%X%-foobar', '1.0.0', '1-foobar'],
+  ['%X%', '2.0.0rc3', '2-rc3'],
+  ['%X.Y%', '2.0.0rc3', '2.0-rc3']
 ]
 
 exports.parseInputListScenarios = [

__tests__/__data__/taggingStrategy.js

@@ -27,4 +27,20 @@ exports.scenarios = [
     'hello/world:1-foobar,hello/world:1.0-foobar,hello/world:1.0.0-foobar,hello/world:latest',
     {inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0', latest: true, imageName: 'hello/world'}
   ],
+  [
+    '1-rc1,1.0-rc1,1.0.0-rc1',
+    {inputTags:'%X%,%X.Y%,%X.Y.Z%', tagName:'1.0.0rc1'}
+  ],
+  [
+    '1-rc1-foobar,1.0-rc1-foobar,1.0.0-rc1-foobar',
+    {inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1'}
+  ],
+  [
+    'hello/world:1-rc1-foobar,hello/world:1.0-rc1-foobar,hello/world:1.0.0-rc1-foobar',
+    {inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1', imageName: 'hello/world'}
+  ],
+  [
+    'hello/world:1-rc1-foobar,hello/world:1.0-rc1-foobar,hello/world:1.0.0-rc1-foobar,hello/world:latest',
+    {latest: true, inputTags:'%X%-foobar,%X.Y%-foobar,%X.Y.Z%-foobar', tagName:'1.0.0rc1', imageName: 'hello/world'}
+  ],
 ]

dist/index.js

@@ -7982,7 +7982,7 @@ exports.parseTag = (pattern, tag) => {
 
     // if 'tag' is valid, attempt to parse it
   // otherwise error: value is not valid or cannot be coerced
-  var parsedTag = s.parse(tag, {includePrerelease: true})
+  var parsedTag = s.parse(s.clean(tag, {loose: true}), {includePrerelease: true})
   if (!parsedTag){
     parsedTag = s.parse(s.valid(s.coerce(tag)))
     if (!parsedTag) return {error: invalidTag}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tagging-strategy",
-  "version": "2.0.0-rc2",
+  "version": "2.1.0",
   "description": "A github action for specifying tagging strategies for docker images using semver or other common docker tags",
   "main": "dist/index.js",
   "scripts": {

src/parser.js

@@ -12,7 +12,7 @@ exports.parseTag = (pattern, tag) => {
 
     // if 'tag' is valid, attempt to parse it
   // otherwise error: value is not valid or cannot be coerced
-  var parsedTag = s.parse(tag, {includePrerelease: true})
+  var parsedTag = s.parse(s.clean(tag, {loose: true}), {includePrerelease: true})
   if (!parsedTag){
     parsedTag = s.parse(s.valid(s.coerce(tag)))
     if (!parsedTag) return {error: invalidTag}