Commit 12b6e331 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch 'master' into esprima-parser

parents 27518ab7 8e652e84
Loading
Loading
Loading
Loading

Gemfile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line
source :rubygems

gemspec

Gemfile.lock

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line
PATH
  remote: .
  specs:
    jsduck (4.0.beta2)
      json
      parallel
      rdiscount
      therubyracer

GEM
  remote: http://rubygems.org/
  specs:
    chunky_png (1.2.5)
    compass (0.12.2)
      chunky_png (~> 1.2)
      fssm (>= 0.2.7)
      sass (~> 3.1)
    diff-lcs (1.1.3)
    fssm (0.2.9)
    json (1.7.4)
    libv8 (3.3.10.4)
    parallel (0.5.17)
    rake (0.9.2.2)
    rdiscount (1.6.8)
    rspec (2.11.0)
      rspec-core (~> 2.11.0)
      rspec-expectations (~> 2.11.0)
      rspec-mocks (~> 2.11.0)
    rspec-core (2.11.1)
    rspec-expectations (2.11.2)
      diff-lcs (~> 1.1.3)
    rspec-mocks (2.11.1)
    sass (3.1.20)
    therubyracer (0.10.1)
      libv8 (~> 3.3.10)

PLATFORMS
  ruby
  x86-mingw32

DEPENDENCIES
  compass
  jsduck!
  rake
  rspec
+3 −2
Original line number Diff line number Diff line
@@ -169,14 +169,15 @@ module JsDuck
      class_formatter.include_types = !@opts.export
      # Format all doc-objects in parallel
      formatted_classes = ParallelWrap.map(@relations.classes) do |cls|
        Logger.instance.log("Markdown formatting #{cls[:name]}")
        files = cls[:files].map {|f| f[:filename] }.join(" ")
        Logger.instance.log("Markdown formatting #{cls[:name]}", files)
        begin
          {
            :doc => class_formatter.format(cls.internal_doc),
            :images => doc_formatter.images
          }
        rescue
          Logger.instance.fatal("Error while formatting #{cls[:name]}", $!)
          Logger.instance.fatal("Error while formatting #{cls[:name]} #{files}", $!)
          exit(1)
        end
      end