momo 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d24aa3bc8b813807f31c3180fec6176ccbe55c
-  data.tar.gz: a3aceaa9e405a1c969c18a5b7382c6210f589d99
+  metadata.gz: befe622c1ebf025fb049faf7fd4ac45599983c2e
+  data.tar.gz: e86b895df8edd1fb0314055fc30c767ba23f7393
 SHA512:
-  metadata.gz: 5631dd9f8217a5a837bb51f09d76cfea9047871c993e31da9cf0ea780e099576d51a25351623d9c126f0ca40ca95089614ca0d0cc581250021550b668d7fd7a1
-  data.tar.gz: 87555420670fc44dc2c0f41af18fe4e02a71ae4b96a8195c1ce3c568d24b7d1e41375fb1262463e9f3d6a3ae4e05974e6af4cf01a2230f19b617e4bbb6c9dae2
+  metadata.gz: ce1f018848a93e6170a89971ab7c18700305d12a80368446e5e620d5200fe69044bfe0c5ca6dd80f001eb592e566ad85ec6fc5c7db0c8fa961753c8f99a823a0
+  data.tar.gz: de168af0051e6894ea89b4ded43fb78982334e2b1f8efb4dd66f3b794ef70b6d6279f46304b2fbedb1eba5e74f1561a424b7cc97da8a9b59c8bb54fffe66ad49

data/lib/momo/cfl.rb

@@ -14,6 +14,7 @@ module Momo
 
 			template["Mappings"] = @stack.templatize_mappings
 			template["Resources"] = @stack.templatize_resources
+			template["Conditions"] = @stack.templatize_conditions
 			template["Parameters"] = @stack.templatize_params if @stack.parameters.length > 0
 			template["Outputs"] = @stack.templatize_outputs if @stack.outputs.length > 0
 

data/lib/momo/funccall.rb

@@ -1,11 +1,15 @@
 
 module Momo
 	class FuncCall
-		def initialize(name, *args)
+		def initialize(name, stack, *args)
 			@name = name
 			@args = []
+			@stack = stack
+			if !stack.is_a? Stack
+				raise "#{stack.inspect} is not a stack"
+			end
 			args.each do |arg|
-				@args << Momo.resolve(arg)
+				@args << Momo.resolve(arg, stack: stack)
 			end
 			if @args.length == 1
 				@args = @args[0]

data/lib/momo/momoscope.rb

@@ -1,8 +1,9 @@
+require "momo/funccall"
 
 module Momo
 
 	def Momo.resolve(something, options={})
-		
+
 		if something.is_a? String or 
 			something.is_a? TrueClass or 
 			something.is_a? FalseClass or
@@ -11,19 +12,22 @@ module Momo
 		elsif something.is_a? Array
 			result = []
 			something.each do |elem|
-				result << Momo.resolve(elem)
+				result << Momo.resolve(elem, options)
 			end
 			return result 
 		elsif something.is_a? Hash
 			result = {}
 			something.each do |key, value|
-				result[key] = Momo.resolve(value)
+				result[key] = Momo.resolve(value, options)
 			end
 			return result
 		elsif something.is_a? Resource
 			return { "Ref" => something.name }
 		elsif something.is_a? Reference
 			return something.representation
+		elsif something.is_a? BooleanValue
+			options[:stack].conditions[something.signature] = something.representation
+			return { "Condition" => something.signature }
 		elsif something.is_a? FuncCall
 			return something.representation
 		elsif something.is_a? Parameter
@@ -34,9 +38,8 @@ module Momo
 	end
 	
 	class MomoScope
-
 		def call(name, *args)
-			FuncCall.new(name, *args)
+			FuncCall.new(name, @stack, *args)
 		end
 
 		def ref(resource)
@@ -47,4 +50,53 @@ module Momo
 			call("Fn::FindInMap", map_name, key, item)
 		end
 	end
-end
+
+	class BooleanValue < FuncCall
+
+		def initialize(operator, stack, *args)
+			super(operator, stack, args)
+		end
+
+		def not()
+			BooleanValue.new("Fn::Not", @stack, self)
+		end
+
+		def signature_of(something)
+			if something.is_a? String or 
+				something.is_a? TrueClass or 
+				something.is_a? FalseClass or
+				something.is_a? Numeric
+				return something
+			elsif something.is_a? Hash
+				return something["Ref"] || something["Condition"]
+			elsif something.is_a? BooleanValue
+				return something.signature
+			elsif something.is_a? Resource
+				return something.name
+			end
+		end
+
+		def signature()
+			match = /Fn::(?<name>[a-z]+)/i.match(@name)
+			"#{signature_of(@args[0])}#{match[:name]}#{signature_of(@args[1])}"
+		end
+
+	end
+
+	module MomoCondition
+
+		def equals(another)
+			BooleanValue.new("Fn::Equals", @stack, self, another)
+		end
+
+		def and(another)
+			BooleanValue.new("Fn::And", @stack, self, another)
+		end
+
+		def or(another)
+			BooleanValue.new("Fn::Or", @stack, self, another)
+		end
+
+	end
+
+end

