lib/germinate/application.rb in devver-germinate-1.0.1 vs lib/germinate/application.rb in devver-germinate-1.1.0

- old
+ new

@@ -1,12 +1,12 @@ # The Application ties all the other componts together. It has public methods # roughly corresponding commands that the 'germ' command-line tool supports. class Germinate::Application attr_writer :formatter - def format(source, output=$stdout, errors=$stderr) - librarian = load_librarian(source) + def format(source, path, output=$stdout, errors=$stderr) + librarian = load_librarian(source, path) editor = Germinate::ArticleEditor.new(librarian) formatter = Germinate::ArticleFormatter.new(output) Germinate::SharedStyleAttributes.fattrs.each do |style_attribute| @@ -17,12 +17,12 @@ formatter.format!(hunk) end formatter.finish! end - def list(source, things_to_list, output=$stdout) - librarian = load_librarian(source) + def list(source, path, things_to_list, output=$stdout) + librarian = load_librarian(source, path) if things_to_list.include?(:sections) output.puts(librarian.section_names.join("\n")) end if things_to_list.include?(:samples) output.puts(librarian.sample_names.join("\n")) @@ -30,12 +30,12 @@ if things_to_list.include?(:processes) output.puts(librarian.process_names.join("\n")) end end - def show(source, selection, output=$stdout) - librarian = load_librarian(source) + def show(source, path, selection, output=$stdout) + librarian = load_librarian(source, path) selection.fetch(:section, []).each do |section| output.puts(*librarian.section(section)) end selection.fetch(:sample, []).each do |sample| output.puts(*librarian.sample(sample)) @@ -43,18 +43,18 @@ selection.fetch(:process, []).each do |process| output.puts(*librarian.process(process).command) end end - def select(source, selector, output=$stdout) - librarian = load_librarian(source) + def select(source, path, selector, output=$stdout) + librarian = load_librarian(source, path) output.puts(*librarian[selector]) end private - def load_librarian(source) + def load_librarian(source, path) librarian = Germinate::Librarian.new - reader = Germinate::Reader.new(librarian) + reader = Germinate::Reader.new(librarian, path) source.each_line do |line| reader << line end librarian end