lutra 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8280ec08022d92e00986f7ac57545b6d07a38f8
-  data.tar.gz: 83530ac917e962aa083b6d71886d4738d53b7cbc
+  metadata.gz: 903cc869e8442ea63148ad65bf377694f8ae5583
+  data.tar.gz: 2c266db60c8eb220d63efe88c8cc95e925d5870b
 SHA512:
-  metadata.gz: 9e8003a4e8026dd896dab97c941220c1d07c540e1ae0b9e3e7c1f998624054b17ee938c17d4144c8e35553aa9fa589363ba26ecf806bde636b90751679e2ecb6
-  data.tar.gz: b0abd8259bccd4425c3c035caf2a469dd89753c799f16e9cd662f518e61332a3fe5c4e47389c83f8d252b016cbfa87fd9aa06cc18114d539863f41d8da176293
+  metadata.gz: 05669ce27f79d59dfbcb9ccd95e040b19f1c69be1cc34286227ef183742f722d2734ba64e3003f85c78bbd3a945a82c7df7f9f59528e9077e353f0945f28c2d3
+  data.tar.gz: ce05f0c382fc3718831b68b9a8ffa964113286d61ce605557ad32c2192c714426962ba48a8e23fd9141dc80317397d37c443afaf94564c18c11d922f3e7005ff

data/README.md

@@ -23,6 +23,7 @@ Usage: lutra [OPTIONS] [PATH]
     -t, --tags=TAG                   Search for custom tags
     -c, --comments=COM               Specify comment lines
     -f, --formatter=NAME             Use your own formatter
+    -s, --text-size=SIZE             Set text size for formatter
     -v, --verbose                    Verbose output
         --hide-tags                  Hide tags
 ```

data/bin/lutra

@@ -8,8 +8,8 @@ color    = STDOUT.tty?
 usage    = 'Usage: lutra [OPTIONS] [PATH]'
 tags     = Lutra::TAGS.dup
 comments = Lutra::COMM.dup
-display_tags = true
 formatter_name = :default
+formatter_opts = {}
 
 ARGV.options do |o|
   o.version = Lutra::VERSION
@@ -26,12 +26,16 @@ ARGV.options do |o|
     formatter_name = name.to_sym
   end
 
+  o.on('-s', '--text-size=SIZE', 'Set text size for formatter') do |size|
+    formatter_opts[:text_size] = size.to_i
+  end
+
   o.on('-v', '--verbose', 'Verbose output') do
     verbose = true
   end
 
   o.on('--hide-tags', 'Hide tags') do
-    display_tags = false
+    formatter_opts[:display_tags] = false
   end
 end
 
@@ -67,7 +71,7 @@ Find.find(*paths) do |path|
   end
 end
 
-formatter = Lutra::Formatter.new(display_tags: display_tags)
+formatter = Lutra::Formatter.new(formatter_opts)
 formatter.set(formatter_name)
 formatter.display(scanner.notes)
 

data/lib/lutra/formatter.rb

@@ -3,7 +3,7 @@ module Lutra
     attr_reader :formatters, :current
 
     def initialize(options = {})
-      @options = options
+      @options = default_options.merge(options)
       @current = :default
       @formatters = [
         { name: :default, short: :d, class: Lutra::Formatters::Default }
@@ -39,5 +39,12 @@ module Lutra
     def formatter?(class_name)
       class_name.new.respond_to?(:prepare)
     end
+
+    def default_options
+      {
+        display_tags: true,
+        text_size: 55
+      }
+    end
   end
 end

data/lib/lutra/formatters/default.rb

@@ -14,9 +14,11 @@ module Lutra
       end
 
       def prepare(note, indent)
-        s =  "[#{note.line.to_s.rjust(indent)}] "
-        s << "[#{note.tag}] " if @options[:display_tags]
-        s << note.text
+        s =  "[#{note[:line].to_s.rjust(indent)}] "
+        s << "[#{note[:tag]}] " if @options[:display_tags]
+        s << note[:text][0..@options[:text_size]].strip.chomp
+        s << "..." if note[:text].size > @options[:text_size]
+        s
       end
     end
   end

data/lib/lutra/note.rb

@@ -1,23 +1,5 @@
 module Lutra
-  class Note
-    attr_reader :tag, :source, :line, :file
-
-    def initialize(data)
-      @tag    = data[:tag]
-      @line   = data[:line]
-      @file   = data[:file]
-      @source = data[:source]
-    end
-
-    def text
-      extract[:text]
-    end
-
-  private
-
-    def extract
-      @source =~ /(#{@tag})\s(.*)/
-      { tag: $1, text: $2 }
-    end
+  class Note < Struct.new(:tag, :text, :line, :file)
+    # ...
   end
 end

data/lib/lutra/scanner.rb

@@ -24,9 +24,8 @@ module Lutra
     def extract(source, path = nil)
       rxp = regexp
       source.each_with_index do |line, i|
-        if rxp =~ line
-          raw = { tag: $1, source: line, line: i + 1, file: path }
-          @notes << Note.new(raw)
+        if r = rxp.match(line)
+          @notes << Note.new(r[:tag], r[:text], i + 1, path)
         end
       end
     end
@@ -40,7 +39,7 @@ module Lutra
     end
 
     def regexp
-      /(#{@comments.join('|')})\s*(?<tag>#{@tags.join('|')})\s*(?<text>.*)/
+      /(#{@comments.join('|')})\s*(?<tag>#{@tags.join('|')})[\s|\:]*(?<text>.*)/
     end
   end
 end

data/lib/lutra/version.rb

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

data/spec/note_spec.rb

@@ -2,18 +2,13 @@ require 'spec_helper'
 
 describe Lutra::Note do
   subject do
-    raw = { tag: 'X', source: 'X text', line: 1, file: 'ex.rb' }
-    described_class.new(raw)
+    described_class.new('X', 'text', 1, 'ex.rb')
   end
 
   it "#tag" do
     expect(subject.tag).to eq 'X'
   end
 
-  it "#source" do
-    expect(subject.source).to eq 'X text'
-  end
-
   it "#line" do
     expect(subject.line).to eq 1
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutra
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Yuri Artemev