hyla 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTIwOTg4YjcxOWI4ZTRhNjUwMDg3Yzk2YjE3NjIxNTgwZjFhODk0OA==
+    ZmU1MzBjMmY0NDBkYjhiMGYwNWY5Y2M2N2RhN2M5MmEzNWZjMTIxNg==
   data.tar.gz: !binary |-
-    MTNjYjdjODA5ODRkNGZkOTk2ZmIyZmZlNGY3NGU0Zjk4NmJlYzk2Yg==
+    MzRhZjkyNzcwYTBiM2FiNDg5ODNmMTQ1ZWE2MTNhNDlhNDc1ODQwNQ==
 SHA512:
   metadata.gz: !binary |-
-    YTY1ZjViYWMzODRkOTZkMGI1YTkzNWM2MDc5N2ZiNWZjMWFmZjMzNDk5NjI5
-    MWI0NWY1MWU2Y2I0ZTNjMjFlZDI1ZDIyN2E0MTY5MjMxNzMwNjg1YjA5OGQ1
-    YTU4Mzg2MTU0OWRlOThkOTM3MTNiNzI5OWY1ZDc4YmU3NjAwNWM=
+    OGU0ZTBlNDI4MTFkZjY2MTkwMGIzYTVkODI5NWQ0ZmI4NWUwODY5OGQ0NDlj
+    ODc4M2QyMTI4Mzc3YmM0NGFlZTZiMjcwYTZhZTAwMmY0NTEwODdkZWRmMGMy
+    MzZlYzUzNGM1NzFjYjg3MGJkMDc4ZjU0MDQ0YTY0YzM2ODQwOTU=
   data.tar.gz: !binary |-
-    OWRlNzFmMjQ4Nzc2MDg5MDIzNmMwYjkxZGVhNzJiNWJmOTQyODRlMzNhN2Ji
-    ZTM1OWE2OGFjMzc5YzEyMzMxYzNiZTM2ZjQ2MWIxNTdkNmJkZTdmM2ZlOTFm
-    YzhhOTIzOTEzN2JlNjYxMmJmMjFjOGNmOTczM2ExZjQ3YzE1YjY=
+    MzYwOTg4MmVhYTBjNTk3MjYyYzBhYmNjZmQwM2FjZmEyYjc1OTQyNGEwZWY2
+    YjE0MjgzMTgyZGYxMWNjOTFmNzViMzFjZTA1YjJjNzJjM2NmMDRiMWVhYTZl
+    YTc5NzhkOWIwMGExNWI4ZGM4ZmZmNDk3ZDFiZWY3N2IxNWQwYjk=

data/.gitignore

@@ -0,0 +1,30 @@
+*.gem
+*.rbc
+*.lock
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

data/LICENSE.txt

@@ -1,22 +1,13 @@
-Copyright (c) 2013 Charles Mouliard
+Copyright (c) 2013-2014 Charles Mouliard
 
-MIT License
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+    http://www.apache.org/licenses/LICENSE-2.0
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.adoc

@@ -1,6 +1,11 @@
 :icons: font
 :date-uri:
-:linkatts:
+:linkattrs:
+:homepage: http://github.com/cmoulliard/hyla
+:docs: https://github.com/cmoulliard/hyla/blob/master/documentation/introduction.adoc
+:sources: https://github.com/cmoulliard/hyla
+:issues: https://github.com/cmoulliard/hyla/issues/
+:license: https://github.com/cmoulliard/hyla/blob/master/LICENSE.txt
 
 image:https://raw.github.com/cmoulliard/hyla/master/documentation/image/hyla_frog.jpg[Hyla, 100, 100, role="left"] **Hyla** is a Ruby command line tool to create a new
 documentation/training/blog/static web site project, add artefacts (articles, blog, audio, video, content, code source, ...), render it in HTML, SlideShow, ... using asciidoc(tor) as markup language.
@@ -35,18 +40,24 @@ The Hyla project name comes from an arboreal http://en.wikipedia.org/wiki/Hyla[f
 
 == Prerequisites
 
-- https://www.ruby-lang.org/en/[Ruby] > 1.9.3
-- http://guides.rubygems.org/[RubyGems] to install Ruby Applications
+- https://github.com/sstephenson/ruby-build#readme[rbenv-build] which let you to deploy a pre-compiled version of Ruby
 - https://github.com/sstephenson/rbenv[rbenv] to manage different versions of Ruby
+- https://www.ruby-lang.org/en/[Ruby] 1.9.3-p484
+- http://guides.rubygems.org/[RubyGems] to install Ruby Applications
+- http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions-[How do I install and use the browser extensions for LiveReload].
+Be sure to enable the option “Allow access to file URLs” checkbox in Tools > Extensions > LiveReload after installation of Chrome Extension.
+
+image::image/access_local_file.png[Access Local File,650,150]
 
 == Installation
 
+The latest source code is located in the {sources}[Hyla git repository] on GitHub. Hyla can be installed via the +gem+ command, bundler.
+
 Use `gem install` command to deploy Hyla :
 
     $ gem install hyla -y
     
 NOTE :  The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required 
-    
 
 An alternative is to create a Gemfile and add this line :
 
@@ -58,7 +69,7 @@ And then execute:
 
 **Or** install it yourself as:
 
-    $ gem install hyla -v 1.0.1
+    $ gem install hyla -v 1.0.2
 
 == For Developer's only
 
@@ -90,15 +101,65 @@ More info about options and commands available can be find by running the `comma
 
 == Documentation
 
-The `hyla`documentation is available at the link:documentation/introduction.adoc[following address]
+The `hyla` documentation is available at the link:documentation/introduction.adoc[following address]
+
+== Copyright and Licensing
+
+Copyright (C) 2013-2014 Charles Moulliard
+Free use of this software is granted under the terms of the Apache License.
+
+See the {license}[LICENSE] file for details.
+
+== Authors
+
+*Hyla* was written by https://github.com/cmoulliard[Charles Moulliard]
+
+== Contact and Help
+
+Home:: {homepage}
+Docs:: {docs}
+Source repository (git):: {sources}
+Issue tracker (GitHub):: {issues}
+
+== Changelog
+
+=== v1.0.3 - @cmoulliard
+
+New Features::
 
+Bug fixes::
 
+  * Change command option to use as symbol the attribute '-' for the one letter and not '--' for the full name. Example -f --file"
+  * Embedded image is not displayed with html attached (link:{issues}30[#30])
+  * Typo error - missing white space between title and level (link:{issues}33[#33])
+  * -st parameter is not supported by commander (link:{issues}32[#32])
 
+Enhancements / Improvements::
 
+  * Refactor command watch to support to use _confg.yaml file  (link:{issues}??[#??])
+  * Pass as parameter the thread variable - Thread.kill(@t)
+  * Refactor `serve` command to allow to have parameters in _config.yaml file
+  * Clean up report template
+  * Refactor _config.yaml to provide more info on options (link:{issues}31[#31])
+  * Check gem required (link:{issues}10[#10])
+  * Add shell scripts to play with different scenario (link:{issues}34[#34])
+  * Add example of code snippet (link:{issues}37[#37])
+  * Rename adoc2slide and index2slide to adoc2htmlslide, index2htmlslide (link:{issues}38[#38])
 
+=== v1.0.2 (2014-01-31) - @cmoulliard
 
+New Features::
 
+  * PDF rendering option has been added - html2pdf (link:{issues}25[#25])
+  * Email as attachment HTML file generated by asciidoctor - (link:{issues}23[#23],link:{issues}21[#21])
+  * Support RevealJS as template backend for slideshow (link:{issues}29[#29])
 
+Bug fixes::
 
+  * Watch option of the command line does not filter files correctly (link:{issues}28[#28])
+  * Rename require Hyla//WebSocket to require hyla/websocket
 
+Enhancements / Improvements::
 
+  * Rename redhat to liberation
+  * Add comment and link to install LiveReload, fixed issue (link:{issues}28[#28])

data/bin/hyla

@@ -18,27 +18,30 @@ program :description, Hyla::DESCRIPTION
 default_command :default
 
 def add_build_options(c)
-  c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
-  c.option '-V', '--verbose', 'Print verbose output.'
+  c.option '-c','--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
+  c.option '-V','--verbose', 'Print verbose output.'
 end
 
 def add_common_options(c)
-  c.option '--s', '--source [DIR]', 'Source directory (defaults to ./)'
-  c.option '--d', '--destination [DIR]', 'Destination directory (defaults to ./generated_content)'
+  c.option '-s', '--source [DIR]', String, 'Source directory (defaults to ./)'
+  c.option '-d', '--destination [DIR]', String, 'Destination directory (defaults to ./generated_content)'
 end
 
 #
 # Creates a new Hyla project using a template or blank to the PATH specified
 #
 command :new do |c|
-  c.syntax = 'hyla new PATH [options]'
+  c.syntax = 'hyla new [options]'
   c.description = 'Creates a new Hyla project using a template or blank to the PATH specified'
-  c.option '--f','--force', 'Force creation even if PATH already exists'
-  c.option '--b','--blank', 'Creates project but with empty files'
-  c.option '--t','--template_type TEMPLATE_TYPE', String, 'Template Type to be used (documentation, book, training, training-exercises, blog, web, ...)'
+  c.option '-f','--force', 'Force creation even if PATH already exists'
+  c.option '-b','--blank', 'Creates project but with empty files'
+  c.option '-','--template_type [TEMPLATE_TYPE]', String, 'Template Type to be used (documentation, book, training, training-exercises, blog, web, ...)'
+
+  add_common_options(c)
 
   c.action do |args, options|
-    Hyla::Commands::New.process(args, options.__hash__)
+    config = Hyla::Configuration.parse(options.__hash__)
+    Hyla::Commands::New.process(args, config)
   end
 end
 
@@ -46,9 +49,9 @@ end
 # Creates a new file from an artefact within an existing project
 #
 command :create do |c|
-  c.syntax = 'hyla create ARTEFACT TYPE [options]'
+  c.syntax = 'hyla create [options]'
   c.description = 'Creates a new file from asciidoc artefact for an existing project'
-  c.option '--a', '--artefact_type [ARTEFACT_TYPE]', String, 'Artefact Type : article, audio, video, blog entry ...'
+  c.option '-a', '--artefact_type [ARTEFACT_TYPE]', String, 'Artefact Type : article, audio, video, blog entry ...'
   c.option '--t', '--type [TYPE]', String, 'Type : asciidoc, slideshow'
 
   add_common_options(c)
@@ -65,13 +68,13 @@ end
 command :generate do |c|
   c.syntax = 'hyla generate [OPTIONS]'
   c.description = 'Generate content from asciidoc files (Table Of Content, modules, ...) to HTML, Slideshow'
-  c.option '--b', '--backend [BACKEND]', String, 'Backend to be used : HTML5, deckjs, revealjs, ...'
+  c.option '-b', '--backend [BACKEND]', String, 'Backend to be used : HTML5, deckjs, revealjs, ...'
   c.option '-f', '--file [HTML FILE]', String, 'HTML File name'
-  c.option '--p', '--project_name [PROJECT_NAME]', String, 'Project Name'
-  c.option '--r', '--rendering [RENDERING]', String, 'Code of the rendering : adoc2html, adoc2slide, toc2adoc, index2slide'
+  c.option '-p', '--project_name [PROJECT_NAME]', String, 'Project Name'
+  c.option '-r', '--rendering [RENDERING]', String, 'Code of the rendering : adoc2html, adoc2htmlslide, toc2adoc, index2htmlslide, html2pdf'
   c.option '--t', '--toc [PATH]', String, 'File Path of the asciidoc file containing the Table of Content'
-  c.option '--st', '--style [STYLE]', String, 'Stylesheet theme to be applied : asciidoctor, liberation, github, colony, foundation, ...'
-  c.option '--a', '--attributes [KEY=VALUE,KEY=VALUE]', String, 'Asciidoctor attributes'
+  c.option '-y', '--style [STYLE]', String, 'Stylesheet theme to be applied : asciidoctor, liberation, github, colony, foundation, ...'
+  c.option '-a', '--attributes [KEY=VALUE,KEY=VALUE]', String, 'Asciidoctor attributes'
 
   add_common_options(c)
 
@@ -89,12 +92,11 @@ command :watch do |c|
 
   c.action do |args, options|
 
-    options.default :serving => true
-
     # TODO Find if it is possible to watch files, generate HTML content - asciidoctor, expose content using HTTPServer and expose WebSocket - LiveReload
     # as they are started in 2 different threads, this is not possible with existing code
     # Hyla::Commands::Serve.process(args,options.__hash__)
-    Hyla::Commands::Watch.process(args, options.__hash__)
+    config = Hyla::Configuration.parse(options.__hash__)
+    Hyla::Commands::Watch.process(args, config)
   end
 end
 
@@ -103,7 +105,7 @@ end
 command :serve do |c|
   c.syntax = 'hyla serve [options]'
   c.description = 'Serve your content locally'
-  c.option '--out_dir DIR', String, 'Output directory where content must be generated'
+  c.option '-out_dir DIR', String, 'Output directory where content must be generated'
   c.option '-B', '--detach', 'Run the server in the background (detach)'
   c.option '-P', '--port [PORT]', 'Port to listen on'
   c.option '-H', '--host [HOST]', 'Host to bind to'

data/documentation/introduction.adoc

@@ -48,7 +48,7 @@ The Hyla project name comes from an arboreal http://en.wikipedia.org/wiki/Hyla[f
 - http://feedback.livereload.com/knowledgebase/articles/86242-how-do-i-install-and-use-the-browser-extensions-[How do I install and use the browser extensions for LiveReload].
 Be sure to enable the option “Allow access to file URLs” checkbox in Tools > Extensions > LiveReload after installation of Chrome Extension.
 
-image::image/access_local_file.png[Access Local File,600,150]
+image::image/access_local_file.png[Access Local File,650,150]
 
 == Installation
 
@@ -56,7 +56,7 @@ Use `gem install` command to deploy Hyla :
 
     $ gem install hyla -y -v 1.0.x
 
-NOTE :  The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required
+NOTE : The option `-y` will tell to rubyGems to deploy the gem but also the dependencies required
 
 NOTE : The option `-v` tells to gem installer to deploy a specific version / release. The release number will depend on the version available (1.0.1, 1.0.2, ...)
 
@@ -70,13 +70,15 @@ And then execute:
 
 **Or** install it yourself as:
 
-    $ gem install hyla -v 1.0.1
+    $ gem install hyla -v _version_
+
+where _version_ should be 1.0.2, 1.0.x
 
 == For Developer's only
 
     Clone Git project locally, move to Hyla directory and execute the following commands
     gem build hyla.gemspec
-    gem install hyla-1.0.x.gem
+    gem install hyla-1.0.x
 
 == To publish Hyla to Gem Repo
 
@@ -101,6 +103,8 @@ More info about options and commands available can be find by running the `comma
 
 == Scenario
 
+The following scenario describes how we can can setup a project using one of the option proposed by Hyla : Create, Generate, Watch, ...
+
 ==== 1. Delete Temp directory
 
     rm -rf ~/hyla/MyBlankProject/
@@ -111,12 +115,7 @@ More info about options and commands available can be find by running the `comma
     rm -rf ~/hyla/MyTrainingExercisesProject/
     rm -rf ~/hyla/MyDeckSlideShow/
     rm -rf ~/hyla/MyRevealSlideShow/
-
-==== 2. Install Gem Hyla
-
-    gem install hyla -v _version_
-
-where _version_ could be 1.0.1
+    rm -rf ~/hyla/MyEmailProject/
 
 == 1. Blank Project & Artefacts
 
@@ -137,21 +136,24 @@ Using hyla we will create a new project (= directory) and add artefacts (article
 
 - Create Asciidoc files from samples (book, article, image, audio, ...)
 
-    hyla create --t asciidoc --a article --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a book --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a image --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a audio --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a video --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a source --d ~/hyla/MyBlankProject
-    hyla create --t asciidoc --a table --d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a article -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a book -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a image -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a audio -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a video -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a source -d ~/hyla/MyBlankProject
+    hyla create --t asciidoc -a table -d ~/hyla/MyBlankProject
 
 == 3.  Create a Blank Project using _config.yaml config file, add artefacts
 
-- Clean and create a MyBlankProject (= directory) using --force option
+- Clean up project and create a MyBlankProject (= directory) using --force option
 
     cd ~/hyla
     rm -rf MyBlankProject/
+
+    # Create a Blank project but containing the yaml config file
     hyla new --blank MyBlankProject --force
+
     cd MyBlankProject
 
 - Create Asciidoc files from samples (book, article, image, audio, ...)
@@ -166,28 +168,28 @@ Using hyla we will create a new project (= directory) and add artefacts (article
 
 === 4. Generate HTML Content of an existing project (asciidoc 2 html)
 
-    hyla generate --r adoc2html --s ~/hyla/MyBlankProject/ --d ~/hyla/MyBlankProject/generated_content
+    hyla generate -r adoc2html -s ~/hyla/MyBlankProject/ -d ~/hyla/MyBlankProject/generated_content
 
 === 5. Generate HTML Content of an existing project (asciidoc 2 html) with a different style
 
     Styles available : liberation, asciidoctor, colony, foundation, foundation-lime, foundation-potion, github, golo, iconic, maker, readthedocs, riak, rocket-panda, rubygems
 
-    hyla generate --r adoc2html --s ~/hyla/MyBlankProject/ --d ~/hyla/MyBlankProject/generated_content --style liberation
-    hyla generate --r adoc2html --s ~/hyla/MyBlankProject/ --d ~/hyla/MyBlankProject/generated_content --style github
-    hyla generate --r adoc2html --s ~/hyla/MyBlankProject/ --d ~/hyla/MyBlankProject/generated_content --style foundation
+    hyla generate -r adoc2html -s ~/hyla/MyBlankProject/ -d ~/hyla/MyBlankProject/generated_content --style liberation
+    hyla generate -r adoc2html -s ~/hyla/MyBlankProject/ -d ~/hyla/MyBlankProject/generated_content --style github
+    hyla generate -r adoc2html -s ~/hyla/MyBlankProject/ -d ~/hyla/MyBlankProject/generated_content --style foundation
 
 === 6. Generate HTML Content within project
 
-    hyla generate --r adoc2html --s . --d generated_content
+    hyla generate -r adoc2html -s . -d generated_content
 
 === 7. Generate HTML Content within project & using Config File
 
    As destination directory is not longer '.' (which is the case when we add artefacts using `hyla create` command, then we must change the destination directory to `generated_content`. the original file is
    still available as it will backup by ruby
 
-    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yml
+    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yaml
     hyla generate
-    hyla generate --style foundation
+    hyla generate -y foundation
 
 
 == 2. Project from Template
@@ -206,16 +208,16 @@ Using hyla we will create a new project (= directory) and add artefacts (article
 === 2. Generate content and watch it
 
     cd ~/hyla/MyTrainingProject
-    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yml
+    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yaml
     hyla generate
 
-    hyla watch --s ~/hyla/MyTrainingProject/ --d ~/hyla/MyTrainingProject/generated_content
+    hyla watch -s ~/hyla/MyTrainingProject/ -d ~/hyla/MyTrainingProject/generated_content
 
 == 3. Table Of Content To asciidoc
 
 === 1. Generate an asciidoctor project from a Table of Content
 
-The entry point of a Documention site, Training, Publication or Book will consist most of the time to create
+The entry point of a Documentation site, Training, Publication or Book will consist most of the time to create
 a Table Of Content which is a collection of modules with chapters that we will develop. As this process to elaborate
 the structure of the project will consume lot of time/effort, Hyla will simplify your life as it allows from a TOC file
 
@@ -244,8 +246,8 @@ slideshow presentation using as backend (DeckJS, DZSlides, ...) later on.
 
 - Generate asciidoc files from a Table Of Content (= collection of folders and files) and next HTML
 
-    hyla generate --r toc2adoc --p my-project --d ~/hyla/MyTocProject/ --toc ~/MyProjects/hyla/data/toc.adoc
-    hyla generate --r adoc2html --s ~/hyla/MyTocProject/ --d ~/hyla/MyTocProject/generated_content
+    hyla generate -r toc2adoc -p my-project -d ~/hyla/MyTocProject/ --toc ~/MyProjects/hyla/data/toc.adoc
+    hyla generate -r adoc2html -s ~/hyla/MyTocProject/ -d ~/hyla/MyTocProject/generated_content
 
 Example about what is generated
 
@@ -267,7 +269,7 @@ While you develop asciidoc(tor) documents, it is interesting to consult the file
 as a WebSocket server is exposed for the browser. To watch files and let's asciidoctor to render them, simply open a terminal and provide as
  parameter the source directory containing the files to be watched.
 
-    hyla watch --s ~/hyla/MyTocProject/ --d ~/hyla/MyTocProject/generated_content
+    hyla watch -s ~/hyla/MyTocProject/ -d ~/hyla/MyTocProject/generated_content
 
 === 2. Generate an asciidoctor project from a Table of Content using YAML config file and watch content
 
@@ -279,20 +281,20 @@ as a WebSocket server is exposed for the browser. To watch files and let's ascii
 
     # Change destination in config files or pass info as option
     # cd ../MyTocProject/
-    # subl _config.yml
-    hyla generate --r adoc2html
+    # subl _config.yaml
+    hyla generate -r adoc2html
 
-    hyla watch --s ~/hyla/MyTocProject/ --d generated_content
+    hyla watch -s ~/hyla/MyTocProject/ -d generated_content
 
 === 3. Generate a DeckJS Slideshow for a module
 
     cd ~/hyla/MyTocProject
-    hyla generate --backend deckjs --s  A_Introduction_module/ --d A_Introduction_module/generated_content --r index2slide
+    hyla generate --backend deckjs -s  A_Introduction_module/ -d A_Introduction_module/generated_content -r index2htmlslide
 
 === 4. Generate a DeckJS Slideshow for a Project (all the TOC)
 
     cd ~/hyla/MyTocProject
-    hyla generate --backend deckjs --s  . --d generated_content --r index2slide --trace
+    hyla generate --backend deckjs -s  . -d generated_content -r index2htmlslide
 
 == 5. Server content locally - HTTP Server
 
@@ -307,31 +309,31 @@ Hyla command in another Terminal
 
     rm -rf  ~/hyla/MyDeckSlideShow
     cd ~/hyla
-    hyla new --blank MyDeckSlideShow
+    hyla new -b -d MyDeckSlideShow
 
-    hyla create --t slideshow --a deckjs --d MyDeckSlideShow
-    hyla generate --backend deckjs --s  ~/hyla/MyDeckSlideShow --d ~/hyla/MyDeckSlideShow/generated_content --r adoc2slide
+   hyla create --t slideshow -a deckjs -d MyDeckSlideShow
+   hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2htmlslide
 
 === 2. Different DeckJS Style options
 
-    hyla generate --backend deckjs --s  ~/hyla/MyDeckSlideShow --d ~/hyla/MyDeckSlideShow/generated_content --r index2slide --a deckjs_theme=swiss,deckjs_transition=fade
-    hyla generate --backend deckjs --s  ~/hyla/MyDeckSlideShow --d ~/hyla/MyDeckSlideShow/generated_content --r index2slide --a deckjs_theme=web-2.0,deckjs_transition=horizontal-slide
+    hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2htmlslide -a deckjs_theme=swiss,deckjs_transition=fade
+    hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2htmlslide -a deckjs_theme=web-2.0,deckjs_transition=horizontal-slide
 
 ===  3. RevealJS
 
     rm -rf ~/hyla/MyRevealSlideShow
     cd ~/hyla
-    hyla new --blank MyRevealSlideShow
+    hyla new --blank -d MyRevealSlideShow
 
-    hyla create --t slideshow --a revealjs --d MyRevealSlideShow
+    hyla create --t slideshow -a revealjs -d MyRevealSlideShow
 
     cd MyRevealSlideShow
 
-    hyla generate --backend revealjs --s . --d generated_content --r adoc2slide
+    hyla generate --backend revealjs -s . -d generated_content -r adoc2htmlslide
 
     open http://localhost:4000/hyla/slideshow_revealjs.html &
 
-    hyla serve -P 4000 -H localhost -b /hyla/ --out_dir ~/hyla/MyRevealSlideShow/generated_content/
+    hyla serve -P 4000 -H localhost -b /hyla/ -d generated_content/
 
 == 7. Generate a PDF
 
@@ -342,17 +344,12 @@ libraries https://github.com/pdfkit/pdfkit[pdfkit] and https://github.com/wkhtml
 
     cd ~/hyla
     rm -rf MyPdfroject/
-    hyla new --blank MyPdfProject --force
+    hyla new -b -d MyPdfProject --force
     cd MyPdfProject
 
-- Create 2 Asciidoc files from samples (book, image)
-
-    hyla create --a book
-    hyla create --a image
-
-- Change destination firm local '.' to 'generated_content'
+- Create Asciidoc file from sample (book)
 
-    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yml
+    hyla create -a book --t asciidoc -d .
 
 - Generate HTML content using foundation stylesheet
 
@@ -360,12 +357,12 @@ libraries https://github.com/pdfkit/pdfkit[pdfkit] and https://github.com/wkhtml
 
 - We change the rendering from adoc2html to html2pdf
 
-    ruby -i.bak -pe 'sub(%r{rendering: adoc2html},"rendering: html2pdf")' _config.yml
+    ruby -i.bak -pe 'sub(%r{rendering: adoc2html},"rendering: html2pdf")' _config.yaml
 
 - Source directory & Destination directory
 
-    ruby -i.bak -pe 'sub(%r{source: .},"source: ./generated_content")' _config.yml
-    ruby -i.bak -pe 'sub(%r{destination: generated_content},"destination: ./generated_content/pdf")' _config.yml
+    ruby -i.bak -pe 'sub(%r{source: .},"source: ./generated_content")' _config.yaml
+    ruby -i.bak -pe 'sub(%r{destination: generated_content},"destination: ./generated_content/pdf")' _config.yaml
 
 - We will generate the PDF file for the image and book
 
@@ -403,14 +400,14 @@ Two new options are required to process the request on the command line or using
 
     cd ~/hyla
     rm -rf MyEmailProject/
-    hyla new --blank MyEmailProject --force
+    hyla new -b -d MyEmailProject --force
     cd MyEmailProject
 
-- Edit the _config.yaml file and add the parameters required (see previously)
+- Add an asciidoc file (report, doc, book, article)
 
-- Change destination firm local '.' to 'generated_content'
+    hyla create --a book --d .
 
-    ruby -i.bak -pe 'sub(%r{destination: .},"destination: generated_content")' _config.yml
+- Edit the _config.yaml file and add the parameters required (see previously)
 
 - Generate HTML content using foundation stylesheet