shards 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9faa695b2983fbdabcb2bdbd83e63a99b2f26f98
-  data.tar.gz: e2ca33526a2a47d4676cecae895848baa21373ed
+SHA256:
+  metadata.gz: 4038bb5139e419a1756231f562e56c2eda09affb2127a3539f108f721b425c57
+  data.tar.gz: 9a7cffcb853daf46e3d4302cef097eaaf69f5e5a059fd7bc23fd33c956ed2e3f
 SHA512:
-  metadata.gz: 1044c57098d7621a2175755acff8d12adbada17034ca3b2b17984942b2b4b46e4c73833236f2a173902de00830d5feed719847b83a3c9981ea368b5822299350
-  data.tar.gz: b7fa3f945f27572f19a2d83fb6caf1262cb0eb9e37931b75f2e1ff86962648895f7df681e35f3048fc1ed8fc90c3557513629fd0f30d16147056efda225fb4cf
+  metadata.gz: 439b72ed1e0105748c0a649e15ce4ef3a75e9d21d3cccfe96ec2c89aa1f78e66b920a0a65a4286fce69820e30e9fa1e87356e3d4350b53f2be8b49a4fd12a6d1
+  data.tar.gz: 647c691803d23f76991a6e3bc314255e4b1e7b1a8080a21219c605f3f83abd3e401d74b0b6fdc9d01b260d0de5c56f9b3f7f9ae32e08c4397ce5c1b7963756c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shards (2.3.2)
+    shards (2.3.3)
       aws-sdk-ec2 (~> 1.48)
       aws-sdk-elasticloadbalancing (~> 1.5)
       aws-sdk-elasticloadbalancingv2 (~> 1.14)
@@ -24,22 +24,22 @@ GEM
       rspec-expectations (>= 2.99)
       thor (~> 0.19)
     aws-eventstream (1.0.1)
-    aws-partitions (1.106.0)
-    aws-sdk-core (3.33.0)
+    aws-partitions (1.107.0)
+    aws-sdk-core (3.36.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.51.0)
+    aws-sdk-ec2 (1.54.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-elasticloadbalancing (1.5.0)
+    aws-sdk-elasticloadbalancing (1.7.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-elasticloadbalancingv2 (1.14.0)
+    aws-sdk-elasticloadbalancingv2 (1.16.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-route53 (1.13.0)
+    aws-sdk-route53 (1.15.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)

data/lib/settings/format_methods.yaml

@@ -62,7 +62,7 @@ Shards::Db:
   user: shard.username_by_server(server)
   password: shard.password_by_server(server)
   file: |
-    '/tmp/createdb' + dns.name + '.sh'
+    File.join(base_dir,'createdb' + dns.name + '.sh')
   init_script: add "#!/bin/bash"
   creating_database: |
     add "echo \"# Creating database #{name}\""
@@ -90,7 +90,7 @@ Shards::Db:
     add "Source: #{net}"
     add "Target: #{name}"
   sql_dump_file: |
-    "/tmp/#{net}.sql.dump"
+    File.join(base_dir,"#{net}.sql.dump")
   chmod_file_command: |
     "chmod +x #{file}"
   chmod_file_message: |

data/lib/settings/workflows/base.yaml

@@ -108,7 +108,7 @@ shared_steps:
     wrong: clean_repo_and_exit
     wrong_message: The domain %s.
     min_size: 3
-    regex: ^[a-z0-9_]*$
+    regex: ^[a-z0-9_\-]*$
 
   validate_stage:
     correct: check_shard_presence_in_shards

data/lib/settings/workflows/fingerprints_terminal.yaml

@@ -14,7 +14,7 @@ fingerprints_terminal:
     wrong: finish
     wrong_message: The domain %s.
     min_size: 3
-    regex: ^[a-z0-9_]*$
+    regex: ^[a-z0-9_\-]*$
 
   validate_stage:
     correct: check_fingerprints

data/lib/shards/db.rb

@@ -22,10 +22,15 @@ module Shards
       @dns=dns
       @databases_on_servers=[]
       @server_databases={}
+      @time=Time.now.strftime("%Y_%m_%d__%H_%M_%S")
 
      reset_output
     end
 
+    def base_dir
+      "/tmp/shards_tool/#{@time}"
+    end
+
     def write_file
       add " "
       open(file, 'w+') { |fsh|
@@ -35,6 +40,7 @@ module Shards
     end
 
     def create_script
+      create_base_dir
       init_script
       creating_database
       dumping_database
@@ -49,6 +55,7 @@ module Shards
         setting_up_database_message
         print_output
         create_script
+        create_remote_base_dir!
         upload!
         ssh!
       end
@@ -59,10 +66,41 @@ module Shards
       Net::SCP.upload! proxy, proxy_user, file, file
     end
 
+    def create_remote_base_dir!
+      ssh_conn do |ssh|
+         run_ssh ssh, base_dir_create_command, base_dir_creation_message
+      end
+    end
+
+    def base_dir_create_message
+      "Creating #{base_dir} directory for db files"
+    end
+
+    def base_dir_delete_message
+      "Deleting #{base_dir} directory for db files"
+    end
+
+    def base_dir_create_command
+      "mkdir -p #{base_dir}"
+    end
+
+    def base_dir_delete_command
+      "rm -rf #{base_dir}"
+    end
+
+    def create_base_dir
+      system base_dir_create_command
+    end
+
+    def delete_base_dir
+      system base_dir_delete_command
+    end
+
     def ssh!
       ssh_conn do |ssh|
         run_ssh ssh, chmod_file_command, chmod_file_message
         run_ssh ssh, db_creation_command, db_creation_message
+        run_ssh ssh, base_dir_delete_command, base_dir_delete_message
       end
     end
 

data/lib/shards/version.rb

@@ -1,3 +1,3 @@
 module Shards
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shards
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Diego PL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Manage shards and sites to many stages and app.