codegrade 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e387a4ec843d880c7c20f2f251851de9797ad772
-  data.tar.gz: 6b22863716a4f1ea94f8c68020db34d32ddbb400
+  metadata.gz: 5db65c0710cb981a6a70470a77af6483a0003067
+  data.tar.gz: fa8eb37af5f94816e754f3d114c993b72fc9152b
 SHA512:
-  metadata.gz: 2c8d198ee979cf3d2a8b8851ea8269c3c6f8d41be20154ae39af2f17d2c8abb8dc53881d23d693acab4caabb589a76015708a2709440c7cb0f704a9ab0fb1a76
-  data.tar.gz: 123e9b9abfc205e094889c5bc6af56c810aa0c54fd9aaff6f81236a9851c7dc172333b6935cb9b07a78ab54313434fe44f001c4af21d66ba47740994f424e2a8
+  metadata.gz: ed5a8224328dc6347e910839b9b93ad444dfa5add89fdb0d8ee3c5eecc324e627415ca8e95c4277b6c426045373bf1081f8f1fe9238fdba483367bc6c7bd202b
+  data.tar.gz: b4722a0199d9084dcaca7695113061cd116edc40dda13b2e13a3eccb5059c40349bd9ef8fa733a58ee96508e008595cc9b116d4854001bd3102da370d9796dfc

data/bin/codegrade

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
 require 'codegrade'
 
-offenses = Codegrade::Grader::Grader.new(Codegrade::Commit.new).grade
+commit = Codegrade::Commit.new('.', ARGV[0])
+offenses = Codegrade::Grader::Grader.new(commit).grade
 Codegrade::Formatter.new(offenses).print

data/lib/codegrade/commit.rb

@@ -32,9 +32,12 @@ module Codegrade
     def parse_git_tree(tree, path)
       files = []
 
-      tree.walk_blobs do |root, entry|
-        path = File.expand_path(root, working_directory)
-        files.push(File.join(path, entry[:name]))
+      return [] if commit.parents.size > 1
+
+      diff = commit.parents[0].diff(commit)
+
+      diff.deltas.each do |delta|
+        files.push(delta.new_file[:path])
       end
 
       files

data/lib/codegrade/formatter.rb

@@ -13,7 +13,7 @@ module Codegrade
         puts
 
         offenses.each do |offense|
-          file = offense.file.gsub(working_directory, '')[1..-1]
+          file = offense.file.gsub(working_directory, '') unless offense.file.nil?
           puts "- #{file}:#{offense.line_number}:#{offense.column_number}"
         end
 

data/lib/codegrade/grader/commit_message.rb

@@ -20,199 +20,213 @@ module Codegrade
 
       def parse_commit_message
         lines = @message.split("\n")
-
-        paragraph, paragraph_start, paragraph_line = [], 1, 0
-        inside_punctation = false
+        state = {
+          :paragraph         => [],
+          :paragraph_start   => 1,
+          :inside_punctation => false }
 
         lines.each_with_index do |line, index|
