rdoc_rubocop 0.1.3 → 0.1.4

data/lib/rdoc_rubocop/rubocop_runner.rb

@@ -1,5 +1,4 @@
-require "rdoc_rubocop/source_file"
-require "rdoc_rubocop/comment_extractor"
+require "rdoc_rubocop/lang/base/source_file"
 
 module RDocRuboCop
   class RuboCopRunner
@@ -54,7 +53,7 @@ module RDocRuboCop
     end
 
     def source_files
-      @paths.map(&SourceFile.method(:build))
+      @paths.map(&Lang::Base::SourceFile.method(:build))
     end
 
     # Report with a message: "Inspecting 0 files"

data/lib/rdoc_rubocop/version.rb

@@ -1,3 +1,3 @@
 module RDocRuboCop
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdoc_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Loose Coupling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -113,18 +113,32 @@ files:
 - bin/setup
 - exe/rdoc-rubocop
 - lib/rdoc_rubocop.rb
-- lib/rdoc_rubocop/comment.rb
-- lib/rdoc_rubocop/comment/source_code.rb
-- lib/rdoc_rubocop/comment_extractor.rb
-- lib/rdoc_rubocop/comment_token_organizable.rb
 - lib/rdoc_rubocop/file_path.rb
+- lib/rdoc_rubocop/indent_util.rb
+- lib/rdoc_rubocop/lang.rb
+- lib/rdoc_rubocop/lang/base/comment.rb
+- lib/rdoc_rubocop/lang/base/source_file.rb
+- lib/rdoc_rubocop/lang/c.rb
+- lib/rdoc_rubocop/lang/c/comment.rb
+- lib/rdoc_rubocop/lang/c/comment/banner.rb
+- lib/rdoc_rubocop/lang/c/comment/normal.rb
+- lib/rdoc_rubocop/lang/c/comment/one_line.rb
+- lib/rdoc_rubocop/lang/c/comment_extractor.rb
+- lib/rdoc_rubocop/lang/c/corrector.rb
+- lib/rdoc_rubocop/lang/c/source_file.rb
+- lib/rdoc_rubocop/lang/ruby.rb
+- lib/rdoc_rubocop/lang/ruby/comment.rb
+- lib/rdoc_rubocop/lang/ruby/comment_extractor.rb
+- lib/rdoc_rubocop/lang/ruby/corrector.rb
+- lib/rdoc_rubocop/lang/ruby/source_file.rb
+- lib/rdoc_rubocop/lang/ruby/token.rb
+- lib/rdoc_rubocop/lang/ruby/token/comment_token.rb
 - lib/rdoc_rubocop/options.rb
+- lib/rdoc_rubocop/rdoc.rb
+- lib/rdoc_rubocop/rdoc/line.rb
+- lib/rdoc_rubocop/rdoc/ruby_snippet.rb
 - lib/rdoc_rubocop/rubocop_modifier.rb
 - lib/rdoc_rubocop/rubocop_runner.rb
-- lib/rdoc_rubocop/source_file.rb
-- lib/rdoc_rubocop/source_file/corrector.rb
-- lib/rdoc_rubocop/token.rb
-- lib/rdoc_rubocop/token/comment_token.rb
 - lib/rdoc_rubocop/version.rb
 - rdoc_rubocop.gemspec
 homepage: https://github.com/nowlinuxing/rdoc_rubocop/

data/lib/rdoc_rubocop/comment.rb

@@ -1,45 +0,0 @@
-require "rdoc_rubocop/comment_token_organizable"
-require "rdoc_rubocop/comment/source_code"
-
-module RDocRuboCop
-  class Comment
-    include CommentTokenOrganizable
-
-    attr_reader :source_file
-
-    def initialize(comment_tokens, source_file = nil)
-      @comment_tokens = comment_tokens
-      @source_file = source_file
-    end
-
-    def source_codes
-      code_chunk = []
-      codes = []
-      @comment_tokens.each do |comment_token|
-        if comment_token.comment_indent > comment_indent
-          code_chunk << comment_token
-        elsif comment_token.blank? && code_chunk.any?
-          code_chunk << comment_token
-        elsif code_chunk.any?
-          codes << SourceCode.new(trim(code_chunk))
-          code_chunk = []
-        end
-      end
-      codes << SourceCode.new(trim(code_chunk), self) if code_chunk.any?
-
-      codes
-    end
-
-    private
-
-    def trim(code_chunk)
-      i = code_chunk.size - 1
-      while i >= 0 && code_chunk[i].blank? do
-        code_chunk.delete_at(i)
-        i -= 1
-      end
-
-      code_chunk
-    end
-  end
-end

