elastic_beans 1.1.0 → 1.2.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1304b62b8e94e71c473dbfd82c8ca925076330ee
-  data.tar.gz: 1a0ede081f5d77071039d0591bd3a982d286c125
+  metadata.gz: 445b81d2f818741c42691b6e727e34da7a4646a7
+  data.tar.gz: ad2ed2724428345abe8caaf64a003d6724bd413e
 SHA512:
-  metadata.gz: 1fae1a0b942fec317e9d0cf5cfde5b2ce4a70982b6965242a105ecd93009b325f1767f5685158f98a28e9b5b12e888b6fc4730917c73089b12382a41b85901c7
-  data.tar.gz: fddb30ed342dacf0091b913480d7419dbd3e3c4caaf174d54d58a0e0e56b9912f76aa9578d3ee301f236fb75bc0ed6ce285402ccbb5992c510aba60d24654bb0
+  metadata.gz: a3a88cf55be625e0d26d4db87f106712c2b3dedbb871b100016d6706a00cb4071a3a1d03b92479999c524de59aad2644fd82b66ca9567103264fd7734dfb45ed
+  data.tar.gz: 881cd193cb819b9592167e7e88b071abb4aeb364a7a70699e5ad03e9c0dc6edf314779d89116421362124494b9961d1c613f421e869a4fc8d25576c1718e6ebb

data/lib/elastic_beans/command/scale.rb

@@ -34,8 +34,25 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           raise EnvironmentsNotReady.new(environments: [environment])
         end
 
+        config = ElasticBeans::ConfigurationTemplate.new_by_type(
+          environment_type,
+          queue: queue,
+          application: application,
+          elastic_beanstalk: elastic_beanstalk,
+        )
+
         progressbar = ProgressBar.create(title: "Configuring", total: nil, output: ui.stdout)
+        update_configuration(config, progressbar: progressbar)
+        scale_environment(environment, progressbar: progressbar)
+
+        clean_up_enqueued_commands(environment: environment) if environment_type == "exec"
+      end
+
+      private
 
+      attr_reader :application, :minimum, :maximum, :queue, :elastic_beanstalk, :ui
+
+      def update_configuration(config, progressbar:)
         Signal.trap("INT") do
           puts "\nInterrupting beans"
           puts "WARNING: Configuration update is partially applied, you should run this command again"
@@ -48,12 +65,6 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         end
 
         thread = Thread.new do
-          config = ElasticBeans::ConfigurationTemplate.new_by_type(
-            environment_type,
-            queue: queue,
-            application: application,
-            elastic_beanstalk: elastic_beanstalk,
-          )
           progressbar.log("Updating `#{config.name}' configuration template in #{application.name}...")
           config.upsert(min_size: minimum, max_size: maximum)
         end
@@ -65,7 +76,9 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
           end
         end
         thread.join
+      end
 
+      def scale_environment(environment, progressbar:)
         Signal.trap("INT") do
           puts "\nInterrupting beans"
           puts "Scaling still in progress, follow it in the AWS console"
@@ -92,9 +105,17 @@ Requires AWS credentials to be set in the environment, i.e. AWS_ACCESS_KEY_ID an
         thread.join
       end
 
-      private
-
-      attr_reader :application, :minimum, :maximum, :queue, :elastic_beanstalk, :ui
+      def clean_up_enqueued_commands(environment:)
+        commands = application.enqueued_commands
+        instance_ids = environment.instance_ids
+        progressbar = ProgressBar.create(title: "Cleaning up", total: commands.size, output: ui.stdout)
+        commands.each do |command|
+          if command.instance_id && !instance_ids.include?(command.instance_id)
+            application.deregister_command(command)
+          end
+          progressbar.increment
+        end
+      end
     end
   end
 end

data/lib/elastic_beans/version.rb

@@ -1,3 +1,3 @@
 module ElasticBeans
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0.alpha1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic_beans
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0.alpha1
 platform: ruby
 authors:
 - Adam Stegman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -251,12 +251,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Elastic Beanstalk environment orchestration for a Rails app