{{ post.date }}
- {{ post.body }} - {% if post.isLink %} - - {% endif %} -
+```bash
diff-index() {
git diff-index -p -M --cached HEAD -- "$@"
}
if diff-index '*Tests.swift' | ...
-
+```
You get the idea.
@@ -34,7 +34,9 @@ One problem is that the bootstrap script uses an absolute path when creating a s
That's easily fixed by using a relative path to your pre-commit hook, like so:
-ln -s ../../scripts/pre-commit.sh .git/hooks/pre-commit+```bash +ln -s ../../scripts/pre-commit.sh .git/hooks/pre-commit +``` Ah, this is more flexible! Of course if you ever move the script itself then it's on you to update the symlink and bootstrap.sh, but that was already the case anyway. @@ -46,42 +48,42 @@ Ok great so this script tells me there are errors. Well, script, what exactly _a First ignore the fact I'm talking to a shell script. I don't get out much. Anyway... now we need to pull out the regular expressions and globs so we can reuse them to show what the actual errors are if we find any. -
+```bash
test_pattern='^\+\s*\b(fdescribe|fit|fcontext|xdescribe|xit|xcontext)\('
test_glob='*Tests.swift *Specs.swift'
if diff-index $test_glob | egrep "$test_pattern" >/dev/null 2>&1
...
-
+```
_Pro tip: I prefixed test\_pattern with `\b` to only match word boundaries to reduce false positives._
And:
-+```bash misplaced_pattern='misplaced="YES"' misplaced_glob='*.xib *.storyboard' if diff-index $misplaced_glob | grep '^+' | egrep "$misplaced_pattern" >/dev/null 2>&1 ... -+``` You may notice that I snuck in `*Specs.swift` as well. Let's not be choosy about file naming. Then we need to show where the errors are by using `diff-indef`, with an `|| true` at the end because the whole script fails if any single command fails, and `git diff-index` regularly exits with non-zero status (I didn't look into why that is). -
+```bash echo "COMMIT REJECTED for fdescribe/fit/fcontext/xdescribe/xit/xcontext." >&2 echo "Remove focused and disabled tests before committing." >&2 diff-index $test_glob | egrep -2 "$test_pattern" || true >&2 echo '----' >&2 -+``` And for misplaced views: -
+```bash echo "COMMIT REJECTED for misplaced views. Correct them before committing." >&2 git grep -E "$misplaced_pattern" $misplaced_glob || true >&2 echo '----' >&2 -+``` ## Fix all the things, at once @@ -91,15 +93,21 @@ The first step is to exit at the end using a code in a variable that is set to 1 Up top: -
failed=0+```bash +failed=0 +``` In the middle, where we detect errors: -
failed=1+```bash +failed=1 +``` And at the bottom: -
exit $failed+```bash +exit $failed +``` That's all there is to it. If we don't exit early then all the code runs. @@ -113,7 +121,7 @@ Those were all the obvious improvements in my mind and now I'm using this modifi Here's the whole thing put together: -
+```bash #!/usr/bin/env bash # # Based on http://merowing.info/2016/08/setting-up-pre-commit-hook-for-ios/ @@ -148,4 +156,4 @@ then fi exit $failed -\ No newline at end of file +``` \ No newline at end of file diff --git a/samhuri.net/Package.resolved b/samhuri.net/Package.resolved index 0784686..b3cfe99 100644 --- a/samhuri.net/Package.resolved +++ b/samhuri.net/Package.resolved @@ -10,15 +10,6 @@ "version": "0.2.0" } }, - { - "package": "PathKit", - "repositoryURL": "https://github.com/kylef/PathKit.git", - "state": { - "branch": null, - "revision": "e2f5be30e4c8f531c9c1e8765aa7b71c0a45d7a0", - "version": "0.9.2" - } - }, { "package": "Plot", "repositoryURL": "https://github.com/johnsundell/plot.git", @@ -27,24 +18,6 @@ "revision": "dd7fce79ce4802afdc7d45ce34bddc5cea566202", "version": "0.2.0" } - }, - { - "package": "Spectre", - "repositoryURL": "https://github.com/kylef/Spectre.git", - "state": { - "branch": null, - "revision": "f14ff47f45642aa5703900980b014c2e9394b6e5", - "version": "0.9.0" - } - }, - { - "package": "Stencil", - "repositoryURL": "https://github.com/stencilproject/Stencil.git", - "state": { - "branch": null, - "revision": "0e9a78d6584e3812cd9c09494d5c7b483e8f533c", - "version": "0.13.1" - } } ] }, diff --git a/samhuri.net/Package.swift b/samhuri.net/Package.swift index 2da060c..da3f0b5 100644 --- a/samhuri.net/Package.swift +++ b/samhuri.net/Package.swift @@ -16,8 +16,7 @@ let package = Package( targets: ["samhuri.net"]), ], dependencies: [ - .package(path: "../SiteGenerator"), - .package(url: "https://github.com/stencilproject/Stencil.git", from: "0.13.0"), + .package(url: "https://github.com/johnsundell/ink.git", from: "0.2.0"), .package(url: "https://github.com/johnsundell/plot.git", from: "0.2.0"), ], targets: [ @@ -26,9 +25,8 @@ let package = Package( .target( name: "samhuri.net", dependencies: [ + "Ink", "Plot", - "SiteGenerator", - "Stencil", ]), .testTarget( name: "samhuri.netTests", diff --git a/samhuri.net/Sources/samhuri.net/Date+Sugar.swift b/samhuri.net/Sources/samhuri.net/Date+Sugar.swift index 82c32b4..1483e3c 100644 --- a/samhuri.net/Sources/samhuri.net/Date+Sugar.swift +++ b/samhuri.net/Sources/samhuri.net/Date+Sugar.swift @@ -11,4 +11,12 @@ extension Date { var year: Int { Calendar.current.dateComponents([.year], from: self).year! } + + var month: Int { + Calendar.current.dateComponents([.month], from: self).month! + } + + var day: Int { + Calendar.current.dateComponents([.day], from: self).day! + } } diff --git a/samhuri.net/Sources/samhuri.net/Page.swift b/samhuri.net/Sources/samhuri.net/Page.swift index 488da84..2246f9a 100644 --- a/samhuri.net/Sources/samhuri.net/Page.swift +++ b/samhuri.net/Sources/samhuri.net/Page.swift @@ -6,7 +6,6 @@ // import Foundation -import SiteGenerator struct Page { let title: String diff --git a/samhuri.net/Sources/samhuri.net/PageRenderer.swift b/samhuri.net/Sources/samhuri.net/PageRenderer.swift index 16e6768..9bcb22a 100644 --- a/samhuri.net/Sources/samhuri.net/PageRenderer.swift +++ b/samhuri.net/Sources/samhuri.net/PageRenderer.swift @@ -7,22 +7,8 @@ import Foundation import Plot -import SiteGenerator - -#warning("Deprecated imports") -import PathKit -import Stencil final class PageRenderer { - @available(*, deprecated) - let stencil: Environment - - init(templatesURL: URL) { - let templatesPath = Path(templatesURL.path) - let loader = FileSystemLoader(paths: [templatesPath]) - self.stencil = Environment(loader: loader) - } - func render(_ body: Node
{{ post.date }}
- {{ post.body }} - {% if post.isLink %} - - {% endif %} --
-