Commit da0d69dd authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Extract InputFiles class from Options::Processor. 

Also turn the single Processor.process! method into a static one.
parent 0793df16

bin/jsduck

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ require 'jsduck/options/parser' 
require 'jsduck/options/processor'



opts = JsDuck::Options::Parser.new.parse(ARGV)

JsDuck::Options::Processor.new.process!(opts)

JsDuck::Options::Processor.process!(opts)



exit_code = JsDuck::App.new(opts).run

lib/jsduck/options/input_files.rb

0 → 100644
+60 −0
Original line number Diff line number Diff line 
require 'jsduck/options/jsb'

require 'jsduck/logger'



module JsDuck

  module Options



    # Finalizes the list of input files.

    class InputFiles

      def initialize(opts)

        @opts = opts

      end



      # Expands opts.input_files (modifying its contents):

      #

      # - When file is a directory, scans all JS, CSS, SCSS files in there.

      # - When file is a .jsb3 file, extracts list of files from it.

      # - Otherwise returns array with this same input filename.

      #

      # Then excludes the files and dirs listed in opts.exclude.

      def expand!

        @opts.input_files = expand_files(@opts.input_files)

        exclude_files!(@opts.input_files, @opts.exclude)

      end



      private



      def expand_files(unexpanded_files)

        unexpanded_files.map {|fname| expand_filename(fname) }.flatten

      end



      def expand_filename(fname)

        files = []



        if File.exists?(fname)

          if File.directory?(fname)

            Dir[fname+"/**/*.{js,css,scss}"].each {|f| files << f }

          elsif fname =~ /\.jsb3$/

            Options::Jsb.read(fname).each {|fn| read_filenames(fn) }

          else

            files << fname

          end

        else

          Logger.warn(nil, "File not found", fname)

        end



        files

      end



      # Removes the files matching exclude_paths from list of files

      def exclude_files!(files, exclude_paths)

        exclude_paths.each do |exclude_path|

          exclude_re = Regexp.new('\A' + Regexp.escape(exclude_path))

          files.reject! {|f| f =~ exclude_re }

        end

      end



    end



  end

end

lib/jsduck/options/processor.rb

+12 −59
Original line number Diff line number Diff line 
require 'jsduck/options/jsb'

require 'jsduck/options/input_files'

require 'jsduck/options/validator'

require 'jsduck/logger'

require 'jsduck/util/json'
@@ -14,69 +14,22 @@ module JsDuck 
    # options and also processes some of the options (like #input_files).

    # Finally it also validates them.

    class Processor



      # Processes and applies the parsed command line options.

      # It modifies the values of#input_files option.

      def process!(opts)

        @opts = opts



      # Also modifies the values of#input_files option.

      def self.process!(opts)

        # Expand list of input files

        configure_input_files

        Options::InputFiles.new(opts).expand!



        # Configure various objects with these options

        Logger.configure(@opts)

        Util::Parallel.configure(@opts)

        TagRegistry.configure(@opts)

        Js::ExtPatterns.configure(@opts)

        Util::Json.configure(@opts)

        Util::IO.configure(@opts)



        Options::Validator.new(@opts).validate!



        @opts

      end



      private



      def configure_input_files

        @opts.input_files = expand_files(@opts.input_files)

        exclude_files!(@opts.input_files, @opts.exclude)

      end



      # Expands directories and .jsb3 files in given list of filenames

      def expand_files(unexpanded_files)

        unexpanded_files.map {|fname| expand_filename(fname) }.flatten

      end



      # When file is a directory, scans all JS, CSS, SCSS files in there.

      # When file is a .jsb3 file, extracts list of files from it.

      # Otherwise returns array with this same input filename.

      def expand_filename(fname)

        files = []



        if File.exists?(fname)

          if File.directory?(fname)

            Dir[fname+"/**/*.{js,css,scss}"].each {|f| files << f }

          elsif fname =~ /\.jsb3$/

            Options::Jsb.read(fname).each {|fn| read_filenames(fn) }

          else

            files << fname

          end

        else

          Logger.warn(nil, "File not found", fname)

        end

        Logger.configure(opts)

        Util::Parallel.configure(opts)

        TagRegistry.configure(opts)

        Js::ExtPatterns.configure(opts)

        Util::Json.configure(opts)

        Util::IO.configure(opts)



        files

        Options::Validator.new(opts).validate!

      end



      # Removes the files matching exclude_paths from list of files

      def exclude_files!(files, exclude_paths)

        exclude_paths.each do |exclude_path|

          exclude_re = Regexp.new('\A' + Regexp.escape(exclude_path))

          files.reject! {|f| f =~ exclude_re }

        end

      end



    end



  end