-          paragraph << line
-          paragraph_line += 1
-
-          line_number      = index + 1
-          blank_line       = blank?(line)
-          title_line       = line_number == 1
-          end_of_paragraph = (index == lines.length - 1 ||
-                             blank?(lines[index + 1])) && !title_line &&
-                             paragraph.any? && !blank?(paragraph.last)
-
-          if line.start_with?('* ')
-            check_punctation_no_separating_line(inside_punctation, line_number)
-
-            inside_punctation = true
-          end
-
-          if title_line
-            check_title_leading_lowercase(line, line_number)
-            check_title_too_long(line, line_number)
-            check_title_trailing_dot(line, line_number)
-          end
-
-          if end_of_paragraph
-            if inside_punctation
-              check_punctation_leading_lowercase(paragraph, paragraph_start)
-              check_punctation_trailing_dot(paragraph, paragraph_start)
-            else
-              check_paragraph_leading_lowercase(paragraph, paragraph_start)
-              check_paragraph_no_trailing_dot(paragraph, paragraph_start)
-            end
-          end
-
-          if blank_line
-            check_redundant_empty_line(paragraph, line_number)
-
-            paragraph, paragraph_start, paragraph_line = [], line_number + 1, 0
-            inside_punctation = false
-          else
-            check_title_multiple_lines(line_number)
-
-            check_line_trailing_whitespace(line, line_number)
-            check_line_too_long(line, line_number) unless title_line
-          end
-
-          if inside_punctation
-            if paragraph_line > 1
-              check_punctation_leading_whitespace(line, line_number)
-            end
-          else
-            if ! blank_line
-              check_line_leading_whitespace(line, line_number)
-            end
+          state[:paragraph] << line
+
+          state.merge!(
+            :line                => line,
+            :index               => index,
+            :line_number         => index + 1,
+            :blank_line          => blank?(line),
+            :title_line          => index == 0,
+            :start_of_punctation => line.start_with?('* '),
+            :was_in_punctation   => state[:inside_punctation])
+
+          state[:end_of_paragraph] = !state[:title_line] &&
+            state[:paragraph].any? &&
+            (index == lines.length - 1 || blank?(lines[index + 1])) &&
+            !blank?(state[:paragraph].last)
+
+          state[:inside_punctation] = state[:inside_punctation] ||
+            state[:start_of_punctation]
+
+          check_title_leading_lowercase(state)
+          check_title_too_long(state)
+          check_title_trailing_dot(state)
+          check_title_multiple_lines(state)
+
+          check_line_trailing_whitespace(state)
+          check_line_too_long(state)
+          check_line_leading_whitespace(state)
+          check_redundant_empty_line(state)
+
+          check_punctation_leading_whitespace(state)
+          check_punctation_leading_lowercase(state)
+          check_punctation_trailing_dot(state)
+          check_punctation_no_separating_line(state)
+
+          check_paragraph_leading_lowercase(state)
+          check_paragraph_no_trailing_dot(state)
+
+          if state[:blank_line]
+            state.merge!(
+              :paragraph         => [],
+              :paragraph_start   => state[:line_number] + 1,
+              :inside_punctation => false)
           end
         end
       end
 
-      def check_title_leading_lowercase(line, line_number)
-        if line[0].downcase == line[0]
+      def check_title_leading_lowercase(state)
+        if state[:title_line] && state[:line][0].downcase == state[:line][0]
           add_offense(
             :category       => 'title_leading_lowercase',
-            :line_number    => line_number,
+            :line_number    => state[:line_number],
             :column_number  => 1)
         end
       end
 
-      def check_title_too_long(line, line_number)
-        if line.length > 50
+      def check_title_too_long(state)
+        if state[:title_line] && state[:line].length > 50
           add_offense(
             :category      => 'title_too_long',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => 51)
         end
       end
 
-      def check_title_trailing_dot(line, line_number)
-        if (m = line.match(/\.\s*$/))
+      def check_title_trailing_dot(state)
+        if state[:title_line] && (m = state[:line].match(/\.\s*$/))
           add_offense(
             :category      => 'title_trailing_dot',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => m.begin(0))
         end
       end
 
-      def check_title_multiple_lines(line_number)
-        if line_number == 2
+      def check_title_multiple_lines(state)
+        return if state[:blank_line]
+
+        if state[:line_number] == 2
           add_offense(
             :category    => 'title_multiple_lines',
-            :line_number => line_number)
+            :line_number => state[:line_number])
         end
       end
 
-      def check_redundant_empty_line(paragraph, line_number)
-        if paragraph.select { |line| !blank?(line) }.empty?
+      def check_redundant_empty_line(state)
+        return unless state[:blank_line]
+
+        if state[:paragraph].select { |line| !blank?(line) }.empty?
           add_offense(
             :category       => 'redundant_empty_line',
-            :line_number    => line_number)
+            :line_number    => state[:line_number])
         end
       end
 
-      def check_line_trailing_whitespace(line, line_number)
-        if (m = line.match(/\s+$/))
+      def check_line_trailing_whitespace(state)
+        return if state[:blank_line]
+
+        if (m = state[:line].match(/\s+$/))
           add_offense(
             :category      => 'line_trailing_whitespace',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => m.begin(0) + 1)
         end
       end
 
-      def check_line_leading_whitespace(line, line_number)
-        if (m = line.match(/^\s+/))
+      def check_line_leading_whitespace(state)
+        if !state[:inside_punctation] &&
+            !state[:blank_line] &&
+            (m = state[:line].match(/^\s+/))
           add_offense(
             :category      => 'line_leading_whitespace',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => m.end(0))
         end
       end
 
-      def check_line_too_long(line, line_number)
-        if line.length > 70
+      def check_line_too_long(state)
+        return if state[:blank_line] || state[:title_line]
+
+        if state[:line].length > 70
           add_offense(
             :category      => 'line_too_long',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => 71)
         end
       end
 
-      def check_paragraph_leading_lowercase(paragraph, paragraph_start)
-        line = strip(paragraph.first)
+      def check_paragraph_leading_lowercase(state)
+        return unless state[:end_of_paragraph] && !state[:inside_punctation]
+
+        line = strip(state[:paragraph].first)
 
         if line[0].downcase == line[0] &&
             !link?(line.split[0])
           add_offense(
             :category      => 'paragraph_leading_lowercase',
-            :line_number   => paragraph_start,
+            :line_number   => state[:paragraph_start],
             :column_number => 1)
         end
       end
 
-      def check_paragraph_no_trailing_dot(paragraph, paragraph_start)
-        line = strip(paragraph.last)
+      def check_paragraph_no_trailing_dot(state)
+        return unless state[:end_of_paragraph] && !state[:inside_punctation]
+
+        line = strip(state[:paragraph].last)
 
         if line[-1] != '.' &&
             !link?(line.split[-1])
           add_offense(
             :category      => 'paragraph_no_trailing_dot',
-            :line_number   => paragraph_start + paragraph.length - 1,
-            :column_number => paragraph.last.length)
+            :line_number   => state[:paragraph_start] +
+                              state[:paragraph].length - 1,
+            :column_number => state[:paragraph].last.length)
         end
       end
 
-      def check_punctation_no_separating_line(inside_punctation, line_number)
-        if inside_punctation
+      def check_punctation_no_separating_line(state)
+        if state[:start_of_punctation] && state[:was_in_punctation]
           add_offense(
             :category      => 'punctation_no_separating_line',
-            :line_number   => line_number)
+            :line_number   => state[:line_number])
         end
       end
 
-      def check_punctation_leading_whitespace(line, line_number)
-        if (m = line.match(/^\s*/)) && m.end(0) != 2
+      def check_punctation_leading_whitespace(state)
+        if state[:inside_punctation] &&
+            !state[:blank_line] &&
+            state[:paragraph].length > 1 &&
+            (m = state[:line].match(/^\s*/)) && m.end(0) != 2
           add_offense(
             :category      => 'punctation_leading_whitespace',
-            :line_number   => line_number,
+            :line_number   => state[:line_number],
             :column_number => m.end(0))
         end
       end
 
-      def check_punctation_leading_lowercase(paragraph, paragraph_start)
-        line = strip(paragraph.first)
+      def check_punctation_leading_lowercase(state)
+        return unless state[:end_of_paragraph] && state[:inside_punctation]
+
+        line = strip(state[:paragraph].first)
 
         if line[2].downcase == line[2] &&
             !link?(line.split[0])
           add_offense(
             :category      => 'punctation_leading_lowercase',
-            :line_number   => paragraph_start,
+            :line_number   => state[:paragraph_start],
             :column_number => 3)
         end
       end
 
-      def check_punctation_trailing_dot(paragraph, paragraph_start)
-        line = strip(paragraph.last)
+      def check_punctation_trailing_dot(state)
+        return unless state[:end_of_paragraph] && state[:inside_punctation]
+
+        line = strip(state[:paragraph].last)
 
         if line[-1] == '.' &&
             !link?(line.split[-1])
           add_offense(
             :category      => 'punctation_trailing_dot',
-            :line_number   => paragraph_start + paragraph.length - 1,
-            :column_number => paragraph.last.length)
+            :line_number   => state[:paragraph_start] +
+                              state[:paragraph].length - 1,
+            :column_number => state[:paragraph].last.length)
         end
       end
 

data/lib/codegrade/version.rb

@@ -1,3 +1,3 @@
 module Codegrade
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: codegrade
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michał Młoźniak