hyla 1.0.7.pre.7 → 1.0.7.pre.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE4Zjk2MzExMDJhNDlhOWY4OGRjMGVhMThhMWMwNDBlNjYyMTliZQ==
+    MThiYzA4ZmM3OGExMDc3MTZhZTIwYzI2ZWM4YTZhZGJlMWQ0YzFmNQ==
   data.tar.gz: !binary |-
-    ZDViYWIwMGRjNWJhMGUzYzUxYWQxNDA3NzdkZmY5OThjMjM1OTdlYQ==
+    ZTEwMzA4NTkzMmI5MDVjMWUzNGUwZTU5N2I4ZDM2MTgxODVkM2IxMw==
 SHA512:
   metadata.gz: !binary |-
-    MWYwYTkxOTdhZjIzMzQ4MGExMDQxNmQ2ZDAxMDA3YzA2MDYzZjg0ODhhMzg0
-    MzRkYjVjYjgyOTliZWUxZDAxOWUyYmM3ZDA3YjkyMTJmZmE4YzczNjZhZDQ0
-    NzU3YmY3YTU1OWVlZTA4NzMzMWRkOGZlMWIwNzgyNTY3ODA0NzU=
+    NzlkOWRhYzBlYjEyNzk0OGEzY2ZiMjYxYTczZjQzMjg5Y2I3MjRlZTFmODkw
+    MzM0ZWJjOTc2OWIzOGIyNDZjMDA4YWJjNWIzNDg2ZWIyYzk3YzkyZTgzMWYx
+    ZTY3YWE3OTUxNGM4OTc0N2M0M2ZmZmJkY2ZlZjA5YjhmY2Q2YjI=
   data.tar.gz: !binary |-
-    N2Q4ZDliZjIxMjAyMDU3NGJkNWU1NjEyNjQyMTU4NTcxNjRkNWQ4NDc0MjNl
-    N2VmNmFjNzM1ZGYwMGNlZWMyMmU1YjRjNjVmNDhiNzE4M2NmOWNkYzRiNjNk
-    ZjI5YzliZDZkNzMxNDIwYzNkZDFjODcxOWVjY2MzM2E3OTcxZGM=
+    M2Q5MTg0YzM3MmFjMThiMDJiOGIxZWFkMjY1NGNjNDY3YjY5M2NlZTIwOTc2
+    MzUyZmJlMmY0ODU3NTFlZWU2NWJhNzNlYmYxZGYyMjA5M2RiODZkYzVlNzlm
+    MjlkMDljYmJiOTI1ZTVhZTRiYjYyZWM4M2JhNGJkOWMxMzRmNzI=

data/bin/hyla

@@ -17,8 +17,11 @@ program :description, Hyla::DESCRIPTION
 
 default_command :default
 
+$cmd_directory = Dir.getwd
+
 def add_build_options(c)
-  c.option '-c', '--config CONFIG_FILE', String, 'Custom configuration file'
+  c.option '-c', '--config CONFIG_FILE', String, 'Hyla Yaml configuration file'
+  c.option '-l', '--log LOG_YML_FILE', String, 'Log4r Yaml configuration file'
   c.option '-V', '--verbose', 'Print verbose output.'
 end
 
@@ -39,12 +42,13 @@ command :new do |c|
   c.option '-b', '--blank', 'Creates project directory containing the YAML config file and a simple readme.ad file'
   c.option '--t', '--template_type [TEMPLATE_TYPE]', String, 'Template Type to be used (documentation, book, training, training-exercises, blog, web, ...)'
 
-  c.option '-V', '--verbose', 'Print verbose output.'
+  add_build_options(c)
 
   c.action do |args, options|
     if args.first.nil?
       puts "Please specify the PATH where the project should be created."
     else
+      $options = options.__hash__
       config = Hyla::Configuration.parse(options.__hash__)
       Hyla::Commands::New.process(args, config)
     end
@@ -64,6 +68,7 @@ command :add do |c|
   add_build_options(c)
 
   c.action do |args, options|
+    $options = options.__hash__
     config = Hyla::Configuration.parse(options.__hash__)
     Hyla::Commands::Add.process(args, config)
   end
@@ -82,17 +87,19 @@ command :generate do |c|
   c.option '--t', '--toc [PATH]', String, 'File Path of the asciidoc file containing the Table of Content'
   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'
-  c.option '-o', '--cover_image [PNG FILE NAME]', String, 'Name of the cover png image file generated'
   c.option '-s', '--snippet_content [FLAG TRUE or FALSE]', String, 'Flag used to generate HTML content using the // tag::snippet[].'
-  c.option '-n', '--course_name [COURSE NAME]', String, 'Name of the course'
-  c.option '-l', '--cover_file [HTML FILE NAME]', String, 'Name of the cover html image file generated'
-  c.option '-m', '--module_name [MODULE NAME]', String, 'Name of the module'
-  c.option '-i', '--image_path [BACKGROUND IMAGE]', String, 'Location of the file used as background'
+
+  c.option '--course_name [COURSE NAME]', String, 'Name of the course'
+  c.option '--cover_file [HTML FILE NAME]', String, 'Name of the cover html image file generated'
+  c.option '--cover_image [PNG FILE NAME]', String, 'Name of the cover png image file generated'
+  c.option '--module_name [MODULE NAME]', String, 'Name of the module'
+  c.option '--image_path [BACKGROUND IMAGE]', String, 'Location of the file used as background'
 
   add_common_options(c)
   add_build_options(c)
 
   c.action do |args, options|
+    $options = options.__hash__
     config = Hyla::Configuration.parse(options.__hash__)
     Hyla::Commands::Generate.process(args, config)
   end
