From c72b8fee32d0bc6aa1e19e35fc3d82e7549eb9f0 Mon Sep 17 00:00:00 2001 From: Tom Tuddenham Date: Thu, 30 Oct 2014 18:57:58 +1030 Subject: [PATCH] FLAPJACK_ENV left in test code, removed elsewhere (expect email.rb where it is required). --- features/support/env.rb | 1 + lib/flapjack/cli/import.rb | 2 +- lib/flapjack/cli/maintenance.rb | 2 +- lib/flapjack/cli/purge.rb | 2 +- lib/flapjack/cli/receiver.rb | 2 +- lib/flapjack/cli/server.rb | 2 +- lib/flapjack/cli/simulate.rb | 2 +- lib/flapjack/gateways/email.rb | 0 tasks/benchmarks.rake | 2 +- tasks/events.rake | 2 +- tasks/profile.rake | 3 +-- 11 files changed, 10 insertions(+), 10 deletions(-) mode change 100644 => 100755 lib/flapjack/cli/purge.rb mode change 100644 => 100755 lib/flapjack/gateways/email.rb diff --git a/features/support/env.rb b/features/support/env.rb index 1f0965ffe..6efca4015 100755 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -23,6 +23,7 @@ require 'i18n' I18n.config.enforce_available_locales = true +FLAPJACK_ENV = 'test' FLAPJACK_ROOT = File.join(File.dirname(__FILE__), '..', '..') FLAPJACK_CONFIG = File.join(FLAPJACK_ROOT, 'etc', 'flapjack_config.toml') diff --git a/lib/flapjack/cli/import.rb b/lib/flapjack/cli/import.rb index 173eebfff..45e3adef7 100644 --- a/lib/flapjack/cli/import.rb +++ b/lib/flapjack/cli/import.rb @@ -18,7 +18,7 @@ def initialize(global_options, options) @config_env = config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end Flapjack::RedisProxy.config = config.for_redis diff --git a/lib/flapjack/cli/maintenance.rb b/lib/flapjack/cli/maintenance.rb index cf9408f73..2e4c98586 100644 --- a/lib/flapjack/cli/maintenance.rb +++ b/lib/flapjack/cli/maintenance.rb @@ -20,7 +20,7 @@ def initialize(global_options, options) @config_env = config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end Flapjack::RedisProxy.config = config.for_redis diff --git a/lib/flapjack/cli/purge.rb b/lib/flapjack/cli/purge.rb old mode 100644 new mode 100755 index d819c07d7..d2a349c5e --- a/lib/flapjack/cli/purge.rb +++ b/lib/flapjack/cli/purge.rb @@ -16,7 +16,7 @@ def initialize(global_options, options) @config_env = config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end Flapjack::RedisProxy.config = config.for_redis diff --git a/lib/flapjack/cli/receiver.rb b/lib/flapjack/cli/receiver.rb index 262f5514d..9757bb5a0 100644 --- a/lib/flapjack/cli/receiver.rb +++ b/lib/flapjack/cli/receiver.rb @@ -22,7 +22,7 @@ def initialize(global_options, options) @config_env = @config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end Flapjack::RedisProxy.config = @config.for_redis diff --git a/lib/flapjack/cli/server.rb b/lib/flapjack/cli/server.rb index 3a668f21a..59014f487 100644 --- a/lib/flapjack/cli/server.rb +++ b/lib/flapjack/cli/server.rb @@ -17,7 +17,7 @@ def initialize(global_options, options) @config_env = @config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end @pidfile = case diff --git a/lib/flapjack/cli/simulate.rb b/lib/flapjack/cli/simulate.rb index 324c5b381..fce17ee04 100644 --- a/lib/flapjack/cli/simulate.rb +++ b/lib/flapjack/cli/simulate.rb @@ -18,7 +18,7 @@ def initialize(global_options, options) @config_env = config.all if @config_env.nil? || @config_env.empty? - exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'" + exit_now! "No config data found in '#{global_options[:config]}'" end Flapjack::RedisProxy.config = config.for_redis diff --git a/lib/flapjack/gateways/email.rb b/lib/flapjack/gateways/email.rb old mode 100644 new mode 100755 diff --git a/tasks/benchmarks.rake b/tasks/benchmarks.rake index 26c4476a4..5d5fc2bc7 100644 --- a/tasks/benchmarks.rake +++ b/tasks/benchmarks.rake @@ -21,7 +21,7 @@ namespace :benchmarks do @redis = Redis.new(config.for_redis) if @config_env.nil? || @config_env.empty? - puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'" + puts "No config data found in '#{config_file}'" exit(false) end end diff --git a/tasks/events.rake b/tasks/events.rake index 329876454..b4fceb78d 100644 --- a/tasks/events.rake +++ b/tasks/events.rake @@ -25,7 +25,7 @@ namespace :events do @redis_config = config.for_redis if @config_env.nil? || @config_env.empty? - puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{config_file}'" + puts "No config data found in '#{config_file}'" exit(false) end diff --git a/tasks/profile.rake b/tasks/profile.rake index 6ac4264d1..573256edb 100644 --- a/tasks/profile.rake +++ b/tasks/profile.rake @@ -78,8 +78,7 @@ namespace :profile do config.load(FLAPJACK_CONFIG) config_env = config.all if config_env.nil? || config_env.empty? - puts "No config data for environment '#{FLAPJACK_ENV}' " + - "found in '#{FLAPJACK_CONFIG}'" + puts "No config data found in '#{FLAPJACK_CONFIG}'" exit(false) end