@@ -3,16 +3,20 @@ class WarningShot::ManualResolver order 10000 branch :manual - description 'A glorified todo list of things that need to be resolved manually' + description 'A glorified todo list of things that need to be done manually' cli("--notes", "List all the notes in the manual branch") do |val| WarningShot::Resolver.descendants.each{|d| d.disable!} self.enable! - config = WarningShot::Config.parse_args - config[:verbosity] = :verbose + #REmove any occurance of --notes + args = ARGV - ARGV.find_all{|x| x =~ /--notes/i} + config = WarningShot::Config.parse_args(args) + config[:verbosity] = :verbose + dr = WarningShot::DependencyResolver.new(config) + dr.dependency_tree[:manual].each { |note| puts "~ #{note}" } exit @@ -25,7 +29,7 @@ class WarningShot::ManualResolver NoteResource.new(note) end - register :test do |dep| - logger.info " ~ #{dep.msg}" - end + before(:test){logger.info "\nReminders:"} + register(:test){|dep| logger.info " ~ #{dep.msg}"} + after(:test){ logger.info ""} end \ No newline at end of file lib/resolvers/manual_resolver.rb @@ -29,7 +29,7 @@ module WarningShot :oload => [], :environment => 'development', :resolve => false, - :config_paths => ['.' / 'config' / 'warningshot', '~' / '.warningshot'], + :config_paths => ['.' / 'config' / 'warningshot' / "*.{yml,yaml}", '~' / '.warningshot' / "*.{yml,yaml}"], :application => '.', :log_path => '.' / 'log' / 'warningshot.log', :log_level => :info, @@ -94,7 +94,9 @@ module WarningShot WarningShot::Config::DEFAULTS.clone.merge(opt_config) end - def parse_args(argv = ARGV) + def parse_args(argv=nil) + argv ||= ARGV.clone + @@cli_options = {} @@cli_options[:environment] = ENV["WARNING_SHOT_ENV"] if ENV["WARNING_SHOT_ENV"] @@ -111,10 +113,10 @@ module WarningShot WarningShot::Config::PARSER.on("--resolve","Resolve missing dependencies (probably need sudo)") do |resolve| @@cli_options[:resolve] = resolve end - WarningShot::Config::PARSER.on("-a=PATH","--app=PATH", String, "Path to application", "Default: #{DEFAULTS[:application]}") do |app| + WarningShot::Config::PARSER.on("-a=PATH","--app=PATH", String, "Path to application (Base for all relative paths)", "Default: #{DEFAULTS[:application]}") do |app| @@cli_options[:application] = app end - WarningShot::Config::PARSER.on("-c=PATH","--configs=PATH", String,"Path to config directories (':' seperated)","Default: #{DEFAULTS[:config_paths].join(':')}") do |config| + WarningShot::Config::PARSER.on("-c=PATH","--configs=PATH", String,"Globs to config files (':' seperated)","Default: #{DEFAULTS[:config_paths].join(':')}") do |config| @@cli_options[:config_paths] = config.split(':') end lib/warningshot/config.rb @@ -155,9 +155,7 @@ module WarningShot self[:config_paths].each do |config_path| @logger.debug "Parsing config: #{config_path}" #Parse the global/running env configs out of the YAML files. - Dir[config_path / WarningShot::RecipeExt].each do |config_file| - # Use WarningShot::RecipeExt & regexp on extension to make supporting add'l - # file types easier in the future + Dir[config_path].each do |config_file| case File.extname(config_file) when /.y(a)?ml/ parse_yml config_file @@ -179,12 +177,11 @@ module WarningShot # # @api protected def parse_yml(file) - #if only on branch is specified in a yaml file it may not come back as an array + #if only one branch is specified in a yaml file it may not come back as an array branches = YAML::load(File.open(file,'r')) - if branches === false - @logger.error "Skipping malformed Yaml file: #{file}" - return + unless branches.is_a?(Array) || branches.is_a?(Hash) + raise Exception, "Malformed config file: #{file}" end #Support for multiple dep branches in one file @@ -206,6 +203,8 @@ module WarningShot #remove nil's if they made it into branch somehow (bad yaml probably) @dependency_tree[branch_name].delete(nil) end + rescue Exception => ex + @logger.error ex.message end end lib/warningshot/dependency_resolver.rb @@ -9,7 +9,7 @@ module WarningShot end def generate_configs(path) - from = WarningShot.dir_for(:templates) / WarningShot::RecipeExt + from = WarningShot.dir_for(:templates) / "*.{yml,yaml}" copy_templates from, path end lib/warningshot/template_generator.rb @@ -13,8 +13,6 @@ module WarningShot :images => 'images', :resolvers => 'lib' / 'resolvers' } - - RecipeExt = "*.{yml,yaml}".freeze class << self def register_application_type(type,&block) lib/warningshot/warning_shot.rb @@ -1,7 +1,7 @@ describe WarningShot::DependencyResolver do before :all do @config = WarningShot::Config.create({ - :config_paths => [$test_data], + :config_paths => [$test_data / "*.{yml,yaml}"], :environment => 'rspec', :log_path => $log_file }) @@ -9,8 +9,8 @@ describe WarningShot::DependencyResolver do end it 'should accept a glob to find config files' do - # Consider taking a glob instead of a set of paths - pending + dr = WarningShot::DependencyResolver.new(@config) + dr.dependency_tree.length.should_not be(0) end it 'should create a dependency tree from a set of config files' do test/spec/unit/warningshot/dependency_resolver_spec.rb @@ -14,7 +14,7 @@ describe WarningShot::TemplateGenerator do end it "should have generate YAML config files" do - yaml_files = Dir[@test_path / WarningShot::RecipeExt] + yaml_files = Dir[@test_path / "*.{yml,yaml}"] yaml_files.empty?.should be(false) end test/spec/unit/warningshot/template_generator_spec.rb f1bdcb79f2e57fa1c25497b4e5cf690d58d4e812 Cory ODaniel contact@coryodaniel.com http://github.com/coryodaniel/warningshot/commit/0d89cc7dbc9daa15354821d635efe775bda751b7 0d89cc7dbc9daa15354821d635efe775bda751b7 2009-02-05T19:32:09-08:00 2009-02-05T19:32:09-08:00 Config clones before use to preserve origian args fix for manual resolver fix for how globbing done for config files 3ee790034c3b9daf0021bf817e706c9dfd21dc2d Cory ODaniel contact@coryodaniel.com