aws-must 0.0.6 → 0.0.7

data/lib/aws-must/docu.rb

@@ -9,9 +9,12 @@ module AwsMust
     # ------------------------------------------------------------------
     # constants
 
-    DEFAULT_OPEN_TAG      ="++start++"
-    DEFAULT_CLOSE_TAG     ="++close++"
-    DEFAULT_INCLUDE_TAG   =">"
+    DEFAULT_OPEN_TAG           ="+++start+++"
+    DEFAULT_CLOSE_TAG          ="+++close+++"
+    DEFAULT_FOLD_ON_TAG        ="+++fold-on+++"
+    DEFAULT_FOLD_OFF_TAG       ="+++fold-off+++"
+    DEFAULT_INCLUDE_TAG        =">"
+
 
 
     # ------------------------------------------------------------------
@@ -22,6 +25,10 @@ module AwsMust
 
     # instance 
 
+    # command line option define lines to output for directive
+    attr_accessor   :fold_on
+    attr_accessor   :fold_off
+
     # ------------------------------------------------------------------
     # Constructor
     # - template: which knows how to return template files
@@ -33,12 +40,20 @@ module AwsMust
 
       @template = template
 
+      # command line option define lines to output for directive
+      @fold_on = options[:fold_on] if options[:fold_on]
+      @fold_off = options[:fold_off] if options[:fold_off]
+
+
       @directives = {
         :open => DEFAULT_OPEN_TAG,
         :close => DEFAULT_CLOSE_TAG,
+        :fold_on => DEFAULT_FOLD_ON_TAG,
+        :fold_off => DEFAULT_FOLD_OFF_TAG,
         :include => DEFAULT_INCLUDE_TAG,
       }
 
+
     end
 
     # ------------------------------------------------------------------
@@ -60,7 +75,7 @@ module AwsMust
 
         if !state_opened then
 
-          # waiting for +++open+++
+          # waiting for +++open+++ or +++fold_on+++
 
           open_found, line = directive_open( line )
           if open_found then
@@ -74,7 +89,7 @@ module AwsMust
 
         else 
 
-          # seen +++open+++, waiting for +++close+++
+          # seen +++open+++ or +++fold_on+++, waiting for +++close+++, +++fold_off+++
 
           close_found, line_pre, line = directive_close( line )
           # puts "close_found=#{close_found}, #{close_found.class}, line=#{line}"
@@ -109,26 +124,34 @@ module AwsMust
       # return line && line.include?( get_tag(:open) )
       if line && line.include?( get_tag(:open) ) then
         # find index pointing _after_ :open tag
-        index = line.index( get_tag(:open) ) + get_tag(:open).length
+        # index = line.index( get_tag(:open) ) + get_tag(:open).length
         # # return text after directtive
         # return  true, line[ index..-1]
 
         # do not output anything for the line
         return  true, nil
 
+      elsif line && line.include?( get_tag(:fold_on) ) then
+        # output fold_on text instread
+        return  true, self.fold_on
       else
         return false, nil
       end
     end
+
     
     # return bool, line_pre, line
     def directive_close( line )
       #return line && line.include?( get_tag( :close ) )
       if line && line.include?( get_tag( :close ) ) then
-        index = line.index( get_tag(:close) )
+        # index = line.index( get_tag(:close) )
         # return true, index == 0 ? nil : line[0..index-1],  line[ index+ get_tag(:close).length..-1]
         # do not output anythin on line for directive
         return true, nil, nil
+        
+      elsif line && line.include?( get_tag(:fold_off) ) then
+        # replace fold-off direcive line with fold_off text
+        return true, self.fold_off, nil
       else
         return false, nil, line
       end
@@ -153,6 +176,7 @@ module AwsMust
 
     # ------------------------------------------------------------------
     # get tag value
+
     def get_tag( tag )
       raise "Unknown tag" unless @directives[tag]
       return @directives[tag]

data/lib/aws-must/template.rb

@@ -70,9 +70,32 @@ module AwsMust
       @logger.debug( "#{__FILE__}.#{__method__} name=#{name}" )
       return @templates[name] if @templates && @templates[name]
 
+      if !  File.exists?( @@template_path ) then
+        raise <<-eos
+
+
+          No such directory '#{@@template_path}'.
+ 
+          Use opition -t to point to an existing directory.
+        
+        eos
+      end
+
       template_path = "#{@@template_path}/#{name}.#{@@template_extension}"
       @logger.info( "#{__FILE__}.#{__method__} read template_path=#{template_path}" )
 
+      if !  File.exists?( template_path ) then
+        raise <<-eos
+
+          No such file  '#{template_path}'.
+ 
+          Use opition -t to point to a directory, which contains file '#{name}.#{@@template_extension}'
+
+        
+        eos
+      end
+
+
       File.read( template_path )
     end
 

data/lib/utils/hasher.rb

@@ -62,10 +62,12 @@ module Utils
         obj2 = dfs(obj) do |o| 
           o.each do |k,v| 
             if v.is_a? Array
-              # add :comma -property expect to the last element
+              # add _comma = ',', expect to the 
               v.slice(0,v.length-1).each do |elem|
                 elem["_comma"] = "," if elem.is_a? Hash
               end
+              # add _comma = '' to the last element
+              v.last["_comma"] = "" if  v.last.is_a? Hash
             end
           end
         end # block

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-must
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - jarjuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache