hyla 1.0.3 → 1.0.4

data/documentation/scripts/generate_content_myblankproject_other_style.sh

@@ -10,13 +10,13 @@ cd ~/hyla/MyBlankProject
 
 echo "Add asciidoc files"
 hyla new -b -d MyBlankProject --force
-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 add --t asciidoc --a article --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a book --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a image --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a audio --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a video --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a source --d ~/hyla/MyBlankProject
+hyla add --t asciidoc --a table --d ~/hyla/MyBlankProject
 
 echo "Change style in the _config.yaml file"
 ruby -i.bak -pe 'sub(%r{style: liberation},"style: foundation")' _config.yaml

data/documentation/scripts/generate_pdf_from_html.sh

@@ -9,7 +9,7 @@ cd MyPdfProject
 
 echo "Create one Asciidoc file from sample (book)"
 
-hyla create -a book --t asciidoc -d .
+hyla add -a book --t asciidoc -d .
 
 echo "Generate HTML content using foundation stylesheet"
 

data/documentation/scripts/generate_slideshow_deckjs.sh

@@ -8,11 +8,11 @@ echo "Create a blank project"
 hyla new -b -d MyDeckSlideShow
 
 echo "Create from slideshow template a DeckJS  file"
-hyla create --t slideshow -a deckjs -d MyDeckSlideShow
+hyla add --t slideshow -a deckjs -d MyDeckSlideShow
 
 echo "Generate HTML5 Slideshow content"
-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 adoc2html -a deckjs_theme=swiss,deckjs_transition=fade
 
-# hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2htmlslide
-# hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2htmlslide -a deckjs_theme=web-2.0,deckjs_transition=horizontal-slide
+# hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2html
+# hyla generate --backend deckjs -s  ~/hyla/MyDeckSlideShow -d ~/hyla/MyDeckSlideShow/generated_content -r adoc2html -a deckjs_theme=web-2.0,deckjs_transition=horizontal-slide
 

data/documentation/scripts/generate_slideshow_mytoc_all.sh

@@ -8,10 +8,10 @@ source create_adoc_from_toc.sh $1 $2
 cd ~/hyla/MyTocProject
 
 # echo "Generate slideshow for a module using deckjs as backend"
-hyla generate --backend deckjs -s  . -d generated_content_deckjs -r index2htmlslide
+hyla generate --backend deckjs -s  . -d generated_content_deckjs -r index2html
 open ~/hyla/MyTocProject/generated_content_deckjs/my-project_AllSlides.html
 
 # echo "Generate slideshow for a module using revealjs as backend"
-hyla generate --backend revealjs -s  . -d generated_content_reveal -r index2htmlslide
+hyla generate --backend revealjs -s  . -d generated_content_reveal -r index2html
 
 open ~/hyla/MyTocProject/generated_content_reveal/my-project_AllSlides.html

data/documentation/scripts/generate_slideshow_mytoc_module.sh

@@ -7,4 +7,4 @@ source create_adoc_from_toc.sh $1 $2
 
 echo "Generate slideshow for a module using deckjs as backend"
 cd ~/hyla/MyTocProject
-hyla generate --backend deckjs -s  A_Introduction_module/ -d A_Introduction_module/generated_content -r index2htmlslide
+hyla generate --backend deckjs -s  A_Introduction_module/ -d A_Introduction_module/generated_content -r index2html

data/documentation/scripts/generate_slideshow_revealjs.sh

@@ -8,16 +8,25 @@ echo "Create a blank project"
 hyla new --blank -d MyRevealSlideShow
 
 echo "Create from slideshow template a RevealJS  file"
-hyla create --t slideshow -a revealjs -d MyRevealSlideShow
+hyla add --t slideshow -a revealjs -d MyRevealSlideShow
 
 echo "Generate HTML5 Slideshow content"
 cd MyRevealSlideShow
 