data/lib/momo/parameter.rb

@@ -3,8 +3,11 @@ module Momo
 	class Parameter
 		attr_accessor :name, :options
 
-		def initialize(name, options={})
+		include MomoCondition
+
+		def initialize(name, stack, options={})
 			@name = name
+			@stack = stack
 			@options = options
 		end
 	end

data/lib/momo/resource.rb

@@ -2,16 +2,20 @@ module Momo
 
 	class Resource < MomoScope
 
-		attr_accessor :type, :name, :props, :metadata, :dependencies, :deletion_policy
+		include MomoCondition
 
-		def initialize(type, name)
+		attr_accessor :type, :name, :props, :metadata, :condition, :dependencies, :deletion_policy
+
+		def initialize(type, name, stack)
 			@type = type
 			@name = name
 			@metadata = nil
 			@props = {}
+			@condition = nil
 			@dependencies = []
 			@complete = false
 			@deletion_policy = nil
+			@stack = stack
 		end
 
 		def method_missing(name, *args, &block)
@@ -21,7 +25,7 @@ module Momo
 			end
 
 			if !@complete
-				@props[name] = Momo.resolve(args[0], resource: name)
+				@props[name] = Momo.resolve(args[0], resource: name, stack: @stack)
 			else
 				MemberReference.new @name, name
 			end
@@ -126,7 +130,7 @@ module Momo
 			info["group"] = options[:group] if options[:group]
 			info["mode"] = options[:mode] if options[:mode]
 			info["owner"] = options[:owner] if options[:owner]
-			info["context"] = Momo.resolve(options[:context]) if options[:context]
+			info["context"] = Momo.resolve(options[:context], stack: @stack, resource: name) if options[:context]
 
 			set_thing2("files", name, info)
 		end
@@ -156,6 +160,5 @@ module Momo
 				raise "Invalid argument to depends_on: #{resource[0]}"
 			end
 		end
-
 	end
 end

data/lib/momo/stack.rb

@@ -4,7 +4,7 @@ module Momo
 
 	class Stack < MomoScope
 
-		attr_accessor :resources, :parameters, :outputs
+		attr_accessor :resources, :parameters, :conditions, :outputs
 
 		def initialize(&block)
 			raise "Stack expects a block" unless block
@@ -14,6 +14,8 @@ module Momo
 			@parameters = {}
 			@outputs = {}
 			@mappings = {}
+			@conditions = {}
+			@stack = self
 
 			@names = {}
 
@@ -33,7 +35,7 @@ module Momo
 				@description
 			end
 		end
-
+ 
 		def make_default_resource_name (type)
 			match = /\:?\:?([a-zA-Z]+)$/.match(type)
 			name = match.captures[0]
@@ -49,18 +51,31 @@ module Momo
 
 		def make_random_string
 			id = ""
-			loop do 
+			loop do
 				o = [('A'..'Z'), ('0'..'9')].map { |i| i.to_a }.flatten
 				id = (1...20).map { o[rand(o.length)] }.join
 				break if !@ids.has_key?(id)
-			end 
+			end
 
 			@ids[id] = true
 			id
 		end
 
 		def param(name, options={})
-			@parameters[name] = Parameter.new(name, options)
+			@parameters[name] = Parameter.new(name, self, options)
+		end
+
+		def condition(cond_expr, &block)
+			Momo.resolve(cond_expr, stack: self, resource: cond_expr.signature)
+			previous_condition = @current_condition
+
+			if previous_condition
+				cond_expr = BooleanValue.new("Fn::And", self, {"Condition" => previous_condition}, {"Condition" => cond_expr.signature})
+				Momo.resolve(cond_expr, stack: self, resource: cond_expr.signature)
+			end
+			@current_condition = cond_expr.signature
+			instance_eval(&block)
+			@current_condition = previous_condition
 		end
 
 		def make(type, options = {}, &block)
@@ -68,7 +83,8 @@ module Momo
 			name = options[:name]
 			name = make_default_resource_name(type) if !name
 
-			resource = Resource.new(type, name)
+			resource = Resource.new(type, name, self)
+			resource.condition = @current_condition
 			resource.instance_eval(&block) if block
 			resource.complete!
 
@@ -78,7 +94,7 @@ module Momo
 		end
 
 		def output(name, res)
-			@outputs[name] = Momo.resolve(res)
+			@outputs[name] = Momo.resolve(res, stack: self)
 		end
 
 		def mapping(name, &block)
@@ -89,6 +105,10 @@ module Momo
 			@mappings
 		end
 
+		def templatize_conditions
+			@conditions
+		end
+
 		def templatize_resources
 			temp = {}
 			@resources.each do |name, res|
@@ -101,6 +121,10 @@ module Momo
 					temp[name]["Metadata"] = res.metadata
 				end
 
+				if res.condition
+					temp[name]["Condition"] = res.condition
+				end
+
 				if res.dependencies.length != 0
 					temp[name]["DependsOn"] = res.dependencies
 				end

data/lib/momo/version.rb

@@ -1,3 +1,3 @@
 module Momo
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: momo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - David Siaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport