cf_deployer 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1db5cec4a3e85b734de2469723174af6076d0334
-  data.tar.gz: 79eebbe809bb12a92a59c4c8eed7d7064df46fbd
+  metadata.gz: 6b05cdb7b669ec244099ae727402aadc968485b7
+  data.tar.gz: 650362af16520e93554712c35284add91c75b448
 SHA512:
-  metadata.gz: 8568f79cd0a27b30174422ce1edb8cfd05e9c554def87df53423cea0fd3f7547e221c6abf53335dfed02aa735cb73a756b2277dddbe78deaa16ad6a1fa51a010
-  data.tar.gz: 5d7fc88066821fc2bffd2abed89914354e516d913635c1274b8bcf681e8417505ff3c9e5ba1c13098e475401921d1f353317f604a189225afdb5e93b3e0f06ed
+  metadata.gz: db066d60450bfc59a695b233c79b0e9b51e6e69798d2c78406ff257bb63ed0a80859669817fe6332cd1fa72d7ff61b30e1bac4561d5a8b22956dcd1e93a25647
+  data.tar.gz: 04f5af6970d722d5e9418ca04eb0fba3b6dd1fafd20e4fe45dcd88dfc685238350ef5d35175236adad1876a9e5fa77b423546672f8f111467f268594b9b9a1bd

data/ChangeLog.md

@@ -23,3 +23,8 @@ version 1.2.10
 
 version 1.2.11
   - Remove record set in R53 when stacks are deployed 
+
+version 1.3.1
+  - Adding way to run hooks manually (outside of deploy)   
+  - Adding new command 'diff' to allow diffing between the deployed JSON
+  - Split after-create and after-update hooks for create-or-update strategy

data/Gemfile

@@ -8,3 +8,4 @@ gem 'pry'
 gem 'rspec'
 gem 'rake'
 gem 'rainbow'
+gem 'diffy'

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    cf_deployer (1.3.0)
+    cf_deployer (1.3.1)
       aws-sdk
+      diffy
       log4r
       rainbow
       thor
@@ -10,16 +11,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.44.0)
+    aws-sdk (1.51.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
     coderay (1.1.0)
     diff-lcs (1.2.5)
+    diffy (3.0.6)
     json (1.8.1)
     log4r (1.1.10)
     method_source (0.8.2)
     mini_portile (0.6.0)
-    nokogiri (1.6.2.1)
+    nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -44,6 +46,7 @@ PLATFORMS
 
 DEPENDENCIES
   cf_deployer!
+  diffy
   pry
   rainbow
   rake

data/cf_deployer.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'log4r'
   gem.add_runtime_dependency 'thor'
   gem.add_runtime_dependency 'rainbow'
+  gem.add_runtime_dependency 'diffy'
 
   gem.files         = `git ls-files`.split($\).reject {|f| f =~ /^samples\// }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/cf_deployer.rb

@@ -54,6 +54,12 @@ module CfDeployer
     Application.new(config).deploy
   end
 
+  def self.runhook opts
+    config = self.parseconfig opts
+    # AWS.config(:logger => Logger.new($stdout))
+    Application.new(config).run_hook opts[:component].first, opts[:hook_name]
+  end
+
   def self.destroy opts
     config = self.parseconfig opts, false
     # AWS.config(:logger => Logger.new($stdout))
@@ -65,6 +71,11 @@ module CfDeployer
     Application.new(config).json
   end
 
+  def self.diff opts
+    config = self.parseconfig opts, false
+    Application.new(config).diff
+  end
+
   def self.status opts
     config = self.parseconfig opts, false
     status_info = Application.new(config).status opts[:component].first, opts[:verbosity]
@@ -87,9 +98,8 @@ module CfDeployer
 
   def self.parseconfig options, validate_inputs = true
     AWS.config(:region => options[:region]) if options[:region]
-    split_settings = options.dup
-    split_settings.merge!({:cli_overrides => {:settings => split_settings.delete(:settings), :inputs => split_settings.delete(:inputs)} })
-    config = ConfigLoader.new.load split_settings
+    options[:cli_overrides] = {:settings => options.delete(:settings), :inputs => options.delete(:inputs)}
+    config = ConfigLoader.new.load options
     ConfigValidation.new.validate config, validate_inputs
     config
   end

data/lib/cf_deployer/application.rb

@@ -42,6 +42,11 @@ module CfDeployer
       components.each &:json
     end
 
+    def diff
+      components = get_targets().sort
+      components.each &:diff
+    end
+
     def status component_name, verbosity
       statuses = {}
       @components.select { |component|  component_name.nil? || component_name == component.name }.each do |component|
@@ -50,6 +55,10 @@ module CfDeployer
       statuses
     end
 
+    def run_hook component_name, hook_name
+      @components.detect{ |component| component_name == component.name }.run_hook hook_name
+    end
+
     def destroy
       components = get_targets.sort { |a, b| b <=> a }
       components.each &:destroy

data/lib/cf_deployer/cli.rb

@@ -19,6 +19,13 @@ module CfDeployer
       CfDeployer.deploy merged_options
     end
 
+    desc "runhook [ENVIRONMENT] [COMPONENT] [HOOK_NAME]\t", 'Run the specified hook'
+    def runhook environment, component, hook_name
+      @hook_name = hook_name.to_sym
+      prep_for_action :runhook, environment, component
+      CfDeployer.runhook merged_options
+    end
+
     desc "destroy [ENVIRONMENT] [COMPONENT]\t", 'Destroy the specified environment/component'
     def destroy environment, component = nil
       prep_for_action :destroy, environment, component
@@ -31,6 +38,12 @@ module CfDeployer
       CfDeployer.config merged_options
     end
 
+    desc "diff [ENVIRONMENT] [COMPONENT]", 'Show a diff between the template of the active stack and the parsed CloudFormation JSON for the target component'
+    def diff environment, component = nil
+      prep_for_action :diff, environment, component
+      CfDeployer.diff merged_options
+    end
+
     desc "json [ENVIRONMENT] [COMPONENT]", 'Show parsed CloudFormation JSON for the target component'
     def json environment, component = nil
       prep_for_action :json, environment, component
@@ -73,7 +86,9 @@ module CfDeployer
       end
 
       def merged_options
-        symbolize_all_keys options.merge({:environment => @environment, :component => @component})
+        the_merge_options = {:environment => @environment, :component => @component}
+        the_merge_options[:hook_name] = @hook_name if @hook_name
+        symbolize_all_keys options.merge(the_merge_options)
       end
 
       def set_log_level

data/lib/cf_deployer/component.rb

@@ -1,3 +1,5 @@
+require 'diffy'
+
 module CfDeployer
   class Component
     attr_reader :name, :dependencies, :children
@@ -36,6 +38,19 @@ module CfDeployer
       puts ConfigLoader.component_json(name, @context)
     end
 
+    def diff
+      resolve_settings
+      current_json = strategy.active_template
+      if current_json
+        puts "#{name} json template diff:"
+        new_json = ConfigLoader.component_json(name, @context)
+        Diffy::Diff.default_format = :color
+        puts Diffy::Diff.new( current_json, new_json )
+      else
+        puts "No current json for component #{name}"
+      end
+    end
+
     def destroy
       raise ApplicationError.new("Unable to destroy #{name}, it is depended on by other components") if any_children_exist?
       strategy.destroy
@@ -76,6 +91,11 @@ module CfDeployer
       strategy.status get_resource_statuses
     end
 
+    def run_hook hook_name
+      resolve_settings
+      strategy.run_hook hook_name
+    end
+
     private
 
     def resolve_settings

data/lib/cf_deployer/config_loader.rb

@@ -4,7 +4,11 @@ module CfDeployer
     def self.component_json component, config
       json_file = File.join(config[:config_dir], "#{component}.json")
       raise ApplicationError.new("#{json_file} is missing") unless File.exists?(json_file)
+      CfDeployer::Log.info "ERBing JSON for #{component}"
       ERB.new(File.read(json_file)).result(binding)
+    rescue RuntimeError,TypeError,NoMethodError => e
+      self.new.send :error_document, File.read(json_file)
+      raise e
     end
 
     def load(options)
@@ -35,7 +39,11 @@ module CfDeployer
 
     def load_yaml(text)
       YAML.load text
+    rescue Psych::SyntaxError => e
+      error_document text
+      raise e
     rescue
+      error_document text
       raise ApplicationError.new("The config file is not a valid yaml file")
     end
 
@@ -51,6 +59,12 @@ module CfDeployer
       end
     end
 
+    def error_document text
+      puts "-" * 80
+      puts text
+      puts "-" * 80
+    end
+
     def to_array(value)
       return value if value.is_a?(Array)
       return [] unless value
@@ -118,13 +132,12 @@ module CfDeployer
       end
 
       json_content = self.class.component_json component.to_s, config
+      CfDeployer::Log.info "Parsing JSON for #{component}"
       begin
         JSON.load json_content
       rescue JSON::ParserError => e
         puts json_content
-        puts '=' * 80
-        puts e.message[0..300]
-        puts '=' * 80
+        error_document e.message[0..300]
         raise "Couldn't parse JSON for component #{component}"
       end
     end

data/lib/cf_deployer/deployment_strategy/base.rb

@@ -28,6 +28,26 @@ module CfDeployer
         BLUE_GREEN_STRATEGY
       end
 
+      def run_hook(hook_name)
+        CfDeployer::Driver::DryRun.guard "Skipping hook #{hook_name}" do
+          unless @params_and_outputs_resolved
+            target_stack = ( active_stack || stack )
+            unless target_stack.exists?
+              CfDeployer::Log.info "Skipping hook call for #{hook_name} since stack #{target_stack.name} doesn't exist."
+              return
+            end
+            get_parameters_outputs target_stack
+          end
+          hook = Hook.new hook_name, context[hook_name]
+          hook.run context
+        end
+      end
+
+      def active_template
+        target_stack = ( active_stack || stack )
+        (target_stack && target_stack.exists?) ? target_stack.template : nil
+      end
+
       protected
 
       def stack_prefix
@@ -45,15 +65,9 @@ module CfDeployer
         stack.delete
       end
 
-      def run_hook(hook_name)
-        CfDeployer::Driver::DryRun.guard "Skipping hook #{hook_name}" do
-          hook = Hook.new hook_name, context[hook_name]
-          hook.run context
-        end
-      end
-
       def get_parameters_outputs(stack)
         CfDeployer::Driver::DryRun.guard "Skipping get_parameters_outputs" do
+          @params_and_outputs_resolved = true
           context[:parameters] = stack.parameters
           context[:outputs] = stack.outputs
         end

data/lib/cf_deployer/deployment_strategy/create_or_update.rb

@@ -17,10 +17,11 @@ module CfDeployer
 
 
       def deploy
+        hook_to_run = stack.exists? ? :'after-update' : :'after-create'
         stack.deploy
         warm_up_inactive_stack
         get_parameters_outputs(inactive_stack)
-        run_hook(:'after-create')
+        run_hook(hook_to_run)
       end
 
       def output_value(key)

data/lib/cf_deployer/driver/cloud_formation_driver.rb

@@ -69,6 +69,10 @@ module CfDeployer
         resources
       end
 
+      def template
+        aws_stack.template
+      end
+
       private
 
       def cloud_formation

data/lib/cf_deployer/hook.rb

@@ -25,8 +25,20 @@ module CfDeployer
       context = context.dup
       timeout = timeout || Defaults::Timeout
       Timeout.timeout(timeout.to_f) do
-        eval(hook, binding)
+        begin
+          eval(hook, binding)
+        rescue SyntaxError, NoMethodError, ApplicationError => e
+          error_document context, hook
+          raise e
+        end
       end
     end
+
+    def error_document context, hook
+      pp context
+      puts '=' * 80
+      puts hook
+      puts '=' * 80
+    end
   end
 end

data/lib/cf_deployer/stack.rb

@@ -92,6 +92,9 @@ module CfDeployer
       @stack_name
     end
 
+    def template
+      @cf_driver.template
+    end
 
     private
 

data/lib/cf_deployer/version.rb

@@ -1,3 +1,3 @@
 module CfDeployer
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/spec_helper.rb

@@ -6,3 +6,4 @@ CfDeployer::Log.log.outputters = nil
 def puts *args
 
 end
+

data/spec/unit/component_spec.rb

@@ -139,4 +139,12 @@ describe "component" do
       end
     end
   end
+
+  describe '#run_hook' do
+    it 'should resolve_settings before running the hook' do
+      expect(@web).to receive(:resolve_settings)
+      expect(@strategy).to receive(:run_hook).with(:'after-work')
+      @web.run_hook :'after-work'
+    end
+  end
 end

data/spec/unit/config_loader_spec.rb

@@ -9,6 +9,8 @@ describe "load config settings" do
     @front_end_json = File.expand_path("../../../tmp/front-end.json", __FILE__)
     @very_simple_json = File.expand_path("../../../tmp/very-simple.json", __FILE__)
     @json_with_erb = File.expand_path("../../../tmp/json-with-erb.json", __FILE__)
+    @broken_json = File.expand_path("../../../tmp/broken_json.json", __FILE__)
+    @broken_erb = File.expand_path("../../../tmp/broken_erb.json", __FILE__)
 
     base_json = <<-eos
     {
@@ -58,11 +60,17 @@ describe "load config settings" do
     }
     eos
 
-    File.open(@api_json, 'w') {|f| f.write(api_json) }
-    File.open(@base_json, 'w') {|f| f.write(base_json) }
-    File.open(@front_end_json, 'w') {|f| f.write(front_end_json) }
+    broken_json = '{ "Some_broken_json": "foo" '
+    broken_erb  = '{ "Some_broken_erb": "<%= [1, 2, 3].first("two") %>" }'
+    @broken_yaml = "something: [ :foo "
+
+    File.open(@api_json,         'w') {|f| f.write(api_json) }
+    File.open(@base_json,        'w') {|f| f.write(base_json) }
+    File.open(@front_end_json,   'w') {|f| f.write(front_end_json) }
     File.open(@very_simple_json, 'w') {|f| f.write(very_simple_json) }
-    File.open(@json_with_erb, 'w') {|f| f.write(json_with_erb) }
+    File.open(@json_with_erb,    'w') {|f| f.write(json_with_erb) }
+    File.open(@broken_json,      'w') {|f| f.write(broken_json) }
+    File.open(@broken_erb,       'w') {|f| f.write(broken_erb) }
 
 
     yaml_string = <<-eos
@@ -97,6 +105,8 @@ components:
       keep-previous-stack: false
   very-simple:
   json-with-erb:
+  #broken-json:
+  #broken_erb:
 
 inputs:
   require-basic-auth: false
@@ -104,7 +114,7 @@ inputs:
   mail-server: http://abc.com
   cname: myserver.com
 
-notify: 
+notify:
   - arn:root
 
 tags:
@@ -186,7 +196,7 @@ environments:
     config[:components][:api][:notify].should eq(['arn:root', 'arn:api', 'arn:dev'])
     config[:components][:'front-end'][:notify].should eq(['arn:root', 'arn:base', 'arn:dev'])
   end
-  
+
   it "notify option should be merged to environment context" do
     config =  CfDeployer::ConfigLoader.new.load({:'config-file' => @config_file, :environment => 'uat'})
     config[:components][:base][:notify].should eq(['arn:root', 'arn:base'])
@@ -322,6 +332,30 @@ environments:
     CfDeployer::ConfigLoader.component_json('json-with-erb', config[:components][:'json-with-erb']).should include('DrWho')
   end
 
+  it 'should use error_document to show the broken document when parsing broken ERB' do
+    config = { :config_dir => File.dirname(@config_file) }
+    CfDeployer::ConfigLoader.any_instance.should_receive(:error_document)
+    expect { CfDeployer::ConfigLoader.component_json('broken_erb', config) }.to raise_error
+  end
+
+  it 'should use error_document to show the broken document when parsing broken json' do
+    loader = CfDeployer::ConfigLoader.new
+    config = loader.load(:'config-file' => @config_file, :environment => 'DrWho')
+    config[:components]['broken_json'] = {
+      :config_dir => config[:components][:base][:config_dir],
+      :inputs => {},
+      :defined_parameters => {},
+      :defined_outputs => {}
+    }
+    CfDeployer::ConfigLoader.any_instance.should_receive(:error_document)
+    expect { loader.send(:cf_template, 'broken_json') }.to raise_error
+  end
+
+  it 'should use error_document to show the broken document when parsing broken yaml' do
+    CfDeployer::ConfigLoader.any_instance.should_receive(:error_document)
+    expect { CfDeployer::ConfigLoader.new.send(:load_yaml, @broken_yaml) }.to raise_error
+  end
+
   it 'should set default keep-previous-stack to true' do
     config =  CfDeployer::ConfigLoader.new.load(:'config-file' => @config_file)
     config[:components][:api][:settings][:'keep-previous-stack'].should eq(CfDeployer::Defaults::KeepPreviousStack)

data/spec/unit/deployment_strategy/base_spec.rb

@@ -41,4 +41,97 @@ describe 'Base Deployment Strategy' do
       }.to raise_error(CfDeployer::ApplicationError)
     end
   end
+
+  describe '#active_template' do
+    before :each do
+      @context = {
+        application: 'myApp',
+        environment: 'uat',
+        components:
+        { base: {:'deployment-strategy' => 'create-or-update'},
+          db:  {:'deployment-strategy' => 'auto-scaling-group-swap'},
+          web: { :'deployment-strategy' => 'cname-swap' }
+          }
+        }
+    end
+
+    it "should return nil if there is no active stack" do
+      the_stack = double()
+      the_stack.should_receive(:exists?).and_return(false)
+      the_stack.should_not_receive(:template)
+
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.should_receive(:active_stack).and_return(the_stack)
+      # strategy.should_not_receive(:get_parameters_outputs)
+
+      expect( strategy.active_template ).to eq(nil)
+    end
+
+    it "should return the JSON template of the active stack, if there is one" do
+      the_template = double
+
+      the_stack = double
+      the_stack.should_receive(:exists?).and_return(true)
+      the_stack.should_receive(:template).and_return(the_template)
+
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.should_receive(:active_stack).and_return(the_stack)
+
+      expect( strategy.active_template ).to eq(the_template)
+    end
+  end
+
+  describe '#run_hook' do
+    before :each do
+      @context = {
+        application: 'myApp',
+        environment: 'uat',
+        components:
+        { base: {:'deployment-strategy' => 'create-or-update'},
+          db:  {:'deployment-strategy' => 'auto-scaling-group-swap'},
+          web: { :'deployment-strategy' => 'cname-swap' }
+          }
+        }
+    end
+
+    it "should run the specified hook" do
+      hook = double()
+      CfDeployer::Hook.should_receive(:new).and_return(hook)
+      hook.should_receive(:run)
+
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.instance_variable_set('@params_and_outputs_resolved', true)
+      strategy.run_hook(:some_hook)
+    end
+
+    it "should not try to resolve parameters and outputs they're already initialized" do
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.instance_variable_set('@params_and_outputs_resolved', true)
+      strategy.should_not_receive(:get_parameters_outputs)
+      strategy.run_hook(:some_hook)
+    end
+
+    it "should not try to resolve parameters and outputs if there's no running stack" do
+      the_stack = double()
+      the_stack.should_receive(:exists?).and_return(false)
+      the_stack.should_receive(:name).and_return("thestack")
+
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.should_receive(:active_stack).and_return(the_stack)
+      strategy.should_not_receive(:get_parameters_outputs)
+      strategy.run_hook(:some_hook)
+    end
+
+    it "should not try to run a hook if there's no running stack" do
+      CfDeployer::Hook.should_not_receive(:new)
+
+      the_stack = double()
+      the_stack.should_receive(:exists?).and_return(false)
+      the_stack.should_receive(:name).and_return("thestack")
+
+      strategy = CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])
+      strategy.should_receive(:active_stack).and_return(the_stack)
+      strategy.run_hook(:some_hook)
+    end
+  end
 end

data/spec/unit/deployment_strategy/create_or_update_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe 'CreateOrUpdate Strategy' do
   before :each do
     @after_create_hook = double('after_create_hook')
+    @after_update_hook = double('after_update_hook')
     @before_destroy_hook = double('before_destroy_hook')
     allow(CfDeployer::Hook).to receive(:new).with(:'after-create', 'after-create'){ @after_create_hook }
+    allow(CfDeployer::Hook).to receive(:new).with(:'after-update', 'after-update'){ @after_update_hook }
     allow(CfDeployer::Hook).to receive(:new).with(:'before-destroy', 'before-destroy') { @before_destroy_hook }
     @context = {
       :application => 'myApp',
@@ -14,6 +16,7 @@ describe 'CreateOrUpdate Strategy' do
           :settings => {},
           :'deployment-strategy' => 'create-or-update',
           :'after-create' => 'after-create',
+          :'after-update' => 'after-update',
           :'before-destroy' => 'before-destroy'
         }
       }
@@ -25,16 +28,28 @@ describe 'CreateOrUpdate Strategy' do
     allow(@stack).to receive(:outputs){ {'ELBName' => 'myelb'}}
   end
 
-  it 'should deploy stack' do
+  it 'should deploy stack and run the after-create hook if no stack exists' do
     hook_context = nil
     expect(@after_create_hook).to receive(:run) do |given_context|
       hook_context = given_context
     end
+    @stack.should_receive(:exists?).and_return(false)
+    expect(@stack).to receive(:deploy)
+    @create_or_update.deploy
+    expect(hook_context[:parameters]).to eq( {'vpc' => 'myvpc'} )
+    expect(hook_context[:outputs]).to eq( {'ELBName' => 'myelb'} )
+  end
+
+  it 'should deploy stack and run the after-update hook if a stack already exists' do
+    hook_context = nil
+    expect(@after_update_hook).to receive(:run) do |given_context|
+      hook_context = given_context
+    end
+    @stack.should_receive(:exists?).and_return(true)
     expect(@stack).to receive(:deploy)
     @create_or_update.deploy
     expect(hook_context[:parameters]).to eq( {'vpc' => 'myvpc'} )
     expect(hook_context[:outputs]).to eq( {'ELBName' => 'myelb'} )
-    
   end
 
   context 'warm up auto scaling group' do
@@ -45,6 +60,7 @@ describe 'CreateOrUpdate Strategy' do
       context = @context[:components][:base]
       context[:settings] = {}
       context[:settings][:'auto-scaling-group-name-output'] = ['AutoScalingGroupID']
+      @stack.should_receive(:exists?).and_return(false)
       allow(@stack).to receive(:output).with('AutoScalingGroupID') { 'asg_name' }
       allow(CfDeployer::Driver::AutoScalingGroup).to receive(:new).with('asg_name') { asg_driver }
       allow(asg_driver).to receive(:describe) { {desired:2, min:1, max:3} }

data/spec/unit/deployment_strategy/deployment_strategy_spec.rb

@@ -22,6 +22,7 @@ describe 'Deployment Strategy' do
     expect(CfDeployer::DeploymentStrategy::AutoScalingGroupSwap).to receive(:new)
     CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'db', @context[:components][:db])
   end
+
   it "should create Cname-Swap strategy" do
     expect(CfDeployer::DeploymentStrategy::CnameSwap).to receive(:new)
     CfDeployer::DeploymentStrategy.create('myApp', 'uat', 'web', @context[:components][:web])

data/spec/unit/hook_spec.rb

@@ -1,3 +1,4 @@
+require 'stringio'
 require 'spec_helper'
 
 describe CfDeployer::Hook do
@@ -62,4 +63,28 @@ describe CfDeployer::Hook do
     context = { app: 'myApp', config_dir: config_dir}
     expect{CfDeployer::Hook.new('MyHook', {file: '../../tmp/test_code.rb', timeout: 20/1000.0}).run(context)}.to raise_error(Timeout::Error)
   end
+
+  it 'should catch SyntaxError during eval and show nicer output' do
+    context = { app: 'myApp' }
+    the_hook = CfDeployer::Hook.new('MyHook', "puts 'hello")
+    the_hook.should_receive :error_document
+    expect { the_hook.run(context) }.to raise_error
+  end
+
+  it 'should catch NoMethodError during eval and show nicer output' do
+  end
+
+  it 'should catch ApplicationError during eval and show nicer output' do
+  end
+
+  def capture_stdout(&block)
+    original_stdout = $stdout
+    $stdout = fake = StringIO.new
+    begin
+      yield
+    ensure
+      $stdout = original_stdout
+    end
+    fake.string
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf_deployer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jame Brechtel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -69,6 +69,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  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'
 description: For automatic blue green deployment flow on CloudFormation.
 email:
 - jbrechtel@gmail.com