data/lib/rdoc_rubocop/comment/source_code.rb

@@ -1,28 +0,0 @@
-require "rdoc_rubocop/token/comment_token"
-
-module RDocRuboCop
-  class Comment
-    class SourceCode
-      include CommentTokenOrganizable
-
-      attr_reader :comment
-
-      def initialize(comment_tokens, comment = nil)
-        @comment_tokens = comment_tokens
-        @comment = comment
-      end
-
-      def text
-        @comment_tokens.map { |comment_token| comment_token.text_without_indent(comment_indent) }.join
-      end
-
-      def lineno
-        @lineno ||= comment_tokens.map(&:lineno).minmax
-      end
-
-      def indent_and_commentchar
-        Token::CommentToken.indent_and_commentchar(comment_tokens[0].column, comment_indent)
-      end
-    end
-  end
-end

data/lib/rdoc_rubocop/comment_extractor.rb

@@ -1,53 +0,0 @@
-require 'ripper'
-require 'rdoc_rubocop/token'
-require 'rdoc_rubocop/comment'
-
-module RDocRuboCop
-  class CommentExtractor
-    attr_reader :comments
-
-    def initialize(source_file)
-      @source_file = source_file
-      @comments = []
-    end
-
-    def extract
-      @comments = extract_comments
-    end
-
-    private
-
-    def extract_comments
-      chunk = []
-      comments = []
-
-      tokens.each do |tokens_in_line|
-        token = tokens_in_line.pop
-
-        if token.comment?
-          if tokens_in_line.all?(&:sp?)
-            chunk << token
-          else
-            comments << Comment.new(chunk, @source_file) if chunk.any?
-            chunk = [token]
-          end
-        else
-          if chunk.any?
-            comments << Comment.new(chunk, @source_file)
-            chunk = []
-          end
-        end
-      end
-      comments << Comment.new(chunk, @source_file) if chunk.any?
-
-      comments
-    end
-
-    def tokens
-      Ripper.
-        lex(@source_file.source).
-        map { |token| Token.build(*token) }.
-        slice_when { |token_before, token_after| token_before.lineno != token_after.lineno }
-    end
-  end
-end

data/lib/rdoc_rubocop/comment_token_organizable.rb

@@ -1,17 +0,0 @@
-module RDocRuboCop
-  module CommentTokenOrganizable
-    def self.included(base)
-      base.include InstanceMethods
-
-      attr_reader :comment_tokens
-    end
-
-    module InstanceMethods
-      private
-
-      def comment_indent
-        @comment_indent ||= @comment_tokens.reject(&:blank?).map(&:comment_indent).min
-      end
-    end
-  end
-end

data/lib/rdoc_rubocop/source_file.rb

@@ -1,72 +0,0 @@
-require "digest"
-require "rdoc_rubocop/comment_extractor"
-require "rdoc_rubocop/file_path"
-require "rdoc_rubocop/source_file/corrector"
-
-module RDocRuboCop
-  class SourceFile
-    attr_reader :source
-    attr_reader :filename
-
-    def self.build(filename)
-      source = File.open(filename, "r").read
-      new(source, filename)
-    end
-
-    def initialize(source, filename)
-      @source = source
-      @filename = filename
-
-      reset
-    end
-
-    def source_code_file_paths
-      @source_code_file_paths ||=
-        comments.flat_map do |comment|
-          comment.source_codes.map do |source_code|
-            FilePath.new(@filename, source_code)
-          end
-        end
-    end
-
-    def comments
-      comment_extractor = CommentExtractor.new(self)
-      comment_extractor.extract
-      comment_extractor.comments
-    end
-
-    def correct!
-      correct
-      save if changed?
-      reset
-    end
-
-    def correct
-      corrector = Corrector.new(@source, @source_code_file_paths)
-      corrector.correct
-
-      @source = corrector.source
-    end
-
-    private
-
-    def reset
-      @checksum = compute_digest(@source)
-      @source_code_file_paths = nil
-    end
-
-    def compute_digest(str)
-      Digest::MD5.hexdigest(str)
-    end
-
-    def save
-      File.open(@filename, "w") do |f|
-        f.puts @source
-      end
-    end
-
-    def changed?
-      compute_digest(@source) != @checksum
-    end
-  end
-end

data/lib/rdoc_rubocop/source_file/corrector.rb

@@ -1,49 +0,0 @@
-require "rdoc_rubocop/token/comment_token"
-
-module RDocRuboCop
-  class SourceFile
-    class Corrector
-      attr_reader :source
-
-      def initialize(source, source_code_file_paths)
-        @source = source
-        @source_code_file_paths = source_code_file_paths
-      end
-
-      def correct
-        source_lines = source.lines
-
-        @source_code_file_paths.reverse_each do |file_path|
-          apply(source_lines, file_path)
-        end
-
-        @source = source_lines.flatten.join
-      end
-
-      private
-
-      def apply(source_lines, file_path)
-        lineno = file_path.source_code.lineno
-
-        delete_lines(source_lines, lineno[0] - 1, lineno[1] - 1)
-        insert(source_lines, lineno[0] - 1, file_path)
-      end
-
-      def delete_lines(source_lines, lineno_from, lineno_to)
-        (lineno_to).downto(lineno_from).each do |i|
-          source_lines.delete_at(i)
-        end
-      end
-
-      def insert(source_lines, index, file_path)
-        indent_and_commentchar = file_path.source_code.indent_and_commentchar
-        source_with_indent =
-          file_path.source.
-          gsub(/^/, indent_and_commentchar).
-          gsub(/#{Token::CommentToken::COMMENT_CHAR}\s*$/, "#")
-
-        source_lines.insert(index, source_with_indent)
-      end
-    end
-  end
-end

data/lib/rdoc_rubocop/token.rb

@@ -1,39 +0,0 @@
-module RDocRuboCop
-  class Token
-    attr_reader :locate, :type, :token, :state
-
-    def self.build(locate, type, token, state)
-      case type
-      when :on_comment
-        CommentToken.new(locate, type, token, state)
-      else
-        new(locate, type, token, state)
-      end
-    end
-
-    def initialize(locate, type, token, state)
-      @locate = locate
-      @type   = type
-      @token  = token
-      @state  = state
-    end
-
-    def lineno
-      @locate[0]
-    end
-
-    def column
-      @locate[1]
-    end
-
-    %i(on_sp on_comment).each do |type|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{type.to_s.sub(/^on_/, "")}? # def sp?
-          type == :#{type}                #   type == :on_sp
-        end                               # end
-      RUBY
-    end
-  end
-end
-
-require "rdoc_rubocop/token/comment_token"

data/lib/rdoc_rubocop/token/comment_token.rb

@@ -1,34 +0,0 @@
-module RDocRuboCop
-  class Token
-    class CommentToken < self
-      COMMENT_CHAR = "#".freeze
-      SPACE_CHAR = " ".freeze
-
-      def self.indent_and_commentchar(indent_before_comment, indent_after_comment)
-        SPACE_CHAR * indent_before_comment +
-          COMMENT_CHAR +
-          SPACE_CHAR * indent_after_comment
-      end
-
-      def comment?
-        true
-      end
-
-      def comment_indent
-        text_with_indent[/^#{SPACE_CHAR}*/].length
-      end
-
-      def text_with_indent
-        token.sub(COMMENT_CHAR, "")
-      end
-
-      def text_without_indent(indent)
-        text_with_indent.sub(/^#{SPACE_CHAR}{#{indent}}/, "")
-      end
-
-      def blank?
-        text_with_indent.match?(/^\s*$/)
-      end
-    end
-  end
-end