murdoc 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/murdoc

@@ -12,6 +12,14 @@ option_parser = OptionParser.new do |opts|
     options[:highlight_source] = h
   end
 
+  opts.on("-t", "--template [FILENAME]", "Use custom haml template for output") do |t|
+    options[:template] = t
+  end
+
+  opts.on("-s", "--stylesheet [FILENAME]", "Use custom css stylesheet for output") do |s|
+    options[:stylesheet] = s
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit

data/lib/murdoc.rb

@@ -11,12 +11,20 @@
 
 module Murdoc
   def self.generate_from_file(input, output, options = {})
+    options = default_options.merge(options)
     annotator = Annotator.from_file(input, nil, options)
-    markup_dir = File.dirname(__FILE__)+ "/../markup"
     File.open(output, "w+") do |f|
-      f.puts Formatter.new("#{markup_dir}/template.haml").render(:paragraphs => annotator.paragraphs, :stylesheet => File.read("#{markup_dir}/stylesheet.css"))
+      f.puts Formatter.new(options[:template]).render(:paragraphs => annotator.paragraphs, :stylesheet => File.read(options[:stylesheet]))
     end
   end
+
+  def self.default_options
+    markup_dir = File.dirname(__FILE__)+ "/../markup"
+    @@options ||= {
+        :template =>   "#{markup_dir}/template.haml",
+        :stylesheet => "#{markup_dir}/stylesheet.css"
+    }
+  end
 end
 
 require "murdoc/annotator"

data/murdoc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murdoc}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mark Abramov
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4042360241948241742
+      hash: 960483362667149107
       segments: 
       - 0
       version: "0"