Permalink
Browse files

Fixed nanoc regression, added footer matter

  • Loading branch information...
1 parent 6238e2c commit b9fceffc3d53566842391bb5f2540c7b7edcd1c2 @wifelette wifelette committed Oct 29, 2014
Showing with 103 additions and 9 deletions.
  1. +3 −0 Gemfile
  2. +23 −3 index.html
  3. +26 −0 stylesheets/stylesheet.css
  4. +25 −6 website/content/index.markdown
  5. +26 −0 website/content/stylesheets/stylesheet.css
View
@@ -4,3 +4,6 @@ source "https://rubygems.org"
gem "nanoc", "~> 3.2.0"
gem "kramdown"
gem "rake"
+gem "fssm"
+gem "rack"
+gem "mime-types"
View
@@ -292,7 +292,7 @@ <h1 id="options-and-flags">Options and Flags</h1>
<pre class="brush: plain; gutter: false; toolbar: false">
$ ./cli hello Yehuda
-No value provided for required options '--from'
+No value provided for required options &#39;--from&#39;
</pre></div>
<p>The full list of metadata you can provide for an option:</p>
@@ -376,7 +376,7 @@ <h1 id="subcommands">Subcommands</h1>
<p>As your CLI becomes more complex, you might want to be able to specify a
command that points at its own set of subcommands. One example of this
is the <code>git remote</code> command, which exposes <code>add</code>, <code>rename</code>, <code>rm</code>,
-<code>prune</code>, <code>set-head</code>, and so in.</p>
+<code>prune</code>, <code>set-head</code>, and so on.</p>
<p>In Thor, you can achieve this easily by creating a new Thor class to
represent the subcommand, and point to it from the parent class. Let’s
@@ -403,7 +403,7 @@ <h1 id="subcommands">Subcommands</h1>
refspec to track only &lt;branch&gt; is created. You can give more than one -t &lt;branch&gt; to track multiple branches without grabbing all
branches.
- With -m &lt;master&gt; option, $GIT_DIR/remotes/&lt;name&gt;/HEAD is set up to point at remote's &lt;master&gt; branch. See also the set-head
+ With -m &lt;master&gt; option, $GIT_DIR/remotes/&lt;name&gt;/HEAD is set up to point at remote&#39;s &lt;master&gt; branch. See also the set-head
command.
When a fetch mirror is created with --mirror=fetch, the refs will not be stored in the refs/remotes/ namespace, but rather
@@ -441,6 +441,26 @@ <h1 id="subcommands">Subcommands</h1>
<p>You can access the options from the parent command in a subcommand using
the <code>parent_options</code> accessor.</p>
+<header>
+ Do you use Thor? Help support the people who made and maintain it!
+
+<div class="footer">
+ <div class="person">
+ <p><a href="http://www.twitter.com/wycats">Yehuda Katz</a></p>
+ <div class="gratipay">
+ <script data-gratipay-username="wycats" src="//grtp.co/v1.js"></script>
+ </div>
+ </div>
+
+ <div class="person">
+ <p><a href="http://www.twitter.com/sferik">Erik Michaels-Ober</a></p>
+ <div class="gratipay">
+ <script data-gratipay-username="sferik" src="//grtp.co/v1.js"></script>
+ </div>
+ </div>
+</div>
+</header>
+
</div>
<script>SyntaxHighlighter.all();</script>
</body>
View
@@ -48,6 +48,7 @@ header {
font-weight: 400;
line-height: 28px;
color: #925700;
+ overflow: hidden;
}
header a:link, header a:visited {
@@ -93,3 +94,28 @@ code {
color: #723700;
font-family: Menlo, Monaco, Courier, monospace;
}
+
+.footer {
+
+}
+
+#main .footer p {
+ font-size: 15px;
+ margin-bottom: 0px;
+ padding-bottom: 0px;
+ text-align: center;
+}
+
+#main .footer .person {
+ float: left;
+ width: 50%;
+}
+
+#main iframe {
+ margin: 0 auto;
+}
+
+.gratipay {
+ margin: 0 auto;
+ text-align: center;
+}
@@ -3,9 +3,7 @@ title: Home
---
<header>
-Thor is a toolkit for building powerful command-line interfaces. It is
-used in Bundler, Vagrant, Rails, and
-<a href="http://gemfamily.info/gems/thor">197 other gems</a>.
+Thor is a toolkit for building powerful command-line interfaces. It is used in Bundler, Vagrant, Rails and others.
</header>
# Getting Started
@@ -262,8 +260,7 @@ The full list of metadata you can provide for an option:
option cannot be both `:required` and have a `:default`.
* `:type`: `:string`, `:hash`, `:array`, `:numeric`, or `:boolean`
* `:aliases`: A list of aliases for this option. Typically, you would
- use aliases to provide short versions of the option. Each alias is a string
- and it has a prepended dash (for example: `"-f"`).
+ use aliases to provide short versions of the option.
You can use a shorthand to specify a number of options at once if you
just want to specify the type of the options. You could rewrite the
@@ -375,7 +372,7 @@ module GitCLI
class Git < Thor
desc "fetch <repository> [<refspec>...]", "Download objects and refs from another repository"
options :all => :boolean, :multiple => :boolean
- option :append, :type => :boolean, :aliases => "-a"
+ option :append, :type => :boolean, :aliases => :a
def fetch(respository, *refspec)
# implement git fetch here
end
@@ -388,3 +385,25 @@ end
You can access the options from the parent command in a subcommand using
the `parent_options` accessor.
+
+<header>
+ Do you use Thor? Help support the people who made and maintain it!
+
+<div class="footer">
+ <div class="person">
+ <p><a href="http://www.twitter.com/wycats">Yehuda Katz</a></p>
+ <div class="gratipay">
+ <script data-gratipay-username="wycats"
+ src="//grtp.co/v1.js"></script>
+ </div>
+ </div>
+
+ <div class="person">
+ <p><a href="http://www.twitter.com/sferik">Erik Michaels-Ober</a></p>
+ <div class="gratipay">
+ <script data-gratipay-username="sferik"
+ src="//grtp.co/v1.js"></script>
+ </div>
+ </div>
+</div>
+</header>
@@ -48,6 +48,7 @@ header {
font-weight: 400;
line-height: 28px;
color: #925700;
+ overflow: hidden;
}
header a:link, header a:visited {
@@ -93,3 +94,28 @@ code {
color: #723700;
font-family: Menlo, Monaco, Courier, monospace;
}
+
+.footer {
+
+}
+
+#main .footer p {
+ font-size: 15px;
+ margin-bottom: 0px;
+ padding-bottom: 0px;
+ text-align: center;
+}
+
+#main .footer .person {
+ float: left;
+ width: 50%;
+}
+
+#main iframe {
+ margin: 0 auto;
+}
+
+.gratipay {
+ margin: 0 auto;
+ text-align: center;
+}

0 comments on commit b9fceff

Please sign in to comment.