convection 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02061f0e91085ee63ba5222db6991c4eba1a446e
-  data.tar.gz: c4f5a62d21357e404e7fd4e2ec287f38af0e2e38
+  metadata.gz: 2c47278ea072d6254e3d9b6bd60ff0b34b26d5c5
+  data.tar.gz: eae63705e881e7b7efa4cc2a5c3376bc453f39b1
 SHA512:
-  metadata.gz: 669379f7312d53a65a6cd02294b9f786028a2bfabd31c8a2fa19476da0e6f7af697630bf23eb76622a833d2e6c20ae072f7c1191b5eafa2877e736e4781bd490
-  data.tar.gz: 0cc22c3896003722f701ac226d4e60254313f73e9cae8c0dfc9d28c9a74997ce1c68f9de107bbea8028bbef1e503b540eac68710c3c3ce810054c7efea5835b9
+  metadata.gz: b6655098f7f79a48236e71f5c20df2a2c236aa3fed7025789d92642df1369d763ec5e70a8e71436f363e062d7549520c6959e5e83452bd454229f0d84bf0f0a0
+  data.tar.gz: 7f8a5150e724eea1ce80a5a6d25a6da6520233242a5a53f985225dabc3739fecc2693269052c75dec5a320e0ef11838cc3305a37dd14e4154af7fc0c48db167a

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.3

data/.travis.yml

@@ -1,7 +1,12 @@
 language: ruby
 rvm:
-  - 2.2.0
-  - 2.2.1
-  - 2.2.2
-  - 2.3.0
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 sudo: false
+before_install:
+  - gem update bundler
+  - gem update --system
+branches:
+  only:
+    - master

data/bin/convection

@@ -18,6 +18,7 @@ module Convection
     desc 'converge STACK', 'Converge your cloud'
     option :stack_group, :type => :string, :desc => 'The name of a stack group defined in your cloudfile to converge'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to converge'
+    option :exclude_stacks, :type => :array, :desc => 'A ordered space separated list of stacks NOT to converge'
     option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress', default: true
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks', default: true
     option :cloudfiles, :type => :array, :default => %w(Cloudfile)
@@ -56,6 +57,7 @@ module Convection
     desc 'diff STACK', 'Show changes that will be applied by converge'
     option :stack_group, :type => :string, :desc => 'The name of a stack group defined in your cloudfile to diff'
     option :stacks, :type => :array, :desc => 'A ordered space separated list of stacks to diff'
+    option :exclude_stacks, :type => :array, :desc => 'A ordered space separated list of stacks NOT to diff'
     option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress'
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
     option :cloudfiles, :type => :array, :default => %w(Cloudfile)
@@ -131,7 +133,7 @@ module Convection
               cloud_array[:cloud].configure(File.absolute_path(cloud_array[:cloudfile_path], @cwd))
               cloud = cloud_array[:cloud]
               region = cloud.cloudfile.region
-              cloud.send(task_name, stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |event, errors|
+              cloud.send(task_name, stack, stack_group: options[:stack_group], stacks: options[:stacks], exclude_stacks: options[:exclude_stacks]) do |event, errors|
                 if options[:cloudfiles].length > 1 && options[:delayed_output]
                   output << { event: event, errors: errors }
                 else

data/lib/convection/control/cloud.rb

@@ -22,31 +22,48 @@ module Convection
       end
 
       def filter_deck(options = {}, &block)
-        # throw an error if the user specifies both a stack group and list of stacks
-        if options[:stack_group] && options[:stacks]
-          block.call(Model::Event.new(:error, 'Cannot specify --stack-group and --stack-list at the same time', :error)) if block
+        # throw an error if the user specifies more than one (stack group, list of stacks, exclusion list of stacks)
+        if (options[:stack_group] && options[:stacks]) ||
+           (options[:stack_group] && options[:exclude_stacks]) ||
+           (options[:stacks] && options[:exclude_stacks])
+          block.call(Model::Event.new(:error, 'Cannot specify --stack-group , --stack-list, or --exclude-stacks at the same time as each other', :error)) if block
           return {}
         end
 
-        # throw an error if the user specifies a nonexistent stack groups
-        if options[:stack_group] && !stack_groups.key?(options[:stack_group])
-          block.call(Model::Event.new(:error, "Unknown stack group: #{options[:stack_group]}", :error)) if block
-          return {}
-        end
+        if options[:stack_group] || options[:stacks]
+          # throw an error if the user specifies a nonexistent stack groups
+          if options[:stack_group] && !stack_groups.key?(options[:stack_group])
+            block.call(Model::Event.new(:error, "Unknown stack group: #{options[:stack_group]}", :error)) if block
+            return {}
+          end
 
-        # throw an error if the user specifies nonexistent stacks
-        if Array(options[:stacks]).any? { |name| !@cloudfile.stacks.key?(name) }
-          bad_stack_names = options[:stacks].reject { |name| @cloudfile.stacks.key?(name) }
-          block.call(Model::Event.new(:error, "Undefined Stack(s) #{bad_stack_names.join(', ')}", :error)) if block
-          return {}
-        end
+          # throw an error if the user specifies nonexistent stacks
+          if Array(options[:stacks]).any? { |name| !@cloudfile.stacks.key?(name) }
+            bad_stack_names = options[:stacks].reject { |name| @cloudfile.stacks.key?(name) }
+            block.call(Model::Event.new(:error, "Undefined Stack(s) #{bad_stack_names.join(', ')}", :error)) if block
+            return {}
+          end
+
+          filter = Array(stack_groups[options[:stack_group]] || options[:stacks])
+          filter.reduce({}) do |result, stack_name|
+            result.merge(stack_name => @cloudfile.stacks[stack_name])
+          end
+
+        elsif options[:exclude_stacks]
+          # throw an error if the user specifies nonexistent excluded stacks
+          if Array(options[:exclude_stacks]).any? { |name| !@cloudfile.stacks.key?(name) }
+            bad_stack_names = options[:exclude_stacks].reject { |name| @cloudfile.stacks.key?(name) }
+            block.call(Model::Event.new(:error, "Undefined Stack(s) #{bad_stack_names.join(', ')}", :error)) if block
+            return {}
+          end
+
+          filter = Array(options[:exclude_stacks])
+          return stacks.reject { |stack_name| filter.include? stack_name }
 
-        filter = Array(stack_groups[options[:stack_group]] || options[:stacks])
+        else
+          # if no filter is specified, return the entire deck
+          return stacks
 
-        # if no filter is specified, return the entire deck
-        return stacks if filter.empty?
-        filter.reduce({}) do |result, stack_name|
-          result.merge(stack_name => @cloudfile.stacks[stack_name])
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk