chemtrail 0.3.1 → 0.4.0

data/lib/chemtrail/matchers/have_resource.rb

@@ -4,24 +4,25 @@ module Chemtrail::RSpec
   extend RSpec::Matchers::DSL
 
   matcher :have_resource do |resource_id|
-    define_method :resource_for do |actual|
-      actual.resources.detect { |resource| resource.id == resource_id }
+    define_method :resource_for do |resource_list|
+      resource_list.detect { |resource| resource.id == resource_id }
     end
 
-    define_method :matches_type? do |actual|
-      @type.nil? || resource_for(actual).type == @type
+    define_method :matches_type? do |resource|
+      @type.nil? || resource.type == @type
     end
 
-    match do |actual|
-      !resource_for(actual).nil? && matches_type?(actual)
+    match do |resource_list|
+      resource = resource_for(resource_list)
+      !resource.nil? && matches_type?(resource)
     end
 
     chain :with_type do |type|
       @type = type
     end
 
-    failure_message_for_should do |actual|
-      if resource = resource_for(actual)
+    failure_message_for_should do |resource_list|
+      if resource = resource_for(resource_list)
         %(expected resource #{resource_id.inspect} to have type #{@type.inspect}, but got #{resource.type.inspect})
       else
         %(expected to find resource #{resource_id.inspect}, but got nothing)

data/lib/chemtrail/matchers/have_tag.rb

@@ -4,10 +4,6 @@ module Chemtrail::RSpec
   extend RSpec::Matchers::DSL
 
   matcher :have_tag do |key_name|
-    define_method :resource_for do |actual|
-      actual.resources.detect { |resource| resource.id == @resource_id }
-    end
-
     define_method :tag_for do |resource|
       tags = resource.properties["Tags"] || []
       tags.detect { |tag| tag["Key"] == key_name }
@@ -23,16 +19,11 @@ module Chemtrail::RSpec
       end
     end
 
-    match do |actual|
-      resource = resource_for(actual)
+    match do |resource|
       tag = tag_for(resource)
       !resource.nil? && !tag.nil? && matches_value?(tag)
     end
 
-    chain :on do |resource_id|
-      @resource_id = resource_id
-    end
-
     chain :with_value do |value|
       @value = value
     end
@@ -41,19 +32,15 @@ module Chemtrail::RSpec
       @reference = reference
     end
 
-    failure_message_for_should do |actual|
-      if resource = resource_for(actual)
-        if tag = tag_for(resource)
-          if @value
-            %(expected resource #{@resource_id.inspect} tag #{key_name.inspect} to have value #{@value.inspect}, but got #{tag["Value"].inspect})
-          else
-            %(expected resource #{@resource_id.inspect} tag #{key_name.inspect} to refer to #{@reference.inspect}, but got #{tag["Value"].id.inspect})
-          end
+    failure_message_for_should do |resource|
+      if tag = tag_for(resource)
+        if @value
+          %(expected resource #{resource.id} tag #{key_name.inspect} to have value #{@value.inspect}, but got #{tag["Value"].inspect})
         else
-          %(expected resource #{@resource_id.inspect} to have tag #{key_name.inspect})
+          %(expected resource #{resource.id} tag #{key_name.inspect} to refer to #{@reference.inspect}, but got #{tag["Value"].id.inspect})
         end
       else
-        %(expected to find resource #{@resource_id.inspect}, but got nothing)
+        %(expected resource #{resource.id} to have tag #{key_name.inspect})
       end
     end
   end

data/lib/chemtrail/reference_presenter.rb

@@ -20,14 +20,16 @@ class Chemtrail::ReferencePresenter
   def to_parameter
     if reference?
       argument.to_reference
-    elsif iterable?
-      if hashlike?
-        argument.reduce(argument) { |h, (k, v)| h[k] = self.class.new(v).to_parameter; h }
+    else
+      if iterable?
+        if hashlike?
+          argument.reduce(argument) { |h, (k, v)| h[k] = self.class.new(v).to_parameter; h }
+        else
+          argument.map { |item| self.class.new(item).to_parameter }
+        end
       else
-        argument.map { |item| self.class.new(item).to_parameter }
+        argument
       end
-    else
-      argument
     end
   end
 end

data/lib/chemtrail/rspec.rb

@@ -1,7 +1,9 @@
 require "chemtrail"
+require "chemtrail/matchers/be_reference_to"
+require "chemtrail/matchers/have_entry"
 require "chemtrail/matchers/have_field"
 require "chemtrail/matchers/have_mapping"
-require "chemtrail/matchers/have_mapping_key"
+require "chemtrail/matchers/have_output"
 require "chemtrail/matchers/have_parameter"
 require "chemtrail/matchers/have_property"
 require "chemtrail/matchers/have_resource"

data/lib/chemtrail/version.rb

@@ -1,3 +1,3 @@
 module Chemtrail
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chemtrail
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Doc Ritezel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -101,10 +101,26 @@ files:
 - chemtrail.gemspec
 - examples/.rspec
 - examples/Guardfile
-- examples/lib/templates/config/mappings.yml
-- examples/lib/templates/config/parameters.yml
-- examples/lib/templates/config/resources.yml
+- examples/lib/templates/config/load_balancer.yml
+- examples/lib/templates/config/nat_device.yml
+- examples/lib/templates/config/opsworks.yml
+- examples/lib/templates/config/private_network.yml
+- examples/lib/templates/config/public_network.yml
+- examples/lib/templates/config/public_network_acl.yml
+- examples/lib/templates/config/stack.yml
+- examples/lib/templates/opsworks_vpc/load_balancer.rb
+- examples/lib/templates/opsworks_vpc/nat_device.rb
+- examples/lib/templates/opsworks_vpc/opsworks.rb
+- examples/lib/templates/opsworks_vpc/private_network.rb
+- examples/lib/templates/opsworks_vpc/public_network.rb
+- examples/lib/templates/opsworks_vpc/public_network_acl.rb
 - examples/lib/templates/opsworks_vpc_template.rb
+- examples/spec/lib/templates/opsworks_vpc/load_balancer_spec.rb
+- examples/spec/lib/templates/opsworks_vpc/nat_device_spec.rb
+- examples/spec/lib/templates/opsworks_vpc/opsworks_spec.rb
+- examples/spec/lib/templates/opsworks_vpc/private_network_spec.rb
+- examples/spec/lib/templates/opsworks_vpc/public_network_acl_spec.rb
+- examples/spec/lib/templates/opsworks_vpc/public_network_spec.rb
 - examples/spec/lib/templates/opsworks_vpc_template_spec.rb
 - examples/spec/spec_helper.rb
 - lib/chemtrail.rb
@@ -113,9 +129,11 @@ files:
 - lib/chemtrail/function.rb
 - lib/chemtrail/intrinsic.rb
 - lib/chemtrail/mapping.rb
+- lib/chemtrail/matchers/be_reference_to.rb
+- lib/chemtrail/matchers/have_entry.rb
 - lib/chemtrail/matchers/have_field.rb
 - lib/chemtrail/matchers/have_mapping.rb
-- lib/chemtrail/matchers/have_mapping_key.rb
+- lib/chemtrail/matchers/have_output.rb
 - lib/chemtrail/matchers/have_parameter.rb
 - lib/chemtrail/matchers/have_property.rb
 - lib/chemtrail/matchers/have_resource.rb

data/examples/lib/templates/config/parameters.yml

@@ -1,18 +0,0 @@
-NATInstanceType:
-  Default: m1.small
-  Description: NAT Device EC2 instance type
-  ConstraintDescription: must be a valid EC2 instance type.
-  AllowedValues:
-    - t1.micro
-    - m1.small
-    - m1.medium
-    - m1.large
-    - m1.xlarge
-    - m2.xlarge
-    - m2.2xlarge
-    - m2.4xlarge
-    - c1.medium
-    - c1.xlarge
-    - cc1.4xlarge
-    - cc2.8xlarge
-    - cg1.4xlarge

data/lib/chemtrail/matchers/have_mapping_key.rb

@@ -1,49 +0,0 @@
-require "rspec/expectations"
-
-module Chemtrail::RSpec
-  extend RSpec::Matchers::DSL
-
-  matcher :have_mapping_key do |entry_name|
-    define_method :mapping_for do |actual|
-      actual.mappings.detect { |m| m.id == @mapping_id }
-    end
-
-    define_method :entry_for do |mapping|
-      mapping.entries[entry_name]
-    end
-
-    define_method :matches_value? do |entry|
-      if @included_value
-        entry.values_at(*@included_value.keys) == @included_value.values
-      else
-        true
-      end
-    end
-
-    match do |actual|
-      mapping = mapping_for(actual)
-      entry = entry_for(mapping)
-      !mapping.nil? && !entry.nil? && matches_value?(entry)
-    end
-
-    chain :on do |mapping_id|
-      @mapping_id = mapping_id
-    end
-
-    chain :including do |value|
-      @included_value = value
-    end
-
-    failure_message_for_should do |actual|
-      if mapping = mapping_for(actual)
-        if entry = entry_for(mapping)
-          %(expected mapping #{@mapping_id.inspect} field #{entry_name.inspect} to have value #{@included_value.inspect}, but got #{entry.inspect})
-        else
-          %(expected mapping #{@mapping_id.inspect} to have type #{entry_name.inspect})
-        end
-      else
-        %(expected to find mapping #{@mapping_id.inspect}, but got nothing)
-      end
-    end
-  end
-end