bbc-cosmos-tools 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c25993fa89a80e8a8d885830fa98979a6dd4602
-  data.tar.gz: 577b33a47bca5af332eb92773388b42366e45389
+  metadata.gz: bd2fe62898213594ae112ece7e649b43252cd876
+  data.tar.gz: f2d9b802382334839d5d0f4489e37f062647078f
 SHA512:
-  metadata.gz: b46bd3807068a3a989aef79a1f0e6d4d1fe80fbb0472ed52fd6dc4aa17df5c744e0ec827c82d3d5a937a5ba29b0e8ed91c0038425266da0be782efd33fb5093c
-  data.tar.gz: 1aba13524eaed9852a5eeb16d6ee60c522d8c1fa0de64d4d49a1b02780732b6db158f3f27fb45e4557df6a32ad8192214264ead1f64d7494398809bed6f4288e
+  metadata.gz: 3fe64c5242a8920e6141bfee928c8f7d136e63efad9ccfb9c2663c429c745b5b1e4df1b2d51ea9fad9ef64358732ef6fe79eaf17eea153eedfd9cdbf8682d9e5
+  data.tar.gz: 355b1b44c9d4ca7b4df2160c8111e39b3e1e970e4ce18f2b66a4e2405f7f9d8cc3124cf4dc7a082cefbb4d6525a661f2c5d7b55250c6702d51f79db10f14b362

data/lib/bbc/cosmos/tools/app.rb

@@ -1,6 +1,5 @@
 require "thor"
 require 'bbc/cosmos/tools/commands/config'
-require 'bbc/cosmos/tools/commands/cloud_formation'
 require 'bbc/cosmos/tools/commands/release'
 require 'bbc/cosmos/tools/commands/stack'
 
@@ -13,16 +12,12 @@ module BBC
         desc "config", "Cosmos sub commands"
         subcommand "config", Commands::Config
 
-        desc "cf", "Cloudformation sub commands"
-        subcommand "cf", Commands::CloudFormation
-
         desc "release", "Cosmos release sub commands"
         subcommand "release", Commands::Release
 
         desc "stack", "Cosmos stack sub commands"
         subcommand "stack", Commands::Stack
 
-
       end
     end
   end

data/lib/bbc/cosmos/tools/commands/base.rb

@@ -14,10 +14,10 @@ module BBC
 
           package_name "BBC Cosmos config tool"
 
-          class_option :key_path, :type => :string, :default => ENV['DEV_CERT_PATH'], :desc => "The path to your dev cert, by default it looks in the env variable '$DEV_CERT_PATH'"
+          class_option :key_path, :type => :string, :default => ENV['DEV_CERT_PATH'], :desc => "The path to your dev cert, by default the value of the env variable $DEV_CERT_PATH is used"
           class_option :env, :type => :string, :default => 'int', :desc => "The environment to target"
           class_option :base, :type => :string, :desc => "The base path for the configs repo"
-          class_option :project, :type => :string, :default => ENV['BBC_COSMOS_TOOLS_PROJECT'], :desc => "The name of the project"
+          class_option :project, :type => :string, :default => ENV['BBC_COSMOS_TOOLS_PROJECT'], :desc => "The name of the project, by default the value of the env variable $BBC_COSMOS_TOOLS_PROJECT is used"
 
           def initialize(args = [], local_options = {}, config = {})
             super(args, local_options, config)

data/lib/bbc/cosmos/tools/commands/stack.rb

@@ -9,6 +9,8 @@ module BBC
         class Stack < Base
           attr_accessor :api
 
+          class_option :stack, :type => :string, :default => 'main', :desc => "The name of the stack to use"
+
           def initialize(args = [], local_options = {}, thor_config = {})
             super(args, local_options, thor_config)
             @api = BBC::Cosmos::Tools::API.new(config.app['api'], options[:key_path])
@@ -44,36 +46,70 @@ module BBC
 
           end
 
-          desc "stack events [COMPONENT]", "Shows the stack events for a component"
-          method_option :stack, :type => :string, :default => 'main', :desc => "The name of the stack to use"
-          method_option :limit, :type => :numeric, :default => 5, :desc => "Limit how many records to show"
-          def events(component)
+          method_option :variant, :type => :string, :default => 'default', :desc => "The variant to use, i.e default|scheduled"
+          method_option :group, :type => :string, :default => nil, :desc => "The group name to override the component id"
+          desc "stack generate [COMPONENT]", "Generates a cloudformation template based on a type of component, the identifier and the environment"
+          def generate(component)
 
