rollo 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56ade1caa6cdf9c29e8c48346ebcd591550bfbb
-  data.tar.gz: 9f661dab545588f447394f80d296187800766524
+  metadata.gz: 22045e3fa6c8b5a4cec9f59229c160aaae5a2bc9
+  data.tar.gz: b51a52be42f0fbafdd70a399678003ca20c84b58
 SHA512:
-  metadata.gz: 83a6ee4e91ba74b736b4000a66d8b167ab6cbd432e276e2b7ceb9c2aa7c5cf8f520ce829ffe13b07bcbf32215d976596e433e1ad2ab74bf93210cb9430e3be81
-  data.tar.gz: b515e70c773228188bf482bba4fcb9405df35f1c9e2ed0025d020298e7f5935b1b0777118fa75c199776e0211db04b81c494c08922037b6222bad19ef5d0b8ae
+  metadata.gz: da6e1d740c258510d9cd5eebfc87e3fab41119755f0c0380eac308b4ad5dd6bfa156b1a7346ab72be8a9f38af164e0ed3c3a39ec36e306a2479f9f2dcd21a86e
+  data.tar.gz: a08d36a6ce0552b2dc05ef0179f9d907c456a68f30141befc68bc507821edbc3bea8f188e070e2342219f383a2cc389c84a5886f1f5907f84d89844b4a3042fc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rollo (0.5.0)
+    rollo (0.6.0)
       aws-sdk (~> 3.0)
       aws-sdk-ecs (~> 1.22)
       hollerback (~> 0.1)
@@ -747,4 +747,4 @@ DEPENDENCIES
   rspec (~> 3.8)
 
 BUNDLED WITH
-   1.17.1
+   1.17.2

data/lib/rollo/commands/main.rb

@@ -33,6 +33,17 @@ module Rollo
           desc:
               'The number of hosts / service instances to add / remove at ' +
                   'a time.')
+      method_option(
+          :maximum_service_instances,
+          aliases: '-mx',
+          type: :numeric,
+          desc: 'The maximum number of service instances to expand to.')
+      method_option(
+          :minimum_service_instances,
+          aliases: '-mn',
+          type: :numeric,
+          desc: 'The minimum number of service instances to contract to.')
+
       def roll(region, asg_name, ecs_cluster_name)
         host_cluster = Rollo::Model::HostCluster.new(asg_name, region)
         service_cluster = Rollo::Model::ServiceCluster
@@ -64,7 +75,8 @@ module Rollo
               [
                   region, asg_name, ecs_cluster_name,
                   service_cluster
-              ])
+              ],
+              maximum_instances: options[:maximum_service_instances])
 
           invoke(
               "hosts:terminate",
@@ -85,7 +97,8 @@ module Rollo
               [
                   region, asg_name, ecs_cluster_name,
                   service_cluster
-              ])
+              ],
+              minimum_instances: options[:minimum_service_instances])
         end
 
         say("Instances in host cluster #{host_cluster.name} rolled " +

data/lib/rollo/commands/services.rb

@@ -25,11 +25,17 @@ module Rollo
           type: :numeric,
           default: 2,
           desc: 'The number of minutes to wait for services to start up.')
+      method_option(
+          :maximum_instances,
+          aliases: '-mx',
+          type: :numeric,
+          desc: 'The maximum number of service instances to expand to.')
 
       def expand(
           region, _, ecs_cluster_name,
               service_cluster = nil)
         batch_size = options[:batch_size]
+        maximum_instances = options[:maximum_instances]
         service_start_wait_minutes = options[:startup_time]
         service_start_wait_seconds = 60 * service_start_wait_minutes
 
@@ -49,7 +55,8 @@ module Rollo
                   "Increasing instance count by #{batch_size} " +
                       "for #{service.name}")
               with_padding do
-                service.increase_instance_count_by(batch_size) do |on|
+                service.increase_instance_count_by(
+                    batch_size, maximum_instances: maximum_instances) do |on|
                   on.prepare do |current, target|
                     say(
                         "Changing instance count from #{current} " +
@@ -86,6 +93,11 @@ module Rollo
           type: :numeric,
           default: 3,
           desc: 'The number of service instances to remove at a time.')
+      method_option(
+          :minimum_instances,
+          aliases: '-mn',
+          type: :numeric,
+          desc: 'The minimum number of service instances to contract to.')
 
       def contract(
           region, _, ecs_cluster_name,

data/lib/rollo/model/service.rb

@@ -52,24 +52,28 @@ module Rollo
         running_count == desired_count
       end
 
-      def increase_instance_count_by(count_delta, &block)
+      def increase_instance_count_by(count_delta, options = {}, &block)
+        maximum = options[:maximum_instance_count] || Float::INFINITY
         initial = desired_count
         increased = initial + count_delta
+        target = [increased, maximum].min
 
         callbacks_for(block).try_respond_with(
-            :prepare, initial, increased)
+            :prepare, initial, target)
 
-        ensure_instance_count(increased, &block)
+        ensure_instance_count(target, &block)
       end
 
-      def decrease_instance_count_by(count_delta, &block)
+      def decrease_instance_count_by(count_delta, options = {}, &block)
+        minimum = options[:minimum_instance_count] || 0
         initial = desired_count
         decreased = initial - count_delta
+        target = [decreased, minimum].max
 
         callbacks_for(block).try_respond_with(
-            :prepare, initial, decreased)
+            :prepare, initial, target)
 
-        ensure_instance_count(decreased, &block)
+        ensure_instance_count(target, &block)
       end
 
       def ensure_instance_count(count, &block)

data/lib/rollo/version.rb

@@ -1,3 +1,3 @@
 module Rollo
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollo
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Toby Clemson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk