cfoo 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5fcc988f1989d6b93a69fa74fac941f3294f5bea
+  data.tar.gz: ede4908b05d3c967c5b71d6b6ed4515298eac28a
+SHA512:
+  metadata.gz: c6ce108951f4369e9d5018746c4f552d655acda9af47808104d5d69675643f016c4e63d46676973cd37591a9ad8776fa7d82235909a1c9062f02e5feb59b763a
+  data.tar.gz: 003f932fcacefab7b329a63c0716540d035a83d7302c322314a163a96d79f9d28592577e8c4c51b0bb0bf5a3fed2e874e3768551b2895797f2fb4a7a0d56e56d

data/Guardfile

@@ -0,0 +1,8 @@
+notification :terminal_notifier
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/README.md

@@ -1,6 +1,6 @@
 # Cfoo
 
-[![Build Status](https://travis-ci.org/drrb/cfoo.png?branch=master)](https://travis-ci.org/drrb/cfoo)
+[![Build Status](https://travis-ci.org/drrb/cfoo.svg?branch=master)](https://travis-ci.org/drrb/cfoo)
 [![Coverage Status](https://coveralls.io/repos/drrb/cfoo/badge.png?branch=master)](https://coveralls.io/r/drrb/cfoo)
 [![Code Climate](https://codeclimate.com/github/drrb/cfoo.png)](https://codeclimate.com/github/drrb/cfoo)
 
@@ -75,7 +75,7 @@ Properties:
 
     function error_exit
     {
-      /opt/aws/bin/cfn-signal -e 1 -r "$1" '$(WaitHandle)'
+      /opt/aws/bin/cfn-signal -e 1 -r "\$1" '$(WaitHandle)'
       exit 1
     }
 
@@ -139,9 +139,7 @@ Cfoo Shortcut: `$(SubnetConfig[VPC][CIDR])`
 
 CloudFormation: `{ "Fn::GetAtt" : [ "Ec2Instance", "PublicIp" ] }`
 
-Cfoo Shortcut: `$(Ec2Instance.PublicIp)`
-
-Other Shortcut: `$(Ec2Instance[PublicIp])`
+Cfoo Shortcut: `$(Ec2Instance[PublicIp])`
 
 ##### Embedded Reference
 

data/cfoo.gemspec

@@ -31,5 +31,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "cucumber"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "coveralls", ">= 0.6.3"
-  gem.add_development_dependency "json" # Coveralls needs it
+  gem.add_development_dependency "mime-types", "< 2" # Needed to support Ruby 1.8
+
+  unless ["1.8.7", "1.9.2"].include? RUBY_VERSION
+      gem.add_development_dependency "guard"
+      gem.add_development_dependency "guard-rspec"
+      gem.add_development_dependency "terminal-notifier-guard"
+  end
 end

data/features/attribute_expansion.feature

@@ -8,7 +8,7 @@ Feature: Expand EL Attribute References
         """
         EntryPoint:
             Description: IP address of the Bastion Host
-            Value: $(BastionHost.PublicIp)
+            Value: $(BastionHost[PublicIp])
         """
         When I process "outputs.yml"
         Then the output should match JSON
@@ -27,7 +27,7 @@ Feature: Expand EL Attribute References
         """
         WebSite:
             Description: URL of the website
-            Value: http://$(PublicElasticLoadBalancer.DNSName)/index.html
+            Value: http://$(PublicElasticLoadBalancer[DNSName])/index.html
         """
         When I process "outputs.yml"
         Then the output should match JSON

data/lib/cfoo/el_parser.rb

@@ -28,13 +28,12 @@ module Cfoo
         rule(:dot) { str('.') }
         rule(:comma) { str(",") >> space? }
         rule(:text_character) { match['^\\\\$'] }
-        rule(:identifier) { match['a-zA-Z0-9_\-:'].repeat(1).as(:identifier) >> space? }
+        rule(:identifier) { match['a-zA-Z0-9._\-:'].repeat(1).as(:identifier) >> space? }
         rule(:text) { text_character.repeat(1).as(:text) }
 
         rule(:attribute_reference) do
             (
                 expression.as(:reference) >> (
-                    str(".") >> identifier.as(:attribute) |
                     str("[") >> expression.as(:attribute) >> str("]")
                 )
             ).as(:attribute_reference)

data/lib/cfoo/file_system.rb

@@ -1,5 +1,22 @@
 require 'cfoo/yaml_parser'
 
+class String
+    def coordinates_of_index(index)
+        lines = split("\n")
+        line_number = 1
+        column_number = index + 1
+        lines.each do |line|
+            if line.length < column_number
+                line_number += 1
+                column_number -= line.length
+            else
+                return [ line_number, column_number ]
+            end
+        end
+        [ -1, -1 ]
+    end
+end
+
 module Cfoo
     class FileSystem
         def initialize(project_root, yaml_parser)
@@ -19,19 +36,19 @@ module Cfoo
         end
 
         def find_coordinates(string, file_name)
-            matching_lines = []
             open(file_name) do |file|
-                file.each_with_index do|line, row_index|
-                    if line.include? string
-                        column_index = line.index(string)
-                        row = row_index + 1
-                        column = column_index + 1
-                        return [row, column]
-                    end
+                content = file.read
+                lines = string.split "\n"
+                patterns = lines.map { |line| Regexp.escape(line) }
+                pattern = patterns.join '\n\s*'
+                regex = %r[#{pattern}]
+                index = regex =~ content
+                if index.nil?
+                    raise CoordinatesNotFound, "Couldn't find '#{string.inspect}' in '#{file_name}'"
+                else
+                    content.coordinates_of_index(index)
                 end
             end
-            #TODO test this
-            raise "Couldn't find '#{string}' in '#{file}'"
         end
 
         def glob_relative(path)
@@ -45,4 +62,7 @@ module Cfoo
             Dir.glob("#{resolve_file path}/*")
         end
     end
+
+    class CoordinatesNotFound < StandardError
+    end
 end

data/lib/cfoo/parser.rb

@@ -98,7 +98,7 @@ module Cfoo
             attr_accessor :file_name, :cause, :source, :line, :column
 
             def initialize(file_name, cause, source, line, column)
-                super("Failed to parse '#{file_name}':\nSource: #{source}\nLocation: #{file_name} line #{line}, column #{column} \nCause: #{cause.ascii_tree}")
+                super("Failed to parse '#{file_name}':\nLocation: #{file_name} line #{line}, column #{column} \nSource: #{source}\nCause: #{cause.ascii_tree}")
 
                 @file_name = file_name
                 @cause = cause

data/lib/cfoo/version.rb

@@ -1,3 +1,3 @@
 module Cfoo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/cfoo/el_parser_spec.rb

@@ -7,6 +7,10 @@ module Cfoo
             parser.parse("$(orange)").should == {"Ref" => "orange"}
         end
 
+        it 'turns simple EL references with dots into CloudFormation "Ref" maps' do
+            parser.parse("$(orange.color)").should == {"Ref" => "orange.color"}
+        end
+
         it 'turns EL references embedded in strings into appended arrays' do
             parser.parse("large $(MelonType) melon").should == {"Fn::Join" => [ "" , [ "large ", { "Ref" => "MelonType" }, " melon" ]]}
         end
@@ -15,14 +19,14 @@ module Cfoo
             parser.parse("I have $(number) apples and $(otherNumber) oranges").should == {"Fn::Join" => [ "" , ["I have ", { "Ref" => "number" }, " apples and ", { "Ref" => "otherNumber" }, " oranges" ]]}
         end
 
-        it 'turns EL attribute references into CloudFormation "GetAtt" maps' do
-            parser.parse("$(apple.color)").should == {"Fn::GetAtt" => ["apple", "color"]}
-        end
-
         it 'turns EL attribute map references into CloudFormation "GetAtt" maps' do
             parser.parse("$(apple[color])").should == {"Fn::GetAtt" => ["apple", "color"]}
         end
 
+        it 'turns EL attribute map references with dots into CloudFormation "GetAtt" maps' do
+            parser.parse("$(apple[color.primary])").should == {"Fn::GetAtt" => ["apple", "color.primary"]}
+        end
+
         it 'turns EL map references into CloudFormation "FindInMap" maps' do
             parser.parse("$(fruit[apple][color])").should == {"Fn::FindInMap" => ["fruit", "apple", "color"]}
         end

data/spec/cfoo/file_system_spec.rb

@@ -50,9 +50,28 @@ module Cfoo
                     dog
                 EOF
 
-                row, column = file_system.find_coordinates("lazy", "test.txt")
-                row.should be 2
-                column.should be 36
+                coordinates = file_system.find_coordinates("lazy", "test.txt")
+                expect(coordinates).to eq [2,37]
+            end
+            it "returns the coordinates of multiline strings" do
+                write_project_file "test.txt", <<-EOF
+                    the quick brown fox
+                    jumps over the lazy
+                    dog
+                EOF
+
+                file_system.find_coordinates("lazy\ndog", "test.txt")
+            end
+            it "raises an error if it can't find the text" do
+                write_project_file "test.txt", <<-EOF
+                    the quick brown fox
+                    jumps over the lazy
+                    dog
+                EOF
+
+                expect {
+                    file_system.find_coordinates("xxxxxx", "test.txt")
+                }.to raise_error CoordinatesNotFound
             end
         end
 
@@ -74,7 +93,7 @@ module Cfoo
                 file_system.glob_relative("modules/*.yml").should == ["modules/c.yml"]
             end
         end
-        
+
         describe "#parse_file" do
             it "loads the file with the YAML parser" do
                yaml_parser.should_receive(:load_file).with("#{project_root}/yamlfile.yml")

data/spec/cfoo/parser_spec.rb

@@ -51,6 +51,11 @@ module Cfoo
                     parser.parse_file("myfile.yml").should == {"Ref" => "orange"}
                 end
 
+                it 'turns simple EL references with dots into CloudFormation "Ref" maps' do
+                    file_system.should_receive(:parse_file).with("myfile.yml").and_return("$(orange.color)")
+                    parser.parse_file("myfile.yml").should == {"Ref" => "orange.color"}
+                end
+
                 it 'turns EL references embedded in strings into appended arrays' do
                     file_system.should_receive(:parse_file).with("myfile.yml").and_return("large $(MelonType) melon")
                     parser.parse_file("myfile.yml").should == {"Fn::Join" => [ "", [ "large ", { "Ref" => "MelonType" }, " melon" ] ] }
@@ -63,10 +68,15 @@ module Cfoo
                 end
 
                 it 'turns EL attribute references into CloudFormation "GetAtt" maps' do
-                    file_system.should_receive(:parse_file).with("myfile.yml").and_return("$(apple.color)")
+                    file_system.should_receive(:parse_file).with("myfile.yml").and_return("$(apple[color])")
                     parser.parse_file("myfile.yml").should == {"Fn::GetAtt" => ["apple", "color"]}
                 end
 
+                it 'turns EL attribute references with dots into CloudFormation "GetAtt" maps' do
+                    file_system.should_receive(:parse_file).with("myfile.yml").and_return("$(apple[color.primary])")
+                    parser.parse_file("myfile.yml").should == {"Fn::GetAtt" => ["apple", "color.primary"]}
+                end
+
                 it 'turns EL map references into CloudFormation "FindInMap" maps' do
                     file_system.should_receive(:parse_file).with("myfile.yml").and_return("$(fruit[apple][color])")
                     parser.parse_file("myfile.yml").should == {"Fn::FindInMap" => ["fruit", "apple", "color"]}

metadata

@@ -1,147 +1,196 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cfoo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+version: !ruby/object:Gem::Version
+  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - drrb
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-26 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-04-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: parslet
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !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'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  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'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  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
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.6.3
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-description: "Cfoo: CloudFormation master"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 'Cfoo: CloudFormation master'
+email:
 - drrrrrrrrrrrb@gmail.com
-executables: 
+executables:
 - cfoo
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .simplecov
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -188,37 +237,33 @@ files:
 - 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 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+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'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 2.2.1
 signing_key: 
-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: 
+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:
 - features/attribute_expansion.feature
 - features/convert_yaml_to_json.feature
 - features/el_escaping.feature