lib/fusuma.rb in fusuma-3.0.0 vs lib/fusuma.rb in fusuma-3.1.0

- old
+ new

@@ -25,17 +25,22 @@ def read_options(option) MultiLogger.filepath = option[:log_filepath] MultiLogger.instance.debug_mode = option[:verbose] - load_custom_config(option[:config_path]) - Plugin::Manager.require_base_plugins + load_custom_config(option[:config_path]) + Environment.dump_information Kernel.exit(0) if option[:version] + if option[:show_config] + Environment.print_config + Kernel.exit(0) + end + if option[:list] Environment.print_device_list Kernel.exit(0) end @@ -145,10 +150,10 @@ main_events.sort_by! { |e| e.record.trigger_priority } matched_context = nil event = main_events.find do |main_event| matched_context = Config::Searcher.find_context(request_context) do - if modified_record = main_event.record.merge(records: modifiers.map(&:record)) + if (modified_record = main_event.record.merge(records: modifiers.map(&:record))) main_event.record = modified_record elsif !modifiers.empty? # try basically the same, but without any modifiers # if modifiers is empty then we end up here only if there is no execute key for this Config.instance.search(main_event.record.index) &&