bbc-cosmos-tools 0.5.2 → 0.6.0

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

@@ -1,4 +1,4 @@
-require 'yaml'
+require "yaml"
 
 module BBC
   module Cosmos
@@ -6,22 +6,22 @@ module BBC
       class Config
         attr_accessor :base_path, :project, :env
 
-        def initialize(base_path, project, env = 'int')
+        def initialize(base_path, project, env = "int")
           @base_path = base_path
           @project   = project
           @env       = env
         end
 
         def resources
-          if File.directory? File.join(base_path, 'resources', env)
-            path = File.join(base_path, 'resources', env, "#{project}.yaml")
+          if File.directory? File.join(base_path, "resources", env)
+            path = File.join(base_path, "resources", env, "#{project}.yaml")
             if File.exist? path
-              YAML::load(File.open(path).read)
+              YAML.load(File.open(path).read)
             else
-              raise("Invalid project, please set the $BBC_COSMOS_TOOLS_PROJECT environment variable or use the --project parameter")
+              fail("Invalid project, please set the $BBC_COSMOS_TOOLS_PROJECT environment variable or use the --project parameter")
             end
           else
-            raise("#{env} is an invalid environment")
+            fail("#{env} is an invalid environment")
           end
         end
 
@@ -30,39 +30,36 @@ module BBC
           if File.exist? path
             template = File.open(path).read
             config = resources
-            YAML::load(
+            YAML.load(
               ERB.new(template).result(binding)
-            )['components']
+            )["components"]
           else
-            raise("'#{project}' isn't valid project")
+            fail("'#{project}' isn't valid project")
           end
         end
 
         def components_for(tags)
-          resources['cloudformation']['components'].select do |component_id, data|
-            data['tags'].any? { |tag| tags.nil? ? true : tags.include?(tag) } if data['tags']
+          resources["cloudformation"]["components"].select do |_component_id, data|
+            data["tags"].any? { |tag| tags.nil? ? true : tags.include?(tag) } if data["tags"]
           end
         end
 
         def app
-          config_path = base_path.join('configs', 'app.yaml')
-          raise("Invalid application config path: #{config_path}") unless File.exists? config_path
-          YAML::load(File.open(config_path).read)['bbc']['cosmos']
+          config_path = base_path.join("configs", "app.yaml")
+          fail("Invalid application config path: #{config_path}") unless File.exist? config_path
+          YAML.load(File.open(config_path).read)["bbc"]["cosmos"]
         end
 
-
-        def cf_templates(component, stack = 'main')
-          aws_templates = File.join(base_path, 'stacks', component, stack, '/aws/**/*.rb')
-          component_template_path = File.join(base_path, 'stacks', component, stack, 'template.rb')
-          component_template = (File.exists? component_template_path) ? File.read(component_template_path) : ''
+        def cf_templates(component, stack = "main")
+          aws_templates = File.join(base_path, "stacks", component, stack, "/aws/**/*.rb")
+          component_template_path = File.join(base_path, "stacks", component, stack, "template.rb")
+          component_template = (File.exist? component_template_path) ? File.read(component_template_path) : ""
 
           Dir
             .glob(aws_templates)
             .reduce(component_template) { |template_string, file| template_string += File.read(file) }
         end
-
       end
     end
   end
 end
-

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

@@ -1,5 +1,5 @@
-require 'yaml'
-require 'bbc/cosmos/tools/config'
+require "yaml"
+require "bbc/cosmos/tools/config"
 
 module BBC
   module Cosmos
@@ -17,18 +17,16 @@ module BBC
 
         def component(id)
           config.components[id].tap do |o|
-            raise("Invalid component id: #{id}") if o.nil?
+            fail("Invalid component id: #{id}") if o.nil?
           end
         end
 
         def cosmos_component(id)
           component(id).reduce([]) do |object, (key, value)|
-            object.tap { |o| o << {:value => value, :key => key} }
+            object.tap { |o| o << { :value => value, :key => key } }
           end
         end
-
       end
     end
   end
 end
-

data/lib/bbc/cosmos/tools/types/base_type.rb

@@ -15,7 +15,7 @@ module BBC
           def generate_data(to_json = false)
             if valid_component_and_stack
               get_parameters.each do |key, value|
-                data['Parameters'][key]['Default'] = value if data['Parameters'][key]
+                data["Parameters"][key]["Default"] = value if data["Parameters"][key]
               end
               to_json ? JSON.pretty_generate(data) : data
             end
@@ -24,26 +24,25 @@ module BBC
           protected
 
           def data
-            raise NotImplementedError
+            fail NotImplementedError
           end
 
-          def construct_file_path type
-            File.join(@config.base_path, 'stacks', @id, "#{@options[:stack]}.#{type}")
+          def construct_file_path(type)
+            File.join(@config.base_path, "stacks", @id, "#{@options[:stack]}.#{type}")
           end
 
           private
 
           def valid_component_and_stack
             Tools::Cloudformation::Generator.component_exists?(@id, @config) &&
-            Tools::Cloudformation::Generator.stack_exists?(@id, @config, @options[:stack])
+              Tools::Cloudformation::Generator.stack_exists?(@id, @config, @options[:stack])
           end
 
           def get_parameters
-            @config.resources['cloudformation']['components'][@id][@options[:stack]]['variants'][@options[:variant]]
+            @config.resources["cloudformation"]["components"][@id][@options[:stack]]["variants"][@options[:variant]]
           end
         end
       end
     end
   end
 end
-

data/lib/bbc/cosmos/tools/types/cfndsl.rb

@@ -12,7 +12,6 @@ module BBC
           end
 
           def generate_data(to_json = false)
-
             # Because the block is evaluated in the context of another class
             # i.e. instance_eval &block
             # we need to store off the values first and *then* reference them inside the block
@@ -20,9 +19,9 @@ module BBC
             config = @config
             stack = @options[:stack]
 
-            Tools::Cloudformation::Generator.create(@id, @config, @options, to_json) {
+            Tools::Cloudformation::Generator.create(@id, @config, @options, to_json) do
               instance_eval config.cf_templates(component_identifier, stack)
-            }
+            end
           end
         end
       end

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

@@ -1,7 +1,7 @@
 module BBC
   module Cosmos
     module Tools
-        VERSION = "0.5.2"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbc-cosmos-tools
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Steven Jack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,14 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.63.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 1.63.0
+- !ruby/object:Gem::Dependency
+  name: highline
+  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: Tool for interacting with BBC Cosmos platform
 email:
 - stevenmajack@gmail.com
@@ -146,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tool for pusing config to cosmos and controlling cloudformation templates
 test_files: []
-has_rdoc: