Commit 4d008d89 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Simplify access to Logger singleton instance.

parent f1b7783b

lib/jsduck/aggregator.rb

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ module JsDuck 
    def warn_alt_name(cls)

      file = cls[:files][0][:filename]

      line = cls[:files][0][:linenr]

      Logger.instance.warn(:alt_name, "Name #{cls[:name]} used as both classname and alternate classname", file, line)

      Logger.warn(:alt_name, "Name #{cls[:name]} used as both classname and alternate classname", file, line)

    end



    # Merges new class-doc into old one.

lib/jsduck/app.rb

+6 −6
Original line number Diff line number Diff line
@@ -107,11 +107,11 @@ module JsDuck 
    # Parses the files in parallel using as many processes as available CPU-s

    def parallel_parse(filenames)

      Util::Parallel.map(filenames) do |fname|

        Logger.instance.log("Parsing", fname)

        Logger.log("Parsing", fname)

        begin

          Source::File.new(Util::IO.read(fname), fname, @opts)

        rescue

          Logger.instance.fatal_backtrace("Error while parsing #{fname}", $!)

          Logger.fatal_backtrace("Error while parsing #{fname}", $!)

          exit(1)

        end

      end
@@ -121,7 +121,7 @@ module JsDuck 
    def aggregate(parsed_files)

      agr = Aggregator.new

      parsed_files.each do |file|

        Logger.instance.log("Aggregating", file.filename)

        Logger.log("Aggregating", file.filename)

        agr.aggregate(file)

      end

      agr.classify_orphans
@@ -156,7 +156,7 @@ module JsDuck 
            type = m[:tagname].to_s

            name = m[:name]

            file = m[:files][0]

            Logger.instance.warn(:global, "Global #{type}: #{name}", file[:filename], file[:linenr])

            Logger.warn(:global, "Global #{type}: #{name}", file[:filename], file[:linenr])

          end

        end

      end
@@ -173,14 +173,14 @@ module JsDuck 
      # Format all doc-objects in parallel

      formatted_classes = Util::Parallel.map(@relations.classes) do |cls|

        files = cls[:files].map {|f| f[:filename] }.join(" ")

        Logger.instance.log("Markdown formatting #{cls[:name]}", files)

        Logger.log("Markdown formatting #{cls[:name]}", files)

        begin

          {

            :doc => class_formatter.format(cls.internal_doc),

            :images => doc_formatter.images

          }

        rescue

          Logger.instance.fatal_backtrace("Error while formatting #{cls[:name]} #{files}", $!)

          Logger.fatal_backtrace("Error while formatting #{cls[:name]} #{files}", $!)

          exit(1)

        end

      end

lib/jsduck/class.rb

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ module JsDuck 
        Class.new({:name => classname}, false)

      else

        context = @doc[:files][0]

        Logger.instance.warn(:extend, "Class #{classname} not found", context[:filename], context[:linenr])

        Logger.warn(:extend, "Class #{classname} not found", context[:filename], context[:linenr])

        # Create placeholder class

        Class.new({:name => classname}, false)

      end

lib/jsduck/class_formatter.rb

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ module JsDuck 
      else

        context = @formatter.doc_context

        if tp.error == :syntax

          Logger.instance.warn(:type_syntax, "Incorrect type syntax #{type}", context[:filename], context[:linenr])

          Logger.warn(:type_syntax, "Incorrect type syntax #{type}", context[:filename], context[:linenr])

        else

          Logger.instance.warn(:type_name, "Unknown type #{type}", context[:filename], context[:linenr])

          Logger.warn(:type_name, "Unknown type #{type}", context[:filename], context[:linenr])

        end

        type

      end

lib/jsduck/class_writer.rb

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ module JsDuck 
      FileUtils.mkdir(dir)

      Util::Parallel.each(@relations.classes) do |cls|

        filename = dir + "/" + cls[:name] + extension

        Logger.instance.log("Writing docs", filename)

        Logger.log("Writing docs", filename)

        json = @exporter.export(cls)

        # skip file if exporter returned nil

        if json