-hyla generate --backend revealjs -s . -d generated_content -r adoc2htmlslide
+echo "Copy logo"
+cp -r /Users/chmoulli/hyla/RevealCreatedContent/image ./image
+
+echo "Change theme to GPE"
+ruby -i.bak -pe 'sub(%r{revealjs_theme: deault},"revealjs_theme: gpe")' _config.yaml
+
+hyla generate --backend revealjs -s . -d generated_content -r adoc2html --trace
 
 echo "Open the slideshow using your web browser"
-open http://localhost:4000/hyla/slideshow_revealjs.html &
+# open http://localhost:4000/hyla/slideshow_revealjs.html &
 
 echo "Start web server"
-hyla serve -P 4000 -H localhost -b /hyla/ -d generated_content/
+# hyla serve -P 4000 -H localhost -b /hyla/ -d generated_content/
+
+echo "Change theme to GPE"
+ruby -i.bak -pe 'sub(%r{revealjs_theme: gpe},"revealjs_theme: default")' _config.yaml
 

data/documentation/scripts/generate_slideshow_revealjs_config.sh

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+echo "Remove MyRevealJS"
+rm -rf ~/hyla/MyRevealSlideShow
+cd ~/hyla
+
+echo "Create a blank project"
+hyla new --blank -d MyRevealSlideShow
+
+echo "Create from slideshow template a RevealJS  file"
+hyla add --t slideshow -a revealjs -d MyRevealSlideShow
+
+echo "Generate HTML5 Slideshow content"
+cd MyRevealSlideShow
+
+echo "Change theme to GPE, backend to reveal"
+ruby -i.bak -pe 'sub(%r{revealjs_theme: default},"revealjs_theme: gpe")' _config.yaml
+ruby -i.bak -pe 'sub(%r{backend: html5},"backend: revealjs")' _config.yaml
+ruby -i.bak -pe 'sub(%r{rendering: adoc2html},"rendering: adoc2html")' _config.yaml
+
+hyla generate
+
+echo "Copy logo"
+cp -r /Users/chmoulli/hyla/RevealCreatedContent/image ./generated_content/image
+
+echo "Open the slideshow using your web browser"
+# open http://localhost:4000/hyla/slideshow_revealjs.html &
+
+echo "Start web server"
+# hyla serve -P 4000 -H localhost -b /hyla/ -d generated_content/
+
+echo "Change theme to GPE"
+#ruby -i.bak -pe 'sub(%r{revealjs_theme: gpe},"revealjs_theme: default")' _config.yaml
+#ruby -i.bak -pe 'sub(%r{backend: revealjs},"backend: html5")' _config.yaml
+#ruby -i.bak -pe 'sub(%r{rendering: adoc2html},"rendering: adoc2html")' _config.yaml
+

data/documentation/scripts/sendmail.sh

@@ -8,7 +8,7 @@ hyla new -b -d ~/hyla/MyEmailProject --force
 cd ~/hyla/MyEmailProject
 
 echo "Add an artefact - asciidoc with images"
-hyla create --a image --d ~/hyla/MyEmailProject
+hyla add --a image --d ~/hyla/MyEmailProject
 
 echo "Generate HTML content"
 hyla generate -r adoc2html -s ~/hyla/MyEmailProject/ -d ~/hyla/MyEmailProject/generated_content

data/hyla.gemspec

@@ -34,7 +34,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'listen', '~> 1.3', '>= 1.3.1'
   s.add_runtime_dependency 'safe_yaml', '~> 1.0', '>= 1.0.0'
   s.add_runtime_dependency 'mail', '~> 2.5', '>= 2.5.4'
-  s.add_runtime_dependency 'pdfkit', '~> 0.5', '>= 0.5.4'
+  s.add_runtime_dependency 'wkhtmltopdf-binary', '~> 0.1', '>= 0.1.2'
+  s.add_runtime_dependency 'imgkit', '~> 1.0', '>= 1.0.3'
 
   # Colorize Text Terminal
   s.add_runtime_dependency 'colorator', '~> 0.1'

data/lib/hyla.rb

@@ -31,7 +31,8 @@ require 'webrick'
 require 'find'
 require 'mail'
 require 'mime/types'
-require 'pdfkit'
+require 'slim'
+require 'imgkit'
 
 # internal requires
 require 'hyla/logger'

data/lib/hyla/commands/{create.rb → add.rb}

@@ -1,11 +1,14 @@
 module Hyla
   module Commands
-    class Create < Command
+    class Add < Command
 
       def self.process(args, options)
         destination = options[:destination] if check_mandatory_option?('-d / --destination', options[:destination])
         artefact_type = options[:artefact_type] if check_mandatory_option?('-a / --artefact_type', options[:artefact_type])
         type = options[:type] if check_mandatory_option?('-t / --type', options[:type])
+        font_type = 'liberation'
+
+        copy_fonts(font_type, destination)
 
         copy_artefact(type, artefact_type, destination)
       end
@@ -29,6 +32,20 @@ module Hyla
         end
       end
 
+      #
+      # Copy fonts
+      #
+      def self.copy_fonts(type, destination)
+        source = [Configuration::fonts, type] * '/'
+        destination = [destination, 'fonts'] * '/'
+        destination = File.expand_path destination
+
+        FileUtils.mkdir_p(destination) unless File.exists?(destination)
+        FileUtils.cp_r source, destination
+
+        Hyla::logger.info ">>   Fonts #{type} added to project #{destination}"
+      end
+
     end # class Create
   end # module Commands
 end # module Hyla

data/lib/hyla/commands/generate.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Hyla
   module Commands
     class Generate < Command
@@ -8,23 +9,16 @@ module Hyla
 
         case rendering
 
-          when 'html2pdf'
-
-            Hyla.logger.info "Rendering : Generate PDF from HTML file"
-
-            source_dir = options[:source] if self.check_mandatory_option?('-s / --source', options[:source])
-            out_dir = options[:destination] if self.check_mandatory_option?('-d / --destination', options[:destination])
-            file_name = options[:file] if self.check_mandatory_option?('-f / --file', options[:file])
-
-            self.html_to_pdf(source_dir, out_dir, file_name)
-
           when 'toc2adoc'
 
             Hyla.logger.info "Rendering : Table of Content to Asciidoc"
             self.check_mandatory_option?('-t / --toc', options[:toc])
+            self.check_mandatory_option?('-d / --destination', options[:destination])
+
             @toc_file = options[:toc]
             @out_dir = options[:destination]
-            @project_name = options[:project_name]
+            @project_name = options[:project_name] if options[:project_name]
+            @project_name = 'My Project' if !options[:project_name]
 
             self.table_of_content_to_asciidoc(@toc_file, @out_dir, @project_name)
 
