bora 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741e43489dd8279e5b9a2fa73068bd45bbfcc7de
-  data.tar.gz: 708c036c31038bec8dc57a61541af3065f4bf2c9
+  metadata.gz: 1cd2cfc5042845d206c5fdd8916b6a0212fc943c
+  data.tar.gz: 3a0f73e893cb10e2d871bfe2e8e364fa9500aaf3
 SHA512:
-  metadata.gz: 85b831a26bb9876db1a32a00238b1d489582a5f87adcb105d5103414d1274d175f53bc8123287a603a811e0f43ee2e336b0704e71107d85698507cbd84e176ac
-  data.tar.gz: 957e597af2294f73976630840ef64dbcdb2f078ea2085b39e0aa9d4d2e9950168ac7c292b1aa67fc9d394ee52abcade685573070d7e7ff419c7a5fda6349eb11
+  metadata.gz: 90dd31bc2e7058cf9e65d9c17d30936c5891943c8d390528e721012b64aef849aa9917192589a316915026af429df1e9ecdec107cfbffdb45f7b364eee0cf4c2
+  data.tar.gz: 5669c210393f07cf5c337c911f6a885e29d8dd1d3bd139162e5d02d87eeeff40a6d7bf271cbcd9018ce056e020635fd70ec8625c5a9a80d2f714729bf4efb11c

data/README.md

@@ -156,6 +156,7 @@ The following commands are available through the command line and rake tasks.
 * **events** - Outputs the latest events from the stack
 * **list** - Outputs a list of all stacks defined in the config file
 * **outputs** - Shows the outputs from the stack
+* **parameters** - Shows the parameters from the stack
 * **recreate** - Recreates (deletes then creates) the stack
 * **show** - Shows the local template in JSON, generating it if necessary
 * **show_current** - Shows the currently applied template in AWS

data/lib/bora/cfn/parameter.rb

@@ -0,0 +1,22 @@
+class Bora
+  module Cfn
+    class Parameter
+      def initialize(parameter)
+        @parameter = parameter
+      end
+
+      def key
+        @parameter.parameter_key
+      end
+
+      def value
+        @parameter.parameter_value
+      end
+
+      def to_s
+        "#{key} - #{value}"
+      end
+    end
+
+  end
+end

data/lib/bora/cfn/stack.rb

@@ -1,10 +1,10 @@
 require 'set'
 require 'open-uri'
 require 'aws-sdk'
-require 'diffy'
 require 'bora/cfn/stack_status'
 require 'bora/cfn/event'
 require 'bora/cfn/output'
+require 'bora/cfn/parameter'
 
 class Bora
   module Cfn
@@ -50,6 +50,11 @@ class Bora
         underlying_stack.outputs.map { |output| Output.new(output) }
       end
 
+      def parameters
+        return if !exists?
+        underlying_stack.parameters.map { |parameter| Parameter.new(parameter) }
+      end
+
       def template(pretty = true)
         return if !exists?
         template = cloudformation.get_template({stack_name: @stack_name}).template_body
@@ -68,10 +73,6 @@ class Bora
         end
       end
 
-      def diff(options)
-        Diffy::Diff.new(template, new_template(options))
-      end
-
       def validate(options)
         cloudformation.validate_template(resolve_options(options).select { |k| [:template_body, :template_url].include?(k) })
       end

data/lib/bora/cli.rb

@@ -17,7 +17,7 @@ class Bora
 
     class_option "cfn-stack-name",
       type: :string,
-      aliases: :c,
+      aliases: :n,
       default: nil,
       desc: "The name to give the stack in CloudFormation. Overrides any CFN stack name setting in the Bora config file."
 
@@ -43,8 +43,9 @@ class Bora
 
     desc "diff STACK_NAME", "Diffs the new template with the stack's current template"
     option :params, type: :array, aliases: :p, desc: "Parameters to be passed to the template, eg: --params 'instance_type=t2.micro'"
+    option :context, type: :numeric, aliases: :c, default: 3, desc: "Number of lines of context to show around the differences"
     def diff(stack_name)
-      stack(options.file, stack_name).diff(params)
+      stack(options.file, stack_name).diff(params, options.context)
     end
 
     desc "events STACK_NAME", "Outputs the latest events from the stack"
@@ -57,6 +58,11 @@ class Bora
       stack(options.file, stack_name).outputs
     end
 
+    desc "parameters STACK_NAME", "Shows the parameters from the stack"
+    def parameters(stack_name)
+      stack(options.file, stack_name).parameters
+    end
+
     desc "recreate STACK_NAME", "Recreates (deletes then creates) the stack"
     option :params, type: :array, aliases: :p, desc: "Parameters to be passed to the template, eg: --params 'instance_type=t2.micro'"
     def recreate(stack_name)

data/lib/bora/stack.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'colorize'
 require 'cfndsl'
+require 'diffy'
 require 'bora/cfn/stack'
 require 'bora/stack_tasks'
 require 'bora/parameter_resolver'
@@ -14,6 +15,7 @@ class Bora
     STACK_EVENTS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no events"
     STACK_EVENTS_MESSAGE = "Events for stack '%s'"
     STACK_OUTPUTS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no outputs"
+    STACK_PARAMETERS_DO_NOT_EXIST_MESSAGE = "Stack '%s' has no parameters"
     STACK_VALIDATE_SUCCESS_MESSAGE = "Template for stack '%s' is valid"
 
     def initialize(stack_name, template_file, stack_config)
@@ -53,9 +55,25 @@ class Bora
       invoke_action("delete")
     end
 
-    def diff(override_params = {})
+    def diff(override_params = {}, context_lines = 3)
       generate(override_params)
-      puts @cfn_stack.diff(@cfn_options).to_s(String.disable_colorization ? :text : :color)
+      diff = Diffy::Diff.new(@cfn_stack.template, @cfn_stack.new_template(@cfn_options),
+              context: context_lines,
+              include_diff_info: true)
+      diff = diff.reject { |line| line =~ /^(---|\+\+\+|\\\\)/ }
+      diff = diff.map do |line|
+        case line
+        when /^\+/
+          line.chomp.colorize(:green)
+        when /^-/
+          line.chomp.colorize(:red)
+        when /^@@/
+          line.chomp.colorize(:cyan)
+        else
+          line.chomp
+        end
+      end
+      puts diff.join("\n")
     end
 
     def events
@@ -88,6 +106,21 @@ class Bora
       outputs
     end
 
+    def parameters
+      parameters = @cfn_stack.parameters
+      if parameters
+        if parameters.length > 0
+          puts "Parameters for stack '#{@cfn_stack_name}'"
+          parameters.each { |parameter| puts parameter }
+        else
+          puts STACK_PARAMETERS_DO_NOT_EXIST_MESSAGE % @cfn_stack_name
+        end
+      else
+        puts STACK_DOES_NOT_EXIST_MESSAGE % @cfn_stack_name
+      end
+      parameters
+    end
+
     def recreate(override_params = {})
       generate(override_params)
       invoke_action("recreate", @cfn_options)

data/lib/bora/stack_tasks.rb

@@ -16,6 +16,7 @@ class Bora
       define_diff_task
       define_events_task
       define_outputs_task
+      define_parameters_task
       define_recreate_task
       define_show_task
       define_show_current_task
@@ -68,6 +69,15 @@ class Bora
       end
     end
 
+    def define_parameters_task
+      within_namespace do
+        desc "Shows the parameters from the '#{@stack.stack_name}' stack"
+        task :parameters do
+          @stack.parameters
+        end
+      end
+    end
+
     def define_recreate_task
       within_namespace do
         desc "Recreates (deletes then creates) the '#{@stack.stack_name}' stack"

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
 class Bora
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -158,6 +158,7 @@ files:
 - lib/bora.rb
 - lib/bora/cfn/event.rb
 - lib/bora/cfn/output.rb
+- lib/bora/cfn/parameter.rb
 - lib/bora/cfn/stack.rb
 - lib/bora/cfn/stack_status.rb
 - lib/bora/cfn/status.rb