domed-city 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7efabd99d90f998c7b6d2ad165fbd90322eea5f
-  data.tar.gz: 09504559d427ebb0a2a79e0477778a0dfdff1878
+  metadata.gz: 67373aa5975c98fd857ea4859e44f2fe10117fca
+  data.tar.gz: b65e596b729abbf3c8943c033be9fc7839bc8da5
 SHA512:
-  metadata.gz: f9634171a656f5fc75030a519b9b8c5ddedd2453cb002b596ea8c527e533ce0e23cc09753bd2159df7c304ac536f8632bb84500d1a4cdd688ec4c9570f861452
-  data.tar.gz: 8e45508db4ea0260baab44e97eec4958e4d96bc855b93057948d22cce8952337883f2d166dfbf39e131c6b2f4f2caab93e0b757e54346be04f4ea721191edb8a
+  metadata.gz: bd6c4e608b28914aad3e67048452f3fd059508e419b11d5d413c0a63f8836cb952b7943c407362f69da7efc87baee84d307bd0f7895e6743787703b3ffb9450c
+  data.tar.gz: 2ac30edb586186cf99415900c16eaa869596ddc84aa1a262f22eea234a4603c69ea2f4daac3e5de4a4cac3355c686ca76ba44963ac6aab0af8206a6b5358f2cc

data/lib/dome/environment.rb

@@ -2,18 +2,17 @@ module Dome
   class Environment
     attr_reader :environment, :account
 
-    def initialize
-      directories  = Dir.pwd.split('/')
+    def initialize(directories = Dir.pwd.split('/'))
       @environment = directories[-1]
       @account     = directories[-2]
     end
 
     def team
-      @account.match(/(\w+)-\w+\z/)[1]
+      @account.split('-').first
     end
 
     def accounts
-      %w(deirdre-dev deirdre-prd)
+      %W(#{team}-dev #{team}-prd)
     end
 
     def non_production_environments
@@ -38,17 +37,17 @@ module Dome
       ENV['AWS_DEFAULT_REGION']    = aws_credentials[:region]
     end
 
-    def valid_account?(account)
-      puts "Account: #{account.colorize(:green)}"
-      accounts.include? account
+    def valid_account?(account_name)
+      puts "Account: #{account_name.colorize(:green)}"
+      accounts.include? account_name
     end
 
-    def valid_environment?(account, environment)
-      puts "Environment: #{environment.colorize(:green)}"
-      if account[-4..-1] == '-dev'
-        non_production_environments.include? environment
+    def valid_environment?(account_name, 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
+        production_environments.include? environment_name
       end
     end
 

data/lib/dome/terraform.rb

@@ -11,10 +11,12 @@ module Dome
     end
 
     def validate_environment
-      environment_name = @environment.environment
-      account_name     = @environment.account
-      @environment.invalid_account_message unless @environment.valid_account? account_name
-      @environment.invalid_environment_message unless @environment.valid_environment?(account_name, environment_name)
+      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)
+      puts "Team: #{@environment.team.colorize(:green)}"
+      puts '----------------------------------------------------------------'
       @environment.populate_aws_access_keys
     end
 

data/lib/dome/version.rb

@@ -1,3 +1,3 @@
 module Dome
-  VERSION = '1.1.1'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domed-city
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Ben Snape