From 1c56b03a28b6e96b221586ff220c8f788d70a48f Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:14:26 -0500 Subject: [PATCH 01/13] highlight DNS zone (BIND) files --- .gitmodules | 3 +++ vendor/grammars/Bind.tmbundle | 1 + 2 files changed, 4 insertions(+) create mode 160000 vendor/grammars/Bind.tmbundle diff --git a/.gitmodules b/.gitmodules index f1ce5891..f22c7288 100644 --- a/.gitmodules +++ b/.gitmodules @@ -657,3 +657,6 @@ [submodule "vendor/grammars/jflex.tmbundle"] path = vendor/grammars/jflex.tmbundle url = https://github.com/jflex-de/jflex.tmbundle.git +[submodule "vendor/grammars/Bind.tmbundle"] + path = vendor/grammars/Bind.tmbundle + url = git@github.com:norm/Bind.tmbundle.git diff --git a/vendor/grammars/Bind.tmbundle b/vendor/grammars/Bind.tmbundle new file mode 160000 index 00000000..ccc1e271 --- /dev/null +++ b/vendor/grammars/Bind.tmbundle @@ -0,0 +1 @@ +Subproject commit ccc1e2711a1238378b62d4045edae3f60679b703 From 5730ab28ab787032297a9f3668f09bb31ad56c5a Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:23:31 -0500 Subject: [PATCH 02/13] list zone in languages.yml --- lib/linguist/languages.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 662c488f..7544b198 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3633,3 +3633,8 @@ xBase: - .prg tm_scope: none ace_mode: text + +zone: + type: programming + extensions: + - .zone From 5aeac500da17406089a60ec21695520b8ceb2f74 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:24:46 -0500 Subject: [PATCH 03/13] list zone in grammars.yml --- grammars.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/grammars.yml b/grammars.yml index 46f2fd5d..13b63cf6 100644 --- a/grammars.yml +++ b/grammars.yml @@ -26,6 +26,9 @@ vendor/grammars/Alloy.tmbundle: - source.alloy vendor/grammars/AutoHotkey/: - source.ahk +vendor/grammars/Bind.tmbundle: +- source.untitled +- text.zone vendor/grammars/BrightScript.tmbundle/: - source.brightauthorproject - source.brightscript From 188d2367df7bdf2e3afe504ac95caa6421d5eecf Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:25:52 -0500 Subject: [PATCH 04/13] add sample zone file --- samples/zone/sneaky.net.zone | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 samples/zone/sneaky.net.zone diff --git a/samples/zone/sneaky.net.zone b/samples/zone/sneaky.net.zone new file mode 100644 index 00000000..1276be5a --- /dev/null +++ b/samples/zone/sneaky.net.zone @@ -0,0 +1,12 @@ +$TTL 3d +@ IN SOA root.localhost. root.sneaky.net. ( + 2015042907 ; serial + 3d ; refresh + 1h ; retry + 12d ; expire + 2h ; negative response TTL + ) + IN NS root.localhost. + IN NS localhost. ; secondary name server is preferably externally maintained + +www IN A 3.141.59.26 From 8b736189e01634cc351758a6e98d193a192d8c87 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:34:43 -0500 Subject: [PATCH 05/13] better name for DNS zone --- lib/linguist/languages.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 7544b198..94571e59 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -769,6 +769,11 @@ Diff: tm_scope: source.diff ace_mode: diff +DNS zone: + type: programming + extensions: + - .zone + Dockerfile: type: data tm_scope: source.dockerfile @@ -3633,8 +3638,3 @@ xBase: - .prg tm_scope: none ace_mode: text - -zone: - type: programming - extensions: - - .zone From 81c41df15c60b7389a1a905200bf46caa74c4863 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:39:32 -0500 Subject: [PATCH 06/13] zone: add tm_scope --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 94571e59..e7ec4af9 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -773,6 +773,7 @@ DNS zone: type: programming extensions: - .zone + tm_scope: text.zone Dockerfile: type: data From 1e20b12241542f6f3e2bd659543e20f70f656262 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Thu, 30 Apr 2015 15:40:44 -0500 Subject: [PATCH 07/13] zone: add ace_mode --- lib/linguist/languages.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index e7ec4af9..cc97d249 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -774,6 +774,7 @@ DNS zone: extensions: - .zone tm_scope: text.zone + ace_mode: text Dockerfile: type: data From 3b2ddb1a18f64e00d69afb74079f4317dbee21f1 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Fri, 1 May 2015 11:25:16 -0500 Subject: [PATCH 08/13] classify DNS zone as a data format --- lib/linguist/languages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index cc97d249..63fdc5c6 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -770,7 +770,7 @@ Diff: ace_mode: diff DNS zone: - type: programming + type: data extensions: - .zone tm_scope: text.zone From 03369b8a6c4d1231d4c1e14d0967d00600779f6d Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Sun, 3 May 2015 12:51:52 -0500 Subject: [PATCH 09/13] use https url for travis support --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f22c7288..cfaf6c66 100644 --- a/.gitmodules +++ b/.gitmodules @@ -659,4 +659,4 @@ url = https://github.com/jflex-de/jflex.tmbundle.git [submodule "vendor/grammars/Bind.tmbundle"] path = vendor/grammars/Bind.tmbundle - url = git@github.com:norm/Bind.tmbundle.git + url = https://github.com/norm/Bind.tmbundle.git From bea90b256ec84a6f92d07d0b4b026f9fbcedf86c Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Tue, 11 Aug 2015 14:01:45 -0500 Subject: [PATCH 10/13] use st2-zonefile (MIT licensed) instead of Bind.tmbundle (unlicensed) --- .gitmodules | 6 +++--- grammars.yml | 2 +- st2-zonefile | 1 + vendor/grammars/st2-zonefile | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) create mode 160000 st2-zonefile create mode 160000 vendor/grammars/st2-zonefile diff --git a/.gitmodules b/.gitmodules index cfaf6c66..0931bc8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -657,6 +657,6 @@ [submodule "vendor/grammars/jflex.tmbundle"] path = vendor/grammars/jflex.tmbundle url = https://github.com/jflex-de/jflex.tmbundle.git -[submodule "vendor/grammars/Bind.tmbundle"] - path = vendor/grammars/Bind.tmbundle - url = https://github.com/norm/Bind.tmbundle.git +[submodule "vendor/grammars/st2-zonefile"] + path = vendor/grammars/st2-zonefile + url = https://github.com/sixty4k/st2-zonefile diff --git a/grammars.yml b/grammars.yml index 13b63cf6..4f9f7f35 100644 --- a/grammars.yml +++ b/grammars.yml @@ -26,7 +26,7 @@ vendor/grammars/Alloy.tmbundle: - source.alloy vendor/grammars/AutoHotkey/: - source.ahk -vendor/grammars/Bind.tmbundle: +vendor/grammars/st2-zonefile: - source.untitled - text.zone vendor/grammars/BrightScript.tmbundle/: diff --git a/st2-zonefile b/st2-zonefile new file mode 160000 index 00000000..0d943fef --- /dev/null +++ b/st2-zonefile @@ -0,0 +1 @@ +Subproject commit 0d943fefb815262804f0ae309b08221f34eda054 diff --git a/vendor/grammars/st2-zonefile b/vendor/grammars/st2-zonefile new file mode 160000 index 00000000..0d943fef --- /dev/null +++ b/vendor/grammars/st2-zonefile @@ -0,0 +1 @@ +Subproject commit 0d943fefb815262804f0ae309b08221f34eda054 From 4f5825818642044970456fb2a87434659ca8fa69 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Wed, 12 Aug 2015 17:05:57 +0100 Subject: [PATCH 11/13] Removing erroneous submodule --- st2-zonefile | 1 - 1 file changed, 1 deletion(-) delete mode 160000 st2-zonefile diff --git a/st2-zonefile b/st2-zonefile deleted file mode 160000 index 0d943fef..00000000 --- a/st2-zonefile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0d943fefb815262804f0ae309b08221f34eda054 From 60e90bab23a030b30345d47e2ee8d5a0436b4d84 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Wed, 12 Aug 2015 17:06:39 +0100 Subject: [PATCH 12/13] Removing un-used Bind bundle --- vendor/grammars/Bind.tmbundle | 1 - 1 file changed, 1 deletion(-) delete mode 160000 vendor/grammars/Bind.tmbundle diff --git a/vendor/grammars/Bind.tmbundle b/vendor/grammars/Bind.tmbundle deleted file mode 160000 index ccc1e271..00000000 --- a/vendor/grammars/Bind.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ccc1e2711a1238378b62d4045edae3f60679b703 From 7cf140940e5fcbbce8fe4706debd90acbf20cab4 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Wed, 12 Aug 2015 17:20:29 +0100 Subject: [PATCH 13/13] Fixing up the build --- grammars.yml | 5 ++--- lib/linguist/languages.yml | 14 +++++++------- samples/{zone => DNS Zone}/sneaky.net.zone | 0 3 files changed, 9 insertions(+), 10 deletions(-) rename samples/{zone => DNS Zone}/sneaky.net.zone (100%) diff --git a/grammars.yml b/grammars.yml index 5b2d376c..4da6c0e2 100644 --- a/grammars.yml +++ b/grammars.yml @@ -26,9 +26,6 @@ vendor/grammars/Alloy.tmbundle: - source.alloy vendor/grammars/AutoHotkey/: - source.ahk -vendor/grammars/st2-zonefile: -- source.untitled -- text.zone vendor/grammars/BrightScript.tmbundle/: - source.brightauthorproject - source.brightscript @@ -473,6 +470,8 @@ vendor/grammars/smalltalk-tmbundle: - source.smalltalk vendor/grammars/sql.tmbundle: - source.sql +vendor/grammars/st2-zonefile: +- text.zone_file vendor/grammars/standard-ml.tmbundle: - source.cm - source.ml diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 71ffe7d8..99a8a19d 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -750,6 +750,13 @@ DM: tm_scope: source.c++ ace_mode: c_cpp +DNS Zone: + type: data + extensions: + - .zone + tm_scope: text.zone_file + ace_mode: text + DTrace: type: programming aliases: @@ -790,13 +797,6 @@ Diff: tm_scope: source.diff ace_mode: diff -DNS zone: - type: data - extensions: - - .zone - tm_scope: text.zone - ace_mode: text - Dockerfile: type: data tm_scope: source.dockerfile diff --git a/samples/zone/sneaky.net.zone b/samples/DNS Zone/sneaky.net.zone similarity index 100% rename from samples/zone/sneaky.net.zone rename to samples/DNS Zone/sneaky.net.zone