cloudformula 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24bc82972e9d49a352e41baa51b21706cd6542d5
-  data.tar.gz: dbb0c9f3404d9c5509ca5cb7d3ecc7b06a494336
+  metadata.gz: 254f2c27d4bf0b5a1338019b969155de36fbea74
+  data.tar.gz: e1ed2fd4df8176bb8a9a2c1e414fdca7da9b5578
 SHA512:
-  metadata.gz: 8cd142edaa41c09a9edbb576dba107de8d27e94c23ccec3afe6783437a42d876abb958544d57051d040b5f8902ee82a7ed1012fa4c9d6422247694beaf7f1602
-  data.tar.gz: b9093780e5397256d3481725703315e4ebcb21343ea98803575abecacb742a9f47b6ca813296ccee8cc8fe2d23bd9aabd3e7e3b5ed65963bd3ac217c55835df5
+  metadata.gz: b4fdef9ca82ff90911bee704501951ce5320fa299ad71d94b346c2e03f611341117ae6de58ff973d9236c90ddbba3f8056e5acd5c7c51d8e851fbfbf6866cbca
+  data.tar.gz: 8018c365ffb61578398d44695aaee18913d0a622e1e1243278f047f5417565d0e442a2348b1450a853e831c919cb68bc22dfb2b6a793459198ef96c5b1a690f6

data/README.md

@@ -46,8 +46,6 @@ stack = CloudFormula.create_stack('us-east-1', 'stack-name', template)
 CloudFormula.update_stack('us-east-1', 'stack-name', template)
 ```
 
-TODO - see api documentation
-
 ## Creating templates
 
 Templates are Ruby ERB, which means you have the full power of Ruby available.
@@ -57,7 +55,7 @@ Templates are Ruby ERB, which means you have the full power of Ruby available.
 Normally, variables output in your ERB templates using `<%= %>` will be automatically JSON-escaped. You can change
 this behavior by using the `raw` helper. For instance:
 
-```ruby
+```erb
 <%= raw @foo %>
 ```
 
@@ -68,11 +66,12 @@ be JSON-escaped.
 
 Basic partial functionality is available. You can include a partial inside a template as follows:
 
-```ruby
+```erb
 <%= render 'path/to/template.json.erb', { :param1 => 'value1', :param2 => 'value2', ... } %>
 ```
 
-ERB variables are not automatically passed through to partials - you'll have to explicitly pass them.
+ERB variables are not automatically passed through to partials - you'll have to explicitly pass them. Paths are
+first tried relative to caller, and then to the source template.
 
 ### Validation
 
@@ -83,7 +82,7 @@ for information on how to use the helpers.
 
 Use pre-defined helpers by creating a Hash named `@validations` in your ERB template. For example:
 
-```ruby
+```erb
 <%
 @validations = {
   :param1 => { :presence => true },
@@ -162,7 +161,7 @@ Ensures a value exists and has a length greater than 0
 
 You can also write custom validations by raising errors:
 
-```ruby
+```erb
 <%
 # Validate parameters
 raise 'Required parameter "@foo" is missing.' if @foo.nil? || @foo.empty?
@@ -200,7 +199,26 @@ This gem should not be used with untrusted templates or parameters.
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+1. Create your feature branch (`git checkout -b my-new-feature`)
+1. Commit your changes (`git commit -am 'Add some feature'`)
+1. Push to the branch (`git push origin my-new-feature`)
+1. Create new Pull Request
+
+## New Releases
+
+1. Make sure all the rspec and integration tests pass.
+1. Bump the version in lib/cloudformula/version.rb
+1. Build the gem (`gem build cloudformula.gemspec`)
+1. Smoke test the build
+   ```
+   $ gem install ./cloudformula-x.y.z.gem
+   Successfully installed cloudformula-x.y.z
+   1 gem installed
+
+   $ irb
+   >> require 'cloudformula'
+   => true
+   >> "[]".try_to_json # should output "\"[]\""
+   => "\"[]\""
+   ```
+1. Push the gem to RubyGems.org (`gem push cloudformula-x-y-z.gem`)

data/lib/cloudformula/template.rb

@@ -39,6 +39,10 @@ module CloudFormula
     # @return [String] The result of generating the template
     def render(source, parameters = {})
       raw CloudFormula::Template.new(source, parameters).generate
+    rescue Errno::ENOENT
+      # retry the path, but relative to its parent template
+      relative_to_parent = Pathname.new(@source).parent + source
+      raw CloudFormula::Template.new(relative_to_parent, parameters).generate
     end
 
     # Returns the CloudFormation stack options defined by the template.
@@ -96,4 +100,4 @@ module CloudFormula
     end
 
   end
-end
+end

data/lib/cloudformula/version.rb

@@ -1,3 +1,3 @@
 module CloudFormula
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudformula
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Kabam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CloudFormula is a tool which generates and uploads CloudFormation templates