lutra 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 903cc869e8442ea63148ad65bf377694f8ae5583
-  data.tar.gz: 2c266db60c8eb220d63efe88c8cc95e925d5870b
+  metadata.gz: 59d911ed406e63282be41712f2613b7225d13dd6
+  data.tar.gz: e6c90ff275373cbba0eafd9cdd53ab413cd6c226
 SHA512:
-  metadata.gz: 05669ce27f79d59dfbcb9ccd95e040b19f1c69be1cc34286227ef183742f722d2734ba64e3003f85c78bbd3a945a82c7df7f9f59528e9077e353f0945f28c2d3
-  data.tar.gz: ce05f0c382fc3718831b68b9a8ffa964113286d61ce605557ad32c2192c714426962ba48a8e23fd9141dc80317397d37c443afaf94564c18c11d922f3e7005ff
+  metadata.gz: a815072f42e68d1705c0812ad8207dffdef13eae9e29375f6fe2f845734d5ff9721c0d77f7038a0cc46567cd4beffc9b76a559a20421a1a1be3ab74461088d3d
+  data.tar.gz: 950dd6dc571266a999899157e985f4f3cd6a84aad890dcfdc72ba049fa36701e0d8c5694f0e72ef99df059e17e2433ca42fc7e3b9248024e7ba17dc9b37a7550

data/bin/lutra

@@ -6,20 +6,21 @@ require 'lutra'
 verbose  = false
 color    = STDOUT.tty?
 usage    = 'Usage: lutra [OPTIONS] [PATH]'
-tags     = Lutra::TAGS.dup
-comments = Lutra::COMM.dup
+tags     = Lutra::TAGS
+comments = Lutra::COMM
 formatter_name = :default
 formatter_opts = {}
 
 ARGV.options do |o|
   o.version = Lutra::VERSION
   o.banner = usage
+
   o.on('-t', '--tags=TAG', 'Search for custom tags') do |tag|
-    tags |= [tag]
+    tags = tag.split(',').map(&:strip)
   end
 
   o.on('-c', '--comments=COM', 'Specify comment lines') do |com|
-    comments |= [com]
+    comments = com.split(',').map(&:strip)
   end
 
   o.on('-f', '--formatter=NAME', 'Use your own formatter') do |name|
@@ -41,19 +42,19 @@ end
 
 begin
   ARGV.options.parse!
-  if ARGV.empty?
-    paths = '.'
+  paths = if ARGV.empty?
+    '.'
   else
-    paths = ARGV.map { |p| File.exist? p or raise Errno::ENOENT, p ; p }
+    ARGV.select { |path| File.exist?(path) }
   end
 rescue => e
-  STDERR.puts "lutra: #{e.message}"
+  STDERR.puts "Error: #{e.message}"
   STDERR.puts usage
   STDERR.puts "Try 'lutra --help' for more information"
   exit 1
 end
 
-scanner = Lutra::Scanner.new(tags: tags, comments: comments)
+scanner = Lutra::Scanner.new(tags, comments)
 
 Find.find(*paths) do |path|
   unless paths.include?(path)

data/lib/lutra/formatters/default.rb

@@ -5,7 +5,7 @@ module Lutra
         indent = notes.map(&:line).flatten.max.to_s.size
 
         notes.group_by { |n| n.file }.each do |file, notes|
-          puts "#{file[2..-1]}:"
+          puts "#{format_path(file)}:"
           notes.each do |note|
             puts " * #{prepare(note, indent)}"
           end
@@ -20,6 +20,12 @@ module Lutra
         s << "..." if note[:text].size > @options[:text_size]
         s
       end
+
+    private
+
+      def format_path(file)
+        file.gsub('../', '').gsub('./', '')
+      end
     end
   end
 end

data/lib/lutra/note.rb

@@ -1,5 +1,3 @@
 module Lutra
-  class Note < Struct.new(:tag, :text, :line, :file)
-    # ...
-  end
+  Note = Struct.new(:tag, :text, :line, :file)
 end

data/lib/lutra/scanner.rb

@@ -3,25 +3,21 @@ module Lutra
     attr_accessor :tags, :comments
     attr_reader :notes
 
-    def initialize(options = {})
-      @tags = options[:tags] || TAGS.dup
-      @comments = options[:comments] || COMM.dup
-      @notes = []
-    end
+    def initialize(tags = nil, comments = nil)
+      @tags     = tags || Lutra::TAGS
+      @comments = comments || Lutra::COMM
+      @notes    = []
 
-    def scan(source)
       check_tags and check_comments
-      extract(source.split("\n")) and self
     end
 
     def scan_file(path)
-      check_tags and check_comments
-      extract(File.open(path), path) and self
+      extract(File.open(path), path)
     end
 
   private
 
-    def extract(source, path = nil)
+    def extract(source, path)
       rxp = regexp
       source.each_with_index do |line, i|
         if r = rxp.match(line)

data/lib/lutra/version.rb

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

data/spec/scanner_spec.rb

@@ -9,7 +9,7 @@ describe Lutra::Scanner do
     end
 
     it "with custom tags" do
-      expect(subject.new(tags: ['X']).tags).to eq ['X']
+      expect(subject.new(['X']).tags).to eq ['X']
     end
 
     it "with default comments" do
@@ -17,29 +17,19 @@ describe Lutra::Scanner do
     end
 
     it "with custom comments" do
-      expect(subject.new(comments: ['#']).comments).to eq ["#"]
+      expect(subject.new(['X'], ['#']).comments).to eq ["#"]
     end
   end
 
   context "#scan_file" do
     let(:notes) do
-      subject.new.scan_file("#{File.dirname(__FILE__)}/example").notes
+      scanner = subject.new
+      scanner.scan_file("#{File.dirname(__FILE__)}/example")
+      scanner.notes
     end
 
     it "have todo, fixme and optimize" do
       expect(notes.map(&:tag)).to eq ['TODO', 'FIXME', 'OPTIMIZE']
     end
   end
-
-  context "#scan" do
-    let(:notes) { subject.new.scan(example_data).notes }
-
-    it "have todo, fixme and optimize" do
-      expect(notes.map(&:tag)).to eq ['TODO', 'FIXME', 'OPTIMIZE']
-    end
-
-    it "have only 3 items" do
-      expect(notes.size).to eq 3
-    end
-  end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: lutra
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yuri Artemev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 description: Parse tags (todo, fixme, optimize) in your source code
@@ -46,16 +46,17 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
-- lutra.gemspec
+- README.md
+- bin/lutra
+- lib/lutra.rb
 - lib/lutra/formatter.rb
 - lib/lutra/formatters/base.rb
 - lib/lutra/formatters/default.rb
 - lib/lutra/note.rb
 - lib/lutra/scanner.rb
 - lib/lutra/version.rb
-- lib/lutra.rb
+- lutra.gemspec
 - spec/example
 - spec/formatter_spec.rb
 - spec/formatters/base_spec.rb
@@ -64,7 +65,6 @@ files:
 - spec/note_spec.rb
 - spec/scanner_spec.rb
 - spec/spec_helper.rb
-- bin/lutra
 homepage: http://github.com/artemeff/lutra
 licenses:
 - MIT
@@ -75,17 +75,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: In source annotaions parser
@@ -98,3 +98,4 @@ test_files:
 - spec/note_spec.rb
 - spec/scanner_spec.rb
 - spec/spec_helper.rb
+has_rdoc: