fulmar 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc973fd8341619eec3fa3f435e285409092c315f
-  data.tar.gz: ab81cf17a631500f7ef6d1c6e547207c85adb1f4
+  metadata.gz: 8b224365b805643b2d4196803ff91f98391a7d09
+  data.tar.gz: 44926cb57c59dac055bdb5be8071ec01546c860a
 SHA512:
-  metadata.gz: 811df6ec97e9fcae45b60c1d7b8e6a329107c72654b9d6e5b16b2da97ccf3a9de2aff5808ea114b1600163cccab60b3aac98fa2a9621ea62decfecf8ae541768
-  data.tar.gz: 71a373b007303ab176c711f42dffcea3457b16b1c80ffc9783721d986f425061b7f725fa53ff01bf1dc82153720ac54534f948b9e642aea74be27a8ca7b8ab83
+  metadata.gz: 49fdb7b07030110486fca5d08555b5a357ecb1216ec29db361da21a2d3dee55a4863fc87d15a20473381904791efc29c7474beb158f0bc5d07864991ef7faf2c
+  data.tar.gz: 39318f26ffed3ab373de64ec1f6fb9dadef6abce1e430d0c3de1b93d8e360ea72e57ffe2d7c7ae14e5b83fd4ab17f0b2c10bab1d3d4e43a1736bbb3e8694c79f

data/lib/fulmar/domain/task/database_sync.rake

@@ -3,19 +3,20 @@ configuration.each do |env, target, data|
   db_configs << [env, target] if data[:type] == 'maria'
 end
 
-def create_update_task(from_db, to_db)
-  namespace to_db.first do
-    desc "Update #{to_db.first} database with #{from_db.first} data" unless to_db.first.match(/^(live|prod)/) # hide sync to live
-    task "from_#{from_db.first}" do
-      configuration.environment = from_db.first
-      configuration.target = from_db.last
+# Expects two hashes as parameters each with { :environment, :target, :name } set
+# :name is either environment:target or just the environment, if the is only one target
+def create_update_task(from, to)
+  namespace to[:name] do
+    task "from_#{from[:name]}" do
+      configuration.environment = from[:environment]
+      configuration.target = from[:target]
       puts 'Getting dump...'
       sql_dump = database.download_dump
       if sql_dump == ''
         puts 'Cannot create sql dump'
       else
-        configuration.environment = to_db.first
-        configuration.target = to_db.last
+        configuration.environment = to[:environment]
+        configuration.target = to[:target]
         puts 'Sending dump...'
         remote_sql_dump = upload(sql_dump)
         database.load_dump(remote_sql_dump)
@@ -24,12 +25,33 @@ def create_update_task(from_db, to_db)
   end
 end
 
+def name(env, target, counts)
+  counts[env] > 1 ? "#{env}:#{target}" : env
+end
+
 def create_update_tasks(db_configs)
+  counts = {}
+  db_configs.each do |config|
+    counts[config.first] = 0 unless counts[config.first]
+    counts[config.first] += 1
+  end
+
   namespace :update do
     db_configs.each do |from_db|
       db_configs.each do |to_db|
-        next if from_db == to_db
-        create_update_task(from_db, to_db)
+        next if from_db == to_db # no need to sync a database to itself
+        next if from_db.last != to_db.last # sync only matching target names
+        from = {
+          environment: from_db.first,
+          target: from_db.last,
+          name: name(from_db.first, from_db.last, counts)
+        }
+        to = {
+          environment: to_db.first,
+          target: to_db.last,
+          name: name(to_db.first, to_db.last, counts)
+        }
+        create_update_task(from, to)
       end
     end
   end

data/lib/fulmar/version.rb

@@ -1,4 +1,4 @@
 # Provides a global version number
 module Fulmar
-  VERSION = '1.7.3'
+  VERSION = '1.7.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fulmar
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - Jonas Siegl
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler