murdoc 0.1.12 → 0.1.13

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ff69e5073e356e1352ca86544832cf54a4aa59fd
+  data.tar.gz: 157c3522d529acf574fb7bca9c673dc5fde93d23
+SHA512:
+  metadata.gz: d48ee92831d38fb6299f1c1ba6fffc56579a4b0b99e8235d9813c50daec1146b9d2d1c0eca56222f69280ffe90c2eb8b7320c67ebec150619ff26036dd84f837
+  data.tar.gz: 403188b4870aa15f253dd6222f9f5e49e8751965b15d2e1a7b11836d8d165be191103fdd2b655d7290741e6a560ef340a1f8ff6958d45bd83f4cd0bb8f86fc95

data/.document

@@ -1,5 +1,5 @@
 lib/**/*.rb
 bin/*
-- 
+-
 features/**/*.feature
-UNLICENSE.txt
+UNLICENSE

data/.travis.yml

@@ -1,6 +1,6 @@
-script: "rake"
+script: "bundle exec rake"
 rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - jruby
+  - jruby

data/Gemfile

@@ -5,6 +5,7 @@ gem "haml", "~> 3.0.0"
 
 group :development do
   gem "jeweler"
+  gem "rake"
   gem "rspec", "~> 2.4.0"
   gem "rdiscount", "~> 1.6.5", :platform => :mri
 end

data/Gemfile.lock

@@ -1,16 +1,54 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.8)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.1.2)
-    git (1.2.5)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.3)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.3)
+      oauth2
     haml (3.0.24)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    hashie (3.4.2)
+    highline (1.7.2)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
+      rdoc
+    json (1.8.3)
+    jwt (1.5.1)
     kramdown (0.13.2)
-    rake (0.8.7)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
     rdiscount (1.6.8)
+    rdoc (4.2.0)
+      json (~> 1.4)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -19,6 +57,7 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -27,5 +66,6 @@ DEPENDENCIES
   haml (~> 3.0.0)
   jeweler
   kramdown
+  rake
   rdiscount (~> 1.6.5)
   rspec (~> 2.4.0)

data/README.md

@@ -1,4 +1,4 @@
-Murdoc -- evil ruby documenter
+Murdoc -- ruby documenter
 ==============================
 
 Murdoc is a doccu-style annotated documentation generator.
@@ -17,11 +17,13 @@ Dependencies
 Example
 =======
 
-See example at [GH.pages](http://markiz.github.com/murdoc).
+See example at [GH.pages](http://jsus.github.com/murdoc).
 
-Bonus: [example](http://markiz.github.com/murdoc/docs) of integration with [jsus](http://github.com/markiz/jsus).
+See also:
+* [example](http://jsus.github.com/murdoc/docs) of integration with [jsus](http://github.com/jsus/jsus)
+* [LSD documentation guides](https://github.com/lovelyscalabledrawings/lsd-guides/tree/gh-pages/grid)
 
 License and authorship
 ======================
 
-Murdoc is originally authored by Mark Abramov and belongs to public domain (see UNLICENSE for details).
+Public domain, see UNLICENSE file.

data/Rakefile

@@ -19,6 +19,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = "Annotated documentation generator, see README.md for details"
   gem.email = "markizko@gmail.com"
   gem.authors = ["Mark Abramov"]
+  gem.executables = ["murdoc", "murdoc-strip-comments"]
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -35,7 +36,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/bin/murdoc

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 require "optparse"
-$: << "./lib/"
+$: << File.expand_path("../../lib/", __FILE__)
 require "murdoc"
 
 options = {}
 
 option_parser = OptionParser.new do |opts|
-  opts.banner = "murdoc <input file> <output html>"  
+  opts.banner = "murdoc <input file> <output html>"
 
   opts.on("--[no-]syntax-highlight", "Highlight syntax using pygments") do |h|
     options[:highlight_source] = h
@@ -20,6 +20,10 @@ option_parser = OptionParser.new do |opts|
     options[:stylesheet] = s
   end
 
+  opts.on("--do-not-count-comment-lines") do |dncl|
+    options[:do_not_count_comment_lines] = dncl
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts opts
     exit
@@ -32,5 +36,9 @@ option_parser.parse!
 if ARGV.size < 2
   puts option_parser
 else
-  Murdoc.generate_from_file(ARGV[0], ARGV[1], options)
-end
+  if ARGV.size == 2
+    Murdoc.generate_from_file(ARGV[0], ARGV[1], options)
+  else
+    Murdoc.generate_from_multiple_files(ARGV[0..-2], ARGV[-1], options)
+  end
+end

data/bin/murdoc-strip-comments

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+require "optparse"
+$: << "./lib/"
+require "murdoc"
+
+options = {}
+source_type = nil
+
+option_parser = OptionParser.new do |opts|
+  opts.banner = "murdoc-strip-comments [input file]\n\nWhen no input file is provided, murdoc-strip-comments uses standard input stream."
+
+  opts.on("-t", "--type TYPE", "Source type (html, ruby, javascript)") do |st|
+    source_type = st
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+
+end
+
+option_parser.parse!
+
+annotator = Murdoc::Annotator.from_file(ARGV[0] || "/dev/stdin", source_type, {})
+annotator.paragraphs.each do |paragraph|
+  puts paragraph.source
+end

data/lib/murdoc.rb

@@ -14,21 +14,42 @@ module Murdoc
     options = default_options.merge(options)
     annotator = Annotator.from_file(input, nil, options)
     File.open(output, "w+") do |f|
-      f.puts Formatter.new(options[:template]).render(:paragraphs => annotator.paragraphs, :stylesheet => File.read(options[:stylesheet]))
+      f.puts Formatter.new(options[:template]).render(:paragraphs => annotator.paragraphs,
+                                                      :stylesheet => File.read(options[:stylesheet]))
+    end
+  end
+
+  def self.generate_from_multiple_files(input_files, output, options = {})
+    options = default_options_for_multiple_files.merge(options)
+    annotators = input_files.map {|fn| Annotator.from_file(fn, nil, options) }
+    File.open(output, "w+") do |f|
+      f.puts Formatter.new(options[:template]).render(:annotators => annotators,
+                                                      :filenames => input_files,
+                                                      :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
+
+  def self.default_options_for_multiple_files
+    @@options ||= {
+        :template =>   "#{markup_dir}/template_multifile.haml",
+        :stylesheet => "#{markup_dir}/stylesheet.css"
+    }
+  end
+
+  def self.markup_dir
+    File.expand_path("../..", __FILE__)+ "/markup"
+  end
 end
 
 require "murdoc/annotator"
 require "murdoc/paragraph"
 require "murdoc/formatter"
 
-Dir["#{File.dirname(File.expand_path(__FILE__))}/murdoc/languages/*.rb"].each {|lang| require lang }
+Dir["#{File.dirname(File.expand_path(__FILE__))}/murdoc/languages/*.rb"].each {|lang| require lang }

data/lib/murdoc/annotator.rb

@@ -32,7 +32,9 @@ module Murdoc
     # You may also initialize annotator from file, it will even try to detect the
     # source type from extension.
     def self.from_file(filename, source_type = nil, options = {})
-      self.new(File.read(filename), source_type || detect_source_type_from_filename(filename), options)
+      self.new(File.read(filename),
+               source_type || detect_source_type_from_filename(filename),
+               options)
     end
 
     def source_type
@@ -51,6 +53,7 @@ module Murdoc
 
       # splitting stuff into lines and setting cursor into initial position
       i = 0
+      source_lines_counter = 0
       while i < lines.size
         comment_lines = []
         # get single line comments
@@ -75,22 +78,32 @@ module Murdoc
         end
 
         # getting source lines
-        starting_line = i
         source_lines = []
+        starting_line = if options[:do_not_count_comment_lines]
+          source_lines_counter
+        else
+          i
+        end
+
         while i < lines.size && !is_comment(lines[i])
           source_lines << lines[i]
+          source_lines_counter += 1
           i += 1
         end
 
         # post-processing: stripping comments and removing empty strings from beginnings and ends
         starting_line += postprocess_source(source_lines)
-        postprocess_comments(comment_lines)        
+        postprocess_comments(comment_lines)
         # clear comment lines if that's commented out code
         comment_lines.clear if comment_lines[0] =~ /^:code:$/
-        
+
         # if we have comments or source
         if comment_lines.size > 0 || source_lines.size > 0
-          @paragraphs << Paragraph.new(source_lines.join("\n"), comment_lines.join("\n"), starting_line, source_type, options)          
+          @paragraphs << Paragraph.new(source_lines.join("\n"),
+                                       comment_lines.join("\n"),
+                                       starting_line,
+                                       source_type,
+                                       options)
         end
       end
     end
@@ -99,7 +112,7 @@ module Murdoc
     def source
       @source
     end
-    
+
   protected
     def comment_symbols
       super || {}
@@ -131,7 +144,7 @@ module Murdoc
       comment_lines.delete_at(-1) while comment_lines.size > 0 && comment_lines[-1].empty?
     end
 
-    
+
     # Removes blank lines from beginning and end of source lines
     # returns starting offset for source (number of lines deleted from beginning)
     def postprocess_source(source_lines)
@@ -140,11 +153,11 @@ module Murdoc
         starting_offset += 1
         source_lines.delete_at(0)
       end
-      
+
       while source_lines.size > 0 && source_lines[-1] =~ /^\s*$/
-        source_lines.delete_at(-1) 
+        source_lines.delete_at(-1)
       end
       starting_offset
     end
   end
-end
+end

data/lib/murdoc/languages/html.rb

@@ -0,0 +1,43 @@
+# Html language module
+module Murdoc
+  module Languages
+    module Html
+      module Annotator
+        def self.included(base)
+          base.extend ClassMethods
+        end
+
+        module ClassMethods
+          protected
+          def detect_source_type_from_filename(filename)
+            if File.extname(filename) == ".html"
+              :html
+            else
+              super if defined?(super)
+            end
+          end
+        end
+      end
+
+      module CommentSymbols
+        protected
+        def comment_symbols
+          if source_type == "html"
+            {:single_line => nil, :multiline => {:begin => "<!--", :end => "-->"}}
+          else
+            super if defined?(super)
+          end
+        end
+      end
+    end
+  end
+
+  class Annotator
+    include Languages::Html::Annotator
+    include Languages::Html::CommentSymbols
+  end
+
+  class Paragraph
+    include Languages::Html::CommentSymbols
+  end
+end

data/markup/stylesheet.css

@@ -6,6 +6,10 @@ p, h1, h2, h3, ol, li, ul, dt, dd, dl, body, html {
   padding: 0;
   margin: 0; }
 
+p + br {
+  display: none;
+}
+
 body {
   width: 40%;
   padding-left: 2.5%;
@@ -27,7 +31,7 @@ body > * {
   padding-right: 6%; }
 
 html {
-  background: #FFD300; }
+  background: #FFC873; }
 
 header {
   background: rgba(255, 255, 255, 0.1);
@@ -41,10 +45,23 @@ header {
       width: 5em;
       font-weight: bold; }
 
-section, руфвук {
+section {
   float: left;
   clear: both;
-  width: 88%; }
+  width: 85%; }
+
+section iframe {
+  width: 260%;
+  height: 250px;
+  border: 1px solid #333;
+  margin-bottom: 1em;
+  margin-top: 1.5em;
+}
+
+section iframe.high {
+  height: 300px;
+}
+
 
 p, dl, li {
   color: #665504;
@@ -57,12 +74,42 @@ a {
   a:visited {
     color: #A64E00; }
 
-p {
+p + p, h2 + p, h1 + p, ul + p, ol + p{
   margin-top: 1.5em; }
 
+p code {
+  background-color: rgba(200, 220, 200, 0.2);
+  display: inline-block;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  padding: 0 0.2em;
+  font-family: "monaco", "Courier New", Courier, monospace, serif;
+  font-size:0.8em;
+  line-height:1.5em;
+}
+p:last-child {
+  margin-bottom: 1.5em;
+}
+
 h1 {
   font-size: 2em; }
 
+h1 + ul {
+  float: right;
+  width: 140%;
+  margin-right: -160%;
+  margin-top: -2em;
+}
+
+h1 + ul li {
+  display: inline;
+}
+
+h1 + ul li + li{
+  margin-left: 1em;
+}
+
 h2 {
   font-size: 1em; }
 
@@ -72,13 +119,18 @@ h1, h2, h3 {
 ol, li {
   margin-left: 1em; }
 
-body > p, body > h1, body > h2 {
+body > p, body > h1 {
   clear: left; }
 
+body > h2 {
+  clear: both;
+}
+
 header {
   padding-bottom: 1em;
   overflow: hidden; }
 
+
 dl {
   clear: left; }
   dl dt, dl dd {
@@ -91,29 +143,45 @@ dl {
 figure {
   display: block;
   float: right;
-  margin-right: -140%;
+  margin-right: -135%;
   width: 122.75%;
   clear: right;
-  padding: 1.5em 5% 3em; }
+  margin-top: -0.1em;
+  padding: 0 0 3em; }
   figure > ol {
-    text-shadow: 0 1px 0 #FFDE40;
-    -moz-text-shadow: 0 1px 0 #FFDE40;
-    -webkit-text-shadow: 0 1px 0 #FFDE40;
+    font-family: 0.75em/2.25em Arial;
+    text-shadow: 0 1px 0 #eee;
+    -moz-text-shadow: 0 1px 0 #eee;
+    -webkit-text-shadow: 0 1px 0 #eee;
+    box-shadow: 0 1px 2px #333;
+    -moz-box-shadow: 0 1px 2px #333;
+    -webkit-box-shadow: 0 1px 2px #333;
     width: 7.5%;
     text-align: right;
     float: left;
-    font-size: 0.8em;
+    -moz-border-radius: 0.2em;
     -webkit-border-radius: 0.2em;
-    background: rgba(166, 137, 0, 0.1);
-    border: 1px solid rgba(0, 0, 0, 0.3);
+    border-radius: 0.2em;
+    border: 1px solid rgba(0, 0, 0, 0.5);
     list-style: none;
     margin-left: -9.25%; }
     figure > ol li {
+      background: rgba(125, 125, 125, 0.4);
       margin: 0; }
-  figure > code, figure > ol {
-    font-size: 1em;
-    font-family: monospace; }
+    figure > ol li:first-child {
+      border-top-left-radius: 0.2em;
+      border-top-right-radius: 0.2em; }
+    figure > ol li:last-child {
+      border-bottom-left-radius: 0.2em;
+      border-bottom-right-radius: 0.2em; }
+    figure > ol li.new {
+      background: #98B72E; }
+    figure > ol li.changed {
+      background: #FFBD40; }
   figure > code {
+    font-size: 1em;
+    line-height: 1.5em;
+    font-family: "monaco", "Courier New", Courier, monospace, serif;
     white-space: pre; }
 
 body .hll {

data/markup/template_multifile.haml

@@ -0,0 +1,17 @@
+!!!
+%html
+  %head
+    %title Murdoc
+    %style=stylesheet
+  %body
+    - annotators.each_with_index do |annotator, i|
+      %h2 #{filenames[i]}
+      - annotator.paragraphs.each do |p|
+        - unless p.annotation.empty?
+          %section= p.formatted_annotation
+        - unless p.source.empty?
+          %figure
+            %ol
+              - 1.upto(p.source.split("\n").size) do |i|
+                %li= i + p.starting_line
+            <code>#{p.formatted_source.gsub("\n", '&#x000A;')}</code>

data/murdoc.gemspec

@@ -2,18 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: murdoc 0.1.13 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = %q{murdoc}
-  s.version = "0.1.12"
+  s.name = "murdoc"
+  s.version = "0.1.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-06-08}
-  s.default_executable = %q{murdoc}
-  s.description = %q{Annotated documentation generator, see README.md for details}
-  s.email = %q{markizko@gmail.com}
-  s.executables = ["murdoc"]
+  s.date = "2015-07-06"
+  s.description = "Annotated documentation generator, see README.md for details"
+  s.email = "markizko@gmail.com"
+  s.executables = ["murdoc", "murdoc-strip-comments"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -29,45 +30,43 @@ Gem::Specification.new do |s|
     "VERSION",
     "autotest/discover.rb",
     "bin/murdoc",
+    "bin/murdoc-strip-comments",
     "lib/murdoc.rb",
     "lib/murdoc/annotator.rb",
     "lib/murdoc/formatter.rb",
+    "lib/murdoc/languages/html.rb",
     "lib/murdoc/languages/javascript.rb",
     "lib/murdoc/languages/ruby.rb",
     "lib/murdoc/paragraph.rb",
     "markup/stylesheet.css",
     "markup/template.haml",
+    "markup/template_multifile.haml",
     "murdoc.gemspec",
     "spec/murdoc/annotator_spec.rb",
     "spec/murdoc/formatter_spec.rb",
     "spec/murdoc/paragraph_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/markiz/murdoc}
+  s.homepage = "http://github.com/markiz/murdoc"
   s.licenses = ["Public Domain"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Annotated documentation generator}
-  s.test_files = [
-    "spec/murdoc/annotator_spec.rb",
-    "spec/murdoc/formatter_spec.rb",
-    "spec/murdoc/paragraph_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "2.4.5"
+  s.summary = "Annotated documentation generator"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<kramdown>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<rdiscount>, ["~> 1.6.5"])
     else
       s.add_dependency(%q<kramdown>, [">= 0"])
       s.add_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
     end
@@ -75,6 +74,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<kramdown>, [">= 0"])
     s.add_dependency(%q<haml>, ["~> 3.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
   end

metadata

@@ -1,85 +1,111 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: murdoc
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.12
+version: !ruby/object:Gem::Version
+  version: 0.1.13
 platform: ruby
-authors: 
+authors:
 - Mark Abramov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 +04:00
-default_executable: murdoc
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-07-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.6.5
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.5
 description: Annotated documentation generator, see README.md for details
 email: markizko@gmail.com
-executables: 
+executables:
 - murdoc
+- murdoc-strip-comments
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
-- .document
-- .rspec
-- .travis.yml
+files:
+- ".document"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -88,52 +114,44 @@ files:
 - VERSION
 - autotest/discover.rb
 - bin/murdoc
+- bin/murdoc-strip-comments
 - lib/murdoc.rb
 - lib/murdoc/annotator.rb
 - lib/murdoc/formatter.rb
+- lib/murdoc/languages/html.rb
 - lib/murdoc/languages/javascript.rb
 - lib/murdoc/languages/ruby.rb
 - lib/murdoc/paragraph.rb
 - markup/stylesheet.css
 - markup/template.haml
+- markup/template_multifile.haml
 - murdoc.gemspec
 - spec/murdoc/annotator_spec.rb
 - spec/murdoc/formatter_spec.rb
 - spec/murdoc/paragraph_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/markiz/murdoc
-licenses: 
+licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3697138582716064667
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Annotated documentation generator
-test_files: 
-- spec/murdoc/annotator_spec.rb
-- spec/murdoc/formatter_spec.rb
-- spec/murdoc/paragraph_spec.rb
-- spec/spec_helper.rb
+test_files: []