-            say "#{banner}\n"
+            say "#{banner(component)}\n"
+            say cloudformation(component, options), :white
 
-            stack_name = "#{options[:env]}-#{component}-#{options[:stack]}"
-            response = api.get sprintf(config.app['stack_events'], options[:env], component, stack_name)
+          end
+
+          method_option :variant, :type => :string, :default => 'default', :desc => "The variant to use, i.e default|scheduled"
+          method_option :group, :type => :string, :default => nil, :desc => "The group name to override the component id"
+          desc "stack create [COMPONENT, MAIN_STACK = false]", "Generates and create the cloudformation template for the specific component"
+          def create(component, main_stack = false)
+
+            say "#{banner(component)}\n"
+
+            data = cloudformation(component, options, false)
+
+            post_data = {
+              'name_suffix'   => options[:stack],
+              'service_stack' => main_stack,
+              'template'      => data,
+              'parameters'    => Tools::Cloudformation::Generator.parameters(data),
+            }
+
+            @api = BBC::Cosmos::Tools::Config::API.new(config.app['api'], options[:key_path])
+            response = @api.post sprintf(config.app['stack_create_endpoint'], options[:env], component), JSON.pretty_generate(post_data)
 
             if response.success?
-              events = JSON.parse(response.body)
+              say "Stack creation for component '#{component}' successfully started", :green
+            else
+              api_error response
+            end
 
-              data = events.slice(0,(options[:limit])).map do |event|
-                event.split(" ")
-              end
+          end
 
-              print_table(
-                build_table(
-                  ['Event type', 'CF type', 'Name', 'Status'],
-                  data
-                )
-              )
+          method_option :variant, :type => :string, :default => 'default', :desc => "The variant to use, i.e default|scheduled"
+          method_option :group, :type => :string, :default => nil, :desc => "The group name to override the component id"
+          desc "stack update [COMPONENT]", "Generates and updates the cloudformation template for the specific component"
+          def update(component)
+
+            say "#{banner(component)}\n"
+
+            stack_name = "#{options[:env]}-#{component}-#{options[:stack]}"
+            data = cloudformation(component, options, false)
+
+            post_data = {
+              'template'    => data,
+              'parameters'  => Tools::Cloudformation::Generator.parameters(data)
+            }
+
+            @api = BBC::Cosmos::Tools::Config::API.new(config.app['api'], options[:key_path])
+            response = @api.post sprintf(config.app['stack_update_endpoint'], options[:env], component, stack_name), JSON.pretty_generate(post_data)
+
+            if response.success?
+              say "Stack update for component '#{component}' successfully started", :green
             else
               api_error response
             end
+
           end
 
           desc "stack delete [COMPONENT]", "Deletes a stack"
-          method_option :stack, :type => :string, :default => 'main', :desc => "The name of the stack to use"
           def delete(component)
 
             say "#{banner(component)}\n"
@@ -97,9 +133,44 @@ module BBC
 
           end
 
+          desc "stack events [COMPONENT]", "Shows the stack events for a component"
+          method_option :stack, :type => :string, :default => 'main', :desc => "The name of the stack to use"
+          method_option :limit, :type => :numeric, :default => 5, :desc => "Limit how many records to show"
+          def events(component)
+
+            say "#{banner}\n"
+
+            stack_name = "#{options[:env]}-#{component}-#{options[:stack]}"
+            response = api.get sprintf(config.app['stack_events'], options[:env], component, stack_name)
+
+            if response.success?
+              events = JSON.parse(response.body)
+
+              data = events.slice(0,(options[:limit])).map do |event|
+                event.split(" ")
+              end
 
+              print_table(
+                build_table(
+                  ['Event type', 'CF type', 'Name', 'Status'],
+                  data
+                )
+              )
+            else
+              api_error response
+            end
+          end
+
+          private
 
+          def cloudformation(component, options, to_json = true)
+            config_data = config
 
+            Tools::Cloudformation::Generator.create(component, config, options, to_json) do
+              component_identifier = options[:group].nil? ? component : options[:group]
+              instance_eval config_data.cf_templates(component_identifier, options[:stack])
+            end
+          end
         end
       end
     end

data/lib/bbc/cosmos/tools/version.rb

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.1.0"
+        VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Steven Jack
@@ -100,7 +100,6 @@ files:
 - lib/bbc/cosmos/tools/app.rb
 - lib/bbc/cosmos/tools/cloudformation/generator.rb
 - lib/bbc/cosmos/tools/commands/base.rb
-- lib/bbc/cosmos/tools/commands/cloud_formation.rb
 - lib/bbc/cosmos/tools/commands/config.rb
 - lib/bbc/cosmos/tools/commands/release.rb
 - lib/bbc/cosmos/tools/commands/stack.rb

data/lib/bbc/cosmos/tools/commands/cloud_formation.rb

@@ -1,116 +0,0 @@
-require "bbc/cosmos/tools/config"
-require 'bbc/cosmos/tools/commands/base'
-require 'bbc/cosmos/tools/cloudformation/generator'
-
-module BBC
-  module Cosmos
-    module Tools
-      module Commands
-        class CloudFormation < Base
-
-          class_option :stack, :type => :string, :default => 'main', :desc => "The name of the stack to use"
-          class_option :variant, :type => :string, :default => 'default', :desc => "The variant to use, i.e default|scheduled|"
-          class_option :group, :type => :string, :default => nil, :desc => "The group name to override the component id"
-
-          def initialize(args = [], local_options = {}, config = {})
-            super(args, local_options, config)
-          end
-
-          desc "cf generate [COMPONENT]", "Generates a cloudformation template based on a type of component, the identifier and the environment"
-          def generate(component)
-
-            say "#{banner(component)}\n"
-            say cloudformation(component, options), :white
-
-          end
-
-          desc "cf create [COMPONENT, STACK_NAME = 'main', MAIN_STACK = false]", "Generates and create the cloudformation template for the specific component"
-          def create(component, main_stack = false)
-
-            say "#{banner(component)}\n"
-
-            data = cloudformation(component, options, false)
-
-            post_data = {
-              'name_suffix'   => options[:stack],
-              'service_stack' => main_stack,
-              'template'      => data,
-              'parameters'    => Tools::Cloudformation::Generator.parameters(data),
-            }
-
-            @api = BBC::Cosmos::Tools::Config::API.new(config.app['api'], options[:key_path])
-            response = @api.post sprintf(config.app['stack_create_endpoint'], options[:env], component), JSON.pretty_generate(post_data)
-
-            if response.success?
-              say "Stack creation for component '#{component}' successfully started", :green
-            else
-              api_error response
-            end
-
-          end
-
-          desc "cf update [COMPONENT]", "Generates and updates the cloudformation template for the specific component"
-          def update(component)
-
-            say "#{banner(component)}\n"
-
-            stack_name = "#{options[:env]}-#{component}-#{options[:stack]}"
-            data = cloudformation(component, options, false)
-
-            post_data = {
-              'template'    => data,
-              'parameters'  => Tools::Cloudformation::Generator.parameters(data)
-            }
-
-            @api = BBC::Cosmos::Tools::Config::API.new(config.app['api'], options[:key_path])
-            response = @api.post sprintf(config.app['stack_update_endpoint'], options[:env], component, stack_name), JSON.pretty_generate(post_data)
-
-            if response.success?
-              say "Stack update for component '#{component}' successfully started", :green
-            else
-              api_error response
-            end
-
-          end
-
-          desc "cf delete [COMPONENT]", "Deletes a stack"
-          def update(component)
-
-            say "#{banner(component)}\n"
-
-            reply = yes?("Are you sure you want to delete the above stack?", :yellow)
-            if reply || reply.nil?
-
-              stack_name = "#{options[:env]}-#{component}-#{options[:stack]}"
-
-              @api = BBC::Cosmos::Tools::Config::API.new(config.app['api'], options[:key_path])
-              response = @api.post sprintf(config.app['stack_delete'], options[:env], component, stack_name), JSON.pretty_generate({})
-
-              if response.success?
-                say "Stack delete for component '#{component}' successfully started", :green
-              else
-                api_error response
-              end
-            else
-              error 'Action cancelled'
-            end
-
-          end
-
-
-          private
-
-          def cloudformation(component, options, to_json = true)
-            config_data = config
-
-            Tools::Cloudformation::Generator.create(component, config, options, to_json) do
-              component_identifier = options[:group].nil? ? component : options[:group]
-              instance_eval config_data.cf_templates(component_identifier, options[:stack])
-            end
-          end
-
-        end
-      end
-    end
-  end
-end