[ADD] Added support for complex regular expressions with flags

features/fixtures/regex/common.yaml

@@ -8,10 +8,15 @@ template_sources:
 
 environments:
   development:
-    temp.erb!regex:
+    temp!regex:
       target: temp.txt
       regex:
         - find: confined
           replace: free
         - find: '^#some\.comment'
           replace: some.comment
+    temp2!regex:
+      target: temp2.txt
+      regex:
+        - find: /<!--\s+?<Connector\s+port="8443".+?certificateKeystoreFile="conf\/localhost-rsa.jks".+?<\/Connector>\s+?-->/m
+          replace: "<Connector protocol=\"org.apache.coyote.http11.Http11NioProtocol\"\n \t\tport=\"8443\" maxThreads=\"200\"\n \t</Connector>"

features/fixtures/regex/temp2.txt

@@ -0,0 +1,13 @@
+Before comment
+
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+After comment

features/regex.feature

@@ -10,7 +10,7 @@ Feature: Reusable template plugin
     Given I use a fixture named "regex"
     When I successfully run `tiller -b . -v -n`
     Then a file named "temp.txt" should exist
-    And the file "temp.txt" should contain:
+    And the file "temp.txt" should contain exactly:
   """
 Village did removed enjoyed explain nor ham saw calling talking.
 Securing as freeinformed declared or margaret.
@@ -19,9 +19,23 @@ Request norland neither mistake for yet.
 Between the for morning free assured country believe.
 On even feet time have an no at.
 Relation so in free smallest children unpacked delicate.
-some.comment
+#some.comment
 Why sir end believe uncivil respect.
-some.comment
+#some.comment
 Always get adieus nature day course for common.
 My little garret repair to desire he esteem.
-  """
+"""
+  Scenario: Create two configs from one template
+    Given I use a fixture named "regex"
+    When I successfully run `tiller -b . -v -n`
+    Then a file named "temp2.txt" should exist
+    And the file "temp2.txt" should contain exactly:
+"""
+Before comment
+
+    <Connector protocol="org.apache.coyote.http11.Http11NioProtocol"
+ 		port="8443" maxThreads="200"
+ 	</Connector>
+
+After comment
+"""

lib/tiller/template/regex.rb

@@ -43,9 +43,12 @@ def template(template_name)
     end
     content = open(template_absolute).read
     @config_hash[template_name]['regex'].each{ |item|
-      find = String.new(item['find'])
       replace = String.new(item['replace'])
-      content.gsub!(Regexp.new(find), replace)
+      find = String.new(item['find'])
+      if find.start_with?('/')
+        find = eval(item['find'])
+      end
+      content.gsub!(find, replace)
     }
     target = open(template_absolute, 'w')
     target.puts(content)