murdoc 0.1.9 → 0.1.10

data/.travis.yml

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

data/Gemfile

@@ -1,9 +1,10 @@
 source "http://rubygems.org"
 
-gem "rdiscount", "~> 1.6.5"
+gem "kramdown"
 gem "haml", "~> 3.0.0"
 
 group :development do
+  gem "rdiscount", "~> 1.6.5", :platform => :mri
   gem "jeweler"
-  gem "rspec", "~> 2.4.0"  
+  gem "rspec", "~> 2.4.0"
 end

data/Gemfile.lock

@@ -8,8 +8,9 @@ GEM
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    kramdown (0.13.2)
     rake (0.8.7)
-    rdiscount (1.6.5)
+    rdiscount (1.6.8)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
       rspec-expectations (~> 2.4.0)
@@ -25,5 +26,6 @@ PLATFORMS
 DEPENDENCIES
   haml (~> 3.0.0)
   jeweler
+  kramdown
   rdiscount (~> 1.6.5)
   rspec (~> 2.4.0)

data/README.md

@@ -8,6 +8,12 @@ You may also want to see:
 * [docco.coffee](http://jashkenas.github.com/docco/)
 * [Rocco](http://rtomayko.github.com/rocco/)
 
+Dependencies
+============
+
+* Haml
+* Either RDiscount (for MRI rubies) or Kramdown (for non-mri rubies)
+
 Example
 =======
 

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/lib/murdoc/paragraph.rb

@@ -1,5 +1,9 @@
 require "rubygems"
-require "rdiscount"
+begin
+  require "rdiscount"
+rescue LoadError
+  require "kramdown"
+end
 require "cgi"
 require "tempfile"
 
@@ -29,7 +33,11 @@ module Murdoc
 
 
     def formatted_annotation
-      Markdown.new(annotation, :smart).to_html
+      if defined?(Markdown)
+        Markdown.new(annotation, :smart).to_html
+      else
+        Kramdown.new(annotation, :input => :markdown).to_html
+      end
     end
 
     def formatted_source

data/murdoc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murdoc}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-04-14}
   s.default_executable = %q{murdoc}
   s.description = %q{Annotated documentation generator, see README.md for details}
   s.email = %q{markizko@gmail.com}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "README.md",
@@ -45,7 +46,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markiz/murdoc}
   s.licenses = ["Public Domain"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Annotated documentation generator}
   s.test_files = [
     "spec/murdoc/annotator_spec.rb",
@@ -55,27 +56,29 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rdiscount>, ["~> 1.6.5"])
+      s.add_runtime_dependency(%q<kramdown>, [">= 0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.0"])
+      s.add_development_dependency(%q<rdiscount>, ["~> 1.6.5"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_runtime_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<rdiscount>, ["~> 1.6.5"])
     else
-      s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
+      s.add_dependency(%q<kramdown>, [">= 0"])
       s.add_dependency(%q<haml>, ["~> 3.0.0"])
+      s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<haml>, ["~> 3.0.0"])
       s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
     end
   else
-    s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
+    s.add_dependency(%q<kramdown>, [">= 0"])
     s.add_dependency(%q<haml>, ["~> 3.0.0"])
+    s.add_dependency(%q<rdiscount>, ["~> 1.6.5"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<haml>, ["~> 3.0.0"])

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: murdoc
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 9
-  version: 0.1.9
+  prerelease: 
+  version: 0.1.10
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,21 +10,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +03:00
+date: 2011-04-14 00:00:00 -05:00
 default_executable: murdoc
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: kramdown
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 5
-        version: 1.6.5
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -39,72 +31,65 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: rdiscount
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.6.5
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rdiscount
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 5
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 description: Annotated documentation generator, see README.md for details
 email: markizko@gmail.com
 executables: 
@@ -116,6 +101,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -151,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2695575767426398562
+      hash: -1945049071011041885
       segments: 
       - 0
       version: "0"
@@ -160,13 +146,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Annotated documentation generator