@@ -111,6 +118,7 @@ command :watch do |c|
     # 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__)
+    $options = options.__hash__
     config = Hyla::Configuration.parse(options.__hash__)
     Hyla::Commands::Watch.process(args, config)
   end
@@ -131,6 +139,7 @@ command :serve do |c|
   add_build_options(c)
 
   c.action do |args, options|
+    $options = options.__hash__
     options.default :serving => true
     config = Hyla::Configuration.parse(options.__hash__)
     Hyla::Commands::Serve.process(args, config)
@@ -145,7 +154,7 @@ command :sendmail do |c|
   c.syntax = 'hyla sendmail [options]'
   c.description = 'Send as HTML Attachment an email to the SMTP Server defined'
   c.option '-f', '--file [File]', String, 'File to be attached'
-  c.option '-l', '--location [PATH]', String, 'Directory containing file to be attached'
+  c.option '-p', '--path [PATH]', String, 'Directory containing file to be attached'
   c.option '-a', '--attachment [boolean]', 'Attach to the email the HTML generated'
   c.option '-e', '--email_attributes [KEY=VALUE,KEY=VALUE]', String, 'Email attributes used to configure smtp server, port number, user password, authentication mode, sender, recipient, subject'
 
@@ -154,6 +163,7 @@ command :sendmail do |c|
 
   c.action do |args, options|
 
+    $options = options.__hash__
     options.default :attachment => false
 
     config = Hyla::Configuration.parse(options.__hash__)

data/hyla.gemspec

@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'tilt', '~> 1.4'
   s.add_runtime_dependency 'thor', '~> 0.18'
   s.add_runtime_dependency 'wkhtmltopdf-binary', '~> 0.9'
-  # s.add_runtime_dependency 'log4r', '~> 1.1'
+  s.add_runtime_dependency 'log4r', '~> 1.1'
   
 
   # Colorize Text Terminal

data/lib/{templates → configs}/_config.yaml

@@ -5,6 +5,15 @@ source: .
 destination: generated_content # or . or ~/Hyla or generated_content
 # end common options
 
+#
+# Logging
+#
+mode: production # Default value = production. Available : 'production', 'development"
+tracer: 'false' #Default value is false. Can be true or false
+level: 'INFO' # Values available : DEBUG, INFO, WARN, ERROR, FATAL. Default for production : 'WARN' and development 'DEBUG'
+dirname:  # Directory where the log files will be saved
+logname: hyla.log # Name of the log file
+
 #
 # Styles
 # Supported :  liberation, asciidoctor, colony, foundation, foundation-lime, foundation-potion, github, golo, iconic, maker, readthedocs, riak, rocket-panda, rubygems

data/lib/configs/log4r.yaml

@@ -0,0 +1,32 @@
+log4r_config:
+  # define all loggers ...
+  loggers:
+    - name      : production
+      level     : "LOGGING_LEVEL"
+      trace     : "TRACER"
+      outputters:
+        - logfile
+    - name      : development
+      level     : "LOGGING_LEVEL"
+      trace     : "TRACER"
+      outputters:
+        - stdout
+        - logfile
+
+  # define all outputters (incl. formatters)
+  outputters:
+    - type     : StdoutOutputter
+      name     : stdout
+      formatter:
+        date_pattern: '%Y-%m-%d %H:%M:%S'
+        pattern     : '%d %l: %m '
+        type        : PatternFormatter
+
+    - type     : DateFileOutputter
+      name     : logfile
+      dirname  : "#{DIRNAME}"
+      filename : "#{LOGNAME}" # notice the file extension is needed!
+      formatter:
+        date_pattern: '%H:%M:%S'
+        pattern     : '%d %l: %m '
+        type        : PatternFormatter

data/lib/hyla.rb

@@ -22,7 +22,6 @@ require 'guard'
 require 'safe_yaml'
 require 'asciidoctor'
 require 'asciidoctor/backends/html5'
-# require 'asciidoctor/backends/_stylesheets'
 
 # Added to fix issue with Ruby 2.0 on Windows machine
 require 'em/pure_ruby'
@@ -45,12 +44,33 @@ require 'hyla/command'
 require 'hyla/configuration'
 require 'hyla/websocket'
 require 'hyla/logger'
+require 'hyla/logger2'
 
 # extensions
 require_all 'hyla/commands'
 
 module Hyla
+
   def self.logger
     @logger ||= Logger.new
   end
+
+  def self.logger2
+    log_cfg ||=  $options[:log]
+
+    hyla_cfg = safe_load_file($options[:config]) if $options[:config]
+
+    mode ||= hyla_cfg['mode']
+    dirname ||= hyla_cfg['dirname']
+    logname ||= hyla_cfg['logname']
+    level ||= hyla_cfg['level']
+    tracer ||= hyla_cfg['tracer']
+
+    $logger2 ||= Logger2.new(mode, log_cfg, dirname, logname, level, tracer)
+  end
+
+  def self.safe_load_file(filename)
+    f = File.expand_path(filename, $cmd_directory)
+    YAML.safe_load_file(f)
+  end
 end

data/lib/hyla/Logger2.rb

@@ -0,0 +1,153 @@
+require 'log4r'
+require 'log4r/yamlconfigurator'
+require 'log4r/outputter/datefileoutputter'
+require 'hyla/configuration'
+include Log4r
+
+module Hyla
+  class Logger2
+    
+    attr_reader :log, :levels
+
+    def initialize(name, log_yml_file, dirname = nil, logname = nil, level = nil, tracer = nil)
+
+      #
+      # Change logging level within the YAML config file
+      # ! Log4r::YamlConfigurator does not allow to change key/val for the level but only for formatter/outputter
+      #
+      if level.nil?
+        new_level = 'INFO'
+      else
+        new_level = level
+      end
+
+      if tracer.nil?
+        new_tracer = 'false'
+      else
+        new_tracer = tracer
+      end
+
+      log4r_hash = load_file(log_yml_file)
+
+      #
+      # TODO - improve it to avoid to hard code path
+      #
+      log4r_hash['log4r_config']['loggers'].each_with_index do |x, index|
+        log4r_hash['log4r_config']['loggers'][index]['level'] = new_level
+        log4r_hash['log4r_config']['loggers'][index]['tracer'] = new_tracer
+      end
+
+      cfg = Log4r::YamlConfigurator
+
+      if dirname.nil?
+        dir = [Dir.home, 'log'] * '/'
+        Dir.mkdir(dir) unless Dir.exist?(dir)
+        cfg['DIRNAME'] = dir
+      else
+        cfg['DIRNAME'] = dirname
+      end
+
+      if logname.nil?
+        cfg['LOGNAME'] = 'hyla.log'
+      else
+        cfg['LOGNAME'] = logname
+      end
+
+      cfg.decode_yaml log4r_hash['log4r_config']
+
+      @log = Log4r::Logger[name]
+    end
+
+    def levels
+      # ALL < DEBUG < INFO < WARN < ERROR < FATAL < OFF
+      levels = {"ALL" => 0, "DEBUG" => 1, "INFO" => 2, "WARN" => 3, "ERROR" => 4, "FATAL" => 5, "OFF" => 6}
+    end
+
+    def iterate(h, level)
+      h.each do |k,v|
+        value = v || k
+        if value.is_a?(Hash) || value.is_a?(Array)
+          puts "evaluating: #{value} recursively..."
+          iterate(value, level)
+        else
+          if k == "level"
+            v = level
+          end
+        end
+      end
+    end
+
+    def nested_hash_value(obj,key)
+      if obj.respond_to?(:key?) && obj.key?(key)
+        obj[key]
+      elsif obj.respond_to?(:each)
+        r = nil
+        obj.find{ |*a| r=nested_hash_value(a.last,key) }
+        r
+      end
+    end
+
+    def load_file(cfg_file)
+      SafeYAML::OPTIONS[:default_mode] = :safe
+
+      if cfg_file.nil?
+        f = [Configuration.configs,'log4r.yaml' ] * '/'
+      else
+        f = cfg_file
+      end
+
+      #
+      # Find/Replace the logging level
+      #
+      #content = File.read(f)
+      #new_contents = content.gsub(/LOGGING_LEVEL/, level)
+
+      # To merely print the contents of the file, use:
+      # puts new_contents
+
+      # To write changes to the file, use:
+      #File.open(f, "w") {|file| file.puts new_contents }
+
+      YAML.load_file(f)
+    end
+
+    def debug(msg)
+      @log.debug msg
+    end
+
+    def info(msg)
+      @log.info msg
+    end
+
+    def warn(msg)
+      @log.warn msg
+    end
+
+    def error(msg)
+      @log.error msg
+    end
+
+    def fatal(msg)
+      @log.fatal msg
+    end
+
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    # message - the message detail
+    #
+    # Returns the formatted message
+    def message(topic, message)
+      formatted_topic(topic) + message.to_s.gsub(/\s+/, ' ')
+    end
+
+    #
+    # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
+    #
+    # Returns the formatted topic statement
+    def formatted_topic(topic)
+      "#{topic} ".rjust(20)
+    end
+
+  end
+
+end

data/lib/hyla/command.rb

@@ -3,7 +3,7 @@ module Hyla
     program :int_block do
       # kill threads etc
       # make sure to exit or abort, otherwise your program keeps running
-      Hyla::logger.warn "CTRL-C / Shutdown command received"
+      Hyla::logger2.warn "CTRL-C / Shutdown command received"
       exit 1
     end
 
@@ -12,7 +12,7 @@ module Hyla
     #
     def self.check_mandatory_option?(key, value)
       if value.nil? or value.empty?
-        Hyla.logger.warn "Mandatory option missing: #{key}"
+        Hyla.logger2.warn "Mandatory option missing: #{key}"
         exit(1)
       else
         true

data/lib/hyla/commands/add.rb

@@ -23,7 +23,7 @@ module Hyla
 
         FileUtils.cp(source, destination)
 
-        Hyla::logger.info ">>   Artefact #{artefact_file_name} added to project #{destination}"
+        Hyla::logger2.info ">>   Artefact #{artefact_file_name} added to project #{destination}"
 
         case artefact_type
           when 'image','audio','video','source'
@@ -43,7 +43,7 @@ module Hyla
         FileUtils.mkdir_p(destination) unless File.exists?(destination)
         FileUtils.cp_r source, destination
 
-        Hyla::logger.info ">>   Fonts #{type} added to project #{destination}"
+        Hyla::logger2.info ">>   Fonts #{type} added to project #{destination}"
       end
 
     end # class Create

data/lib/hyla/commands/build.rb

@@ -13,9 +13,9 @@ module Hyla
       def build(training, options)
         source = options['source']
         destination = options['destination']
-        Hyla.logger.info "Source: ", source
-        Hyla.logger.info "Destination: ", destination
-        print Hyla.logger.formatted_topic "Generating..."
+        Hyla.logger2.info "Source: ", source
+        Hyla.logger2.info "Destination: ", destination
+        print Hyla.logger2.formatted_topic "Generating..."
         self.process_training(training)
         puts "done."
       end
@@ -29,9 +29,9 @@ module Hyla
         training.process
       rescue Hyla::FatalException => e
         puts
-        Hyla.logger.error "ERROR:", "YOUR TRAINING COULD NOT BE BUILT:"
-        Hyla.logger.error "", "------------------------------------"
-        Hyla.logger.error "", e.message
+        Hyla.logger2.error "ERROR:", "YOUR TRAINING COULD NOT BE BUILT:"
+        Hyla.logger2.error "", "------------------------------------"
+        Hyla.logger2.error "", e.message
         exit(1)
       end
 

data/lib/hyla/commands/generate.rb

@@ -11,7 +11,7 @@ module Hyla
 
           when 'toc2adoc'
 
-            Hyla.logger.info "Rendering : Table of Content to Asciidoc"
+            Hyla.logger2.info "Rendering : Table of Content to Asciidoc"
             self.check_mandatory_option?('-t / --toc', options[:toc])
             self.check_mandatory_option?('-d / --destination', options[:destination])
 
@@ -25,7 +25,7 @@ module Hyla
 
           when 'adoc2html'
 
-            Hyla.logger.info "Rendering : Asciidoc to HTML"
+            Hyla.logger2.info "Rendering : Asciidoc to HTML"
             self.check_mandatory_option?('-s / --source', options[:source])
             self.check_mandatory_option?('-d / --destination', options[:destination])
 
@@ -48,7 +48,7 @@ module Hyla
             self.asciidoc_to_html(@source, @destination, extensions, excludes, merged_options)
 
           when 'index2html'
-            Hyla.logger.info "Rendering : Asciidoctor Indexed Files to HTML"
+            Hyla.logger2.info "Rendering : Asciidoctor Indexed Files to HTML"
             self.check_mandatory_option?('-s / --source', options[:source])
             self.check_mandatory_option?('-d / --destination', options[:destination])
 
@@ -74,7 +74,7 @@ module Hyla
 
           when 'html2pdf'
 
-            Hyla.logger.info "Rendering : Generate PDF from HTML file"
+            Hyla.logger2.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])
@@ -88,7 +88,7 @@ module Hyla
 
           when 'cover2png'
 
-            Hyla.logger.info "Rendering : Generate Cover HTML page & picture - format png"
+            Hyla.logger2.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]
@@ -101,7 +101,7 @@ module Hyla
             self.cover_img(out_dir, file_name, image_name, course_name, module_name, bg_image_path, tool)
 
           else
-            Hyla.logger.error ">> Unknow rendering"
+            Hyla.logger2.error ">> Unknow rendering"
             exit(1)
         end
       end
@@ -129,7 +129,7 @@ module Hyla
       # Cover Function
       # Create a png file using the HTML generated with the Slim cover template
       #
-      def self.cover_img(out_dir, file_name, image_name, course_name, module_name, bg_image_path, tool)
+      def self.cover_img(out_dir, file_name, image_name, course_name, module_name, bg_image_path, tool = imgkit)
 
         unless Dir.exist? out_dir
           FileUtils.mkdir_p out_dir
@@ -147,8 +147,8 @@ module Hyla
             # Replace underscore with space, next digits & space with nothing & Capitalize
             module_name = module_name.gsub('_', ' ').gsub(/^\d{1,2}\s/, '').capitalize
 
