shards 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb4cc54d6b0923dce6d98ec135ec76a383c0d31150e4576b23b00a07038378a
-  data.tar.gz: 40ddf20a5afadedad393b9a708cc8df103f511e905e49459538722424b5ea74c
+  metadata.gz: c804f800c7a67a380ec52b9aceb45ee1d206e8285aca03f5d2f66a1a386ad42e
+  data.tar.gz: 9d06affc175287848d498fd26c1dd2aa58f1d19084ee7287ce4f8fce722afe0d
 SHA512:
-  metadata.gz: 6e2074014961d33910bcc52e3c8e3ff005392ad3ee7922963996f179aaab1818e4ca93bc03d6000de7723da6fa20dfc4fbd8cde7fd7585f269027e7e8d0cd66b
-  data.tar.gz: 95078cec446bc54aa82ebe437a817bdbfc769b28a35bd76af3992d44773bc08e356148f82774a08a527beee02ec18a4c80cc168f03ebaee7d7d6da499eea6a8a
+  metadata.gz: 4fe4f5604cada371743b2140216878bdad6e31a4ecbf34ac60165eeb48dfacc5bb87f176bb728e29a45f084faa4eb47a76dfbae42fed01c5dcd222b2b5d466a8
+  data.tar.gz: 1369e2c79f51e3545533c2304fd5140676315915c1290e3ba77bcf892c3f9ed3dec83b71d587f381bbc49e6854f250972df1217c3492eeb67b31689a5608c5a1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shards (2.3.4)
+    shards (2.4.0)
       aws-sdk-ec2 (~> 1.48)
       aws-sdk-elasticloadbalancing (~> 1.5)
       aws-sdk-elasticloadbalancingv2 (~> 1.14)

data/lib/settings/workflows/base.yaml

@@ -110,8 +110,14 @@ shared_steps:
     min_size: 3
     regex: ^[a-z0-9_\-]*$
 
-  validate_stage:
+  validate_blank_db_shard:
     correct: check_shard_presence_in_shards
+    message: Shard %s defined as blank_db exists.
+    wrong_message: Shard %s does not exist and it is defined in the stage config as blank_db.
+    wrong: clean_repo_and_exit
+
+  validate_stage:
+    correct: validate_blank_db_shard
     wrong_message: Stage %s does not exist.
     wrong: clean_repo_and_exit
 

data/lib/settings/workflows/create_by_api.yaml

@@ -14,6 +14,7 @@ correct_steps_summary:
   - validate_domain
   - validate_location
   - validate_stage
+  - validate_blank_db_shard
   - check_shard_presence_in_shards
   - check_database_presence_in_server
   - check_domain_dns_presence

data/lib/settings/workflows/fast_terminal.yaml

@@ -10,6 +10,7 @@ correct_steps_summary:
   - validate_domain
   - validate_location
   - validate_stage
+  - validate_blank_db_shard
   - check_shard_presence_in_shards
   - check_database_presence_in_server
   - check_domain_dns_presence

data/lib/shards/db.rb

@@ -164,7 +164,7 @@ module Shards
     end
 
     def blank_db_connection
-      shard.list[blank_db || stage.get('blank_db')]
+      shard.list[stage.blank_db_shard_key]
     end
 
   end

data/lib/shards/stage.rb

@@ -13,7 +13,7 @@ module Shards
       define_method(m.to_sym) { run __method__ }
     end
 
-    attr_accessor :name, :location_name, :shard
+    attr_accessor :name, :location_name, :shard, :chosen_blank_db
 
     def initialize name, data, location_name
 
@@ -100,6 +100,15 @@ module Shards
         [ h , send(remote_check) ]
       end.to_h
     end
+
+    def blank_db_shard_key
+      chosen_blank_db || get('blank_db')
+    end
+
+    def blank_db_shard_exist?
+      shard.list.keys.include? blank_db_shard_key
+    end
+
   end
 end
 

data/lib/shards/version.rb

@@ -1,3 +1,3 @@
 module Shards
-  VERSION = "2.3.4"
+  VERSION = "2.4.0"
 end

data/lib/shards/workflow/base.rb

@@ -223,7 +223,6 @@ module Shards
       end
 
       def create_database
-        stage.shard.db.blank_db = blank_db
         stage.shard.db.create dryrun: false
         message_params= [stage.shard.db.name, stage.shard.db.server]
         raise_wrong_text message_params unless stage.shard.db.exist?
@@ -261,10 +260,16 @@ module Shards
         @stage=location.stages[st]
       end
 
+      def validate_blank_db_shard
+        raise_wrong_text stage.blank_db_shard_key unless stage.blank_db_shard_exist?
+        output_message step['message'] % stage.blank_db_shard_key
+      end
+
       def ask_blank_db
         shards=stage.shard.list.keys
         choose_one "Databases:", shards
         @blank_db=shards[answer.to_i]
+        stage.chosen_blank_db=blank_db
       end
 
       def add_ask_blank_db_step

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shards
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Diego PL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler