bora 0.9.4 → 1.0.0.beta1

data/lib/bora/stack_tasks.rb

@@ -0,0 +1,132 @@
+require 'rake/tasklib'
+
+class Bora
+  class StackTasks < Rake::TaskLib
+    def initialize(stack)
+      @stack = stack
+      define_tasks
+    end
+
+
+    protected
+
+    def define_tasks
+      define_apply_task
+      define_delete_task
+      define_diff_task
+      define_events_task
+      define_outputs_task
+      define_recreate_task
+      define_show_task
+      define_show_current_task
+      define_status_task
+      define_validate_task
+    end
+
+    def define_apply_task
+      within_namespace do
+        desc "Creates (or updates) the '#{@stack.stack_name}' stack"
+        task :apply do |_, args|
+          @stack.apply(extract_params_from_args(args.extras))
+        end
+      end
+    end
+
+    def define_delete_task
+      within_namespace do
+        desc "Deletes the '#{@stack.stack_name}' stack"
+        task :delete do
+          @stack.delete
+        end
+      end
+    end
+
+    def define_diff_task
+      within_namespace do
+        desc "Diffs the new template with the '#{@stack.stack_name}' stack's current template"
+        task :diff do |_, args|
+          @stack.diff(extract_params_from_args(args.extras))
+        end
+      end
+    end
+
+    def define_events_task
+      within_namespace do
+        desc "Outputs the latest events from the '#{@stack.stack_name}' stack"
+        task :events do
+          @stack.events
+        end
+      end
+    end
+
+    def define_outputs_task
+      within_namespace do
+        desc "Shows the outputs from the '#{@stack.stack_name}' stack"
+        task :outputs do
+          @stack.outputs
+        end
+      end
+    end
+
+    def define_recreate_task
+      within_namespace do
+        desc "Recreates (deletes then creates) the '#{@stack.stack_name}' stack"
+        task :recreate do |_, args|
+          @stack.recreate(extract_params_from_args(args.extras))
+        end
+      end
+    end
+
+    def define_show_task
+      within_namespace do
+        desc "Shows the new template for '#{@stack.stack_name}' stack"
+        task :show do |_, args|
+          @stack.show(self.extract_params_from_args(args.extras))
+        end
+      end
+    end
+
+    def define_show_current_task
+      within_namespace do
+        desc "Shows the current template for '#{@stack.stack_name}' stack"
+        task :show_current do
+          @stack.show_current
+        end
+      end
+    end
+
+    def define_status_task
+      within_namespace do
+        desc "Displays the current status of the '#{@stack.stack_name}' stack"
+        task :status do
+          @stack.status
+        end
+      end
+    end
+
+    def define_validate_task
+      within_namespace do
+        desc "Checks the '#{@stack.stack_name}' stack's template for validity"
+        task :validate do |_, args|
+          @stack.validate(extract_params_from_args(args.extras))
+        end
+      end
+    end
+
+    def within_namespace
+      namespace :stack do
+        namespace @stack.stack_name do
+          yield
+        end
+      end
+    end
+
+
+    protected
+
+    def extract_params_from_args(args)
+      args ? Hash[args.map { |arg| arg.split("=", 2) }] : {}
+    end
+
+  end
+end

data/lib/bora/tasks.rb

@@ -1,12 +1,17 @@
 require 'colorize'
 require 'rake/tasklib'
-require 'bora/stack'
+require 'bora/cfn/stack'
 
-module Bora
+class Bora
   class Tasks < Rake::TaskLib
     def initialize(stack_name, template_uri = nil)
+      puts "--------------------------------------------------------------------------------"
+      puts "Bora::Tasks is deprecated. Please use YAML based configuration instead."
+      puts "See http://ampedandwired.com/bora for more information."
+      puts "--------------------------------------------------------------------------------"
+
       @stack_name = stack_name
-      @stack = Stack.new(stack_name)
+      @stack = Cfn::Stack.new(stack_name)
       @colorize = true
       @stack_options = {}
       within_namespace { yield self } if block_given?

data/lib/bora/template.rb

@@ -0,0 +1,37 @@
+require 'bora/stack'
+
+class Bora
+  class Template
+    def initialize(template_name, template_config)
+      @template_name = template_name
+      @template_config = template_config
+      @stacks = {}
+      template_config['stacks'].each do |stack_name, stack_config|
+        stack_name = "#{template_name}-#{stack_name}"
+        stack_config = resolve_stack_config(template_config, stack_config)
+        @stacks[stack_name] = Stack.new(stack_name, template_config['template_file'], stack_config)
+      end
+    end
+
+    def stack(name)
+      @stacks[name]
+    end
+
+    def rake_tasks
+      @stacks.each { |_, s| s.rake_tasks }
+    end
+
+
+    private
+
+    def resolve_stack_config(template_config, stack_config)
+      extract_cfn_options(template_config).merge(stack_config)
+    end
+
+    def extract_cfn_options(config)
+      valid_options = ["capabilities"]
+      config.select { |k| valid_options.include?(k) }
+    end
+
+  end
+end

data/lib/bora/version.rb

@@ -1,3 +1,3 @@
-module Bora
-  VERSION = "0.9.4"
+class Bora
+  VERSION = "1.0.0.beta1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bora
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Charles Blaxland
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +125,8 @@ dependencies:
 description: 
 email:
 - charles.blaxland@gmail.com
-executables: []
+executables:
+- bora
 extensions: []
 extra_rdoc_files: []
 files:
@@ -124,15 +139,19 @@ files:
 - bin/console
 - bin/setup
 - bora.gemspec
+- exe/bora
 - lib/bora.rb
+- lib/bora/cfn/event.rb
+- lib/bora/cfn/output.rb
+- lib/bora/cfn/stack.rb
+- lib/bora/cfn/stack_status.rb
+- lib/bora/cfn/status.rb
 - lib/bora/cfn_param_resolver.rb
-- lib/bora/event.rb
-- lib/bora/output.rb
-- lib/bora/rake_tasks.rb
+- lib/bora/cli.rb
 - lib/bora/stack.rb
-- lib/bora/stack_status.rb
-- lib/bora/status.rb
+- lib/bora/stack_tasks.rb
 - lib/bora/tasks.rb
+- lib/bora/template.rb
 - lib/bora/version.rb
 homepage: https://github.com/ampedandwired/bora
 licenses: []
@@ -148,9 +167,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1

data/lib/bora/event.rb

@@ -1,31 +0,0 @@
-require 'bora/status'
-
-module Bora
-  class Event
-    def initialize(event)
-      @event = event
-      @status = Status.new(@event.resource_status)
-    end
-
-    def method_missing(sym, *args, &block)
-      @event.send(sym, *args, &block)
-    end
-
-    def status_success?
-      @status.success?
-    end
-
-    def status_failure?
-      @status.failure?
-    end
-
-    def status_complete?
-      status_success? || status_failure?
-    end
-
-    def to_s
-      status_reason = @event.resource_status_reason ? " - #{@event.resource_status_reason}" : ""
-      "#{@event.timestamp.getlocal} - #{@event.resource_type} - #{@event.logical_resource_id} - #{@status}#{status_reason}"
-    end
-  end
-end

data/lib/bora/output.rb

@@ -1,20 +0,0 @@
-module Bora
-  class Output
-    def initialize(output)
-      @output = output
-    end
-
-    def key
-      @output.output_key
-    end
-
-    def value
-      @output.output_value
-    end
-
-    def to_s
-      desc = @output.description ? " (#{@output.description})" : ""
-      "#{@output.output_key} - #{@output.output_value} #{desc}"
-    end
-  end
-end

data/lib/bora/rake_tasks.rb

@@ -1,107 +0,0 @@
-require 'tempfile'
-require 'yaml'
-require 'colorize'
-require 'rake/tasklib'
-require 'cfndsl'
-require 'bora/tasks'
-require 'bora/cfn_param_resolver'
-
-module Bora
-  class RakeTasks < Rake::TaskLib
-    def initialize(config_file_or_hash)
-      define_templates(load_config(config_file_or_hash))
-    end
-
-
-    private
-
-    def define_templates(config)
-      config['templates'].each do |template_name, template_config|
-        define_stacks(template_name, template_config)
-      end
-    end
-
-    def define_stacks(template_name, template_config)
-      template_file = template_config['template_file']
-      template_config['stacks'].each do |stack_name, stack_config|
-        stack_name = stack_config['stack_name'] || "#{template_name}-#{stack_name}"
-        stack_options = extract_stack_options(template_config)
-        define_tasks(template_file, stack_name, stack_config, stack_options)
-      end
-    end
-
-    def define_tasks(template_file, stack_name, stack_config, stack_options)
-      Bora::Tasks.new(stack_name) do |t|
-        t.stack_options = stack_options
-
-        task :generate do |_, args|
-          params = extract_params(stack_config, args)
-
-          if File.extname(template_file) == ".rb"
-            template_body = run_cfndsl(template_file, params)
-            template_json = JSON.parse(template_body)
-            if template_json["Parameters"]
-              cfn_param_keys = template_json["Parameters"].keys
-              cfn_params = params.select { |k, v| cfn_param_keys.include?(k) }.map do |k, v|
-                { parameter_key: k, parameter_value: v }
-              end
-              t.stack_options[:parameters] = cfn_params if !cfn_params.empty?
-            end
-            t.stack_options[:template_body] = template_body
-          else
-            t.stack_options[:template_url] = template_file
-            if !params.empty?
-              t.stack_options[:parameters] = params.map do |k, v|
-                { parameter_key: k, parameter_value: v }
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def run_cfndsl(template_file, params)
-      temp_extras = Tempfile.new("bora")
-      temp_extras.write(params.to_yaml)
-      temp_extras.close
-      template_body = CfnDsl.eval_file_with_extras(template_file, [[:yaml, temp_extras.path]]).to_json
-      temp_extras.unlink
-      template_body
-    end
-
-    def extract_stack_options(config)
-      valid_options = ["capabilities"]
-      config.select { |k| valid_options.include?(k) }
-    end
-
-    def extract_params(stack_config, args)
-      params = stack_config['params'] || {}
-      params.merge!(extract_params_from_args(args.extras))
-      params.map { |k, v| [k, process_param_substitutions(v)] }.to_h
-    end
-
-    def process_param_substitutions(val)
-      old_val = nil
-      while old_val != val
-        old_val = val
-        val = val.sub(/\${[^}]+}/) do |m|
-          token = m[2..-2]
-          CfnParamResolver.new(token).resolve
-        end
-      end
-      val
-    end
-
-    def extract_params_from_args(args)
-      args ? Hash[args.map { |arg| arg.split("=", 2) }] : {}
-    end
-
-    def load_config(config)
-      if config.class == String
-        return YAML.load_file(config)
-      elsif config.class == Hash
-        return config
-      end
-    end
-  end
-end

data/lib/bora/stack_status.rb

@@ -1,29 +0,0 @@
-require 'bora/status'
-
-module Bora
-  class StackStatus
-    def initialize(underlying_stack)
-      @stack = underlying_stack
-      if @stack
-        @status = Status.new(@stack.stack_status)
-      end
-    end
-
-    def exists?
-      @status && !@status.deleted?
-    end
-
-    def success?
-      @status && @status.success?
-    end
-
-    def to_s
-      if @stack
-        status_reason = @stack.stack_status_reason ? " - #{@stack.stack_status_reason}" : ""
-        "#{@stack.stack_name} - #{@status}#{status_reason}"
-      else
-        "Stack does not exist"
-      end
-    end
-  end
-end