-            Hyla.logger.debug "Module name : " + module_name
-            Hyla.logger.info "Curent directory : #{Dir.pwd}"
+            Hyla.logger2.debug "Module name : " + module_name
+            Hyla.logger2.info "Curent directory : #{Dir.pwd}"
 
             # Use slim template & render the HTML
             parameters = {:course_name => course_name,
@@ -185,19 +185,19 @@ module Hyla
         source = File.expand_path source
         @destination = File.expand_path destination
 
-        Hyla.logger.info ">>       Source dir: #{source}"
-        Hyla.logger.info ">>  Destination dir: #{@destination}"
+        Hyla.logger2.info ">>       Source dir: #{source}"
+        Hyla.logger2.info ">>  Destination dir: #{@destination}"
 
         # Exit if source directory does not exist
         if !Dir.exist? source
-          Hyla.logger.error ">> Source directory does not exist"
+          Hyla.logger2.error ">> Source directory does not exist"
           exit(1)
         end
 
         # Move to source directory
         Dir.chdir(source)
         current_dir = Dir.pwd
-        Hyla.logger.info ">>       Current dir: #{current_dir}"
+        Hyla.logger2.info ">>       Current dir: #{current_dir}"
 
         #
         # Backup Asciidoctor attributes
@@ -231,7 +231,7 @@ module Hyla
           path_to_source = Pathname.new(source)
           path_to_adoc_file = Pathname.new(f)
           relative_path = path_to_adoc_file.relative_path_from(path_to_source).to_s
-          Hyla.logger.debug ">>       Relative path: #{relative_path}"
+          Hyla.logger2.debug ">>       Relative path: #{relative_path}"
           adoc_file_paths << relative_path
 
           # Get asciidoctor file name
@@ -241,7 +241,7 @@ module Hyla
           # Create destination dir relative to the path calculated
           #
           html_dir = [@destination, File.dirname(relative_path)] * '/'
-          Hyla.logger.debug ">>        Dir of html: #{html_dir}"
+          Hyla.logger2.debug ">>        Dir of html: #{html_dir}"
           FileUtils.mkdir_p html_dir
 
           # Copy Fonts
@@ -263,7 +263,7 @@ module Hyla
           #
           # Render asciidoc to HTML
           #
-          Hyla.logger.info ">> File to be rendered : #{file_name_processed}"
+          Hyla.logger2.info ">> File to be rendered : #{file_name_processed}"
 
           #
           # Convert asciidoc file name to html file name
@@ -289,7 +289,7 @@ module Hyla
 
         # No asciidoc files retrieved
         if adoc_file_paths.empty?
-          Hyla.logger.info "     >>   No asciidoc files retrieved."
+          Hyla.logger2.info "     >>   No asciidoc files retrieved."
           exit(1)
         end
 
@@ -314,7 +314,7 @@ module Hyla
         source = [Configuration::assets, resource] * '/'
         # destination = [path, resource] * '/'
         destination = path
-        Hyla.logger.debug ">>        Copy resource from Source dir: #{source} --> destination dir: #{destination}"
+        Hyla.logger2.debug ">>        Copy resource from Source dir: #{source} --> destination dir: #{destination}"
         FileUtils.cp_r source, destination, :verbose => false
       end
 
@@ -329,7 +329,7 @@ module Hyla
       #
       def self.table_of_content_to_asciidoc(toc_file, out_dir, project_name, image_path)
 
-        Hyla.logger.info '>> Project Name : ' + project_name + ' <<'
+        Hyla.logger2.info '>> Project Name : ' + project_name + ' <<'
 
         # Open file & parse it
         f = f = File.open(toc_file, 'r')
@@ -337,7 +337,7 @@ module Hyla
 
         # Expand File Path
         @out_dir = File.expand_path out_dir
-        Hyla.logger.info '>> Output directory : ' + out_dir + ' <<'
+        Hyla.logger2.info '>> Output directory : ' + out_dir + ' <<'
 
         #
         # Create destination directory if it does not exist
@@ -347,7 +347,7 @@ module Hyla
         end
 
         # Copy YAML Config file
-        FileUtils.cp_r [Configuration::templates, Configuration::YAML_CONFIG_FILE_NAME] * '/', @out_dir
+        FileUtils.cp_r [Configuration::configs, Configuration::YAML_CONFIG_FILE_NAME] * '/', @out_dir
 
         # Copy styles
         # FileUtils.cp_r Configuration::styles, @out_dir
@@ -397,7 +397,7 @@ module Hyla
             new_dir = [@out_dir, dir_name].join('/')
             FileUtils.rm_rf new_dir
             FileUtils.mkdir new_dir
-            Hyla.logger.info '>> Directory created : ' + new_dir + ' <<'
+            Hyla.logger2.info '>> Directory created : ' + new_dir + ' <<'
 
             Dir.chdir(new_dir)
 
@@ -428,7 +428,7 @@ module Hyla
             #
             dir_name = File.basename(Dir.getwd)
             @module_key = dir_name.initial.rjust(2, '0')
-            Hyla.logger.info ">> Module key : #@module_key <<"
+            Hyla.logger2.info ">> Module key : #@module_key <<"
 
             #
             # Reset counter value used to generate file number
@@ -442,9 +442,9 @@ module Hyla
             @index += 1
             file_index = sprintf('%02d', @index)
             f_name = 'm' + @module_key + 'p' + file_index + '_cover' + Configuration::ADOC_EXT
-            Hyla.logger.debug '>> Directory name : ' + dir_name.to_s.gsub('_', ' ')
+            Hyla.logger2.debug '>> Directory name : ' + dir_name.to_s.gsub('_', ' ')
             rep_txt = Configuration::COVER_TXT.gsub(/xxx\.png/, dir_name + '.png')
-            Hyla.logger.debug "Replaced by : " + rep_txt
+            Hyla.logger2.debug "Replaced by : " + rep_txt
             cover_f = File.new(f_name, 'w')
             cover_f.puts rep_txt
             cover_f.close
@@ -458,13 +458,13 @@ module Hyla
             course_name = @project_name
             module_name= dir_name
             bg_image_path = image_path
-            Hyla.logger.debug '>> Out Directory : ' + out_dir.to_s
-            Hyla.logger.debug '>> Image name : ' + image_name.to_s
-            Hyla.logger.debug '>> Course Name  : ' + course_name.to_s
-            Hyla.logger.debug '>> Module Name  : ' + module_name.to_s
-            Hyla.logger.debug '>> Bg Image  : ' + bg_image_path.to_s
+            Hyla.logger2.debug '>> Out Directory : ' + out_dir.to_s
+            Hyla.logger2.debug '>> Image name : ' + image_name.to_s
+            Hyla.logger2.debug '>> Course Name  : ' + course_name.to_s
+            Hyla.logger2.debug '>> Module Name  : ' + module_name.to_s
+            Hyla.logger2.debug '>> Bg Image  : ' + bg_image_path.to_s
 
-            self.cover_img(out_dir, file_name, image_name, course_name, module_name, bg_image_path)
+            self.cover_img(out_dir, file_name, image_name, course_name, module_name, bg_image_path, tool = nil)
 
             #
             # Include cover file to index
@@ -559,7 +559,7 @@ module Hyla
             @new_f.puts Configuration::HEADER_TXT
             @new_f.puts "\n"
 
-            Hyla.logger.info '   # File created : ' + f_asciidoc_name.to_s
+            Hyla.logger2.info '   # File created : ' + f_asciidoc_name.to_s
 
             @previous_f = @new_f
 
@@ -620,7 +620,7 @@ module Hyla
         # Save PDF to a file
         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} "
+        Hyla.logger2.info ">> PDF file generated and saved : #{pdf_file_name} "
       end
 =end
 
@@ -698,7 +698,7 @@ module Hyla
         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}"
+        Hyla.logger2.debug "c #{wkhtml_cmd}"
 
         Dir.chdir(source) do
           system "#{wkhtml_cmd}"
@@ -733,7 +733,7 @@ module Hyla
       #
       def self.check_slash_end(out_dir)
         last_char = out_dir.to_s[-1, 1]
-        Hyla.logger.info '>> Last char : ' + last_char
+        Hyla.logger2.info '>> Last char : ' + last_char
         if !last_char.equal? '/\//'
           temp_dir = out_dir.to_s
           out_dir = temp_dir + '/'
@@ -834,7 +834,7 @@ module Hyla
       #
       def self.check_mandatory_option?(key, value)
         if value.nil? or value.empty?
-          Hyla.logger.warn "Mandatory option missing: #{key}"
+          Hyla.logger2.warn "Mandatory option missing: #{key}"
           exit(1)
         else
           true

data/lib/hyla/commands/new.rb

@@ -28,22 +28,22 @@ EOS
 
         if Dir.exist? new_project_path
 
-          Hyla.logger.debug("Dir exists: #{new_project_path}")
+          Hyla.logger2.debug("Dir exists: #{new_project_path}")
 
           # If force is selected, then we delete & recreate it to clean content
           if options[:force]
-            Hyla.logger.debug("Force option selected")
+            Hyla.logger2.debug("Force option selected")
             # DOES NOT WORK ON Mac OS X
             # FileUtils.rmdir(new_project_path)
             FileUtils.rm_rf new_project_path
             # Create Directory
             FileUtils.mkdir_p new_project_path
-            Hyla.logger.debug("Dir recreated")
+            Hyla.logger2.debug("Dir recreated")
           end
 
           # Preserve content if it exists
           if preserve_content?(new_project_path)
-            Hyla.logger.error "Conflict: ", "#{new_project_path} exists and is not empty."
+            Hyla.logger2.error "Conflict: #{new_project_path} exists and is not empty."
             exit(1)
           end
 
@@ -55,17 +55,17 @@ EOS
         #
         # Create blank project
         # or copy sample project from template directory
-        #
+        #igs
         if options[:blank]
           create_blank_project new_project_path
 
           # Add yaml config file
-          FileUtils.cp_r [Configuration::templates, Configuration::YAML_CONFIG_FILE_NAME] * '/', new_project_path
+          FileUtils.cp_r [Configuration::configs, Configuration::YAML_CONFIG_FILE_NAME] * '/', new_project_path
 
           # Copy styles
           FileUtils.cp_r Configuration::styles, new_project_path
 
-          Hyla.logger.info("Blank project created")
+          Hyla.logger2.info("Blank project created")
 
         else
           raise ArgumentError.new('You must specifiy a template type.') if options[:template_type].nil?
@@ -75,7 +75,7 @@ EOS
           # Copy styles
           FileUtils.cp_r Configuration::styles, new_project_path
 
-          Hyla.logger.info("Sample project created using template : #{options[:template_type]}")
+          Hyla.logger2.info("Sample project created using template : #{options[:template_type]}")
         end
 
       end
@@ -100,7 +100,7 @@ EOS
         FileUtils.cp_r source, path
 
         # Add yaml config file
-        FileUtils.cp_r [Configuration::templates, Configuration::YAML_CONFIG_FILE_NAME] * '/', path
+        FileUtils.cp_r [Configuration::configs, Configuration::YAML_CONFIG_FILE_NAME] * '/', path
       end
 
       #

data/lib/hyla/commands/reload.rb

@@ -24,21 +24,21 @@ module Hyla
       end
 
       def reload_browser(paths = [])
-        Hyla.logger.info "Reloading browser: #{paths.join(' ')}"
+        Hyla.logger2.info "Reloading browser: #{paths.join(' ')}"
         paths.each do |path|
-          Hyla.logger.info(path)
+          Hyla.logger2.info(path)
           data = _data(path)
-          Hyla.logger.info(">> Data received : #{data}")
+          Hyla.logger2.info(">> Data received : #{data}")
           @@web_sockets.each { |ws| ws.send(MultiJson.encode(data)) }
         end
       end
 
       def reload_browser2(paths = [])
-        Hyla.logger.info "Reloading browser: #{paths.join(' ')}"
+        Hyla.logger2.info "Reloading browser: #{paths.join(' ')}"
         paths.each do |path|
-          Hyla.logger.info(path)
+          Hyla.logger2.info(path)
           data = 'hyla/development/'
-          Hyla.logger.info(">> Data received : #{data}")
+          Hyla.logger2.info(">> Data received : #{data}")
           @@web_sockets.each { |ws| ws.send(MultiJson.encode(data)) }
         end
       end
@@ -70,7 +70,7 @@ module Hyla
       end
 
       def _start_reactor
-        Hyla.logger.info "LiveReload is waiting for a browser to connect."
+        Hyla.logger2.info "LiveReload is waiting for a browser to connect."
         EventMachine.epoll
         EventMachine.run do
           EventMachine.start_server(@options[:host], @options[:port], @Websocket, {}) do |ws|
@@ -82,7 +82,7 @@ module Hyla
       end
 
       def _connect(ws)
-        Hyla.logger.info "Browser connected."
+        Hyla.logger2.info "Browser connected."
         ws.send MultiJson.encode(
                     command: 'hello',
                     protocols: ['http://livereload.com/protocols/official-7'],
@@ -90,18 +90,18 @@ module Hyla
                 )
         @@web_sockets << ws
       rescue
-        Hyla.logger.error $!
-        Hyla.logger.error $!.backtrace
+        Hyla.logger2.error $!
+        Hyla.logger2.error $!.backtrace
       end
 
       def _disconnect(ws)
-        Hyla.logger.info "Browser disconnected."
+        Hyla.logger2.info "Browser disconnected."
         @@web_sockets.delete(ws)
       end
 
       def _print_message(message)
         message = MultiJson.decode(message)
-        Hyla.logger.info "Browser URL: #{message['url']}" if message['command'] == 'url'
+        Hyla.logger2.info "Browser URL: #{message['url']}" if message['command'] == 'url'
       end
 
     end # class

data/lib/hyla/commands/sendmail.rb

@@ -74,7 +74,7 @@ module Hyla
 
         mail.delivery_method :smtp, parameters()
         mail.deliver!
-        Hyla.logger.info "Email send to SMTP server from #{sender} with this subject : #{subject}"
+        Hyla.logger2.info "Email send to SMTP server from #{sender} with this subject : #{subject}"
       end
 
       #

data/lib/hyla/commands/serve.rb

@@ -29,12 +29,12 @@ module Hyla
 
         s.mount(my_opts[:baseurl],HTTPServlet::FileHandler, destination, fh_option)
 
-        Hyla.logger.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
+        Hyla.logger2.info "Server address:", "http://#{s.config[:BindAddress]}:#{s.config[:Port]}"
 
         if options[:detach] # detach the server
           pid = Process.fork { s.start }
           Process.detach(pid)
-          Hyla.logger.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
+          Hyla.logger2.info "Server detached with pid '#{pid}'.", "Run `kill -9 #{pid}' to stop the server."
         else # create a new server thread, then join it with current terminal
           t = Thread.new { s.start }
           trap("INT") { s.shutdown }
@@ -45,7 +45,7 @@ module Hyla
 
       def self.start_callback(detached)
         unless detached
-          Proc.new { Hyla.logger.info "Server running...", "press ctrl-c to stop." }
+          Proc.new { Hyla.logger2.info "Server running...", "press ctrl-c to stop." }
         end
       end
 

data/lib/hyla/commands/watch.rb

@@ -35,34 +35,34 @@ module Hyla
         # Detect files modified, deleted or added
         #
         callback = Proc.new do |modified, added, removed|
-          Hyla.logger.info "modified absolute path: #{modified}"
-          Hyla.logger.info "added absolute path: #{added}"
-          Hyla.logger.info "removed absolute path: #{removed}"
+          Hyla.logger2.info "modified absolute path: #{modified}"
+          Hyla.logger2.info "added absolute path: #{added}"
+          Hyla.logger2.info "removed absolute path: #{removed}"
 
           if !modified.nil? or !added.nil?
             modified.each do |modify|
-              Hyla.logger.info "File modified : #{modify}"
+              Hyla.logger2.info "File modified : #{modify}"
               call_asciidoctor(modify)
             end
 
             added.each do |add|
-              Hyla.logger.info "File added : #{add}"
+              Hyla.logger2.info "File added : #{add}"
               call_asciidoctor(add)
             end
 
           end
         end # callback
 
-        Hyla.logger.info ">> ... Starting\n"
-        Hyla.logger.info ">> Hyla has started to watch files in this dir : #{@opts[:watch_dir]}"
-        Hyla.logger.info ">> Results of rendering will be available here : #{@opts[:to_dir]}"
+        Hyla.logger2.info ">> ... Starting\n"
+        Hyla.logger2.info ">> Hyla has started to watch files in this dir : #{@opts[:watch_dir]}"
+        Hyla.logger2.info ">> Results of rendering will be available here : #{@opts[:to_dir]}"
 
         # TODO : Investigate issue with Thread pool is not running (Celluloid::Error)
         # when using a more recent version of guard listen
         listener = Listen.to!(@opts[:watch_dir], &callback)
 
         trap(:INT) {
-          Hyla.logger.info "Interrupt intercepted"
+          Hyla.logger2.info "Interrupt intercepted"
           Thread.kill(@t)
         }
       end
@@ -76,9 +76,9 @@ module Hyla
 
         if [".adoc",".ad",".asciidoc",".txt",".index"].include? @ext_name
 
-          Hyla.logger.info ">> Directory containing file(s) to be processed : #{dir_file}"
-          Hyla.logger.info ">> File to be processed : #{file_to_process}"
-          Hyla.logger.info ">> Extension of the file : #{@ext_name}"
+          Hyla.logger2.info ">> Directory containing file(s) to be processed : #{dir_file}"
+          Hyla.logger2.info ">> File to be processed : #{file_to_process}"
+          Hyla.logger2.info ">> Extension of the file : #{@ext_name}"
 
           # Generate File name
           # Rename xxx.adoc, xxx.asciidoc, xxx.ad, xxx.index to xxx.html
@@ -100,8 +100,8 @@ module Hyla
 
           @opts[:to_dir] = calc_dir
 
-          Hyla.logger.info ">> Directory of the file to be generated : #{calc_dir}"
-          Hyla.logger.debug ">> Asciidoctor options : #{@opts}"
+          Hyla.logger2.info ">> Directory of the file to be generated : #{calc_dir}"
+          Hyla.logger2.debug ">> Asciidoctor options : #{@opts}"
 
           # Render Asciidoc document
           Asciidoctor.render_file(f, @opts)
@@ -115,7 +115,7 @@ module Hyla
 
       def self.substract_watch_dir(file_dir, watched_dir)
         s = file_dir.sub(watched_dir, '')
-        Hyla.logger.info ">> Relative directory : #{s}"
+        Hyla.logger2.info ">> Relative directory : #{s}"
         s
       end
 

data/lib/hyla/configuration.rb

@@ -3,7 +3,7 @@ module Hyla
 
     attr_reader :HEADER, :INDEX_SUFFIX, :HEADER_INDEX, :INCLUDE_PREFIX, :INCLUDE_SUFFIX, :LEVEL_1, :LEVEL_2, :SKIP_CHARACTERS,
                 :ADOC_EXT, :PREFIX_ARTEFACT, :YAML_CONFIG_FILE_NAME, :DEFAULTS,
