diff options
author | elijah <elijah@riseup.net> | 2012-11-14 14:27:35 -0800 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2012-11-14 14:27:35 -0800 |
commit | 54fe4bcb36959866a12509ce7d45a97c60722c11 (patch) | |
tree | 8d54bd70cc1339ba5461925779373f87aae1b388 | |
parent | c3730c0dd8362f0e6a4d7667d83f733d04ab59f9 (diff) | |
download | leap_cli-54fe4bcb36959866a12509ce7d45a97c60722c11.tar.gz leap_cli-54fe4bcb36959866a12509ce7d45a97c60722c11.tar.bz2 |
added requirements checking - will bail out if a configuration option is missing
-rw-r--r-- | Rakefile | 27 | ||||
-rw-r--r-- | lib/leap_cli.rb | 1 | ||||
-rw-r--r-- | lib/leap_cli/commands/pre.rb | 8 | ||||
-rw-r--r-- | lib/leap_cli/requirements.rb | 11 |
4 files changed, 47 insertions, 0 deletions
@@ -81,6 +81,33 @@ end task :default => :test ## +## CODE GENERATION +## + +desc "Updates the list of required configuration options for this version of LEAP CLI" +task 'update-requirements' do + Dir.chdir($base_dir) do + required_configs = `find -name '*.rb' | xargs grep -R 'assert_config!'`.split("\n").collect{|line| + if line =~ /def/ + nil + else + line.sub(/.*assert_config! ["'](.*?)["'].*/,'"\1"') + end + }.compact + File.open("#{$base_dir}/lib/leap_cli/requirements.rb", 'w') do |f| + f.puts "# run 'rake update-requirements' to generate this file." + f.puts "module LeapCli" + f.puts " REQUIREMENTS = [" + f.puts " " + required_configs.join(",\n ") + f.puts " ]" + f.puts "end" + end + puts "updated #{$base_dir}/lib/leap_cli/requirements.rb" + #puts `cat '#{$base_dir}/lib/leap_cli/requirements.rb'` + end +end + +## ## DOCUMENTATION ## diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb index 5ed5033..cc9ec69 100644 --- a/lib/leap_cli.rb +++ b/lib/leap_cli.rb @@ -1,6 +1,7 @@ module LeapCli; end require 'leap_cli/version.rb' +require 'leap_cli/requirements.rb' require 'core_ext/hash' require 'core_ext/boolean' require 'core_ext/nil' diff --git a/lib/leap_cli/commands/pre.rb b/lib/leap_cli/commands/pre.rb index a15a628..b1df5cd 100644 --- a/lib/leap_cli/commands/pre.rb +++ b/lib/leap_cli/commands/pre.rb @@ -40,6 +40,14 @@ module LeapCli else bail!("Could not find the root directory. Change current working directory or try --root") end + + # + # check requirements + # + REQUIREMENTS.each do |key| + assert_config! key + end + end end diff --git a/lib/leap_cli/requirements.rb b/lib/leap_cli/requirements.rb new file mode 100644 index 0000000..ad4fb21 --- /dev/null +++ b/lib/leap_cli/requirements.rb @@ -0,0 +1,11 @@ +# run 'rake update-requirements' to generate this file. +module LeapCli + REQUIREMENTS = [ + "provider.ca.name", + "provider.ca.bit_size", + "provider.ca.life_span", + "provider.ca.server_certificates.bit_size", + "provider.ca.server_certificates.life_span", + "provider.vagrant.network" + ] +end |