domed-city 1.6.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d8f26172301e9ca28b6ccac2be14bf9f05ef973
-  data.tar.gz: c38ca8ff67f62909d5414d02650ea71473eac0ed
+  metadata.gz: ed66b624e303da572cb9b8373540c31f87025733
+  data.tar.gz: 3c4439e4ede3d703dc60b0098e5cfabd0a6e5a4b
 SHA512:
-  metadata.gz: d01788ccba53d666fd49d9d703ff0cfa7848f546dcd3958b700c3b4b40e5ac78a98bb3928f883869a2786c69fabca65e14c5feddb08512eb92b146acb73d507d
-  data.tar.gz: 55dfde32d29864e0e863ba3d6a66f1d0b4ba9030daf10b40ece824f8ba0937e3dd3ff95604f411978d7d43dcba4c26dff1f185263b24213b0ff0ffc0366b9888
+  metadata.gz: 90f0c2c2db637fd0946a507a8434990e37d44b6e6e103aa7eec7d89cd006a5647b4da252da6279eefab99132323b9b54fa1a5210ebe6416c37ac58f79649ab33
+  data.tar.gz: e9e87383b69a2e7bf938fb6ee3cac144e3219b8ab429e3b02e7625dd2295f06206dc482099e35e7fde51b377b3e4ef0cda76fdda072001f7342e2f6e1c2fe5d5

data/bin/dome

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'bundler/setup'
-require 'dome'
+require_relative '../lib/dome'
 
 opts = Trollop.options do
   version Dome::VERSION

data/lib/dome.rb

@@ -3,7 +3,9 @@ require 'aws-sdk'
 require 'colorize'
 require 'aws/profile_parser'
 require 'fileutils'
+require 'yaml'
 
+require 'dome/settings'
 require 'dome/version'
 require 'dome/helpers/shell'
 require 'dome/environment'

data/lib/dome/environment.rb

@@ -1,26 +1,23 @@
 module Dome
   class Environment
-    attr_reader :environment, :account
+    attr_reader :environment, :account, :settings
 
     def initialize(directories = Dir.pwd.split('/'))
       @environment = directories[-1]
       @account     = directories[-2]
+      @settings    = Dome::Settings.new
     end
 
     def team
-      @account.split('-').first
+      @settings.parse['project']
     end
 
     def accounts
       %W(#{team}-dev #{team}-prd)
     end
 
-    def non_production_environments
-      %w(infradev dev sit qa qa1 qa2 stg)
-    end
-
-    def production_environments
-      %w(infraprd prd)
+    def environments
+      @settings.parse['environments']
     end
 
     def aws_credentials
@@ -40,38 +37,42 @@ module Dome
       accounts.include? account_name
     end
 
-    def valid_environment?(account_name, environment_name)
+    def valid_environment?(environment_name)
       puts "Environment: #{environment_name.colorize(:green)}"
-      if account_name.split('-')[1] == 'dev'
-        non_production_environments.include? environment_name
-      else
-        production_environments.include? environment_name
-      end
+      environments.include? environment_name
     end
 
     def invalid_account_message
       puts "\n'#{@account}' is not a valid account.\n".colorize(:red)
-      puts "The 'account' and 'environment' variables are assigned based on your current directory.\n".colorize(:red)
-      puts "The expected directory structure is '.../<account>/<environment>'\n".colorize(:red)
-      puts "Valid accounts are: #{accounts}."
-      puts "\nEither:"
-      puts '1. Set your .aws/config to one of the valid accounts above.'
-      puts '2. Ensure you are running this from the correct directory.'
+      generic_error_message
       exit 1
     end
 
     def invalid_environment_message
-      puts "\n'#{@environment}' is not a valid environment for the account: '#{@account}'.\n".colorize(:red)
+      puts "\n'#{@environment}' is not a valid environment.\n".colorize(:red)
+      generic_error_message
+      exit 1
+    end
+
+    private
+
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
+    def generic_error_message
       puts "The 'account' and 'environment' variables are assigned based on your current directory.\n".colorize(:red)
       puts "The expected directory structure is '.../<account>/<environment>'\n".colorize(:red)
-
-      env = if account[-4..-1] == '-dev'
-              non_production_environments
-            else
-              production_environments
-            end
-      puts "Valid environments are: #{env}."
-      exit 1
+      puts '============================================================================='
+      puts "Valid environments are defined using the 'environments' key in your itv.yaml."
+      puts "The environments you have defined are: #{environments}."
+      puts '============================================================================='
+      puts 'Valid accounts are of the format <project>-dev/prd and <project>-prd' \
+           " (where 'project' is defined using the 'project' key in your itv.yaml."
+      puts "The accounts you have defined are: #{accounts}."
+      puts '============================================================================='
+      puts 'To fix your issue, try the following:'
+      puts '1. Set your .aws/config to one of the valid accounts above.'
+      puts '2. Ensure you are running this from the correct directory.'
+      puts '3. Update your itv.yaml with the required environments or project.'
     end
   end
 end

data/lib/dome/settings.rb

@@ -0,0 +1,16 @@
+module Dome
+  class Settings
+    def parse
+      raise('[*] itv.yaml does not exist') unless File.exist? itv_yaml_path
+      load_yaml
+    end
+
+    def load_yaml
+      @parsed_yaml ||= YAML.load_file(itv_yaml_path)
+    end
+
+    def itv_yaml_path
+      '../../../itv.yaml'
+    end
+  end
+end

data/lib/dome/terraform.rb

@@ -14,7 +14,7 @@ module Dome
       environment = @environment.environment
       account     = @environment.account
       @environment.invalid_account_message unless @environment.valid_account? account
-      @environment.invalid_environment_message unless @environment.valid_environment?(account, environment)
+      @environment.invalid_environment_message unless @environment.valid_environment? environment
       puts "Team: #{@environment.team.colorize(:green)}"
       puts '----------------------------------------------------------------'
       @environment.populate_aws_access_keys

data/lib/dome/version.rb

@@ -1,3 +1,3 @@
 module Dome
-  VERSION = '1.6.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domed-city
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Snape
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-10 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - lib/dome.rb
 - lib/dome/environment.rb
 - lib/dome/helpers/shell.rb
+- lib/dome/settings.rb
 - lib/dome/state.rb
 - lib/dome/terraform.rb
 - lib/dome/version.rb