insxsync 0.0.13 → 0.0.14

data/features/step_definitions/synchronization_steps.rb

@@ -80,7 +80,7 @@ And(/^The config files should be updated$/) do
     path = file.scan(/.*(subdomain.*)/).flatten[0]
     next if path == 'subdomain/config.ini'
     text = File.read(file)
-    db_name, db_suffix = text.scan(/database.params.database\s*=\s*('|")([^'"]*?)(db|3[01][^'"]*|[0-2]\d[^'"]*)?('|")/).flatten
+    db_name, db_suffix = text.scan(/params.database\s*=\s*('|")([^'"]*?)(db|3[01][^'"]*|[0-2]\d[^'"]*)?('|")/).flatten
     if db_suffix == 'db'
       puts file
       puts db_name
@@ -96,7 +96,7 @@ And(/^The config files should be unchanged/) do
     path = file.scan(/.*(subdomain.*)/).flatten[0]
     next if path == 'subdomain/config.ini'
     text = File.read(file).gsub("\"","'")
-    db_name, db_suffix = text.scan(/database.params.database\s*=\s*'([^']*?)(db|3[01][^']*|[0-2]\d[^']*)?'/).flatten
+    db_name, db_suffix = text.scan(/params.database\s*=\s*'([^']*?)(db|3[01][^']*|[0-2]\d[^']*)?'/).flatten
     unless db_suffix == 'db'
       puts file
       puts db_name

data/lib/config_file.rb

@@ -17,9 +17,9 @@ class ConfigFile < ErrorHandlingIface
   def scrub
     @scrubbed = @contents
     @scrubbed.gsub!("\"", "'")
-    @scrubbed.gsub!(/database.params.hostname(\s*)=(\s*)'[^']*'/m, "database.params.hostname\\1=\\2''")
-    @scrubbed.gsub!(/database.params.username(\s*)=(\s*)'[^']*'/m, "database.params.username\\1=\\2''")
-    @scrubbed.gsub!(/database.params.password(\s*)=(\s*)'[^']*'/m, "database.params.password\\1=\\2''")
+    @scrubbed.gsub!(/params.hostname(\s*)=(\s*)'[^']*'/m, "params.hostname\\1=\\2''")
+    @scrubbed.gsub!(/params.username(\s*)=(\s*)'[^']*'/m, "params.username\\1=\\2''")
+    @scrubbed.gsub!(/params.password(\s*)=(\s*)'[^']*'/m, "params.password\\1=\\2''")
     @scrubbed.gsub!(/BucketName(\s*)=(\s*)'[^']*'/m, "BucketName\\1=\\2''")
 
     @scrubbed.gsub!(/\s*useAnalytics\s*=\s*\d*/m, '')

data/lib/insxsync/version.rb

@@ -1,3 +1,3 @@
 module InsxSync
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/lib/sync_point_restore.rb

@@ -57,17 +57,17 @@ class SyncPointRestore < ErrorHandlingIface
 
       text = File.read(file).gsub("\"", "'")
 
-      text.gsub!(/database.params.hostname(\s*)=(\s*)'[^']*'/m, "database.params.hostname\\1=\\2'85.204.164.82'")
-      text.gsub!(/database.params.username(\s*)=(\s*)'[^']*'/m, "database.params.username\\1=\\2'root'")
-      text.gsub!(/database.params.password(\s*)=(\s*)'[^']*'/m, "database.params.password\\1=\\2'3dba6b67837565f146698075d5cd077fc805668c42defbf4e9b13db2eb2163ffWQXcbdGa5kLk4Kte70T66SAR7n7A13WuDsTV8VZuxwE='")
+      text.gsub!(/params.hostname(\s*)=(\s*)'[^']*'/m, "params.hostname\\1=\\2'85.204.164.82'")
+      text.gsub!(/params.username(\s*)=(\s*)'[^']*'/m, "params.username\\1=\\2'root'")
+      text.gsub!(/params.password(\s*)=(\s*)'[^']*'/m, "params.password\\1=\\2'3dba6b67837565f146698075d5cd077fc805668c42defbf4e9b13db2eb2163ffWQXcbdGa5kLk4Kte70T66SAR7n7A13WuDsTV8VZuxwE='")
       text.gsub!(/BucketName(\s*)=(\s*)'[^']*'/m, "BucketName\\1=\\2'my1outsourcing2-bucket'")
 
-      db_name, db_suffix = text.scan(/database.params.database\s*=\s*'([^']*?)(db|3[01][^']*|[0-2]\d[^']*)?'/).flatten
+      db_name, db_suffix = text.scan(/params.database\s*=\s*'([^']*?)(db|3[01][^']*|[0-2]\d[^']*)?'/).flatten
 
       if dbs.has_key?(db_name)
         latest_month = reverse_abbrvs[dbs[db_name].keys.max]
         latest_day = dbs[db_name][dbs[db_name].keys.max].max
-        text.gsub!(/database.params.database(\s*)=(\s*)'[^']*'/m, "database.params.database\\1=\\2'#{db_name}#{latest_day}#{latest_month}'")
+        text.gsub!(/params.database(\s*)=(\s*)'[^']*'/m, "params.database\\1=\\2'#{db_name}#{latest_day}#{latest_month}'")
       else
         puts "Error updating subdomain config file: #{file}"
         puts "Subdomain config file uses the database '#{db_name}#{db_suffix}' but no equivalent database exists on MySQL host."
@@ -145,17 +145,17 @@ class SyncPointRestore < ErrorHandlingIface
 
       text = File.read(file).gsub("\"", "'")
 
-      text.gsub!(/database.params.hostname(\s*)=(\s*)''/m, "database.params.hostname\\1=\\2'85.204.164.82'")
-      text.gsub!(/database.params.username(\s*)=(\s*)''/m, "database.params.username\\1=\\2'root'")
-      text.gsub!(/database.params.password(\s*)=(\s*)''/m, "database.params.password\\1=\\2'3dba6b67837565f146698075d5cd077fc805668c42defbf4e9b13db2eb2163ffWQXcbdGa5kLk4Kte70T66SAR7n7A13WuDsTV8VZuxwE='")
+      text.gsub!(/params.hostname(\s*)=(\s*)''/m, "params.hostname\\1=\\2'85.204.164.82'")
+      text.gsub!(/params.username(\s*)=(\s*)''/m, "params.username\\1=\\2'root'")
+      text.gsub!(/params.password(\s*)=(\s*)''/m, "params.password\\1=\\2'3dba6b67837565f146698075d5cd077fc805668c42defbf4e9b13db2eb2163ffWQXcbdGa5kLk4Kte70T66SAR7n7A13WuDsTV8VZuxwE='")
       text.gsub!(/BucketName(\s*)=(\s*)''/m, "BucketName\\1=\\2'my1outsourcing2-bucket'")
 
-      db_name, db_suffix = text.scan(/database.params.database\s*=\s*'([^']*?)(db)?'/).flatten
+      db_name, db_suffix = text.scan(/params.database\s*=\s*'([^']*?)(db)?'/).flatten
 
       if dbs.has_key?(db_name)
         latest_month = reverse_abbrvs[dbs[db_name].keys.max]
         latest_day = dbs[db_name][dbs[db_name].keys.max].max
-        text.gsub!(/database.params.database(\s*)=(\s*)'[^']*'/m, "database.params.database\\1=\\2'#{db_name}#{latest_day}#{latest_month}'")
+        text.gsub!(/params.database(\s*)=(\s*)'[^']*'/m, "params.database\\1=\\2'#{db_name}#{latest_day}#{latest_month}'")
       else
         puts "Error Synchronizing subdomain config file: #{file}"
         puts "Subdomain config file uses the database '#{db_name}#{db_suffix}' but no equivalent database exists on MySQL host."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: insxsync
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk