tass 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fbaf66a002c23f78ecba2fe3dde0f7dead0214c
-  data.tar.gz: d0f5de92d5118d377f984c16ff2fc1cd039a5097
+  metadata.gz: 7477b740521cfffcab21dc81e51ab3d81c76457d
+  data.tar.gz: 724f1459c3ddfa7997e5975d4dc325caeb8e6e14
 SHA512:
-  metadata.gz: 14db736a00d63966e69e44854e579597b2a9ecc5c6730c6c99178eef09ef5d0da701f8a98c07cc73795d0a28739197d3c58e952aa95fc0279e8a1af48bf4d63c
-  data.tar.gz: d77038de3412e14e46ed9c394a709b2bb9cc09ce91e0dec9b93c48a5b43e2b44db8f891642367f9c1011a0a6c8d5ac5a4350d02fa2a6604cedc761ee8632a7b5
+  metadata.gz: c09942370add8729fbf7480e1819da06b1029d3aee25677d670886f1eb82f457146013d2cd3e05d37cfa899cf7b1f9b4aec7045d6a87b1e05513c1814eabc8bf
+  data.tar.gz: c65b5f549e3ece2517df0ff1d0c70fcd8191f71d6070d32b3823070d77e0d4afb5222d1de3fff871f02672232d546059f194cdb4fadb4072eba761ac23221dfb

data/bin/tass

@@ -11,16 +11,6 @@ def confirm_config(aws_env, misc_config, opts)
   end
 end
 
-def supported_envs(listing)
-  envs = []
-  Dir.entries("#{listing}/config/common").each do |file|
-    next unless file.end_with?('yaml')
-    next if file.start_with?('defaults')
-    envs << file.chomp!('.yaml')
-  end
-  envs
-end
-
 SUB_COMMANDS = %w(create update audit)
 Trollop::options do
   usage '[SUB_COMMAND] [options]'
@@ -39,17 +29,12 @@ when 'create'
 
     opt :filename, 'Specify config file to load', type: :string, required: true
     opt :config_dir, 'Specify the directory for configuration files', type: :string, short: :none, default: Tapjoy::AutoscalingBootstrap.config_dir
-    opt :env, 'Specify which environment config to load', required: true, type: :string
+    opt :env, 'Specify which environment config to load', type: :string
     opt :clobber_elb, 'Force ELB creation', default: false, short: :none
     opt :clobber_as, 'Force AS group creation', default: false, short: :none
     opt :prompt, 'Enable/disable prompts', default: true
   end
 
-  env_list = supported_envs(opts[:config_dir])
-  unless env_list.include?(opts[:env])
-    Trollop.die :env, "Currently supported enviroments are #{env_list.join(',')}"
-  end
-
   config, aws_env, user_data = Tapjoy::AutoscalingBootstrap::Base.new.configure_environment(opts[:filename], opts[:env], opts[:config_dir])
   Aws.config[:region] = config[:aws_region]
   confirm_config(aws_env, config, opts)
@@ -63,15 +48,10 @@ when 'update'
     synopsis 'This command creates new launch configurations based on existing autoscaling groups using local instance configuration files as overrides.'
     opt :filename, 'Specify config file to load', type: :string, required: true
     opt :config_dir, 'Specify the directory for configuration files', type: :string, short: :none, default: Tapjoy::AutoscalingBootstrap.config_dir
-    opt :env, 'Specify which environment config to load', required: true, type: :string
+    opt :env, 'Specify which environment config to load', type: :string
     opt :prompt, 'Enable/disable prompts', default: true
   end
 
-  env_list = supported_envs(opts[:config_dir])
-  unless env_list.include?(opts[:env])
-    Trollop.die :env, "Currently supported enviroments are #{env_list.join(',')}"
-  end
-
   config, aws_env, user_data = Tapjoy::AutoscalingBootstrap::Base.new.configure_environment(opts[:filename], opts[:env], opts[:config_dir])
   Aws.config[:region] = config[:aws_region]
   confirm_config(aws_env, config, opts)

data/lib/tapjoy/autoscaling_bootstrap/version.rb

@@ -3,7 +3,7 @@ module Tapjoy
     module Version
       MAJOR = 0
       MINOR = 1
-      PATCH = 2
+      PATCH = 3
     end
 
     VERSION = [Version::MAJOR, Version::MINOR, Version::PATCH].join('.')

data/lib/tapjoy/autoscaling_bootstrap.rb

@@ -63,6 +63,24 @@ module Tapjoy
       def config_dir
         @config_dir ||= ENV['TASS_CONFIG_DIR'] || "#{ENV['HOME']}/.tass"
       end
+
+      def is_valid_env?(config_dir, env)
+        env_list = self.supported_envs(config_dir)
+        puts config_dir
+        unless env_list.include?(env)
+          Trollop.die :env, "Currently supported enviroments are #{env_list.join(',')}"
+        end
+      end
+
+      def supported_envs(listing)
+        envs = []
+        Dir.entries("#{listing}/config/common").each do |file|
+          next unless file.end_with?('yaml')
+          next if file.start_with?('defaults')
+          envs << file.chomp!('.yaml')
+        end
+        envs
+      end
     end
 
     # Base class for generic methods used throughout the gem
@@ -136,9 +154,12 @@ module Tapjoy
       end
 
       # configure environment
-      def configure_environment(filename, env, config_dir)
+      def configure_environment(filename, env=nil, config_dir)
         defaults_hash = self.load_yaml("#{config_dir}/config/common/defaults.yaml")
         facet_hash    = self.load_yaml("#{config_dir}/config/clusters/#{filename}")
+        env         ||= facet_hash[:environment]
+        env         ||= defaults_hash[:environment]
+        Tapjoy::AutoscalingBootstrap.is_valid_env?(config_dir, env)
         env_hash      = self.load_yaml("#{config_dir}/config/common/#{env}.yaml")
 
         new_config = defaults_hash.merge!(env_hash).merge(facet_hash)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tass
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ali Tayarani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop