convection 0.2.34.pre.beta.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 837d14e5ddd6639c86b5c3bb0cf6dd5396919125
-  data.tar.gz: 2079fa841463566dd1b7eacd62a104f1e70d627e
+  metadata.gz: fd846eec3c4ac7ee0d3e4e2053ae0952a23955a5
+  data.tar.gz: 19e03ceb6351b1f136efb020de67b76abef91e9b
 SHA512:
-  metadata.gz: 0b3f343979e83ddb138d30d97ae57f5a8da0ee6b90346b9d7966a9b0ccbb8ee7f545eb0536695ad053a5f74cd6309d83b21e31436808bbcf1ec26d9acee9e5a0
-  data.tar.gz: b39d1d06d1a03e41db3fa78cab20d33a2c2f9be94541896af8b3973f5c71486bee3d0c4df4385b0024ca7643980129830210a8f0e6889e242bbdd28a10f776dc
+  metadata.gz: da357166bb2b7a0f37a56c4af42266b23d7e9330a52c2aefa83e963825f8530d5ba33c97e388c86cc4656548057aab6da68053e4b0219bd0c0ac738d5959635b
+  data.tar.gz: 44feaba9519541d70f1808185d1faea01b8b13c712a7d9ba042882f54c8ee3e6334d30a1b3d8de59a3c2d67dd318d9fb34d4e839e3ef9e30d3012d5b6c1188fd

data/bin/convection

@@ -15,9 +15,11 @@ module Convection
     end
 
     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'
     def converge(stack = nil)
       @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-      @cloud.converge(stack) do |event, errors|
+      @cloud.converge(stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |event, errors|
         say_status(*event.to_thor)
         errors.each do |error|
           say "* #{ error.message }"
@@ -29,14 +31,15 @@ module Convection
     desc 'diff STACK', 'Show changes that will be applied by converge'
     option :verbose, :type => :boolean, :aliases => '--v', :desc => 'Show stack progress'
     option :'very-verbose', :type => :boolean, :aliases => '--vv', :desc => 'Show unchanged stacks'
+    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'
     def diff(stack = nil)
       @cloud.configure(File.absolute_path(options['cloudfile'], @cwd))
-
       last_event = nil
 
-      @cloud.diff(stack) do |d|
+      @cloud.diff(stack, stack_group: options[:stack_group], stacks: options[:stacks]) do |d|
         if d.is_a? Model::Event
-          if options[:'very-verbose']
+          if options[:'very-verbose'] || d.name == :error
             say_status(*d.to_thor)
           elsif options[:verbose]
             say_status(*d.to_thor) if d.name == :compare

data/example/demo-cloud/Cloudfile

@@ -0,0 +1,49 @@
+#See the getting started guide for a description of this file and what it does.
+#to run this file make sure you are following the project layout in the getting started guide
+Dir.glob('./../../templates/**.rb') do |file|
+  require_relative file
+end
+
+require 'convection'
+
+region 'us-east-1'
+prefix = ENV['USER'] || 'anon-'
+name "#{prefix}-convection-demo"
+
+module Templates
+  INSTANCE1 = Convection.template {
+    ec2_instance('FooInstance') {
+      image_id 'ami-c02b04a8'
+    }
+  }
+  INSTANCE2 = Convection.template {
+    ec2_instance('BarInstance') {
+      image_id 'ami-c02b04a8'
+    }
+  }
+  INSTANCE3 = Convection.template {
+    ec2_instance('BazInstance') {
+      image_id 'ami-c02b04a8'
+    }
+  }
+  VPC1 = Convection.template {
+    ec2_vpc('FooVpc') {
+      network '10.1.1.0/24'
+    }
+  }
+  VPC2 = Convection.template {
+    ec2_vpc('BarVpc') {
+      network '10.1.2.0/24'
+    }
+  }
+end
+
+stack 'vpc1', Templates::VPC1
+stack 'vpc2', Templates::VPC2
+stack_group 'vpcs', %w(vpc1 vpc2)
+
+stack 'instance1', Templates::INSTANCE1
+stack 'instance2', Templates::INSTANCE2
+stack_group 'primary-instances', %w(instance1 instance2)
+
+stack 'instance3', Templates::INSTANCE3

data/lib/convection/control/cloud.rb

@@ -16,17 +16,46 @@ module Convection
         @cloudfile.stacks
       end
 
-      def deck
-        @cloudfile.deck
+      def stack_groups
+        @cloudfile.stack_groups
       end
 
-      def converge(to_stack, &block)
-        unless to_stack.nil? || stacks.include?(to_stack)
-          block.call(Model::Event.new(:error, "Stack #{ to_stack } is not defined", :error)) if block
+      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
+          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
+
+        # 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])
+
+        # 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
+
+      def converge(to_stack, options = {}, &block)
+        if to_stack && !stacks.include?(to_stack)
+          block.call(Model::Event.new(:error, "Undefined Stack #{ to_stack }", :error)) if block
           return
         end
 
-        deck.each do |stack|
+        filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:converge, "Stack #{ stack.name }", :info)) if block
           stack.apply(&block)
 
@@ -44,13 +73,18 @@ module Convection
         end
       end
 
-      def diff(to_stack, &block)
-        @cloudfile.deck.each do |stack|
+      def diff(to_stack, options = {}, &block)
+        if to_stack && !stacks.include?(to_stack)
+          block.call(Model::Event.new(:error, "Undefined Stack #{ to_stack }", :error)) if block
+          return
+        end
+
+        filter_deck(options, &block).each_value do |stack|
           block.call(Model::Event.new(:compare, "Compare local state of stack #{ stack.name } (#{ stack.cloud_name }) with remote template", :info))
 
           difference = stack.diff
           if difference.empty?
-            difference << Model::Event.new(:unchanged, "Stack #{ stack.cloud_name } Has no changes", :info)
+            difference << Model::Event.new(:unchanged, "Stack #{ stack.cloud_name } has no changes", :info)
           end
 
           difference.each { |diff| block.call(diff) }

data/lib/convection/model/cloudfile.rb

@@ -35,6 +35,10 @@ module Convection
         @stacks[stack_name] = Control::Stack.new(stack_name, template, options, &block)
         @deck << @stacks[stack_name]
       end
+
+      def stack_group(group_name, group_list)
+        @stack_groups[group_name] = group_list
+      end
     end
   end
 
@@ -48,11 +52,13 @@ module Convection
       attr_reader :attributes
       attr_reader :stacks
       attr_reader :deck
+      attr_reader :stack_groups
 
       def initialize(cloudfile)
         @attributes = Model::Attributes.new
         @stacks = {}
         @deck = []
+        @stack_groups = {}
 
         instance_eval(IO.read(cloudfile), cloudfile, 1)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.34.pre.beta.1
+  version: 0.3.0
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -100,6 +100,7 @@ files:
 - docs/stacks.md
 - docs/template.html
 - example/.ruby-version
+- example/demo-cloud/Cloudfile
 - example/getting-started-guide/Cloudfile
 - example/getting-started-guide/vpc.rb
 - example/stacks/Cloudfile
@@ -274,12 +275,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A fully generic, modular DSL for AWS CloudFormation