merge

repository/c.json

@@ -1831,6 +1831,16 @@
 				}
 			]
 		},
+		{
+			"name": "CV3 Build Template",
+			"details": "https://github.com/thisishuey/Sublime-CV3-Build-Template",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/thisishuey/Sublime-CV3-Build-Template/tree/master"
+				}
+			]
+		},
 		{
 			"name": "Cycle Setting",
 			"details": "https://github.com/jmm/Sublime-Text-Cycle-Setting/tree/package-control",

repository/f.json

@@ -11,6 +11,17 @@
 				}
 			]
 		},
+		{
+			"name": "Fabric Engine - KL Language Support",
+			"details": "https://github.com/fabric-engine/Sublime-KL",
+			"previous_names": ["Creation Platform - KL Language Support"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/fabric-engine/Sublime-KL/tags"
+				}
+			]
+		},
 		{
 			"name": "Fabric Tasks",
 			"details": "https://github.com/b3ni/Sublime-Fabric",
@@ -73,7 +84,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/alessandrofac93/FalconSublimeTools/releases/tags"
+					"details": "https://github.com/alessandrofac93/FalconSublimeTools/tree/master"
 				}
 			]
 		},
@@ -146,7 +157,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/jaabell/fei-syntax-n-snippets/master"
+					"details": "https://github.com/jaabell/fei-syntax-n-snippets/tree/master"
 				}
 			]
 		},
@@ -625,6 +636,16 @@
 				}
 			]
 		},
+		{
+			"name": "FramerCompletion",
+			"details": "https://github.com/awt2542/SublimeCompletionFramerjs",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/awt2542/SublimeCompletionFramerjs/tags"
+				}
+			]
+		},
 		{
 			"name": "FreeMarker",
 			"details": "https://github.com/briancavalier/textmate-freemarker-bundle",

repository/g.json

@@ -562,6 +562,18 @@
 				}
 			]
 		},
+		{
+			"name": "GoToAnchor",
+			"author": "Ermes Enea Colella",
+			"details": "https://github.com/eecolella/GoToAnchor",
+			"labels": ["file navigation"],
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/eecolella/GoToAnchor/tree/master"
+				}
+			]
+		},
 		{
 			"details": "https://github.com/lazyguru/GoToClass",
 			"releases": [
@@ -670,6 +682,16 @@
 				}
 			]
 		},
+		{
+			"name": "Gradle_Language",
+			"details": "https://github.com/kingofmalkier/sublime-gradle",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/kingofmalkier/sublime-gradle/tags"
+				}
+			]
+		},
 		{
 			"name": "Grails",
 			"details": "https://github.com/osoco/sublimetext-grails",

repository/h.json

@@ -144,7 +144,7 @@
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "https://github.com/hayaku/hayaku/tree/master"
+					"details": "https://github.com/hayaku/hayaku/tags"
 				}
 			]
 		},

repository/l.json

@@ -615,6 +615,17 @@
 				}
 			]
 		},
+		{
+			"name": "London Underground Status",
+			"details": "https://github.com/sabarasaba/sublimetext-LondonUnderground",
+			"labels": ["london", "tube", "underground"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/sabarasaba/sublimetext-LondonUnderground/tree/master"
+				}
+			]
+		},
 		{
 			"details": "https://github.com/shvva/Lookupdic",
 			"releases": [

repository/m.json

@@ -781,6 +781,18 @@
 				}
 			]
 		},
+		{
+			"name": "More Layouts",
+			"details": "https://github.com/unknownuser88/morelayouts",
+			"author": "David Bekoyan",
+			"labels": ["layout"],
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/unknownuser88/morelayouts/tags"
+				}
+			]
+		},
 		{
 			"name": "Morse",
 			"details": "https://github.com/hippasus/SublimeMorse",

repository/n.json

@@ -111,6 +111,17 @@
 				}
 			]
 		},
+		{
+			"name": "Neutron",
+			"labels": ["color scheme"],
+			"details": "https://github.com/ale110/SublimeText-Neutron-Syntax",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/ale110/SublimeText-Neutron-Syntax/tree/master"
+				}
+			]
+		},
 		{
 			"name": "New from Selection",
 			"details": "https://github.com/idosela/sublime_new_from_selection",
@@ -237,6 +248,16 @@
 				}
 			]
 		},
+		{
+			"name": "nRepeat",
+			"details": "https://github.com/bfrascher/Sublime-nRepeat",
+			"releases": [
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/bfrascher/Sublime-nRepeat/tags"
+				}
+			]
+		},
 		{
 			"details": "https://github.com/SublimeText/NSIS",
 			"labels": ["language syntax"],

repository/o.json

@@ -99,12 +99,12 @@
 		},
 		{
 			"name": "Ohdeung-eun",
-			"details": "http://github.com/luavis/Ohdeung-eun",
+			"details": "https://github.com/luavis/Ohdeung-eun",
 			"labels": ["Lorem", "lorem", "hangul", "\\uc624\\ub4f1\\uc740"],
 			"releases": [
 				{
 					"sublime_text": "*",
-					"details": "http://github.com/luavis/Ohdeung-eun/tree/master"
+					"details": "https://github.com/luavis/Ohdeung-eun/tree/master"
 				}
 			]
 		},
