elastic_beans 0.12.0.alpha2 → 0.12.0.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae6aa35f652ca0e53486f211218fedea2419d62
-  data.tar.gz: 55e52f1bb58c11f5fa40934621ecca13e63b2408
+  metadata.gz: 9e9279440583eb621e91ba0b232afd34f9e4419c
+  data.tar.gz: 578621f57dfa6d0beb263a83f22a48fe1e146144
 SHA512:
-  metadata.gz: abd30c1b53faac2caf2f0c38261d999d3a9d5863253ede34375a812b9e1617a9ed96e017cbd579bdeede82e012dcf5b9a31f95b54236526f3266c564a3435649
-  data.tar.gz: f34694b8c6601115f442eee12a90195cf50af471ec90a52ea94d5d332a58d31b70c7c00e8aa923c9eea871a2051594f9438bab2a2f64319e6df914401631a611
+  metadata.gz: cc57df37016899de9ff2967d3c2ac8803a8d9655d75be8a04ebbf713f5ed85d7a5b5e7b28f1488804bbee3eb199528af3ebe3d81291ed82c785d76ae906b2045
+  data.tar.gz: b7561fbc15110e58c68cae383d067ba4a6ef1f25a32b634bae4e30fa0aa92197fd49375f2fa29c1cfe8040f8f797a79962d7d61258b5b317a291e6ba1eedbe15

data/exe/beans

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
 Signal.trap("INT") do
-  puts "\nInterrupting beans -- if an operation was in progress, it will still be running."
+  puts "\nInterrupting beans"
   raise Interrupt
 end
 
 Signal.trap("TERM") do
-  puts "Terminating beans -- if an operation was in progress, it will still be running."
+  puts "Terminating beans"
   raise SignalException.new("TERM")
 end
 

data/lib/elastic_beans/command/configure.rb

@@ -50,6 +50,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
         threads = []
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise SignalException.new("TERM")
+        end
+
         config_templates = 4 + application.worker_queues.size
         progressbar = ProgressBar.create(title: "Configuring", total: config_templates, output: ui.stdout)
         progressbar.log("Updating configuration templates in #{application.name}...")

data/lib/elastic_beans/command/create.rb

@@ -65,6 +65,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           end
         end
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "Create environment still in progress, follow it in the AWS console"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "Create environment still in progress, follow it in the AWS console"
+          raise SignalException.new("TERM")
+        end
+
         ui.info("Creating environment `#{environment.name}'...")
         progressbar = ProgressBar.create(title: "Creating", total: nil, output: ui.stdout)
         environment_thread = Thread.new do

data/lib/elastic_beans/command/deploy.rb

@@ -48,6 +48,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
         version_thread.join
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "Deployment still in progress, follow it in the AWS console"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "Deployment still in progress, follow it in the AWS console"
+          raise SignalException.new("TERM")
+        end
+
         progressbar.log("Deploying version '#{version}' to #{application.name}...")
         progressbar.title = "Deploying"
         deploy_threads = environments.map { |environment|

data/lib/elastic_beans/command/restart.rb

@@ -49,6 +49,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
         progressbar = ProgressBar.create(title: "Restarting", total: nil, output: ui.stdout)
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "Restart still in progress, follow it in the AWS console"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "Restart still in progress, follow it in the AWS console"
+          raise SignalException.new("TERM")
+        end
+
         threads = environments.map { |environment|
           progressbar.log("Restarting `#{environment.name}'...")
           thread = Thread.new do

data/lib/elastic_beans/command/scale.rb

@@ -36,6 +36,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
         progressbar = ProgressBar.create(title: "Configuring", total: nil, output: ui.stdout)
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise SignalException.new("TERM")
+        end
+
         thread = Thread.new do
           config = ElasticBeans::ConfigurationTemplate.new_by_type(
             environment_type,
@@ -55,6 +66,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
         thread.join
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "Scaling still in progress, follow it in the AWS console"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "Scaling still in progress, follow it in the AWS console"
+          raise SignalException.new("TERM")
+        end
+
         thread = Thread.new do
           progressbar.log("Updating `#{environment.name}'...")
           environment.scale(min_size: minimum, max_size: maximum)

data/lib/elastic_beans/command/set_env.rb

@@ -32,6 +32,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
         progressbar = ProgressBar.create(title: "Updating", total: nil, output: ui.stdout)
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise SignalException.new("TERM")
+        end
+
         progressbar.log("Updating configuration in #{application.name}...")
         application.env_vars.upsert(env_vars)
         progressbar.increment

data/lib/elastic_beans/command/unset_env.rb

@@ -31,6 +31,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
 
         progressbar = ProgressBar.create(title: "Updating", total: nil, output: ui.stdout)
 
+        Signal.trap("INT") do
+          puts "\nInterrupting beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise Interrupt
+        end
+        Signal.trap("TERM") do
+          puts "Terminating beans"
+          puts "WARNING: Configuration update is partially applied, you should run this command again"
+          raise SignalException.new("TERM")
+        end
+
         progressbar.log("Updating configuration in #{application.name}...")
         application.env_vars.del(env_keys)
         progressbar.increment

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = "0.12.0.alpha2"
+  VERSION = "0.12.0.alpha3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 0.12.0.alpha2
+  version: 0.12.0.alpha3
 platform: ruby
 authors:
 - Adam Stegman