murk 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60df7bc401fcbc090f5c5c92b21f321a7b213223
-  data.tar.gz: 1aef1f3005dec89dd6c9d891cc420488de417e00
+  metadata.gz: 23360b45d4e37658cbf2a87096eb068be03984c2
+  data.tar.gz: 2543370fa8b160ac8276db0c30e77eae131f09fa
 SHA512:
-  metadata.gz: cb8332d52d2992b972cc025c8c65ec92615110911eee4fde93dbf883ea8921385d27afe06c546b7ab08ac7fd9f3478d79e154b0af941ca548373952afeec78c1
-  data.tar.gz: 6d31ff340f1ff72540ffeed4065e41bdab412e32919b392a26598a9585dfe7bc8bcced561b422c2bd445126f1afbdd66ea5a52a6761263d71efc2590fdd5dc95
+  metadata.gz: 81386a579324972281f454b2450bb37fa267352dd160f1371a68f761fc1273c730f99476a18d6d3fcb4ed619b712361c469fd1089194165bd777b0ef07cef18a
+  data.tar.gz: 2a341ca46363621d52c4aab88249d989982ff001c162e78b4413eca090a3928f57fc140bc83fdbcdfde99ac9b742c1c65273b0d717b816e88d1931f1cf4afeb1

data/lib/murk/builder/parameters_builder.rb

@@ -6,7 +6,8 @@ module Murk
 
     class ParametersBuilder
 
-      def initialize
+      def initialize(env: nil)
+        @env = env
         @parameters = []
       end
 
@@ -20,9 +21,9 @@ module Murk
 
       def method_missing(method_sym, *args, &block)
         if args.length > 0
-          @parameters << Murk::Model::SimpleStackParameter.new(method_sym, args[0])
+          @parameters << Murk::Model::SimpleStackParameter.new(method_sym, args[0], env: @env)
         else
-          @parameters << Murk::Model::ReferenceStackParameter.new(method_sym, block)
+          @parameters << Murk::Model::ReferenceStackParameter.new(method_sym, block, env: @env)
         end
       end
 

data/lib/murk/builder/stack_builder.rb

@@ -7,7 +7,7 @@ module Murk
       def initialize(stack_name, env: nil)
         @stack_name = stack_name
         @env = env
-        @parameters_builder = ParametersBuilder.new
+        @parameters_builder = ParametersBuilder.new(env: @env)
       end
 
       def build

data/lib/murk/model/stack.rb

@@ -10,7 +10,6 @@ module Murk
       include Murk::AWS
 
       attr_reader :name, :env, :template
-      attr_accessor :collection
 
       def initialize(name, env: nil, template_filename: name + '.json')
         @name = name
@@ -32,7 +31,7 @@ module Murk
       end
 
       def parameter_value(parameter_key)
-        @parameters.find { |parameter| parameter.key == parameter_key }.resolve(@collection)
+        @parameters.find { |parameter| parameter.key == parameter_key }.resolve
       end
 
       def create_or_update
@@ -117,7 +116,7 @@ module Murk
 
       def explicit_parameters
         @parameters.map do |parameter|
-          { parameter_key: parameter.key, parameter_value: parameter.resolve(@collection) }
+          { parameter_key: parameter.key, parameter_value: parameter.resolve }
         end
       end
 

data/lib/murk/model/stack_collection.rb

@@ -5,13 +5,12 @@ module Murk
 
       include Enumerable
 
-      def initialize
-        @stacks = []
+      def initialize(stacks = nil)
+        @stacks = stacks || []
       end
 
       def add(stack)
         @stacks << stack
-        stack.collection = self
       end
 
       def each(&block)
@@ -24,10 +23,6 @@ module Murk
         end
       end
 
-      def stack(name)
-        @stacks.find { |stack| stack.name == name.to_s }
-      end
-
     end
   end
 end

data/lib/murk/model/stack_parameter.rb

@@ -4,19 +4,20 @@ module Murk
 
     class SimpleStackParameter
 
-      attr_reader :key, :value
+      attr_reader :key, :value, :env
 
-      def initialize(key, value)
+      def initialize(key, value, env: nil)
         @key = key
         @value = value
+        @env = env
       end
 
-      def resolve(stack_collection)
+      def resolve
         @value
       end
 
       def ==(other)
-        @key == other.key && @value == other.value
+        @key == other.key && @value == other.value && @env == other.env
       end
 
     end
@@ -25,13 +26,23 @@ module Murk
 
       attr_reader :key, :block
 
-      def initialize(key, block)
+      def initialize(key, block, env: nil)
         @key = key
         @block = block
+        @env = env
       end
 
-      def resolve(stack_collection)
-        stack_collection.instance_eval(&@block)
+      def resolve
+        instance_eval(&@block)
+      end
+
+      def env(name)
+        @env = name
+        self
+      end
+
+      def stack(name)
+        Stack.new(name, env: @env)
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: murk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Cam Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api_cache