@@ -19,9 +19,9 @@ class Statig < Thor desc 'build', 'Build website in DIRECTORY' method_options :force => :boolean, :config => :optional def build(directory=Dir.pwd) - directory = File.expand_path(directory) + @directory = File.expand_path(directory) - Dir.chdir(directory) do + Dir.chdir(@directory) do abort('needs to be run inside of a git working directory') unless git? files_list.each do |source| @@ -42,12 +42,13 @@ class Statig < Thor end def content_for(source, destination) - parsed = parse_meta_data(File.read(source)) + parsed = parse_meta_data(File.read(source)) + content = formatter_for(source).call(parsed[:content]) if template? - template(parsed) + template(parsed.update(:content => content)) else - formatter_for(source).call(parsed[:content]) + content end end @@ -74,7 +75,7 @@ class Statig < Thor def load_template_file @template_content ||= begin - File.read(File.join(options[:directory], config[:template])) + File.read(File.join(@directory, config[:template])) rescue Errno::ENOENT nil end statig.rb 873510369ec182c8020d42a24809504d8dbebaef Simon Rozet simon@rozet.name http://github.com/sr/statig/commit/12dde2317716f7ba9af85b6a942e8adfb3e48721 12dde2317716f7ba9af85b6a942e8adfb3e48721 2008-11-14T13:21:17-08:00 2008-11-14T13:21:17-08:00 bug fix 882d6aea600ff10160e639c7b8748723591d7d7a Simon Rozet simon@rozet.name