@@ -39,6 +33,7 @@ module Hyla
 
             # Check Style to be used
             new_asciidoctor_option = {
+                :template_dirs => [self.backend_dir(options[:backend])],
                 :attributes => {
                     'stylesheet' => self.check_style(options[:style])
                 }
@@ -50,7 +45,7 @@ module Hyla
 
             self.asciidoc_to_html(@source, @destination, extensions, merged_options)
 
-          when 'index2htmlslide'
+          when 'index2html'
             Hyla.logger.info "Rendering : Asciidoctor Indexed Files to SlideShow"
             self.check_mandatory_option?('-s / --source', options[:source])
             self.check_mandatory_option?('-d / --destination', options[:destination])
@@ -72,27 +67,57 @@ module Hyla
 
             self.asciidoc_to_html(@source, @destination, extensions, merged_options)
 
-          when 'adoc2htmlslide'
-            Hyla.logger.info "Rendering : Asciidoc to SlideShow"
-            self.check_mandatory_option?('-s / --source', options[:source])
-            self.check_mandatory_option?('-d / --destination', options[:destination])
+          when 'html2pdf'
 
-            @destination = options[:destination]
-            @source = options[:source]
+            Hyla.logger.info "Rendering : Generate PDF from HTML file"
 
-            new_asciidoctor_option = {
-                :template_dirs => [self.backend_dir(options[:backend])],
-                :attributes => {
-                    'stylesheet' => self.check_style(options[:style])
-                }
-            }
+            source_dir = options[:source] if self.check_mandatory_option?('-s / --source', options[:source])
+            out_dir = options[:destination] if self.check_mandatory_option?('-d / --destination', options[:destination])
 
-            merged_options = Configuration[options].deep_merge(new_asciidoctor_option)
+            file_name = options[:file]
+            cover_path ||= options[:cover_path]
+            header_html_path = options[:header_html_path]
+            footer_text = options[:footer_text]
 
-            # Extension(s) of the files to be parsed
-            extensions = 'adoc|ad|asciidoc'
+            self.html_to_pdf(file_name, source_dir, out_dir, footer_text, header_html_path, cover_path)
+
+          when 'cover2png'
+
+            Hyla.logger.info "Rendering : Generate Cover HTML page & picture - format png"
+
+            out_dir = options[:destination] if self.check_mandatory_option?('-d / --destination', options[:destination])
+            file_name = options[:cover_file]
+            image_name = options[:cover_image]
+
+            # Configure Slim engine
+            slim_file = Configuration::cover_template
+            slim_tmpl = File.read(slim_file)
+            template = Slim::Template.new(:pretty => true) { slim_tmpl }
+
+            # Do the Rendering HTML
+            parameters = {:course_name => options[:course_name],
+                          :module_name => options[:module_name],
+                          :image_path => options[:image_path]}
+            res = template.render(Object.new, parameters)
+
+            unless Dir.exist? out_dir
+              FileUtils.mkdir_p out_dir
+            end
+
+            Dir.chdir(out_dir) do
+              out_file = File.new(file_name, 'w')
+              out_file.puts res
+              out_file.puts "\n"
+
+              # Do the Rendering Image
+              kit = IMGKit.new(res, quality: 90, width: 950, height: 750)
+              kit.to_img(:png)
+              kit.to_file(image_name)
+
+              # Convert HTML to Image
+              # system ("wkhtmltoimage -f 'png' #{file_name} #{image_name}")
+            end
 
-            self.asciidoc_to_html(@source, @destination, extensions, merged_options)
           else
             Hyla.logger.error ">> Unknow rendering"
             exit(1)
@@ -109,6 +134,10 @@ module Hyla
             return [Configuration::backends, 'haml', 'deckjs'] * '/'
           when 'revealjs'
             return [Configuration::backends, 'slim', 'revealjs'] * '/'
+          when 'html5'
+            return [Configuration::backends, 'slim', 'html5'] * '/'
+          else
+            return [Configuration::backends, 'slim', 'html5'] * '/'
         end
       end
 
@@ -135,6 +164,12 @@ module Hyla
         current_dir = Dir.pwd
         Hyla.logger.info ">>       Current dir: #{current_dir}"
 
+        #
+        # Backup Asciidoctor attributes
+        # Strange issue discovered
+        #
+        @attributes_bk = options[:attributes]
+
         # Delete destination directory (generated_content, ...)
         # FileUtils.rm_rf(Dir.glob(@destination))
 
@@ -159,6 +194,9 @@ module Hyla
             Hyla.logger.info ">>        Dir of html: #{html_dir}"
             FileUtils.mkdir_p html_dir
 
+            # Copy Fonts
+            self.cp_resources_to_dir(File.dirname(html_dir), 'fonts')
+
             # Copy Resources for Slideshow
             case options[:backend]
               when 'deckjs'
@@ -175,6 +213,7 @@ module Hyla
             html_file_name = file_name_processed.to_s.gsub(/.adoc$|.ad$|.asciidoc$|.index$|.txt$/, '.html')
             options[:to_dir] = html_dir
             options[:to_file] = html_file_name
+            options[:attributes] = @attributes_bk
             Asciidoctor.render_file(f, options)
 
           end
@@ -227,15 +266,13 @@ module Hyla
         # Expand File Path
         @out_dir = File.expand_path out_dir
 
-        # Re Create Directory of generated content
-        if Dir.exist? @out_dir
-          FileUtils.rm_rf @out_dir
-          FileUtils.mkdir_p @out_dir
-        else
+        #
+        # Create destination directory if it does not exist
+        unless Dir.exist? @out_dir
           FileUtils.mkdir_p @out_dir
         end
 
-        # Copy YML Config file
+        # Copy YAML Config file
         FileUtils.cp_r [Configuration::templates, Configuration::YAML_CONFIG_FILE_NAME] * '/', @out_dir
 
         # Copy styles
@@ -263,11 +300,15 @@ module Hyla
           #
           if line[/^=\s/]
 
-            # Create File
+            #
+            # Create Directory of the module and next the File
+            #
             dir_name = remove_special_chars(2, line)
             new_dir = [@out_dir, dir_name].join('/')
+            FileUtils.rm_rf new_dir
+            FileUtils.mkdir new_dir
             Hyla.logger.info '>> Directory created : ' + new_dir + ' <<'
-            FileUtils.mkdir_p new_dir
+
             Dir.chdir(new_dir)
 
             # Add image, audio, video directory
@@ -284,6 +325,21 @@ module Hyla
             @project_index_file.puts Configuration::INCLUDE_PREFIX + dir_name + '/' + dir_name + Configuration::INDEX_SUFFIX + Configuration::INCLUDE_SUFFIX
             @project_index_file.puts "\n"
 
+            #
+            # Generate a Module key value
+            # 01, 02, ...
+            # that we will use as key to create the asciidoc file
+            #
+            dir_name = File.basename(Dir.getwd)
+            @module_key = dir_name.initial.rjust(2, '0')
+            Hyla.logger.info ">> Module key : #@module_key <<"
+
+            #
+            # Reset counter value used to generate file number
+            # for the file 01, 00
+            #
+            @index = 0
+
             # Move to next line record
             next
           end
@@ -300,10 +356,22 @@ module Hyla
               @previous_f.close
             end
 
-            # Create File
+            #
+            # Replace special characters form the file and
+            # add the module key followed by the index value for the file
+            # Example : m01p01_MyTitle.ad, m01p02_Another_Title.ad
+            #
             f_name = remove_special_chars(3, line)
+            @index += 1
+            #file_index = @index.to_s.initial.rjust(2, '0')
+            file_index = sprintf('%02d', @index)
+            f_name = 'm' + @module_key + 'p' + file_index + '_' + f_name + '.ad'
+
             Hyla.logger.info '   # File created : ' + f_name.to_s
-            f_name += '.adoc'
+
+            #
+            # Create File and add configuration HEADER
+            #
             @new_f = File.new(f_name, 'w')
             @new_f.puts Configuration::HEADER
             @new_f.puts "\n"
@@ -326,6 +394,7 @@ module Hyla
 
       end
 
+=begin
       #
       # Generate PDF
       #
@@ -333,9 +402,9 @@ module Hyla
         file_path = [source, html_file_name] * '/'
         html_file = File.new(file_path)
         kit = PDFKit.new(html_file,
-                         :page_size     => 'A4',
-                         :toc           => true,
-                         :page_offset   => 1,
+                         :page_size => 'A4',
+                         :toc => true,
+                         :page_offset => 1,
                          :footer_center => 'Page [page]')
 
         # Create destination directory if it does not exist
@@ -344,10 +413,77 @@ module Hyla
         end
 
         # Save PDF to a file
-        pdf_file_name = [destination, html_file_name.sub(/html|htm/,'pdf')] * '/'
+        pdf_file_name = [destination, html_file_name.sub(/html|htm/, 'pdf')] * '/'
         kit.to_file(pdf_file_name)
         Hyla.logger.info ">> PDF file generated and saved : #{pdf_file_name} "
       end
+=end
+
+      def self.html_to_pdf(file_name, source, destination, footer_text, header_html_path, cover_path)
+
+        @cover_path = cover_path
+        destination= File.expand_path destination
+        pdf_file = [destination, "result.pdf"] * '/'
+        wkhtml_cmd = "wkhtmltopdf"
+        size = 'A4'
+
+        # pdf_file_name = [destination, html_file_name.sub(/html|htm/, 'pdf')] * '/'
+
+        list_of_files = ""
+
+        unless File.directory?(destination)
+          FileUtils.mkdir_p(destination)
+        end
+
+        if file_name.nil? || file_name.empty?
+          filter = [source] * '/' + "*.html"
+          files = Dir[filter]
+
+          files.each do |file|
+            file_name = File.basename file
+            next if file_name.downcase.include?('assessments')
+            next if file_name.downcase.include?('labinstructions')
+            next if file_name.downcase.include?('title')
+            next if file_name.downcase.include?('cover')
+            file = File.expand_path file
+            list_of_files = list_of_files + " " + file
+          end
+        else
+          #
+          # If the file passed as parameter has extension name equal to txt, then we will extract the file names
+          # whenever we have a include:: directive in the file
+          #
+          extension_name = File.extname file_name
+
+          case extension_name
+            when '.txt'
+              file_to_processed = [File.expand_path(Dir.getwd), file_name] * '/'
+              result = self.extract_file_names(file_to_processed, source)
+
+              result.each do | file_path |
+                if file_path.downcase.include?('title') || file_path.downcase.include?('cover')
+                  @cover_path = file_path
+                  next
+                end
+                list_of_files = list_of_files + " " + file_path
+              end
+
+            else
+              list_of_files = [File.expand_path(source), file_name] * '/'
+          end
+        end
+
+        wkhtml_cmd.concat " #{list_of_files} #{pdf_file}"
+        wkhtml_cmd.concat " --margin-top '18mm' --header-html '#{header_html_path}'" if header_html_path
+        wkhtml_cmd.concat " --margin-bottom '10mm'  --footer-center '#{footer_text}'" if footer_text
+        wkhtml_cmd.concat " --cover '#@cover_path'" if @cover_path
+        wkhtml_cmd.concat " --page-size #{size}"
+        Hyla.logger.debug "c #{wkhtml_cmd}"
+
+        Dir.chdir(source) do
+          system "#{wkhtml_cmd}"
+        end
+      end
 
       #
       # Create Asset Directory
@@ -362,7 +498,9 @@ module Hyla
       # Remove space, dot from a String
       #
       def self.remove_special_chars(pos, text)
-        return text[pos, text.length].strip.gsub(/\s/, '_').gsub('.', '')
+        return text[pos, text.length].strip.gsub(/\s/, '_')
+        .gsub('.', '')
+        .gsub('&', '')
       end
 
       #
@@ -410,6 +548,39 @@ module Hyla
         end
       end
 
+      #
+      # Extract files names from a file containing include:: directive
+      #
+      def self.extract_file_names(file_name, destination)
+
+        result = []
+        f = File.open(file_name, 'r')
+        matches = f.grep(Configuration::IncludeDirectiveRx)
+
+        if matches
+
+          matches.each do |record|
+            # Extract string after include::
+            matchdata = record.match(/^include::(.+)/)
+
+            if matchdata
+
+              data = matchdata[1]
+              # Remove []
+              name = data.to_s.gsub(/[\[\]]/, '').strip
+
+              # Rename file to .html
+              name = name.gsub(/ad$/, 'html')
+              file_name = [destination, name] * '/'
+              file_path = File.expand_path file_name
+              result << file_path
+            end
+          end
+        end
+        f.close
+        return result
+      end
+
     end # class
   end # module Commands
-end # module Hyla
+end # module Hyla