-                :templates, :cover_template, :samples, :resources, :styles, :fonts, :backends, :assets
+                :templates, :configs, :cover_template, :samples, :resources, :styles, :fonts, :backends, :assets
 
     DEFAULTS = {
         'source' => Dir.pwd,
@@ -49,18 +49,6 @@ module Hyla
 
     SNIPPET_TAG = 'snippet'
 
-
-    #    OLD HEADER_TXT used with hyla < 1.0.7
-    #    HEADER_TXT = ":data-uri:\n" +
-    #        ":icons: font\n" +
-    #        ":last-update-label!:\n" +
-    #        ":source-highlighter: coderay\n"
-    #
-    #    HEADER_TXT = "ifndef::local[]\n" +
-    #                 ":imagesdir: ../image/\n" +
-    #                 "endif::[]\n"
-
-
     HEADER_TXT = "// Asciidoctor attributes\n"
 
     LEVEL_1 = '= '
@@ -91,6 +79,13 @@ module Hyla
       File.expand_path(COVERS, File.dirname(__FILE__))
     end
 
+    #
+    # Config Location
+    #
+    def self.configs
+      File.expand_path(CONFIGS, File.dirname(__FILE__))
+    end
+
     #
     # Templates Location
     #
@@ -161,11 +156,11 @@ module Hyla
 
       # Stringify keys of the hash that we receive from Hyla
       override = Configuration[override].stringify_keys
-      Hyla::logger.debug("OVERRIDE Keys: #{override.inspect}")
+      Hyla::logger2.debug("OVERRIDE Keys: #{override.inspect}")
 
       # Clone DEFAULTS
       config = DEFAULTS
-      Hyla::logger.debug("DEFAULTS Keys: #{config.inspect}")
+      Hyla::logger2.debug("DEFAULTS Keys: #{config.inspect}")
 
       #
       # Read the config file passed as parameter if it exists
@@ -177,7 +172,7 @@ module Hyla
         config = config.deep_merge(alt_config)
       else
         new_config = read_config_file(YAML_CONFIG_FILE_NAME)
-        Hyla::logger.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
+        Hyla::logger2.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
         config = config.deep_merge(new_config) if !new_config.nil?
       end
 
@@ -185,7 +180,7 @@ module Hyla
       config = config.deep_merge(override)
       # Convert String Keys to Symbols Keys
       config = Configuration[].transform_keys_to_symbols(config)
-      Hyla::logger.debug("Merged Keys: #{config.inspect}")
+      Hyla::logger2.debug("Merged Keys: #{config.inspect}")
       return config
     end
 
@@ -194,11 +189,10 @@ module Hyla
     #
     def self.read_config_file(filename)
       f = File.expand_path(filename)
-      Hyla::logger.info("Config file to be parsed : #{f}")
-      config = safe_load_file(f)
-      config
+      Hyla::logger2.info("Config file to be parsed : #{f}")
+      safe_load_file(f)
     rescue SystemCallError
-      Hyla::logger.warn "No configuration file retrieved for the name : #{filename}"
+      Hyla::logger2.error "No configuration file retrieved for the name : #{filename}"
     end
 
     #
@@ -267,6 +261,8 @@ module Hyla
 
     TEMPLATES = '../../lib/templates'
 
+    CONFIGS = '../../lib/configs'
+
     RESOURCES = '../../lib/resources'
 
     SAMPLES = '../../lib/templates/sample'

data/lib/hyla/logger.rb

@@ -6,6 +6,7 @@ module Hyla
     INFO = 1
     WARN = 2
     ERROR = 3
+    FATAL = 4
 
     # Public: Create a new instance of Hyla's logger
     #

data/lib/hyla/project.rb

@@ -1,5 +1,5 @@
 module Hyla
-    VERSION = '1.0.7.pre.7'
+    VERSION = '1.0.7.pre.8'
     DESCRIPTION = 'Asciidoctor Hyla - Command Line tool to create new project, watch modifications, generate content, publish or consult it live !'
     SUMMARY = 'Asciidoctor Hyla - builder/generator of HTML5, slideshow. Watch modifications, generate content, publish or consult it live !'
 end

data/lib/hyla/websocket.rb

@@ -23,7 +23,7 @@ module Hyla
     private
 
     def _serve_file(path)
-      Hyla.logger.info "Serving file #{path}"
+      Hyla.logger2.info "Serving file #{path}"
       send_data "HTTP/1.1 200 OK\r\nContent-Type: #{_content_type(path)}\r\nContent-Length: #{File.size path}\r\n\r\n"
       stream_file_data(path).callback { close_connection_after_writing }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyla
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre.7
+  version: 1.0.7.pre.8
 platform: ruby
 authors:
 - Charles Moulliard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -442,6 +442,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: colorator
   requirement: !ruby/object:Gem::Requirement
@@ -506,7 +520,10 @@ files:
 - documentation/scripts/remove_temp_directories.sh
 - documentation/scripts/sendmail.sh
 - hyla.gemspec
+- lib/configs/_config.yaml
+- lib/configs/log4r.yaml
 - lib/hyla.rb
+- lib/hyla/Logger2.rb
 - lib/hyla/command.rb
 - lib/hyla/commands/add.rb
 - lib/hyla/commands/build.rb
@@ -1179,7 +1196,6 @@ files:
 - lib/resources/backends/slim/revealjs/inline_menu.html.slim
 - lib/resources/backends/slim/revealjs/inline_quoted.html.slim
 - lib/resources/backends/slim/revealjs/section.html.slim
-- lib/templates/_config.yaml
 - lib/templates/book/development/audio/ocean_waves.mp3
 - lib/templates/book/development/book.adoc
 - lib/templates/book/development/image/hyla_frog.jpg