adjutant 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63fdbf4d9637148a899bf681d613517c9a58e643
-  data.tar.gz: 545ec10edc2ad99477c21bb1c934b8688269cb71
+  metadata.gz: e7ade5ef06a52ba977c6cdf02258e8b39b47336d
+  data.tar.gz: 4baaed035761d72a020831da9c6b80f002c83116
 SHA512:
-  metadata.gz: ad1648c468bbda14bc1bc5dfc77bbde84e0128482ad0ed6ea1de29d0f8c8d4f4b8e080b8e2894d6b7e862e6d6e2025c8e4dfbc26ed11d77cf6d3c93ee27afa50
-  data.tar.gz: f6fafe1b348d8bbfcfedde2a33de44d1e1ddade102867473e45212c6bb62b32c34215966daf689749286eb6ff03fe3a8b39c27e96bedac6e001b8246a4d2c8d7
+  metadata.gz: fb8cd05f8e2b38c6d795938764a0fdb7c6dfcc10ba727dc613658c60bc170a344fa6567fb22b27385c003b8ec113646e1a596cef51cbf8d875b2df3b5e9d4c4e
+  data.tar.gz: 0373d16b91be83dd143fe230a080942f3fee186c5871577e1c78b744cca8b6843d5cd880ebece289bd66aec268d67c39e8282f3967aa274d82c3f4b933a12655

data/lib/adjutant/file_parser.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 module Adjutant
   class FileParser
 
@@ -7,30 +9,27 @@ module Adjutant
       @text = file[:patch]
       @comment = Comment.new("")
       @comments = []
+      @previous_was_usefull = false
     end
 
     def detect_comments
-      usefull = false
       lines_pushed.each_with_index do |line, index|
         line = Line.new(line)
-
-        if line.usefull? || usefull
-          usefull = true
+        if line.usefull? || @previous_was_usefull
           parse_line(line, index)
         else
-          push_comment
-          usefull = false
-
-          next
+          push_comment and next
         end
       end
-      push_comment if usefull
+
+      push_comment if @previous_was_usefull
       @comments
     end
 
     def push_comment
-      @comments << @comment.print
+      @comments << @comment.print unless comment.text.nil?
       @comment.reset
+      @previous_was_usefull = false
     end
 
     def parse_line(line, index)
@@ -38,6 +37,7 @@ module Adjutant
         push_comment
       else
         @comment.add line.usefull_text, index
+        @previous_was_usefull = true
       end
     end
 

data/lib/adjutant/line.rb

@@ -4,7 +4,7 @@ module Adjutant
     USERNAME_SIGN = "@"
     TODO_LINE = "TODO:"
 
-    def usefull?() contain_comment? && point_of_interes? && new_added?  end
+    def usefull?()          contain_comment? && point_of_interes?   end
 
     def contain_comment?()  line.scan(/\+\s*#{COMMENT_SIGN}/).any?  end
 
@@ -12,10 +12,8 @@ module Adjutant
     def contain_username?() line.scan(/(#{USERNAME_SIGN}\w+)/).any? end
     def contain_todo?()     line.scan(/#{TODO_LINE}/).any?          end
 
-    def new_added?() line[0] == '+' end
-
-    def end_of_comment?() contain_comment?() ? empty_comment? : true        end
-    def empty_comment?()  line.scan(/\+\s*#{COMMENT_SIGN}\s*(\S+)/).empty?  end
+    def end_of_comment?()   contain_comment?() ? empty_comment? : true       end
+    def empty_comment?()    line.scan(/\+\s*#{COMMENT_SIGN}\s*(\S+)/).empty? end
 
     def usefull_text
       matched = line.scan(/\+\s*#\s*/).first

data/lib/adjutant/version.rb

@@ -1,3 +1,3 @@
 module Adjutant
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/spec/adjutant/file_parser_spec.rb

@@ -3,15 +3,20 @@ require 'spec_helper'
 RSpec.describe Adjutant::FileParser do
 
   let(:file) do
-    { :patch => "@@ -0,0 +1,14 @@\n+# @Baltazore is trying to check first line comment\n+def super_method(such_args)\n \"Doge tutorial\"\nend\n# doing some stuff\n\"hello world\"\n+# @baltazore, Let's check multiline comments,\n+# them really rocks\n#\n+\n+# TODO:\n+# - [ ] This Github flavoured markdown\n+# - [ ] such nice\n+# - [ ] very exciting" }
+    { :patch=> "@@ -0,0 +1,14 @@\n+# @Baltazore is trying to check first line comment\n+def super_method(such_args)\n+ \"Doge tutorial\"\n+end\n+# useless comment\n+\"hello world\"\n+# @baltazore, Let's check multiline comments,\n+# them really rocks\n+#\n+\n+# TODO:\n+# - [ ] This Github flavoured markdown\n+# - [ ] such nice\n+# - [ ] very exciting" }
   end
 
   let(:lines) do
     [
       "+# @Baltazore is trying to check first line comment",
       "+def super_method(such_args)",
+      "+ \"Doge tutorial\"",
+      "+end",
+      "+# useless comment",
+      "+\"hello world\"",
       "+# @baltazore, Let's check multiline comments,",
       "+# them really rocks",
+      "+#",
       "+",
       "+# TODO:",
       "+# - [ ] This Github flavoured markdown",
@@ -23,13 +28,17 @@ RSpec.describe Adjutant::FileParser do
   let(:comments) do
     [
       [ "@Baltazore is trying to check first line comment", 1 ],
-      [ "@baltazore, Let's check multiline comments,\\nthem really rocks", 3],
-      [ "TODO:\\n- [ ] This Github flavoured markdown\\n- [ ] such nice\\n- [ ] very exciting", 6 ]
+      [ "@baltazore, Let's check multiline comments,\\nthem really rocks", 7],
+      [ "TODO:\\n- [ ] This Github flavoured markdown\\n- [ ] such nice\\n- [ ] very exciting", 11 ]
     ]
   end
   let(:file_parser) { Adjutant::FileParser.new(file) }
 
   describe '#detect_comments' do
+    it 'fineds only 3 comments here' do
+      expect(file_parser.detect_comments.count).to eq(3)
+    end
+
     context '#lines_pushed' do
       it 'returns all lines that has been pushed in commit' do
         file_parser.lines_pushed.each_with_index do |line, index|

data/spec/adjutant/line_spec.rb

@@ -57,17 +57,6 @@ RSpec.describe Adjutant::Line do
       end
     end
 
-    context '#new_added?' do
-      it 'returns true if line is new added' do
-        expect(Adjutant::Line.new(comment).new_added?).to eq(true)
-        expect(Adjutant::Line.new(todo).new_added?).to eq(true)
-        expect(Adjutant::Line.new(empty).new_added?).to eq(true)
-      end
-
-      it 'returns false in other cases' do
-        expect(Adjutant::Line.new(useless).new_added?).to eq(false)
-      end
-    end
   end
 
   describe '#usefull_text' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adjutant
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Baltazore