hyla 1.0.7.pre.8 → 1.0.7.pre.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MThiYzA4ZmM3OGExMDc3MTZhZTIwYzI2ZWM4YTZhZGJlMWQ0YzFmNQ==
+    ZTQ0MTcwYmY2MDdkOGE3YmVlNDk2NDdkMGQ3YTZiNjFiMmY0MjA0Nw==
   data.tar.gz: !binary |-
-    ZTEwMzA4NTkzMmI5MDVjMWUzNGUwZTU5N2I4ZDM2MTgxODVkM2IxMw==
+    ZjU3YWJmNzA1YTA0ZDYwZjIxMjIwZTIxOWZjYmQ0MjExZjQ4NmMxYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzlkOWRhYzBlYjEyNzk0OGEzY2ZiMjYxYTczZjQzMjg5Y2I3MjRlZTFmODkw
-    MzM0ZWJjOTc2OWIzOGIyNDZjMDA4YWJjNWIzNDg2ZWIyYzk3YzkyZTgzMWYx
-    ZTY3YWE3OTUxNGM4OTc0N2M0M2ZmZmJkY2ZlZjA5YjhmY2Q2YjI=
+    YzY0ODE2NjIwNTE0NmZkZmVmZWU4MTdiZmUyMDY0MzdjODVlZmMwZGQ3Yjhk
+    MGI2ZjdlODIwZDQyN2E5NGU3OWQ0MzFmNDE3YWQ0YzNmY2Q1YjU3NWMzNzVh
+    Y2RkZjhjY2M0MmExZDI3NjQ4M2U2NjFhZjhjZGU3NTJhMGQzNzc=
   data.tar.gz: !binary |-
-    M2Q5MTg0YzM3MmFjMThiMDJiOGIxZWFkMjY1NGNjNDY3YjY5M2NlZTIwOTc2
-    MzUyZmJlMmY0ODU3NTFlZWU2NWJhNzNlYmYxZGYyMjA5M2RiODZkYzVlNzlm
-    MjlkMDljYmJiOTI1ZTVhZTRiYjYyZWM4M2JhNGJkOWMxMzRmNzI=
+    NDRhODc4YTlkMDc5NWEyM2QwZjZmZGEyMDc2ZmQ1NTNjNzA0NGRlMmI3NjAy
+    MzkyZTQ2Y2RlNTA1ZmJjZTQwNmMxNGVlNzFhNGQ2ZTJjZjdiNDI1MmUxMmRh
+    Njg1MTRhMzI2NzZiN2YyZTIyOGFjOGEzZThhOTI2N2RhMWE2ZmE=

data/lib/hyla.rb

@@ -56,15 +56,27 @@ module Hyla
   end
 
   def self.logger2
-    log_cfg ||=  $options[:log]
+    configs = $options[:config].split(",").map(&:strip) if $options[:config]
+    if !configs.nil? && !configs.empty?
+      @yaml_cfg = nil
+      configs.each do |config|
+        cfg = safe_load_file(config)
+        @yaml_cfg = cfg if @yaml_cfg.nil?
+        @yaml_cfg = @yaml_cfg.deep_merge(cfg)
+      end
+    else
+      # We will try to read the _config.yaml file if it exists within the project
+      cfg = safe_load_file(Configuration::YAML_CONFIG_FILE_NAME)
+      @yaml_cfg = cfg if !cfg.nil? && !cfg.empty?
+    end
+    hyla_cfg ||= @yaml_cfg if @yaml_cfg
 
-    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']
+    log_cfg ||= $options[:log]
+    mode ||= hyla_cfg['mode'] if hyla_cfg
+    dirname ||= hyla_cfg['dirname'] if hyla_cfg
+    logname ||= hyla_cfg['logname'] if hyla_cfg
+    level ||= hyla_cfg['level'] if hyla_cfg
+    tracer ||= hyla_cfg['tracer'] if hyla_cfg
 
     $logger2 ||= Logger2.new(mode, log_cfg, dirname, logname, level, tracer)
   end
@@ -72,5 +84,7 @@ module Hyla
   def self.safe_load_file(filename)
     f = File.expand_path(filename, $cmd_directory)
     YAML.safe_load_file(f)
+  rescue SystemCallError
+    puts "No configuration file retrieved for the name : #{filename}"
   end
 end

data/lib/hyla/Logger2.rb

@@ -9,23 +9,15 @@ module Hyla
     
     attr_reader :log, :levels
 
-    def initialize(name, log_yml_file, dirname = nil, logname = nil, level = nil, tracer = nil)
+    def initialize(mode, 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
+      if level.nil? then new_level = 'INFO' else new_level = level end
+      if tracer.nil? then new_tracer = 'false' else new_tracer = tracer end
+      if mode.nil? then new_mode = 'production' else new_mode = mode end
 
       log4r_hash = load_file(log_yml_file)
 
@@ -47,15 +39,11 @@ module Hyla
         cfg['DIRNAME'] = dirname
       end
 
-      if logname.nil?
-        cfg['LOGNAME'] = 'hyla.log'
-      else
-        cfg['LOGNAME'] = logname
-      end
+      if logname.nil? then cfg['LOGNAME'] = 'hyla.log' else cfg['LOGNAME'] = logname end
 
       cfg.decode_yaml log4r_hash['log4r_config']
 
-      @log = Log4r::Logger[name]
+      @log = Log4r::Logger[new_mode]
     end
 
     def levels

data/lib/hyla/configuration.rb

@@ -13,7 +13,6 @@ module Hyla
 
         # Asciidoctor
         'backend' => 'html5',
-        'eruby' => 'erb',
         'doctype' => 'article',
         'compact' => false,
         'to_dir' => '.',
@@ -154,30 +153,34 @@ module Hyla
       extracted_email_attributes = self.extract_attributes(override[:email_attributes]) if override[:email_attributes]
       override[:email_attributes] = extracted_email_attributes if extracted_email_attributes
 
-      # Stringify keys of the hash that we receive from Hyla
+      # Stringify keys of the hash
       override = Configuration[override].stringify_keys
       Hyla::logger2.debug("OVERRIDE Keys: #{override.inspect}")
-
-      # Clone DEFAULTS
+      
+      # Config 
       config = DEFAULTS
       Hyla::logger2.debug("DEFAULTS Keys: #{config.inspect}")
 
       #
-      # Read the config file passed as parameter if it exists
-      # otherwise read default _config.yaml file if it exists and
-      # merge content with DEFAULT config
+      # Check if config parameter was passed and split content which is a list of files
+      # Read each config file and merge content with DEFAULTS
+      # Otherwise, check if there is a _config.yaml
       #
-      alt_config = read_config_file(override['config']) if override['config']
-      if !alt_config.nil?
-        config = config.deep_merge(alt_config)
+      configs = override['config'].split(",").map(&:strip) if override['config']
+      if !configs.nil? && !configs.empty?
+        configs.each do |cfg_file|
+          cfg = read_config_file(cfg_file)
+          config = config.deep_merge(cfg)
+        end
       else
         new_config = read_config_file(YAML_CONFIG_FILE_NAME)
         Hyla::logger2.debug("OVERRIDE Keys: #{new_config.inspect}") if !new_config.nil?
-        config = config.deep_merge(new_config) if !new_config.nil?
+        config = config.deep_merge(new_config) if !new_config.nil? && !new_config.empty?
       end
 
-      # Merge DEFAULTS < _config.yaml or your_config.yaml file < override
+      # Merge files with parameters  coming from the cmd line
       config = config.deep_merge(override)
+      Hyla::logger2.debug("DEFAULTS Keys: #{config.inspect}")
       # Convert String Keys to Symbols Keys
       config = Configuration[].transform_keys_to_symbols(config)
       Hyla::logger2.debug("Merged Keys: #{config.inspect}")
@@ -192,7 +195,8 @@ module Hyla
       Hyla::logger2.info("Config file to be parsed : #{f}")
       safe_load_file(f)
     rescue SystemCallError
-      Hyla::logger2.error "No configuration file retrieved for the name : #{filename}"
+      Hyla::logger2.error "No configuration file retrieved for : #{filename}"
+      exit
     end
 
     #
@@ -250,7 +254,7 @@ module Hyla
         result
       }
     end
-    
+
     ASSETS = '../../lib/resources/assets'
 
     FONTS = '../../lib/resources/assets/fonts'
@@ -270,26 +274,26 @@ module Hyla
     BACKENDS = '../../lib/resources/backends'
 
     COVER_TEMPLATE = '../../lib/resources/assets/cover/cover.slim'
-    
+
     NEW_COVER_TEMPLATE = '../../lib/resources/assets/cover/new_cover.slim'
 
-    ASSESSMENT_TXT = File.open(self.templates + '/course/assessment.txt','r').read
+    ASSESSMENT_TXT = File.open(self.templates + '/course/assessment.txt', 'r').read
 
-    LABS_TXT = File.open(self.templates + '/course/labinstructions.txt','r').read
+    LABS_TXT = File.open(self.templates + '/course/labinstructions.txt', 'r').read
 
-    INDEX = File.open(self.templates + '/course/index.txt','r').read
+    INDEX = File.open(self.templates + '/course/index.txt', 'r').read
 
-    HEADER_INDEX = File.open(self.templates + '/course/header_index.txt','r').read
+    HEADER_INDEX = File.open(self.templates + '/course/header_index.txt', 'r').read
 
-    FOOTER_TXT = File.open(self.templates + '/course/footer.txt','r').read
+    FOOTER_TXT = File.open(self.templates + '/course/footer.txt', 'r').read
 
-    COVER_TXT = File.open(self.templates + '/course/cover.txt','r').read
+    COVER_TXT = File.open(self.templates + '/course/cover.txt', 'r').read
 
-    OBJECTIVES_TXT = File.open(self.templates + '/course/objectives.txt','r').read
+    OBJECTIVES_TXT = File.open(self.templates + '/course/objectives.txt', 'r').read
 
-    SUMMARY_TXT = File.open(self.templates + '/course/summary.txt','r').read
+    SUMMARY_TXT = File.open(self.templates + '/course/summary.txt', 'r').read
 
-    AUDIO_TXT = File.open(self.templates + '/course/audio.txt','r').read
+    AUDIO_TXT = File.open(self.templates + '/course/audio.txt', 'r').read
 
   end # Class Configuration
 end # module Hyla

data/lib/hyla/project.rb

@@ -1,5 +1,5 @@
 module Hyla
-    VERSION = '1.0.7.pre.8'
+    VERSION = '1.0.7.pre.9'
     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/resources/assets/revealjs-redhat/lib/js/debug/gpe.js

@@ -1,11 +1,70 @@
-/* Selection audioblock under a section tag and move it before the title */
-var $sections = $('section');
-$sections.each(function () {
-    var $this = $(this);
-    var $audio = $this.find('.audioblock');
-    var $audioHtml = $audio.html();
-    if ($audioHtml != null) {
-        $this.removeData($audioHtml);
-        $audio.prependTo($this);
+/**************************************************************/
+/* Module GPE
+/**************************************************************/
+var GPE = {
+    prepareList: function () {
+        $('#expList').find('li:has(ul)')
+            .click(function (event) {
+                if (this == event.target) {
+                    $(this).toggleClass('expanded');
+                    $(this).children('ul').toggle('medium');
+                }
+                return false;
+            })
+            .addClass('collapsed')
+            .children('ul').hide();
+
+        //Create the button funtionality
+        $('#expandList')
+            .unbind('click')
+            .click(function () {
+                $('.collapsed').addClass('expanded');
+                $('.collapsed').children().show('medium');
+            })
+
+        $('#collapseList')
+            .unbind('click')
+            .click(function () {
+                $('.collapsed').removeClass('expanded');
+                $('.collapsed').children().hide('medium');
+            })
+    },
+
+    popuplink: function(audio_file) {
+        window.open(audio_file,
+            'audio',
+            'resizable=yes,status=no,location=no,toolbar=no,menubar=no,fullscreen=no,scrollbars=no,dependent=no,width=400,height=200');
+        return false
+    },
+
+    /* Selection audioblock under a section tag and move it before the title */
+    moveAudioBlock: function() {
+        $('section').each(function () {
+            var $this = $(this);
+            var $audio = $this.find('.audioblock');
+            var $audioHtml = $audio.html();
+            if ($audioHtml != null) {
+                $this.removeData($audioHtml);
+                $audio.prependTo($this);
+            }
+        });
     }
-});
+};
+
+
+/**************************************************************/
+/* Functions to execute on loading of the document            */
+/**************************************************************/
+$(document).ready(function () {
+    
+    // Check expandable and collapsable lists
+    GPE.prepareList();
+
+    // Add click event for <a href where id=popuplink and audio-file
+    $("a[id][audio-file]").click(function () {
+        GPE.popuplink($(this).attr('audio-file'))
+    });
+    
+    GPE.moveAudioBlock();
+
+});   

data/lib/resources/assets/revealjs-redhat/lib/js/gpe.min.js

@@ -1 +1,3 @@
-var $sections=$('section');$sections.each(function(){var $this=$(this);var $audio=$this.find('.audioblock');var $audioHtml=$audio.html();if($audioHtml!=null){$this.removeData($audioHtml);$audio.prependTo($this);}});
+var GPE={prepareList:function(){$('#expList').find('li:has(ul)').click(function(event){if(this==event.target){$(this).toggleClass('expanded');$(this).children('ul').toggle('medium');}
+return false;}).addClass('collapsed').children('ul').hide();$('#expandList').unbind('click').click(function(){$('.collapsed').addClass('expanded');$('.collapsed').children().show('medium');})
+$('#collapseList').unbind('click').click(function(){$('.collapsed').removeClass('expanded');$('.collapsed').children().hide('medium');})},popuplink:function(audio_file){window.open(audio_file,'audio','resizable=yes,status=no,location=no,toolbar=no,menubar=no,fullscreen=no,scrollbars=no,dependent=no,width=400,height=200');return false},moveAudioBlock:function(){$('section').each(function(){var $this=$(this);var $audio=$this.find('.audioblock');var $audioHtml=$audio.html();if($audioHtml!=null){$this.removeData($audioHtml);$audio.prependTo($this);}});}};$(document).ready(function(){GPE.prepareList();$("a[id][audio-file]").click(function(){GPE.popuplink($(this).attr('audio-file'))});GPE.moveAudioBlock();});

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyla
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre.8
+  version: 1.0.7.pre.9
 platform: ruby
 authors:
 - Charles Moulliard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler