cfoo 0.0.1 → 0.0.2

data/spec/cfoo/file_system_spec.rb

@@ -26,6 +26,36 @@ module Cfoo
             end
         end
 
+        describe "#open" do
+            it "opens a file on disk for reading and passes it to the provided block" do
+                write_project_file "file.txt", "test content"
+
+                actual_content = "block not called"
+                file_system.open("file.txt") do |file|
+                    actual_content = file.read
+                end
+
+                actual_content.should include "test content"
+            end
+        end
+
+        describe "#find_coordinates" do
+            it "returns the coordinates of the first match of the specified string in the specified file" do
+                write_project_file "test.txt", <<-EOF
+                    the quick brown fox
+                    jumps over the lazy
+                    dog
+                    the quick brown fox
+                    jumps over the lazy
+                    dog
+                EOF
+
+                row, column = file_system.find_coordinates("lazy", "test.txt")
+                row.should be 2
+                column.should be 36
+            end
+        end
+
         describe "#glob_relative" do
             it "returns relative path of files, resolved relative to project root" do
                 files = %w[a b c].map {|file| File.join(project_root, "modules", file) }
@@ -52,10 +82,18 @@ module Cfoo
             end
         end
 
+        def relative(file)
+            File.join(project_root, file)
+        end
+
         def write(file, content)
             File.open(file, "w+") do |f|
                 f.puts content
             end
         end
+
+        def write_project_file(file, content)
+            write(relative(file), content)
+        end
     end
 end

data/spec/cfoo/parser_spec.rb

@@ -6,6 +6,13 @@ module Cfoo
         let(:parser) { Parser.new(file_system) }
 
         describe "#parse_file" do
+            context "when parsing fails" do
+                it "raises an error" do
+                    file_system.should_receive(:parse_file).and_raise "parsing failed"
+                    expect { parser.parse_file("myfile.yml") }.to raise_error Parser::CfooParseError, "Failed to parse 'myfile.yml':\nparsing failed"
+                end
+            end
+
             context "when processing a normal array" do
                 it "returns it" do
                     file_system.should_receive(:parse_file).with("myfile.yml").and_return([1, 2, 3])
@@ -106,6 +113,11 @@ module Cfoo
 
                     parser.parse_file("b64.yml").should == {"Fn::Base64" => "myencodedstring"}
                 end
+                it "raises an error when finding other (unknown) domain types" do
+                    file_system.should_receive(:parse_file).with("domaintype.yml").and_return(YAML::DomainType.create("Unknown type", "unknowntypecontent"))
+
+                    expect {parser.parse_file("domaintype.yml")}.to raise_error /Couldn't parse object/
+                end
             end
 
             context "in an array" do
@@ -140,7 +152,7 @@ module Cfoo
             context "when presented with an unknown object" do
                 it "raises an error" do
                     file_system.should_receive(:parse_file).with("myfile.yml").and_return(/a regex/)
-                    expect {parser.parse_file("myfile.yml")}.to raise_error Parser::ElParseError
+                    expect {parser.parse_file("myfile.yml")}.to raise_error Parser::ElExpansionError
                 end
             end
         end

data/spec/cfoo/processor_spec.rb

@@ -8,8 +8,8 @@ module Cfoo
         let(:processor) { Processor.new(parser, project) }
 
         describe "#process" do
-            it "parses the specified files" do
-                parser.should_receive(:parse_file).with("app.yml").and_return({"Resources" => { "AppServer" => { "Type" => "EC2Instance" } } })
+            it "parses and merges the specified files" do
+                parser.should_receive(:parse_file).with("app.yml").and_return({"Resources" => { "AppServer" => { "Type" => "LaunchConfiguration"} } })
                 parser.should_receive(:parse_file).with("db.yml").and_return({"Resources" => { "DbServer" => { "Type" => "EC2Instance" } } })
                 parser.should_receive(:parse_file).with("network.yml").and_return({"Parameters" => { "LoadBalancerIpAddress" => "10.0.0.51" } })
                 processor.process("app.yml", "db.yml", "network.yml").should == {
@@ -18,11 +18,119 @@ module Cfoo
                         "LoadBalancerIpAddress" => "10.0.0.51"
                     },
                     "Resources" => {
-                        "AppServer" => { "Type" => "EC2Instance" },
+                        "AppServer" => { "Type" => "LaunchConfiguration" },
                         "DbServer" => { "Type" => "EC2Instance" }
                     }
                 }
             end
+            context "when there's a duplicate resource definition" do
+                it "merges them" do
+                    parser.should_receive(:parse_file).with("app.yml").and_return(
+                        "Resources" => {
+                            "FrontendFleet" => {
+                                "Type" => "AutoScalingGroup"
+                            }
+                        }
+                    )
+                    parser.should_receive(:parse_file).with("app_extra.yml").and_return(
+                        "Resources" => {
+                            "FrontendFleet" => {
+                                "LoadBalancerNames" => [ "load balancer" ]
+                            }
+                        }
+                    )
+                    processor.process("app.yml", "app_extra.yml").should == {
+                        "AWSTemplateFormatVersion" => "2010-09-09",
+                        "Resources" => {
+                            "FrontendFleet" => {
+                                "Type" => "AutoScalingGroup",
+                                "LoadBalancerNames" => [ "load balancer" ]
+                            }
+                        }
+                    }
+                end
+                context "when the resources both define the same property" do
+                    it "replaces strings" do
+                        parser.should_receive(:parse_file).with("app.yml").and_return(
+                            "Resources" => {
+                                "WebApp" => {
+                                    "Type" => "Ec2Instance"
+                                }
+                            }
+                        )
+                        parser.should_receive(:parse_file).with("app_extra.yml").and_return(
+                            "Resources" => {
+                                "WebApp" => {
+                                    "Type" => "LaunchConfiguration"
+                                }
+                            }
+                        )
+                        processor.process("app.yml", "app_extra.yml").should == {
+                            "AWSTemplateFormatVersion" => "2010-09-09",
+                            "Resources" => {
+                                "WebApp" => {
+                                    "Type" => "LaunchConfiguration"
+                                }
+                            }
+                        }
+                    end
+                    it "merges arrays" do
+                        parser.should_receive(:parse_file).with("app.yml").and_return(
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "LoadBalancerNames" => [ "load balancer A" ]
+                                }
+                            }
+                        )
+                        parser.should_receive(:parse_file).with("app_extra.yml").and_return(
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "LoadBalancerNames" => [ "load balancer B" ]
+                                }
+                            }
+                        )
+                        processor.process("app.yml", "app_extra.yml").should == {
+                            "AWSTemplateFormatVersion" => "2010-09-09",
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "LoadBalancerNames" => [ "load balancer A", "load balancer B" ]
+                                }
+                            }
+                        }
+                    end
+                    it "merges maps" do
+                        parser.should_receive(:parse_file).with("app.yml").and_return(
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "Properties" => {
+                                        "LoadBalancerNames" => [ "load balancer A" ]
+                                    }
+                                }
+                            }
+                        )
+                        parser.should_receive(:parse_file).with("app_extra.yml").and_return(
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "Properties" => {
+                                        "MinSize" => "1"
+                                    }
+                                }
+                            }
+                        )
+                        processor.process("app.yml", "app_extra.yml").should == {
+                            "AWSTemplateFormatVersion" => "2010-09-09",
+                            "Resources" => {
+                                "FrontendFleet" => {
+                                    "Properties" => {
+                                        "LoadBalancerNames" => [ "load balancer A" ],
+                                        "MinSize" => "1"
+                                    }
+                                }
+                            }
+                        }
+                    end
+                end
+            end
         end
 
         describe "#process_all" do

data/spec/cfoo/yaml_parser_spec.rb

@@ -66,6 +66,11 @@ module Cfoo
 
                     parser.load_file("#{working_dir}/base64.yml").should == YAML::DomainType.create("Base64", "myencodedstring")
                 end
+                it "converts AZ lookups to GetAZs function-calls" do
+                    write "#{working_dir}/get_azs.yml", "!GetAZs myregion"
+
+                    parser.load_file("#{working_dir}/get_azs.yml").should == YAML::DomainType.create("GetAZs", "myregion")
+                end
             end
         end
 

data/spec/cfoo/yaml_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module YAML
+   describe DomainType do
+      describe "#eq?" do
+         it "returns true when all properties are equal" do
+            left = DomainType.create("type", "value")
+            right = DomainType.create("type", "value")
+            left.should == right
+         end
+         it "returns false when type IDs are different" do
+            left = DomainType.create("type_a", "value")
+            right = DomainType.create("type_b", "value")
+            left.should_not == right
+         end
+         it "returns false when values are different" do
+            left = DomainType.create("type", "value_1")
+            right = DomainType.create("type", "value_2")
+            left.should_not == right
+         end
+         it "returns false when domains are different" do
+            left = DomainType.create("type", "value")
+            right = DomainType.create("type", "value")
+            left.domain = "some domain"
+            right.domain = "some other domain"
+            left.should_not == right
+         end
+         it "returns false when other type is not a domain type" do
+            left = DomainType.create("type", "value")
+            right = "not a domain type"
+            left.should_not == right
+         end
+      end
+   end
+end
+

metadata

@@ -1,149 +1,143 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cfoo
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-26 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: parslet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: parslet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: simplecov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.3
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: coveralls
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 3
         version: 0.6.3
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 'Cfoo: CloudFormation master'
-email:
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+description: "Cfoo: CloudFormation master"
+email: 
 - drrrrrrrrrrrb@gmail.com
-executables:
+executables: 
 - cfoo
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .simplecov
 - .travis.yml
@@ -157,6 +151,8 @@ files:
 - features/attribute_expansion.feature
 - features/convert_yaml_to_json.feature
 - features/el_escaping.feature
+- features/error_reporting.feature
+- features/function_expansion.feature
 - features/map_reference_expansion.feature
 - features/modules.feature
 - features/parse_files.feature
@@ -165,8 +161,11 @@ files:
 - features/support/env.rb
 - features/yamly_shortcuts.feature
 - lib/cfoo.rb
+- lib/cfoo/array.rb
 - lib/cfoo/cfoo.rb
+- lib/cfoo/constants.rb
 - lib/cfoo/el_parser.rb
+- lib/cfoo/factory.rb
 - lib/cfoo/file_system.rb
 - lib/cfoo/module.rb
 - lib/cfoo/parser.rb
@@ -176,8 +175,10 @@ files:
 - lib/cfoo/version.rb
 - lib/cfoo/yaml.rb
 - lib/cfoo/yaml_parser.rb
+- spec/cfoo/array_spec.rb
 - spec/cfoo/cfoo_spec.rb
 - spec/cfoo/el_parser_spec.rb
+- spec/cfoo/factory_spec.rb
 - spec/cfoo/file_system_spec.rb
 - spec/cfoo/module_spec.rb
 - spec/cfoo/parser_spec.rb
@@ -185,37 +186,44 @@ files:
 - spec/cfoo/project_spec.rb
 - spec/cfoo/renderer_spec.rb
 - spec/cfoo/yaml_parser_spec.rb
+- spec/cfoo/yaml_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/drrb/cfoo
-licenses:
+licenses: 
 - GPL-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 4
-summary: Cfoo (pronounced 'sifu') allows you to write your CloudFormation templates
-  in a YAML-based markup language, and organise it into modules to make it easier
-  to maintain.
-test_files:
+specification_version: 3
+summary: Cfoo (pronounced 'sifu') allows you to write your CloudFormation templates in a YAML-based markup language, and organise it into modules to make it easier to maintain.
+test_files: 
 - features/attribute_expansion.feature
 - features/convert_yaml_to_json.feature
 - features/el_escaping.feature
+- features/error_reporting.feature
+- features/function_expansion.feature
 - features/map_reference_expansion.feature
 - features/modules.feature
 - features/parse_files.feature
@@ -223,8 +231,10 @@ test_files:
 - features/step_definitions/cfoo_steps.rb
 - features/support/env.rb
 - features/yamly_shortcuts.feature
+- spec/cfoo/array_spec.rb
 - spec/cfoo/cfoo_spec.rb
 - spec/cfoo/el_parser_spec.rb
+- spec/cfoo/factory_spec.rb
 - spec/cfoo/file_system_spec.rb
 - spec/cfoo/module_spec.rb
 - spec/cfoo/parser_spec.rb
@@ -232,4 +242,5 @@ test_files:
 - spec/cfoo/project_spec.rb
 - spec/cfoo/renderer_spec.rb
 - spec/cfoo/yaml_parser_spec.rb
+- spec/cfoo/yaml_spec.rb
 - spec/spec_helper.rb