cfer 0.5.0.pre.rc1 → 0.5.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9d002adc64d106f800cb61545ae2a62644cdf6
-  data.tar.gz: e6c08b6a6f4d011d23f2b0567f65febb1ebf1a8b
+  metadata.gz: '03594ef49c992c1131effb85d44014b6fabc7356'
+  data.tar.gz: 10026ae4c9616d6ba4cfb61068c1861211dd680f
 SHA512:
-  metadata.gz: 6eb2bd6ddf3bc719faaeb11361662bbd7ac938b5ac2d4e37583e144b6cbdf7a59aa43c585f48f1117d2ace34be4a85d9f38a5b237f338231d84e03b9ce75aac5
-  data.tar.gz: d342f24e5c9329cee1088aed994555be198efea702c063e6a62ef5f5b20843c7319c6c055fe92dc6f00ba821694545e3420507ece940e083d1fc25009ad07431
+  metadata.gz: dcd8edc9504e962937b7735432871d6c38dcbda94c602389dccd7b140e0faca0508f25219d125488f530f94daece3ffc65f2438092e6bfe271ff6a29ca9e3044
+  data.tar.gz: a0bf003d630ae1137880ffb62a29190fe6695baf1b1de12f90a543c8e27371dbfd49267fb3e663603ed75cfd29e76c7924920ba2cb4278eb38c86df0d2557949

data/CHANGELOG.md

@@ -2,10 +2,15 @@
 
 ## 0.5.0
 
+### **BREAKING CHANGES**
+* `--parameters <name>:<value>` option is removed from CLI. Use `name=value` instead.
+  For example: `cfer generate stack.rb parameter_name=parameter_value`
+
 ### Enhancements
 * Adds support for Pre-build and Post-build hooks for resources and stacks.
 * Adds `json-to-cfer` script to automatically convert json templates to Cfer DSL code.
 * Adds support for directly converging JSON files.
+* Replaces [Thor](https://github.com/erikhuda/thor) with [Cri](https://github.com/ddfreyne/cri) as a CLI option parser.
 * Relaxes some version constraints to make it easier to integrate with older Rails projects.
 * Pulled stack validation out into an extension using post-build hooks.
 * Adds some extension methods to improve usability of certain resources.
@@ -13,6 +18,7 @@
 * Supports reading ruby template from stdin by specifying the filename `-`
 * Adds exponential backoff to `tail` command.
 * `--on-failure` flag is now case insensitive.
+* Removes `--pretty-print` as a global option and adds `--minified` to the `generate` command.
 * Various test improvements.
 
 ### Bugfixes

data/README.md

@@ -41,7 +41,7 @@ To quickly see Cfer in action, try converging the example stacks:
 
 ```bash
 cfer converge vpc -t examples/vpc.rb --profile [YOUR-PROFILE] --region [YOUR-REGION]
-cfer converge instance -t examples/instance.rb --profile [YOUR-PROFILE] --region [YOUR-REGION] --parameters KeyName:[YOUR-EC2-SSH-KEY]
+cfer converge instance -t examples/instance.rb --profile [YOUR-PROFILE] --region [YOUR-REGION] KeyName=[YOUR-EC2-SSH-KEY]
 ```
 
 You should see something like this:
@@ -50,65 +50,14 @@ You should see something like this:
 
 ### Command line
 
-    Commands:
-      cfer converge [OPTIONS] <stack-name>   # Creates or updates a cloudformation stack according to the template
-      cfer generate [OPTIONS] <template.rb>  # Generates a CloudFormation template by evaluating a Cfer template
-      cfer help [COMMAND]                    # Describe available commands or one specific command
-      cfer tail <stack-name>                 # Follows stack events on standard output as they occur
-
-#### Global options
-
-* `--profile <profile>`: The AWS profile to use (from your `~/.aws/credentials` file)
-* `--region <region>`: The AWS region to use
-* `--verbose`: Also print debugging messages
-
-#### `generate <template.rb>`
-
-The `generate` subcommand evaluates the given Ruby script and prints the CloudFormation stack JSON to standard output.
-
-The following options may be used with the `generate` command:
-
-* `--no-pretty-print`: Print minified JSON
-
-#### `converge <stack-name>`
-
-Creates or updates a CloudFormation stack according to the specified template.
-
-The following options may be used with the `converge` command:
-
-* `--follow` (`-f`): Follows stack events on standard output as the create/update process takes place.
-* `--stack-file <template.rb>`: Reads this file from the filesystem, rather than the default `<stack-name>.rb`
-* `--parameters <Key1>:<Value1> <Key2>:<Value2> ...`: Specifies input parameters, which will be available to Ruby in the `parameters` hash, or to CloudFormation by using the `Fn::ref` function
-* `--parameter-file <params_file.[yaml|json]`: Specifies input parameters from a YAML or JSON file
-* `--parameter-environment <env_name>`: Requires `--parameter-file`. Merges the specified key in the YAML or JSON file into the root of the parameter file before passing it into the Cfer stack, i.e. to provide different constants for different AWS environments. The priority for parameters is, in ascending order, **stack default**, **file**, **environment**, and **command line**.
-* `--on-failure <DELETE|ROLLBACK|DO_NOTHING>`: Specifies the action to take when a stack creation fails. Has no effect if the stack already exists and is being updated.
-* `--stack-policy <filename|URL|JSON string>` (`-s`): Stack policy to apply to the stack in order to control updates; takes a local filename containing the policy, a URL to an S3 object, or a raw JSON string.
-* `--stack-policy-during-update <filename|URL|JSON string>` (`-u`): Stack policy as in `--stack-policy` option above, but applied as a temporary override to the permanent policy during stack update.
-* `--s3-path <S3_PATH>`: Path to an S3 bucket location where the template will be stored. This is required if the template output exceeds [51,200 bytes](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cloudformation-limits.html).
-* `--force-s3`: Forces Cfer to upload the template to S3, even if it's small enough to be uploaded directly to the cloudformation API.
-* `--change <CHANGE_NAME>`: Creates a [CloudFormation Change Set](https://aws.amazon.com/blogs/aws/new-change-sets-for-aws-cloudformation/), rather than immediately updating the stack.
-
-#### `tail <stack-name>`
-
-Prints the latest `n` stack events, and optionally follows events while a stack is converging.
-
-The following options may be used with the `tail` command:
-
-* `--follow` (`-f`): Follows stack events on standard output as the create/update process takes place.
-* `--number` (`-n`): Print the last `n` stack events.
-
-#### `remove <stack-name>`
-
-Removes or deletes an existing CloudFormation stack. 
-
-```bash
-cfer remove vpc --profile [YOUR-PROFILE] --region [YOUR-REGION]
-```
-
-This can also be done in the following way with the awscli tools, but now eliminates the need to install that package.
-```bash
-aws cloudformation delete-stack --stack-name vpc
-```
+    COMMANDS
+        converge     Create or update a cloudformation stack according to the template
+        delete       Deletes a CloudFormation stack
+        describe     Fetches and prints information about a CloudFormation
+        estimate     Prints a link to the Amazon cost caculator estimating the cost of the resulting CloudFormation stack
+        generate     Generates a CloudFormation template by evaluating a Cfer template
+        help         show help
+        tail         Follows stack events on standard output as they occur
 
 ### Template Anatomy
 

data/bin/cfer-dbg

@@ -2,22 +2,7 @@
 lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
 $LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
-require 'pry'
-require 'pry-rescue'
-
-module Cfer
-  DEBUG = true
-end
-
-require 'cfer'
-
-Cfer::LOGGER.level = Logger::DEBUG
-
-Cfer::LOGGER.fatal "Showing FATAL logs"
-Cfer::LOGGER.error "Showing ERROR logs"
-Cfer::LOGGER.warn "Showing WARN logs"
-Cfer::LOGGER.info "Showing INFO logs"
-Cfer::LOGGER.debug "Showing DEBUG logs"
+require 'cfer/console'
 
 Pry::rescue {
   Cfer::Cli::main(ARGV)

data/bin/console

@@ -1,14 +1,9 @@
 #!/usr/bin/env ruby
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
 
 require "bundler/setup"
-require "cfer"
+require 'cfer/console'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "pry"
 Pry.start
+

data/cfer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency 'docile', '~> 1.1'
-  spec.add_runtime_dependency 'thor', '~> 0.19.1'
+  spec.add_runtime_dependency 'cri', '~> 2.7'
   spec.add_runtime_dependency 'activesupport', '>= 3'
   spec.add_runtime_dependency 'aws-sdk', '~> 2.2'
   spec.add_runtime_dependency 'aws-sdk-resources', '~> 2.2'

data/lib/cfer.rb

@@ -14,6 +14,8 @@ end
 
 # Contains the core Cfer logic
 module Cfer
+  DEBUG = false unless defined? DEBUG
+
   # Code relating to working with Amazon CloudFormation
   module Cfn
   end
@@ -62,13 +64,15 @@ module Cfer
       cfn = options[:aws_options] || {}
 
       cfn_stack = options[:cfer_client] || Cfer::Cfn::Client.new(cfn.merge(stack_name: stack_name))
-      stack = options[:cfer_stack] ||
-              Cfer::stack_from_file(tmpl,
-                options.merge(
-                  client: cfn_stack,
-                  parameters: generate_final_parameters(options)
-                )
-              )
+      raise Cfer::Util::CferError, "No such template file: #{tmpl}" unless File.exists?(tmpl)
+      stack =
+        options[:cfer_stack] ||
+          Cfer::stack_from_file(tmpl,
+            options.merge(
+              client: cfn_stack,
+              parameters: generate_final_parameters(options)
+            )
+          )
 
       begin
         operation = stack.converge!(options)
@@ -91,7 +95,8 @@ module Cfer
             end
           end
         end
-        describe! stack_name, options rescue nil # It's fine if we can't do this.
+        # This is allowed to fail, particularly if we decided to roll back
+        describe! stack_name, options rescue nil
       rescue Aws::CloudFormation::Errors::ValidationError => e
         Cfer::LOGGER.info "CFN validation error: #{e.message}"
       end
@@ -109,7 +114,7 @@ module Cfer
       if cfer_version
         cfer_version_str = [cfer_version["major"], cfer_version["minor"], cfer_version["patch"]].join '.'
         cfer_version_str << '-' << cfer_version["pre"] unless cfer_version["pre"].nil?
-        cfer_version_str << '+' << cfer_version["pre"] unless cfer_version["pre"].nil?
+        cfer_version_str << '+' << cfer_version["build"] unless cfer_version["build"].nil?
       end
 
       Cfer::LOGGER.debug "Describe stack: #{cfn_stack}"
@@ -160,6 +165,7 @@ module Cfer
       cfn = options[:aws_options] || {}
 
       cfn_stack = options[:cfer_client] || Cfer::Cfn::Client.new(cfn)
+      raise Cfer::Util::CferError, "No such template file: #{tmpl}" unless File.exists?(tmpl)
       stack = options[:cfer_stack] || Cfer::stack_from_file(tmpl,
         options.merge(client: cfn_stack, parameters: generate_final_parameters(options))).to_h
       puts render_json(stack, options)
@@ -179,7 +185,7 @@ module Cfer
       config(options)
       cfn = options[:aws_options] || {}
       cfn_stack = options[:cfer_client] || cfn_stack = Cfer::Cfn::Client.new(cfn.merge(stack_name: stack_name))
-      cfn_stack.delete_stack(stack_name)
+      cfn_stack.delete_stack(stack_name: stack_name)
 
       if options[:follow]
         tail! stack_name, options.merge(cfer_client: cfn_stack)
@@ -209,12 +215,8 @@ module Cfer
       return stack_from_stdin(options) if file == '-'
 
       s = Cfer::Core::Stack.new(options)
-      if file.ends_with?('.json')
-        s.deep_merge! JSON.parse(File.read(file))
-      else
-        templatize_errors(file) do
-          s.build_from_file file
-        end
+      templatize_errors(file) do
+        s.build_from_file file
       end
       s
     end
@@ -242,32 +244,28 @@ module Cfer
     end
 
     def generate_final_parameters(options)
-      raise "parameter-environment set but parameter_file not set" \
+      raise Cfer::Util::CferError, "parameter-environment set but parameter_file not set" \
         if options[:parameter_environment] && options[:parameter_file].nil?
 
-      file_params =
-        if options[:parameter_file]
-          case File.extname(options[:parameter_file])
-          when '.yaml'
-            require 'yaml'
-            YAML.load_file(options[:parameter_file])
-          when '.json'
-            JSON.parse(IO.read(options[:parameter_file]))
-          else
-            raise "Unrecognized parameter file format: #{File.extname(options[:parameter_file])}"
-          end
-        else
-          {}
-        end
+      final_params = HashWithIndifferentAccess.new
+
+      final_params.deep_merge! Cfer::Config.new(cfer: options) \
+        .build_from_file(options[:parameter_file]) \
+        .to_h if options[:parameter_file]
 
       if options[:parameter_environment]
-        raise "no key '#{options[:parameter_environment]}' found in parameters file." \
-          unless file_params.key?(options[:parameter_environment])
+        raise Cfer::Util::CferError, "no key '#{options[:parameter_environment]}' found in parameters file." \
+          unless final_params.key?(options[:parameter_environment])
+
+        Cfer::LOGGER.debug "Merging in environment key #{options[:parameter_environment]}"
 
-        file_params = file_params.deep_merge(file_params[options[:parameter_environment]])
+        final_params.deep_merge!(final_params[options[:parameter_environment]])
       end
 
-      file_params.deep_merge(options[:parameters] || {})
+      final_params.deep_merge!(options[:parameters] || {})
+
+      Cfer::LOGGER.debug "Final parameters: #{final_params}"
+      final_params
     end
 
     def render_json(obj, options = {})
@@ -298,53 +296,24 @@ module Cfer
 
 
     COLORS_MAP = {
-      'CREATE_IN_PROGRESS' => {
-        color: :yellow
-      },
-      'DELETE_IN_PROGRESS' => {
-        color: :yellow
-      },
-      'UPDATE_IN_PROGRESS' => {
-        color: :green
-      },
-
-      'CREATE_FAILED' => {
-        color: :red,
-        finished: true
-      },
-      'DELETE_FAILED' => {
-        color: :red,
-        finished: true
-      },
-      'UPDATE_FAILED' => {
-        color: :red,
-        finished: true
-      },
-
-      'CREATE_COMPLETE' => {
-        color: :green,
-        finished: true
-      },
-      'DELETE_COMPLETE' => {
-        color: :green,
-        finished: true
-      },
-      'UPDATE_COMPLETE' => {
-        color: :green,
-        finished: true
-      },
-
-      'DELETE_SKIPPED' => {
-        color: :yellow
-      },
-
-      'ROLLBACK_IN_PROGRESS' => {
-        color: :red
-      },
-      'ROLLBACK_COMPLETE' => {
-        color: :red,
-        finished: true
-      }
+      'CREATE_IN_PROGRESS' => { color: :yellow },
+      'DELETE_IN_PROGRESS' => { color: :yellow },
+      'UPDATE_IN_PROGRESS' => { color: :green },
+
+      'CREATE_FAILED' => { color: :red, finished: true },
+      'DELETE_FAILED' => { color: :red, finished: true },
+      'UPDATE_FAILED' => { color: :red, finished: true },
+
+      'CREATE_COMPLETE' => { color: :green, finished: true },
+      'DELETE_COMPLETE' => { color: :green, finished: true },
+      'UPDATE_COMPLETE' => { color: :green, finished: true },
+
+      'DELETE_SKIPPED' => { color: :yellow },
+
+      'ROLLBACK_IN_PROGRESS' => { color: :red },
+
+      'UPDATE_ROLLBACK_COMPLETE' => { color: :red, finished: true },
+      'ROLLBACK_COMPLETE' => { color: :red, finished: true }
     }
 
     def color_map(str)
@@ -361,7 +330,6 @@ 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__)}/cfer/**/*.rb"].each { |f| require(f) unless f.ends_with?('console.rb') }
 Dir["#{File.dirname(__FILE__)}/cferext/**/*.rb"].each { |f| require(f) }
 

data/lib/cfer/block.rb

@@ -1,4 +1,6 @@
 require 'docile'
+require 'json'
+require 'yaml'
 
 module Cfer
   # Represents the base class of a Cfer DSL
@@ -27,7 +29,23 @@ module Cfer
     # @param args [Array<Object>] (see: #build_from_block)
     # @param file [File] The Ruby script to evaluate
     def build_from_file(*args, file)
-      build_from_string File.read(file), file
+      build_from_block(*args) do
+        include_file(file)
+      end
+    end
+
+    def include_file(file)
+      Preconditions.check(file).is_not_nil
+      raise Cfer::Util::FileDoesNotExistError, "#{file} does not exist." unless File.exists?(file)
+
+      case File.extname(file)
+      when '.json'
+        deep_merge! JSON.parse(IO.read(file))
+      when '.yml', '.yaml'
+        deep_merge! YAML.load_file(file)
+      else
+        instance_eval File.read(file), file
+      end
     end
 
     # Executed just before the DSL is evaluated

data/lib/cfer/cfn/client.rb

@@ -24,17 +24,6 @@ module Cfer::Cfn
       end
     end
 
-
-    def delete_stack(stack_name)
-      begin
-        @cfn.delete_stack({
-          stack_name: stack_name, # required
-        })
-      rescue Aws::CloudFormation::Errors
-        raise CferError, "Stack delete #{stack_name}"
-      end
-    end
-
     def responds_to?(method)
       @cfn.responds_to? method
     end
@@ -196,6 +185,9 @@ module Cfer::Cfn
                 q.unshift fetched_event
               end
             end
+          rescue Aws::CloudFormation::Errors::Throttling
+            Cfer::LOGGER.debug "AWS SDK is being throttled..."
+            # Keep going though.
           rescue Aws::CloudFormation::Errors::ValidationError
             running = false
           end

data/lib/cfer/cli.rb

@@ -1,139 +1,148 @@
-require 'thor'
+require 'cri'
 require 'rainbow'
 require 'table_print'
 
 module Cfer
-  class Cli < Thor
-    map '-v' => :version, '--version' => :version
-
-    namespace 'cfer'
-    class_option :verbose, type: :boolean, default: false
-    class_option :profile, type: :string, aliases: :p, desc: 'The AWS profile to use from your credentials file'
-    class_option :region, type: :string, aliases: :r, desc: 'The AWS region to use'
-    class_option :pretty_print, type: :boolean, default: :true, desc: 'Render JSON in a more human-friendly format'
-
-    def self.template_options
-      method_option :parameters,
-        type: :hash,
-        desc: 'The CloudFormation parameters to pass to the stack',
-        default: {}
-      method_option :parameter_file,
-        type: :string,
-        desc: 'A YAML or JSON file with CloudFormation parameters to pass to the stack'
-      method_option :parameter_environment,
-        type: :string,
-        desc: 'If parameter_file is set, will merge the subkey of this into the parameter list.'
-    end
+  module Cli
+    CFER_CLI = Cri::Command.define do
+      name 'cfer'
+      description 'Toolkit and Ruby DSL for automating infrastructure using AWS CloudFormation'
+      flag nil, 'verbose', 'Runs Cfer with debug output enabled'
+
+      optional :p, 'profile', 'The AWS profile to use from your credentials file'
+      optional :r, 'region', 'The AWS region to use'
+
+      optional nil, 'output-format', 'The output format to use when printing a stack [table|json]'
+
+      optional nil, 'parameter', 'Sets a parameter to pass into the stack (format: `name:value`)', multiple: true
+      optional nil, 'parameter-file', 'A YAML or JSON file with CloudFormation parameters to pass to the stack'
+      optional nil, 'parameter-environment', 'If parameter_file is set, will merge the subkey of this into the parameter list.'
+
+      flag :v, 'version', 'show the current version of cfer' do |value, cmd|
+        puts Cfer::VERSION
+        exit 0
+      end
 
-    def self.stack_options
-      method_option :output_format,
-        type: :string,
-        desc: 'The output format of the stack [table|json]',
-        default: 'table'
+      flag  :h, 'help',  'show help for this command' do |value, cmd|
+        puts cmd.help
+        exit 0
+      end
     end
 
-    desc 'converge [OPTIONS] <stack-name>', 'Create or update a cloudformation stack according to the template'
-    #method_option :git_lock,
-    #  type: :boolean,
-    #  default: true,
-    #  desc: 'When enabled, Cfer will not converge a stack in a dirty git tree'
-
-    method_option :on_failure,
-      type: :string,
-      desc: 'The action to take if the stack creation fails'
-    method_option :follow,
-      aliases: :f,
-      type: :boolean,
-      default: true,
-      desc: 'Follow stack events on standard output while the changes are made.'
-    method_option :number,
-      type: :numeric,
-      default: 1,
-      desc: 'Prints the last (n) stack events.'
-    method_option :template,
-      aliases: :t,
-      type: :string,
-      desc: 'Override the stack filename (defaults to <stack-name>.rb)'
-    method_option :stack_policy,
-      aliases: :s,
-      type: :string,
-      desc: 'Set a new stack policy on create or update of the stack [file|url|json]'
-    method_option :stack_policy_during_update,
-      aliases: :u,
-      type: :string,
-      desc: 'Set a temporary overriding stack policy during an update [file|url|json]'
-    method_option :timeout,
-      type: :numeric,
-      desc: 'The timeout (in minutes) before the stack operation aborts'
-    method_option :s3_path,
-      type: :string,
-      desc: 'Specifies an S3 path in case the stack is created with a URL.'
-    method_option :force_s3,
-      type: :boolean,
-      default: false,
-      desc: 'Forces Cfer to upload the template to S3 and pass CloudFormation a URL.'
-    method_option :change,
-      type: :string,
-      desc: 'Issues updates as a Cfn change set.'
-    method_option :change_description,
-      type: :string,
-      desc: 'The description of this Cfn change'
-
-    template_options
-    stack_options
-    def converge(stack_name)
-      Cfer.converge! stack_name, options
+    CFER_CLI.define_command do
+      name 'converge'
+      usage 'converge [OPTIONS] <stack-name> [param=value ...]'
+      summary 'Create or update a cloudformation stack according to the template'
+
+      optional :t,  'template', 'Override the stack filename (defaults to <stack-name>.rb)'
+      optional nil, 'on-failure', 'The action to take if the stack creation fails'
+      optional nil, 'timeout', 'The timeout (in minutes) before the stack operation aborts'
+      #flag   nil, 'git-lock', 'When enabled, Cfer will not converge a stack in a dirty git tree'
+
+      optional :s,  'stack-policy', 'Set a new stack policy on create or update of the stack [file|url|json]'
+      optional :u,  'stack-policy-during-update', 'Set a temporary overriding stack policy during an update [file|url|json]'
+
+      optional nil, 'change', 'Issues updates as a Cfn change set.'
+      optional nil, 'change-description', 'The description of this Cfn change'
+
+      optional nil, 's3-path', 'Specifies an S3 path in case the stack is created with a URL.'
+      flag     nil, 'force-s3', 'Forces Cfer to upload the template to S3 and pass CloudFormation a URL.'
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        params = {}
+        options[:number] = 0
+        options[:follow] = true
+        #options[:git_lock] = true if options[:git_lock].nil?
+
+        Cfer::Cli.extract_parameters(params, args).each do |arg|
+          Cfer.converge! arg, options.merge(parameters: params)
+        end
+      end
     end
 
-    desc 'describe <stack>', 'Fetches and prints information about a CloudFormation'
-    stack_options
-    def describe(stack_name)
-      Cfer.describe! stack_name, options
+    CFER_CLI.define_command do
+      name 'generate'
+      usage 'generate [OPTIONS] <template.rb> [param=value ...]'
+      summary 'Generates a CloudFormation template by evaluating a Cfer template'
+
+      flag nil, 'minified', 'Minifies the JSON when printing output.'
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        params = {}
+        options[:pretty_print] = !options[:minified]
+
+        Cfer::Cli.extract_parameters(params, args).each do |arg|
+          Cfer.generate! arg, options.merge(parameters: params)
+        end
+      end
     end
 
-    desc 'delete <stack>', 'Deletes a CloudFormation stack'
-    stack_options
-    def delete(stack_name)
-      Cfer.delete! stack_name, options
+    CFER_CLI.define_command do
+      name 'tail'
+      usage 'tail <stack>'
+      summary 'Follows stack events on standard output as they occur'
+
+      flag :f, 'follow', 'Follow stack events on standard output while the changes are made.'
+      optional :n, 'number', 'Prints the last (n) stack events.', type: :number
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        args.each do |arg|
+          Cfer.tail! arg, options
+        end
+      end
     end
 
-    desc 'tail <stack>', 'Follows stack events on standard output as they occur'
-    method_option :follow,
-      aliases: :f,
-      type: :boolean,
-      default: false,
-      desc: 'Follow stack events on standard output while the changes are made.'
-    method_option :number,
-      aliases: :n,
-      type: :numeric,
-      default: 10,
-      desc: 'Prints the last (n) stack events.'
-    stack_options
-    def tail(stack_name)
-      Cfer.tail! stack_name, options
+    CFER_CLI.define_command do
+      name 'estimate'
+      usage 'estimate [OPTIONS] <template.rb>'
+      summary 'Prints a link to the Amazon cost caculator estimating the cost of the resulting CloudFormation stack'
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        args.each do |arg|
+          Cfer.estimate! arg, options
+        end
+      end
     end
 
-    desc 'generate [OPTIONS] <template.rb>', 'Generates a CloudFormation template by evaluating a Cfer template'
-    long_desc <<-LONGDESC
-      Generates a CloudFormation template by evaluating a Cfer template.
-    LONGDESC
-    template_options
-    def generate(tmpl)
-      Cfer.generate! tmpl, options
+    CFER_CLI.define_command do
+      name 'describe'
+      usage 'describe <stack>'
+      summary 'Fetches and prints information about a CloudFormation'
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        options[:pretty_print] ||= true
+        args.each do |arg|
+          Cfer.describe! arg, options
+        end
+      end
     end
 
-    desc 'estimate [OPTIONS] <template.rb>', 'Prints a link to the Amazon cost caculator estimating the cost of the resulting CloudFormation stack'
-    long_desc <<-LONGDESC
-    LONGDESC
-    template_options
-    def estimate(tmpl)
-      Cfer.estimate! tmpl, options
+    CFER_CLI.define_command do
+      name 'delete'
+      usage 'delete <stack>'
+      summary 'Deletes a CloudFormation stack'
+
+      run do |options, args, cmd|
+        Cfer::Cli.fixup_options(options)
+        options[:number] = 0
+        options[:follow] = true
+        args.each do |arg|
+          Cfer.delete! arg, options
+        end
+      end
     end
 
+    CFER_CLI.add_command Cri::Command.new_basic_help
+
     def self.main(args)
       Cfer::LOGGER.debug "Cfer version #{Cfer::VERSION}"
       begin
-        Cli.start(args)
+        CFER_CLI.run(args)
       rescue Aws::Errors::NoSuchProfileError => e
         Cfer::LOGGER.error "#{e.message}. Specify a valid profile with the --profile option."
         exit 1
@@ -162,16 +171,31 @@ module Cfer
       end
     end
 
-    desc 'version', 'Prints the current version of Cfer'
-    def version
-      puts Cfer::VERSION
+    PARAM_REGEX=/(?<name>.+?)=(?<value>.+)/
+    def self.extract_parameters(params, args)
+      args.reject do |arg|
+        if match = PARAM_REGEX.match(arg)
+          name = match[:name]
+          value = match[:value]
+          Cfer::LOGGER.debug "Extracting parameter #{name}: #{value}"
+          params[name] = value
+        end
+      end
     end
 
-    private
-
-    def cfn(opts = {})
-      @cfn ||= opts
+    # Convert options of the form `:'some-option'` into `:some_option`.
+    # Cfer internally uses the latter format, while Cri options must be specified as the former.
+    # This approach is better than changing the names of all the options in the CLI.
+    def self.fixup_options(opts)
+      opts.keys.map(&:to_s).each do |k|
+        old_k = k.to_sym
+        new_k = k.gsub('-', '_').to_sym
+        val = opts[old_k]
+        opts[new_k] = (Integer(val) rescue Float(val) rescue val)
+        opts.delete(old_k) if old_k != new_k
+      end
     end
+
     private
     def self.format_backtrace(bt)
       "Backtrace: #{bt.join("\n   from ")}"

data/lib/cfer/config.rb

@@ -0,0 +1,47 @@
+module Cfer
+  class Config < BlockHash
+    def initialize(file = nil, options = nil, &block)
+      @config_file = file
+      deep_merge! options if options
+      instance_eval &block if block
+    end
+
+    def method_missing(method_sym, *arguments, &block)
+      key = camelize_property(method_sym)
+      case arguments.size
+      when 0
+        if block
+          Config.new(@config_file, nil, &block)
+        else
+          val = self[key]
+          val =
+            case val
+            when Hash, nil
+              Config.new(nil, val)
+            else
+              val
+            end
+          properties key => val
+          val
+        end
+      else
+        super
+      end
+    end
+
+    # Includes config 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_config(*files)
+      include_base = File.dirname(@config_file) if @config_file
+      files.each do |file|
+        path = File.join(include_base, file) if include_base
+        include_file(path || file)
+      end
+    end
+
+    private
+    def non_proxied_methods
+      []
+    end
+  end
+end

data/lib/cfer/console.rb

@@ -0,0 +1,21 @@
+require "pry"
+require "pry-rescue"
+
+module Cfer
+  DEBUG = true
+end
+
+require "cfer"
+
+Cfer::LOGGER.level = Logger::DEBUG
+
+Cfer::LOGGER.fatal "Showing FATAL logs"
+Cfer::LOGGER.error "Showing ERROR logs"
+Cfer::LOGGER.warn "Showing WARN logs"
+Cfer::LOGGER.info "Showing INFO logs"
+Cfer::LOGGER.debug "Showing DEBUG logs"
+
+def cfer(*args)
+  Cfer::Cli::main(args)
+end
+

data/lib/cfer/core/stack.rb

@@ -169,11 +169,7 @@ module Cfer::Core
       include_base = options[:include_base] || File.dirname(caller.first.split(/:\d/,2).first)
       files.each do |file|
         path = File.join(include_base, file)
-        if path.ends_with?('.json')
-          self.deep_merge! JSON.parse(File.read(path))
-        else
-          instance_eval(File.read(path), path)
-        end
+        include_file(path)
       end
     end
 

data/lib/cfer/util/error.rb

@@ -17,6 +17,9 @@ module Cfer::Util
   class StackDoesNotExistError < CferError
   end
 
+  class FileDoesNotExistError < CferError
+  end
+
   class TemplateError < CferError
     attr_reader :template_backtrace
 

data/lib/cfer/version.rb

@@ -1,5 +1,5 @@
 module Cfer
-  VERSION = "0.5.0-rc1"
+  VERSION = "0.5.0-rc2"
 
   begin
     require 'semantic'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfer
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.rc1
+  version: 0.5.0.pre.rc2
 platform: ruby
 authors:
 - Sean Edwards
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +229,8 @@ files:
 - lib/cfer/cfn/cfer_credentials_provider.rb
 - lib/cfer/cfn/client.rb
 - lib/cfer/cli.rb
+- lib/cfer/config.rb
+- lib/cfer/console.rb
 - lib/cfer/core/client.rb
 - lib/cfer/core/functions.rb
 - lib/cfer/core/hooks.rb