autostacker24 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac0007f20ca08f1cb9705239b0d9473a6bf80441
-  data.tar.gz: fb82a1abcbb82108fd8ce04fbd0eb1b28ed7ec54
+  metadata.gz: bb33f6ccb4d9c081991bde6bb12c79283672f8e6
+  data.tar.gz: 4f166b6956bde0bc0dcee63f29b988062874db8f
 SHA512:
-  metadata.gz: e8b963abe01c15b039ccee84edc4c05387d1acac505ed6d60473f0f67854e6178a93e99bbdd0f72d90f07f47cd5ff7566c5861458e97e78087dd73a501c5c1d0
-  data.tar.gz: 8b050254c30f426e67106bef0ac1d3a410ade76003c2e1bf9f91c73ae80e83e6579a0c9609620b7ddff8b88b1a93ddf5b2713a039043c49b8fc09d7870313f19
+  metadata.gz: 292dd8f06c404a9dd2173f2cec11cc350e026b5e6ede4bc9756cb38b0e6d962cde2e25837bdd0b75283ca22b7ad7636da09639116e668fc1940d8dac6a61a37e
+  data.tar.gz: da2e04310f05e1c8e3fd1fd9d6c13597fa593c655e320cc09179ed8c99029f5519674beff3a8a745c4c78f2238a9ab390da40408ca588a0389967a8a2ee975b9

data/lib/autostacker24/stacker.rb

@@ -1,6 +1,8 @@
 require 'aws-sdk-core'
 require 'set'
 
+require_relative 'template_preprocessor.rb'
+
 module Stacker
 
   attr_reader :region, :credentials
@@ -155,7 +157,7 @@ module Stacker
 
   def template_body(template)
     template = File.read(template) if File.exists?(template)
-    template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''}
+    AutoStacker24::Preprocessor.preprocess(template)
   end
 
   extend self

data/lib/autostacker24/template_preprocessor.rb

@@ -0,0 +1,69 @@
+
+require 'json'
+
+module AutoStacker24
+
+  module Preprocessor
+
+    def self.preprocess(template)
+      template = template.gsub(/(\s*\/\/.*$)|(".*")/) {|m| m[0] == '"' ? m : ''} # replace comments
+      preprocess_json(JSON(template)).to_s
+    end
+
+    def self.preprocess_json(json)
+      if json.is_a?(Hash)
+        json.inject({}){|m, (k, v)| m.merge(k => preprocess_json(v))}
+      elsif json.is_a?(Array)
+        json.map{|v| preprocess_json(v)}
+      elsif json.is_a?(String)
+        preprocess_string(json)
+      end
+    end
+
+    def self.preprocess_string(s)
+      parts = tokenize(s).map do |token|
+        case token
+          when '@@' then '@'
+          when /^@/ then {'Ref' => token[1..-1]}
+          else token
+        end
+      end
+
+      # merge neighboured strings
+      parts = parts.reduce([])do |m, p|
+        if m.last.is_a?(String) && p.is_a?(String)
+          m[-1] += p
+        else
+          m << p
+        end
+        m
+      end
+
+      if parts.length == 1
+        parts.first
+      else # we need a join construct
+        {'Fn::Join' => ['', parts]}
+      end
+
+    end
+
+    def self.tokenize(s)
+      pattern = /@@|@([^@\s]+)/
+      tokens = []
+      until s.empty?
+        m = pattern.match(s)
+        if m
+          tokens << m.pre_match unless m.pre_match.empty?
+          tokens << m.to_s
+          s = m.post_match
+        else
+          tokens << s
+          s = ''
+        end
+      end
+      tokens
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autostacker24
 version: !ruby/object:Gem::Version
-  version: 1.0.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Johannes Mueller
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -25,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.8'
 description: n/a
 email:
 - jmueller@autoscout24.com
@@ -35,7 +49,7 @@ extra_rdoc_files: []
 files:
 - lib/autostacker24.rb
 - lib/autostacker24/stacker.rb
-- lib/autostacker24/stacker_tests.rb
+- lib/autostacker24/template_preprocessor.rb
 homepage: https://github.com/AutoScout24/autostacker24
 licenses:
 - MIT

data/lib/autostacker24/stacker_tests.rb

@@ -1,21 +0,0 @@
-require 'openssl'
-require_relative 'stacker.rb'
-
-def template_body
-  template = <<-EOL
-    bla bla //comment
-    bla "//no comment"
-    bla // still a "comment"
-    bla "some string" // comment
-  EOL
-
-  puts Stacker.template_body(template)
-end
-
-if $0 ==__FILE__ # placeholder for interactive testing
-
-  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE # Windows Hack
-
-  template_body
-
-end