cfer 0.1.3 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWVkYTNhODMzYjViNDE5NGYwMjY0MGJkYTMwMWI0NGU0YTI3M2UzYQ==
+    M2IzNjMyMzZiNTJiZjhkNjU2OGYyZTNmNmZjMDFkYWQzZGRhNTQ1NA==
   data.tar.gz: !binary |-
-    ZWMzZDQzMzAxMWRiZGNhODVmODYzMTU1NjU0NzBkZjMyYmZkY2U0ZQ==
+    MjQ5NGU4Mjc4ODUwZWFlZGM3MTBmNGRlOTY5MjE5NDI3MjQyMmJhMg==
 SHA512:
   metadata.gz: !binary |-
-    Nzg3MzgyNmYzODRkZDUwY2UyMzk0NjIxYjk2MTZhYjI2YjYyOTUxM2EwNGUz
-    NGE4YmM1MWUyMGVjNmNjMDFmMzlkOWY3NzNmNWNmNjY0YzA3NWM0MTY1MzM5
-    Zjg4MTM1ZmRkNzMxMTExOTFiNjNmMTczNWEwZWVmZGExMjhkYjM=
+    YzE4OWI3YTM2MDdmZjBkZDM3YTM0ODExZjdiOTk2YmQ4YWRjZTU3ODg1MTdm
+    NjBiNDRlM2MwYTJhOTNiMjExNzIxOGNlNzVhNmVkZjI1MGM4YmY4MTA1YzU5
+    ZWQ4MTQ1YTlkZDNhOWQ1ZTQ3MzEwYjY4MTkyNGE4NWVmN2RlNTU=
   data.tar.gz: !binary |-
-    ODJiZGZlNTU4MzZlMzI4ODg5NjM3ZDVhOTBjNTFjNzM3ZDEzYmY1ZDA1NWI5
-    ZmQ4Y2M5ODIzNjUyZTUzOGRmOTRkMzk5N2E1NDY4Y2ViZDI5NmIxY2NmYjMy
-    ZDQwYjBlOGIxYjYxMjkwNDM1MzU4NGM5NTgxZTFiOGRhMmUzODA=
+    NmM1Y2M4YWI3MjQ3NzM3OWRkMzMzNzhjNDI1YWM4NzkwNzExYjVlN2FhNDI3
+    NzA1ODdmOGNhYzNhMWM3NTAwNjVjOTQ3OGZhYzQ1OTM3MThmMDFkNGVmNzg0
+    NWFjMGE0MjQzYTU0NzkxMjhiMzQzN2E4OGEzMTJkZjkxYzFiNmM=

data/Dockerfile

@@ -0,0 +1,5 @@
+FROM ruby:2.2
+COPY . /usr/src/app
+WORKDIR /usr/src/app
+RUN bundle install
+

data/README.md

@@ -6,6 +6,8 @@
 
 Cfer is a lightweight toolkit for managing CloudFormation templates.
 
+Read about Cfer [here](http://tilmonedwards.com/2015/07/28/cfer.html).
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -137,6 +139,29 @@ Outputs may be defined using the `output` function:
 output :OutputName, Fn::ref(:ResourceName)
 ```
 
+#### Including code from multiple files
+
+Templates can get pretty large, and splitting template code into multiple
+files can help keep things more manageable. The `include_template`
+function works in a similar way to ruby's `require_relative`, but
+within the context of the CloudFormation stack:
+
+```ruby
+include_template 'ec2.rb'
+```
+
+You can also include multiple files in a single call:
+
+```ruby
+include_template(
+  'stack/ec2.rb',
+  'stack/elb.rb'
+)
+```
+
+The path to included files is relative to the base template file
+(e.g. the `converge` command `-t` option).
+
 ## SDK
 
 Embedding the Cfer SDK involves interacting with two components: The `Client` and the `Stack`.
@@ -212,6 +237,8 @@ This project uses [git-flow](http://nvie.com/posts/a-successful-git-branching-mo
 
 Always use `--no-ff` when merging into `develop` or `master`.
 
+This project also contains a [Code of Conduct](CODE_OF_CONDUCT.md), which should be followed when submitting feedback or contributions to this project.
+
 ### New features
 
 * Branch from `develop`

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+#require "bundler/gem_tasks"
 gem 'cfer'
 require 'cfer'
 require 'highline'
@@ -39,3 +39,19 @@ end
 
 task :converge => [:vpc, :instance]
 
+
+########################
+##### END OF DEMO ######
+########################
+
+
+# This task isn't really part of Cfer.
+# It just makes it easier for me to release new versions.
+task :release do
+  require_relative 'lib/cfer/version.rb'
+
+  `git checkout master`
+  `git merge develop --no-ff -m 'Merge from develop for release v#{Cfer::VERSION}'`
+  `git tag -m "Release v#{Cfer::VERSION}" #{Cfer::VERSION}`
+end
+

data/lib/cfer.rb

@@ -230,6 +230,7 @@ module Cfer
   end
 end
 
+Dir["#{File.dirname(__FILE__)}/cfer/*.rb"].each { |f| require(f) }
 Dir["#{File.dirname(__FILE__)}/cfer/**/*.rb"].each { |f| require(f) }
 Dir["#{File.dirname(__FILE__)}/cferext/**/*.rb"].each { |f| require(f) }
 

data/lib/cfer/core/resource.rb

@@ -1,6 +1,6 @@
 module Cfer::Cfn
   class Resource < Cfer::Block
-    NON_PROXIED_METHODS = [:parameters, :options]
+    NON_PROXIED_METHODS = [:parameters, :options, :resolve]
 
     def initialize(name, type, **options, &block)
       @name = name

data/lib/cfer/core/stack.rb

@@ -159,6 +159,17 @@ module Cfer::Core
       to_h.to_json
     end
 
+    # Includes template code from one or more files, and evals it in the context of this stack.
+    # Filenames are relative to the file containing the invocation of this method.
+    def include_template(*files)
+      calling_file = caller.first.split(/:\d/,2).first
+      dirname = File.dirname(calling_file)
+      files.each do |file|
+        path = File.join(dirname, file)
+        instance_eval(File.read(path), path)
+      end
+    end
+
     private
     def verify_param(param_name, err_msg)
       raise Cfer::Util::CferError, err_msg if (@parameters[param_name] && !yield(@parameters[param_name].to_s))

data/lib/cfer/version.rb

@@ -1,3 +1,3 @@
 module Cfer
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -205,6 +205,7 @@ files:
 - .travis.yml
 - .yardopts
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md