Skip to content
Browse files

merged local with remote branches

  • Loading branch information...
2 parents 571a4d9 + 8fe8ff3 commit 973720993730c18c0a8906d6c84d77fa91e87a10 Ian Greulich committed
Showing with 34 additions and 22 deletions.
  1. +33 −21 index.html
  2. +1 −1 params.json
View
54 index.html
@@ -35,59 +35,67 @@ <h2 id="project_tagline">Making Sinatra even easier.</h2>
<p>Making Sinatra even easier.</p>
-<p>Sing will create the basic directory structure and base files for a Sinatra
-webapp. It creates your Gemfile (containing haml, sass, and compass),
-config.ru, index.haml, application.scss, and downloads jquery for you.</p>
+<p>Sing will create the basic directory structure and base files for a Sinatra webapp. It creates your Gemfile (containing haml, sass, and compass), config.ru, index.haml, application.scss, and downloads jquery for you.</p>
<p>I created this with ruby 1.9.2, but it should work in 1.8.7 just fine.</p>
+<h3>Installation</h3>
+
+<hr><p>To install, assuming you are using <a href="http://beginrescueend.com/">RVM</a> (and you should be),</p>
+
+<pre><code>gem install sing
+</code></pre>
+
<h3>Examples</h3>
-<hr><p>Create a new project; from the dirctory you want the project directory
-to live in:</p>
+<hr><p>Create a new project; from the dirctory you want the project directory to live in:</p>
<pre><code>sing new my_project
</code></pre>
-<p>Other examples:</p>
-<pre><code>sing -p my_project
-sing --verbose my_project
-</code></pre>
<h3>Usage</h3>
-<hr><pre><code>sing [options] my_project
+<hr><pre><code>sing command project_name
</code></pre>
<p>For help use:</p>
-<pre><code>sing -h
+<pre><code>sing help
</code></pre>
-<h3>Options</h3>
+<h3>Commands</h3>
+
+<hr><p>Currently the commands are limited to:</p>
-<hr><pre><code>-h, --help Displays help message
--v, --version Display the version
--q, --quiet Output as little as possible, overrides verbose
--V, --verbose Verbose output (default)
+<pre><code>sing new
+sing help
</code></pre>
+<p>but I am open to adding more.</p>
+
+
+
<h3>Authors</h3>
<hr><p>Ian Greulich<br>
- Based on Sow by David Duggins</p>
+Based on Sow by David Duggins</p>
<h3>Copyright</h3>
<hr><p>Copyright (c) 2012 Ian Greulich. Licensed under the MIT License:<br>
- <a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a><br>
- Copyright (c) 2010 David Duggins. Licensed under GPL2:<br>
- <a href="http://www.opensource.org/licenses/GPL-2.0">http://www.opensource.org/licenses/GPL-2.0</a></p>
+<a href="http://www.opensource.org/licenses/mit-license.php">http://www.opensource.org/licenses/mit-license.php</a><br>
+Copyright (c) 2010 David Duggins. Licensed under GPL2:<br>
+<a href="http://www.opensource.org/licenses/GPL-2.0">http://www.opensource.org/licenses/GPL-2.0</a></p>
<h3>CHANGE LOG:</h3>
-<hr><h4>2012.04.04</h4>
+<hr><h4>2012.04.09</h4>
+
+<p>Refactored so basic command line structure now works <code>sing new my_project</code></p>
+
+<h4>2012.04.04</h4>
<p>Changed Readme.md to define the scope of the next steps of the development of Sing.</p>
@@ -98,6 +106,10 @@ <h2 id="project_tagline">Making Sinatra even easier.</h2>
<h4>2010.05.04</h4>
<p>Created the script, got the directory structure up and running</p>
+
+<h3>TODO:</h3>
+
+<hr><p>Add global switches for versioning, and reduced output</p>
</section>
</div>
View
2 params.json
@@ -1 +1 @@
-{"name":"Sing","body":"## Sing\r\nMaking Sinatra even easier.\r\n\r\nSing will create the basic directory structure and base files for a Sinatra \r\nwebapp. It creates your Gemfile (containing haml, sass, and compass), \r\nconfig.ru, index.haml, application.scss, and downloads jquery for you.\r\n\r\nI created this with ruby 1.9.2, but it should work in 1.8.7 just fine.\r\n\r\n### Examples\r\n---\r\nCreate a new project; from the dirctory you want the project directory\r\nto live in:\r\n\r\n sing new my_project\r\n\r\nOther examples:\r\n\r\n sing -p my_project\r\n sing --verbose my_project\r\n\r\n### Usage\r\n---\r\n sing [options] my_project\r\n\r\nFor help use:\r\n\r\n sing -h\r\n\r\n### Options\r\n---\r\n -h, --help Displays help message \r\n -v, --version Display the version \r\n -q, --quiet Output as little as possible, overrides verbose \r\n -V, --verbose Verbose output (default)\r\n\r\n### Authors\r\n---\r\n Ian Greulich \r\n Based on Sow by David Duggins\r\n\r\n### Copyright\r\n---\r\n Copyright (c) 2012 Ian Greulich. Licensed under the MIT License: \r\n http://www.opensource.org/licenses/mit-license.php \r\n Copyright (c) 2010 David Duggins. Licensed under GPL2: \r\n http://www.opensource.org/licenses/GPL-2.0\r\n\r\n### CHANGE LOG:\r\n---\r\n#### 2012.04.04\r\nChanged Readme.md to define the scope of the next steps of the development of Sing.\r\n#### 2010.05.14\r\nAdded code to download three js libraries and also create a index.html file with the XHTML Strict Doctype.\r\n#### 2010.05.04\r\nCreated the script, got the directory structure up and running\r\n","tagline":"Making Sinatra even easier.","google":"","note":"Don't delete this file! It's used internally to help with page regeneration."}
+{"tagline":"Making Sinatra even easier.","google":"","note":"Don't delete this file! It's used internally to help with page regeneration.","body":"## Sing\r\nMaking Sinatra even easier.\r\n\r\nSing will create the basic directory structure and base files for a Sinatra webapp. It creates your Gemfile (containing haml, sass, and compass), config.ru, index.haml, application.scss, and downloads jquery for you.\r\n\r\nI created this with ruby 1.9.2, but it should work in 1.8.7 just fine.\r\n\r\n### Installation\r\n---\r\nTo install, assuming you are using [RVM](http://beginrescueend.com/) (and you should be),\r\n\r\n gem install sing\r\n\r\n### Examples\r\n---\r\nCreate a new project; from the dirctory you want the project directory to live in:\r\n\r\n sing new my_project\r\n\r\n<!-- Other examples:\r\n\r\n sing -q new my_project\r\n sing --verbose new my_project\r\n-->\r\n### Usage\r\n---\r\n sing command project_name\r\n\r\nFor help use:\r\n\r\n sing help\r\n\r\n### Commands\r\n---\r\nCurrently the commands are limited to:\r\n\r\n sing new\r\n sing help\r\n\r\nbut I am open to adding more.\r\n\r\n<!-- ### Options\r\n---\r\n -v, --version Display the version \r\n -q, --quiet Output as little as possible, overrides verbose \r\n -V, --verbose Verbose output (default)\r\n-->\r\n### Authors\r\n---\r\nIan Greulich \r\nBased on Sow by David Duggins\r\n\r\n### Copyright\r\n---\r\nCopyright (c) 2012 Ian Greulich. Licensed under the MIT License: \r\nhttp://www.opensource.org/licenses/mit-license.php \r\nCopyright (c) 2010 David Duggins. Licensed under GPL2: \r\nhttp://www.opensource.org/licenses/GPL-2.0\r\n\r\n### CHANGE LOG:\r\n---\r\n#### 2012.04.09\r\nRefactored so basic command line structure now works ```sing new my_project```\r\n#### 2012.04.04\r\nChanged Readme.md to define the scope of the next steps of the development of Sing.\r\n#### 2010.05.14\r\nAdded code to download three js libraries and also create a index.html file with the XHTML Strict Doctype.\r\n#### 2010.05.04\r\nCreated the script, got the directory structure up and running\r\n\r\n### TODO:\r\n---\r\nAdd global switches for versioning, and reduced output\r\n","name":"Sing"}

0 comments on commit 9737209

Please sign in to comment.
Something went wrong with that request. Please try again.