@@ -308,7 +308,7 @@
 						"*"
 					],
 					"sublime_text": "*",
-					"details": "https://bitbucket.org/bteryek/openinbrowser/#tags"
+					"details": "https://bitbucket.org/bteryek/openinbrowser#tags"
 				}
 			]
 		},

repository/p.json

@@ -594,7 +594,7 @@
 						"*"
 					],
 					"sublime_text": "*",
-					"details": "https://bitbucket.org/bteryek/phpcodegen/#tags"
+					"details": "https://bitbucket.org/bteryek/phpcodegen#tags"
 				}
 			]
 		},
@@ -807,7 +807,7 @@
 		},
 		{
 			"name": "plist",
-			"details": "https://bitbucket.org/fschwehn/sublime_plist/overview",
+			"details": "https://bitbucket.org/fschwehn/sublime_plist",
 			"labels": ["language syntax"],
 			"releases": [
 				{

repository/s.json

@@ -1630,8 +1630,12 @@
 			"details": "https://github.com/grundprinzip/sublemacspro",
 			"releases": [
 				{
-					"sublime_text": "*",
+					"sublime_text": "<3000",
 					"details": "https://github.com/grundprinzip/sublemacspro/tree/release/st2/current"
+				},
+				{
+					"sublime_text": ">=3000",
+					"details": "https://github.com/grundprinzip/sublemacspro/tags"
 				}
 			]
 		},

repository/t.json

@@ -1333,7 +1333,11 @@
 			"details": "https://github.com/alehandrof/Typewriter",
 			"releases": [
 				{
-					"sublime_text": "*",
+					"sublime_text": "<3000",
+					"details": "https://github.com/alehandrof/Typewriter/tree/st2"
+				},
+				{
+					"sublime_text": ">=3000",
 					"details": "https://github.com/alehandrof/Typewriter/tags"
 				}
 			]

repository/v.json

@@ -187,6 +187,16 @@
 				}
 			]
 		},
+		{
+			"name": "VimL",
+			"details": "https://github.com/SalGnt/Sublime-VimL",
+			"releases": [
+				{
+					"sublime_text": "*",
+					"details": "https://github.com/SalGnt/Sublime-VimL/tree/master"
+				}
+			]
+		},
 		{
 			"name": "Vintage Escape",
 			"details": "https://github.com/tonymagro/VintageEscape",

tests/test.py

@@ -133,6 +133,16 @@ class TestContainer(object):
         'labels': list
     }
 
+    d_reg = r'''^ (https:// github\.com/ [^/]+/ [^/]+ (/tree/ .+ (?<!/)
+                                                      |/tags
+                                                      |/)?
+                  |https:// bitbucket\.org/ [^/]+/ [^/]+ (/src/ .+ (?<!/)
+                                                         |\#tags
+                                                         |/)?
+                  ) $'''
+    # Strip multilines for better debug info on failures
+    details_regex = re.compile(' '.join(d_reg.split()), re.X)
+
     def _test_repository_keys(self, include, data):
         self.assertTrue(2 <= len(data) <= 3, "Unexpected number of keys")
         self.assertIn('schema_version', data)
@@ -182,10 +192,14 @@ class TestContainer(object):
             self.assertIn(k, self.package_key_types_map)
             self.assertIsInstance(v, self.package_key_types_map[k], k)
 
-            if k in ('details', 'homepage', 'readme', 'issues', 'donate',
-                     'buy'):
+            if k in ('homepage', 'readme', 'issues', 'donate', 'buy'):
                 self.assertRegex(v, '^https?://')
 
+            if k == 'details':
+                self.assertRegex(v, self.details_regex,
+                                 'The details url is badly formatted or '
+                                 'invalid')
+
             # Test for invalid characters (on file systems)
             if k == 'name':
                 # Invalid on Windows (and sometimes problematic on UNIX)
@@ -233,8 +247,13 @@ class TestContainer(object):
             if k == 'date':
                 self.assertRegex(v, r"^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$")
 
-            if k in ('details', 'url'):
-                self.assertRegex(v, '^https?://')
+            if k == 'url':
+                self.assertRegex(v, r'^https?://')
+
+            if k == 'details':
+                self.assertRegex(v, self.details_regex,
+                                 'The details url is badly formatted or '
+                                 'invalid')
 
             if k == 'sublime_text':
                 self.assertRegex(v, '^(\*|<=?\d{4}|>=?\d{4})$',