Skip to content

Commit 4482527

Browse files
committed
Merge pull request #52 from pnathan/better-readme-and-hygine
Improve readme.org and add in the git hash to the footer.
2 parents f2fd5fd + a50996c commit 4482527

File tree

3 files changed

+84
-16
lines changed

3 files changed

+84
-16
lines changed

README.org

+54-10
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ docs/specs for a tutorial/introduction site for a Common Lisp environment
66

77
** Dear Reader,
88

9-
One of the key problems in onboarding developers to use modern Common Lisp is the vertical wall of difficulty. Things that are routinely problematic:
9+
One of the key problems in onboarding developers to use modern Common
10+
Lisp is the vertical wall of difficulty. Things that are routinely
11+
problematic:
1012

1113
- emacs use. Most people don't use emacs.
1214

@@ -17,9 +19,21 @@ One of the key problems in onboarding developers to use modern Common Lisp is th
1719
- Putting together serious projects is not commonly discussed.
1820

1921

20-
This repository is the source code to build a Common Lisp site dedicated to handling these problems. My goal is to put together an introduction/tutorial for practicing professionals and hobbyists from other languages. People who want to get started with Lisp beyond just typing into a REPL. Right now, it feels like this information is less disseminated and much less centralized than it otherwise might be. It's not intended to be a HOWTO for Common Lisp. That's been covered *quite* well. But it is intended to be a HOWTO on how to put together a Lisp *environment*.
22+
This repository is the source code to build a Common Lisp site
23+
dedicated to handling these problems. My goal is to put together an
24+
introduction/tutorial for practicing professionals and hobbyists from
25+
other languages. People who want to get started with Lisp beyond just
26+
typing into a REPL. Right now, it feels like this information is less
27+
disseminated and much less centralized than it otherwise might be.
28+
It's not intended to be a HOWTO for Common Lisp. That's been covered
29+
*quite* well. But it is intended to be a HOWTO on how to put together
30+
a Lisp *environment*.
2131

22-
Anyway, I'd like to collaborate with other people to build a remarkably fine Lisp help site. Contributions are both *accepted* and *welcome*. It's a wholly static site at this point in time - I don't see a need for articulate-lisp.com to have a dynamic backend. Perhaps/probably one of the code examples will be a webapp.
32+
Anyway, I'd like to collaborate with other people to build a
33+
remarkably fine Lisp help site. Contributions are both *accepted* and
34+
*welcome*. It's a wholly static site at this point in time - I don't
35+
see a need for articulate-lisp.com to have a dynamic
36+
backend. Perhaps/probably one of the code examples will be a webapp.
2337

2438
Happy Hacking,
2539

@@ -28,18 +42,48 @@ Paul Nathan
2842
P.S.: feel free to contact me for anything you like.
2943

3044

45+
** Making Contributions.
46+
47+
Please send in pull requests or issues!
48+
49+
Each pull request is vetted to correctly compile in Jekyll; this is
50+
then logged on Github and has to pass for a pull request to be
51+
mergable to master.
52+
53+
3154
** Notes regarding build process.
3255

33-
This is a Jekyll site; the existing build scripts use Dockerized
34-
Jekyll for sandboxing.
56+
Articulate Common Lisp is super-heavy on Docker
57+
(http://docker.com/). Docker is used for doing builds, as well as the
58+
vehicle of deployment. This is because we think it's simpler than
59+
having to install all sorts of other dependencies and keeping them up
60+
to date.
61+
62+
This is a Jekyll site; therefore existing build scripts use Dockerized
63+
Jekyll to do the build.
64+
65+
If you run this...
66+
67+
#+BEGIN_EXAMPLE
68+
./livetest.sh
69+
#+END_EXAMPLE
70+
71+
You will have a hot-rebuilding Jekyll server running on
72+
http://localhost:4000. Hit Ctrl-C to stop it. This is very useful for
73+
contributing content!
74+
75+
76+
If you run this...
3577

36-
Unfortunately, I don't have autobuild yet set up to Docker build &&
37-
docker push, as that requires credentials and capabilities Travis
38-
doesn't have yet.4
78+
#+BEGIN_EXAMPLE
79+
./build.sh
80+
#+END_EXAMPLE
3981

40-
** Contributions.
82+
You will then have the Jekyll compile occur, then the Docker instance
83+
build.
4184

42-
Please send in pull requests!
85+
This is the process used to deploy new versions onto Docker Hub; these
86+
are then downloaded onto the VPS and started up.
4387

4488

4589
** License information & legalities.

_includes/footer.html

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,20 @@
44
<center>
55
&lambda;
66
</center>
7-
8-
<footer class="footer">
9-
&copy; Paul Nathan and others; licenced under the AGPL3 except where specified.
107
<p>
11-
<a href="https://github.com/{{ site.github }}"> Github source</a> - contributions welcome!
8+
<footer class="footer">
9+
<center>{{ site.data['hash']}}</center>
10+
<p>
11+
<a href="https://github.com/{{ site.github }}"> Github source</a> - contributions welcome!
12+
<p>
13+
&copy; Paul Nathan and others; licenced under the AGPL3 except where specified.
1214
<p>
1315
Powered by <a href="http://jekyllrb.com">Jekyll</a>,
1416
theme by <a href="https://github.com/scotte/jekyll-clean">Scott Emmons</a>
1517
under
1618
<a href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution</a></p>
17-
</footer>
18-
</div>
19+
</footer>
20+
</div>
1921
</div>
2022
</div>
2123

_plugins/jekyll-git-hash.rb

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Jekyll plugin for generating Git hash
2+
#
3+
# Place this file in the _plugins directory and
4+
# use {{ site.data['hash'] }} in your Liquid templates
5+
#
6+
# Author: Yegor Bugayenko <yegor@tpc2.com>
7+
# Source: http://github.com/yegor256/jekyll-git-hash
8+
#
9+
# Distributed under the MIT license
10+
# Copyright Yegor Bugayenko, 2014
11+
# modifications pnathan 2015
12+
13+
module Jekyll
14+
class GitHashGenerator < Generator
15+
priority :high
16+
safe true
17+
def generate(site)
18+
hash = %x( git rev-parse HEAD ).strip
19+
site.data['hash'] = hash
20+
end
21+
end
22+
end

0 commit comments

Comments
 (0)