CoffeeTags 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48aca8f7eee32a205a458f87b3a7bc073e920e9
-  data.tar.gz: 264e600ae7858dc4d8dc44011302cd01ceb6c4f7
+  metadata.gz: b05cb5e87997558764236d0a2d3851cdf5be4c5d
+  data.tar.gz: 02882da57c44fc15c7eb68f58b0f88769b49cf08
 SHA512:
-  metadata.gz: 4cb8138b038f5eb505f30eaea5c3ab3a2f2b3af6c025df3ab63685f0333d976f95cb90818e9e067b23eb43923c6cbacdffeffa7188753412d0cccc92581e8490
-  data.tar.gz: d08c6dc51d1b205f0840612e72053c7bde9da762c90df53350efc398cf2b20a156c2496ebc24378ff27fb6a4afe53cd753ec176658fa431cdfef1d75dfc763cf
+  metadata.gz: 172dac2405fe4ae029f6b7cac91507a58d0877b63d32fded053a59e1246fe0a7fde038822cf65b022ccd78e045da8ebad7157b978ebb3c161e330a2e15587c3c
+  data.tar.gz: e12b440057b69aec784244d0a451aa054187d375b8e512390013dd1083ca11b5fc090e0ef943095c8c17b643d9034afe02ef3d716c0e688538b9245d98b3ba25

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-# 1.8.x and 1.9 < 1.9.3 are not supported anymore buy Ruby core
+# 1.8.x and 1.9 < 1.9.3 are not supported anymore by Ruby core
 #  - 1.8.7
 # - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0

data/lib/CoffeeTags/formatter.rb

@@ -64,7 +64,6 @@ module Coffeetags
       @lines.reject!{|l| l.nil? }
     end
 
-
     def tags
       @lines.map { |l| "#{l}\n"}.join ''
     end

data/lib/CoffeeTags/parser.rb

@@ -16,12 +16,14 @@ module Coffeetags
       @tree = []
 
       # regexes
-      @block = /^\s*(if|unless|switch|loop|do)/
+      @block = /^\s*(if\s+|unless\s+|switch\s+|loop\s+|do\s+|for\s+)/
       @class_regex = /\s*class\s+(?:@)?([\w\.]*)/
-      @proto_meths = /^\s*([A-Za-z]*)::([@a-zA-Z0-9_]*)/
-      @var_regex = /([@a-zA-Z0-9_]*)\s*[:=]\s*$/
-      @token_regex = /([@a-zA-Z0-9_]*)\s*[:=]/
-      @iterator_regex = /^\s*for\s+([a-zA-Z0-9_]*)\s*/
+      @func_regex = /^\s*(?<name>[a-zA-Z0-9_]+)\s?[=:]\s?(?<params>\([@a-zA-Z0-9_]*\))?\s?[=-]>/
+      @proto_meths = /^\s*(?<parent>[A-Za-z]+)::(?<name>[@a-zA-Z0-9_]*)/
+      @var_regex = /([@a-zA-Z0-9_]+)\s*[:=]\s*[^-=]*$/
+      @token_regex = /([@a-zA-Z0-9_]+)\s*[:=]/
+      #@iterator_regex = /^\s*for\s+([a-zA-Z0-9_]*)\s*/ # for in/of
+      @iterator_regex = /^\s*for\s+(?<name>[a-zA-Z0-9_]+)\s+(in|of)(?<parent>.)*/ # use named captures too specify parent variable in iterator
       @comment_regex = /^\s*#/
       @start_block_comment_regex = /^\s*###/
       @end_block_comment_regex = /^.*###/
@@ -79,12 +81,17 @@ module Coffeetags
       current_level = element[:level]
       tree[0..idx].reverse.each_with_index do |item, index|
         # uhmmmmmm
-        if item[:level] != current_level and item[:level] < current_level and item[:line] !~  @block
-          bf << item[:name] unless item[:kind] == 'b'
+        if item[:level] < current_level
+          if item[:kind] == 'b'
+            true
+          elsif
+            bf << item[:name]
+          end
           current_level = item[:level]
         end
       end
-      bf.uniq.reverse.join('.')
+      sp = bf.uniq.reverse.join('.')
+      sp
     end
 
     # Helper function for generating parse tree elements for given
@@ -97,14 +104,19 @@ module Coffeetags
     # @returns [Hash,nil] returns a parse tree element consiting of:
     #   :name of the element
     #   indentation :level of the element
-    def item_for_regex line,  regex, level, additional_fields={}
+    def item_for_regex line, regex, level, additional_fields={}
       if item = line.match(regex)
         entry_for_item = {
           :level => level
         }
-        if item.length > 2 # proto method
-          entry_for_item[:parent] = item[1]
-          entry_for_item[:name] = item[2]
+        if item.length > 2 # proto method or func
+          if regex == @proto_meths
+            entry_for_item[:parent] = item[1]
+            entry_for_item[:name] = item[2]
+          elsif regex == @func_regex
+            entry_for_item[:name] = item[1]
+            #entry_for_item[:params] = item[2] # TODO: when formatting, show params in name ?
+          end
         else
           entry_for_item[:name] = item[1]
         end
@@ -112,12 +124,39 @@ module Coffeetags
       end
     end
 
+    # Look through the tree to see if it's possible to change an entry's kind
+    # Differ the objects from simple variables
+    # Should execute after the whole tree has been generated
+    def comb_kinds tree
+      entries_with_parent = tree.reject {|c| c[:parent].nil? }
+      tree.each do |c|
+        next c unless c[:kind] == 'v'
+        maybe_child = entries_with_parent.select {|e| e[:parent] == c[:name]}
+        unless maybe_child.empty?
+          c[:kind] = 'o'
+        end
+      end
+      tree
+    end
+
+    # trim the bloated tree
+    # - when not required to include_vars, reject the variables
+    def trim_tree tree
+      unless @include_vars
+        tree = tree.reject do |c|
+          ['v'].include? c[:kind]
+        end
+      end
+      tree
+    end
+
     # Parse the source and create a tags tree
     # @note this method mutates @tree instance variable of Coffeetags::Parser instance
     # @returns self it can be chained
     def execute!
       line_n = 0
       level = 0
+      classes = []
       @source.each_line do |line|
         line_n += 1
         line.chomp!
@@ -130,31 +169,59 @@ module Coffeetags
         [
           [@class_regex, 'c'],
           [@proto_meths, 'p'],
+          [@func_regex, 'f'],
           [@var_regex, 'v'],
           [@block, 'b']
         ].each do |regex, kind|
           mt = item_for_regex line, regex, level, :source => line, :line => line_n, :kind => kind
-          @tree << mt unless mt.nil?
+          unless mt.nil?
+            # TODO: one token should not fit for multiple regex
+            classes.push mt if kind == 'c'
+            next if kind == 'f' # wait for later to determine whether it is a class method
+            @tree << mt
+          end
         end
 
-
         # instance variable or iterator (for/in)?
         token = line.match(@token_regex )
         token ||=  line.match(@iterator_regex)
 
         # we have found something!
         if not token.nil?
-          o = {
-            :name => token[1],
-            :level => level,
-            :parent => '',
-            :source => line,
-            :line => line_n
-          }
-
-          # remove edge cases for now
+          # should find token through the tree first
+          token_name = token[1]
+          existing_token = @tree.find {|o| o[:name] == token_name}
+          if existing_token
+            o = existing_token
+          else
+            o = {
+              :name => token_name,
+              :level => level,
+              :parent => '',
+              :source => line,
+              :line => line_n
+            }
+          end
+
+          # Remove edge cases for now
+
           # - if a line containes a line like:  element.getElement('type=[checkbox]').lol()
-          is_in_string = line =~ /.*['"].*#{token[1]}.*=.*["'].*/
+          token_match_in_line = false
+          token_match_in_line = line.match token_name
+          unless token_match_in_line.nil?
+            offset = token_match_in_line.offset 0
+            str_before = line.slice 0, offset[0]
+            str_after = line.slice offset[1], line.size
+            [str_before, str_after].map do |str|
+              # if there are unmatch quotes, our token is in a string
+              token_match_in_line = ['"', '\''].any? { |q| str.scan(q).size % 2 == 1 }
+            end
+          end
+
+          if token_match_in_line
+            @tree = @tree.reject {|c| c[:name] == o[:name]}
+            next
+          end
 
           # - scope access and comparison in if x == 'lol'
           is_in_comparison = line =~ /::|==/
@@ -163,20 +230,35 @@ module Coffeetags
           has_blank_parent = o[:parent] =~ /\.$/
 
           # - multiple consecutive assignments
-          is_previous_not_the_same = !(@tree.last and @tree.last[:name] == o[:name] and  @tree.last[:level] == o[:level])
+          is_previous_not_the_same = !(@tree.last and @tree.last[:name] == o[:name] and @tree.last[:level] == o[:level])
 
-          if is_in_string.nil? and is_in_comparison.nil? and has_blank_parent.nil? and is_previous_not_the_same
-            o[:kind]   =  line =~ /[:=]{1}.*[-=]\>/ ? 'f' : 'o'
-            o[:parent] =  scope_path o
+          if !token_match_in_line and is_in_comparison.nil? and (has_blank_parent.nil? or is_previous_not_the_same)
+            unless o[:kind]
+              o[:kind]   = line =~ /[:=]{1}.*[-=]\s?\>/ ? 'f' : 'v'
+            end
+            o[:parent] = scope_path o
             o[:parent] = @fake_parent if o[:parent].empty?
 
-            @tree << o if o[:kind] == 'f'
-            @tree << o if o[:kind] == 'o' and @include_vars
+            # treat variable and function with a class as parent as property
+            if ['f', 'v', 'o'].include? o[:kind]
+              # TODO: process func params
+              maybe_parent_class = classes.find {|c| c[:name] == o[:parent] }
+              if maybe_parent_class
+                o[:kind] = 'p'
+              end
+            end
+
+            @tree << o unless @tree.include? o
           end
         end
-        # get rid of duplicate entries
-        @tree.uniq!
       end
+
+      @tree = comb_kinds @tree
+
+      @tree = trim_tree @tree
+
+      # P.S when found a token, first lookup in the tree, thus the duplicate won't appear
+      # so there is no need of uniq_tree
       self # chain!
     end
   end

data/lib/CoffeeTags/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Coffeetags
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/script/bump_version

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+readonly currentVersion=$(ruby -r ./lib/CoffeeTags/version.rb -e 'puts Coffeetags::VERSION')
+readonly newVersion=$1
+
+if [[ "$newVersion" == '' ]] ; then
+  echo "$(basename $0)  <new_version>"
+  echo "Current version: $currentVersion"
+  exit 1
+fi
+
+git grep "$currentVersion" | cut -d: -f1 | tee /dev/stderr | uniq | xargs sed -i "s/$currentVersion/$newVersion/g"

data/spec/coffeetags_spec.rb

@@ -148,7 +148,9 @@ FF
       FileUtils.mkdir "testout" unless File.directory? "testout"
       output = "testout/test.out"
 
-      FileUtils.cp "spec/fixtures/out.test-relative-append.ctags", output
+      append_tags = 'testout/append_test.out'
+      Coffeetags::Utils.run({ :output => append_tags, :files => ["spec/fixtures/test.coffee"], :tag_relative => true })
+      FileUtils.cp append_tags, output
 
       lines = Coffeetags::Utils.run({ :output => output, :files => ["spec/fixtures/campfire.coffee"], :append => true, :tag_relative => true })
       File.read(output).should == File.read("./spec/fixtures/out.test-relative.ctags")
@@ -180,7 +182,7 @@ FF
 
     it "returns contents of output file without header and without tags for files that will be indexed" do
       lines = Coffeetags::Utils.setup_tag_lines("spec/fixtures/out.test-two.ctags", ["spec/fixtures/test.coffee"], true).map {|l| l.split("\t")[0]}
-      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent resp roomInfo rooms}
+      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent roomInfo rooms}
     end
 
     it "returns contents of output file with relative file paths without header and without tags for files that will be indexed" do
@@ -190,9 +192,10 @@ FF
       FileUtils.cp "spec/fixtures/out.test-relative.ctags", output
 
       lines = Coffeetags::Utils.setup_tag_lines(output, ["spec/fixtures/test.coffee"], true).map {|l| l.split("\t")[0]}
-      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent resp roomInfo rooms}
+      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent roomInfo rooms}
     end
 
+    # FIXME: setup_tag_lines will reject some lines ...
     it "returns contents of output file with relative file paths from absolute file path" do
       FileUtils.mkdir "testout" unless File.directory? "testout"
       output = "testout/test.out"
@@ -202,7 +205,7 @@ FF
       expanded_path = Pathname.new("spec/fixtures/test.coffee").expand_path.to_s
 
       lines = Coffeetags::Utils.setup_tag_lines(output, [expanded_path], true).map {|l| l.split("\t")[0]}
-      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent resp roomInfo rooms}
+      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent roomInfo rooms}
     end
 
     it "returns contents of output file with relative file paths from absolution output path" do
@@ -212,7 +215,7 @@ FF
       FileUtils.cp "spec/fixtures/out.test-relative.ctags", output
 
       lines = Coffeetags::Utils.setup_tag_lines(Pathname.new(output).expand_path.to_s, ["spec/fixtures/test.coffee"], true).map {|l| l.split("\t")[0]}
-      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent resp roomInfo rooms}
+      lines.should == %w{Campfire Test bump constructor handlers onFailure onSuccess recent roomInfo rooms}
     end
   end
 

data/spec/fixtures/append-expected.ctags

@@ -3,28 +3,31 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
-@filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	object:Wat.ho	language:coffee
+!_TAG_PROGRAM_VERSION	0.6.0	//
+@filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
 Campfire	spec/fixtures/campfire.coffee	/^class Campfire$/;"	c	line:3	language:coffee
 Test	spec/fixtures/campfire.coffee	/^class Test$/;"	c	line:45	language:coffee
-_loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	object:window	language:coffee
-baz	spec/fixtures/blockcomment.coffee	/^baz : (x, y) ->$/;"	f	line:15	object:window	language:coffee
-beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	object:window	language:coffee
-bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	object:window	language:coffee
-bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	f	line:46	language:coffee	object:Test
-bump	spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	object:Wat.ho.@lolWat	language:coffee
-bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	object:window	language:coffee
-bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	object:Wat.ho.@lolWat	language:coffee
-constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	language:coffee	object:Campfire
-echo2	spec/fixtures/blockcomment.coffee	/^echo2 :-> console.log 'echo'$/;"	f	line:7	object:window	language:coffee
-echo3	spec/fixtures/blockcomment.coffee	/^echo3 :-> console.log 'echo'$/;"	f	line:23	object:window	language:coffee
-foo	spec/fixtures/blockcomment.coffee	/^foo : (x) -> console.log 'bar #{x}'$/;"	f	line:26	object:window	language:coffee
-foo2	spec/fixtures/blockcomment.coffee	/^foo2 : (x) -> console.log 'bar #{x}'$/;"	f	line:10	object:window	language:coffee
-handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	line:14	language:coffee	object:Campfire
-ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	object:Wat	language:coffee
+Wat	spec/fixtures/test.coffee	/^Wat =$/;"	o	line:4	language:coffee	object:window
+_loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
+beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
+bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
+bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	p	line:46	language:coffee	object:Test
+bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
+bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
+constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	p	line:8	language:coffee	object:Campfire
+do 	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+f	spec/fixtures/test.coffee	/^for f in dir$/;"	o	line:35	language:coffee	object:window
+for 	spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
+handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	p	line:14	language:coffee	object:Campfire
+ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
+if 	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+loop	spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
+obj	spec/fixtures/test.coffee	/^obj =$/;"	o	line:49	language:coffee	object:window
 onFailure	spec/fixtures/campfire.coffee	/^      onFailure: (response) ->$/;"	f	line:24	language:coffee	object:Campfire.handlers.resp
 onSuccess	spec/fixtures/campfire.coffee	/^      onSuccess : (response) ->$/;"	f	line:16	language:coffee	object:Campfire.handlers.resp
-recent	spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	f	line:40	language:coffee	object:Campfire
-resp	spec/fixtures/campfire.coffee	/^    resp =$/;"	v	line:15	language:coffee
-roomInfo	spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	f	line:34	language:coffee	object:Campfire
-rooms	spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	f	line:29	language:coffee	object:Campfire
+recent	spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	p	line:40	language:coffee	object:Campfire
+roomInfo	spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	p	line:34	language:coffee	object:Campfire
+rooms	spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	p	line:29	language:coffee	object:Campfire

data/spec/fixtures/append.ctags

@@ -3,27 +3,21 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
-!_TAG_PROGRAM_VERSION	0.5.0	//
-!_THIS_LINE_SHOULD_GET_REMOVED	Nothing to see here	//
-@filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	object:Wat.ho	language:coffee
-_loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	object:window	language:coffee
-baz	spec/fixtures/blockcomment.coffee	/^baz : (x, y) ->$/;"	f	line:15	object:window	language:coffee
-beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	object:window	language:coffee
-bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	object:window	language:coffee
-bump	spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	object:Wat.ho.@lolWat	language:coffee
-bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	object:window	language:coffee
-bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	object:Wat.ho.@lolWat	language:coffee
-constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	object:Campfire	language:coffee
-constructor2	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	object:Campfire	language:coffee
-echo2	spec/fixtures/blockcomment.coffee	/^echo2 :-> console.log 'echo'$/;"	f	line:7	object:window	language:coffee
-echo3	spec/fixtures/blockcomment.coffee	/^echo3 :-> console.log 'echo'$/;"	f	line:23	object:window	language:coffee
-foo	spec/fixtures/blockcomment.coffee	/^foo : (x) -> console.log 'bar #{x}'$/;"	f	line:26	object:window	language:coffee
-foo2	spec/fixtures/blockcomment.coffee	/^foo2 : (x) -> console.log 'bar #{x}'$/;"	f	line:10	object:window	language:coffee
-handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	line:14	object:Campfire	language:coffee
-ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	object:Wat	language:coffee
-onFailure	spec/fixtures/campfire.coffee	/^      onFailure: (response) ->$/;"	f	line:24	object:Campfire.handlers.resp	language:coffee
-onSuccess	spec/fixtures/campfire.coffee	/^      onSuccess : (response) ->$/;"	f	line:16	object:Campfire.handlers.resp	language:coffee
-recent	spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	f	line:40	object:Campfire	language:coffee
-roomInfo	spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	f	line:34	object:Campfire	language:coffee
-rooms	spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	f	line:29	object:Campfire	language:coffee
+!_TAG_PROGRAM_VERSION	0.6.0	//
+@filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
+Wat	spec/fixtures/test.coffee	/^Wat =$/;"	o	line:4	language:coffee	object:window
+_loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
+beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
+bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
+bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
+bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
+do 	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+f	spec/fixtures/test.coffee	/^for f in dir$/;"	o	line:35	language:coffee	object:window
+for 	spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
+ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
+if 	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+loop	spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
+obj	spec/fixtures/test.coffee	/^obj =$/;"	o	line:49	language:coffee	object:window

data/spec/fixtures/blockcomment.ctags

@@ -3,7 +3,7 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
+!_TAG_PROGRAM_VERSION	0.6.0	//
 baz	spec/fixtures/blockcomment.coffee	/^baz : (x, y) ->$/;"	f	line:15	language:coffee	object:window
 echo2	spec/fixtures/blockcomment.coffee	/^echo2 :-> console.log 'echo'$/;"	f	line:7	language:coffee	object:window
 echo3	spec/fixtures/blockcomment.coffee	/^echo3 :-> console.log 'echo'$/;"	f	line:23	language:coffee	object:window

data/spec/fixtures/campfire.js.tags

@@ -3,7 +3,7 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
+!_TAG_PROGRAM_VERSION	0.6.0	//
 bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	f	lineno:46	object:Test
 constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	lineno:8	object:Campfire
 handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	lineno:14	object:Campfire

data/spec/fixtures/out.test-relative-append.ctags

@@ -3,33 +3,33 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
-!_TAG_PROGRAM_VERSION	0.5.0	//
-!_THIS_LINE_SHOULD_GET_REMOVED	Nothing to see here	//
-@filter	../spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
-@lolWat	../spec/fixtures/test.coffee	/^    @lolWat =$/;"	v	line:9	language:coffee
-Campfire	../spec/fixtures/campfire.coffee	/^class Campfire$/;"	c	line:3	language:coffee
-Test	../spec/fixtures/campfire.coffee	/^class Test$/;"	c	line:45	language:coffee
-Wat	../spec/fixtures/test.coffee	/^Wat =$/;"	v	line:4	language:coffee
-_loop	../spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
-beam_magnum	../spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
-bound_func	../spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
-bump	../spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	language:coffee	object:Wat.ho.@lolWat
-bump	../spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
-bump_up	../spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
-constructor	../spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	language:coffee	object:Campfire
-constructor2	../spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	lineno:8	object:Campfire
-do	../spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
-do	../spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
-handlers	../spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	line:14	language:coffee	object:Campfire
-ho	../spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
-if	../spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
-if	../spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
-loop	../spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
-obj	../spec/fixtures/test.coffee	/^obj =$/;"	v	line:49	language:coffee
-onFailure	../spec/fixtures/campfire.coffee	/^      onFailure: (response) ->$/;"	f	line:24	language:coffee	object:Campfire.handlers.resp
-onSuccess	../spec/fixtures/campfire.coffee	/^      onSuccess : (response) ->$/;"	f	line:16	language:coffee	object:Campfire.handlers.resp
-recent	../spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	f	line:40	language:coffee	object:Campfire
-resp	../spec/fixtures/campfire.coffee	/^    resp =$/;"	v	line:15	language:coffee
-roomInfo	../spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	f	line:34	language:coffee	object:Campfire
-rooms	../spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	f	line:29	language:coffee	object:Campfire
+!_TAG_PROGRAM_VERSION	0.6.0	//
+@filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:bump
+@lolWat	spec/fixtures/test.coffee	/^    @lolWat =$/;"	v	line:9	language:coffee	object:Wat.ho
+Wat	spec/fixtures/test.coffee	/^Wat =$/;"	v	line:4	language:coffee	object:window
+_loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
+beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
+bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
+bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
+bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
+bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:bump
+className	spec/fixtures/test.coffee	/^  className: 'notAClass'$/;"	v	line:50	language:coffee	object:obj
+dir	spec/fixtures/test.coffee	/^dir = fs.readdirSync __dirname$/;"	v	line:32	language:coffee	object:window
+do 	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+for 	spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
+forVariable	spec/fixtures/test.coffee	/^      forVariable = 2 * element$/;"	v	line:30	language:coffee	object:_loop
+fu	spec/fixtures/test.coffee	/^    fu = 1$/;"	v	line:22	language:coffee	object:_loop
+ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
+if 	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+loop	spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
+nice	spec/fixtures/test.coffee	/^      nice = 'ok'$/;"	v	line:25	language:coffee	object:_loop
+obj	spec/fixtures/test.coffee	/^obj =$/;"	v	line:49	language:coffee	object:window
+v	spec/fixtures/test.coffee	/^  v = 'test'$/;"	v	line:2	language:coffee	object:bump
+woop	spec/fixtures/test.coffee	/^  woop = 1$/;"	v	line:20	language:coffee	object:_loop
+x	spec/fixtures/test.coffee	/^    x = 'o'$/;"	v	line:6	language:coffee	object:Wat.ho
+x	spec/fixtures/test.coffee	/^    x = 'z' if bamp$/;"	v	line:7	language:coffee
+x	spec/fixtures/test.coffee	/^    zorb = get['x=\\\\/f'].getLast('/woot\$')$/;"	v	line:39	language:coffee
+x	spec/fixtures/test.coffee	/^x = dir + '/foo'$/;"	v	line:33	language:coffee

data/spec/fixtures/out.test-relative.ctags

@@ -3,31 +3,31 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
+!_TAG_PROGRAM_VERSION	0.6.0	//
 @filter	../spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
-@lolWat	../spec/fixtures/test.coffee	/^    @lolWat =$/;"	v	line:9	language:coffee
 Campfire	../spec/fixtures/campfire.coffee	/^class Campfire$/;"	c	line:3	language:coffee
 Test	../spec/fixtures/campfire.coffee	/^class Test$/;"	c	line:45	language:coffee
-Wat	../spec/fixtures/test.coffee	/^Wat =$/;"	v	line:4	language:coffee
+Wat	../spec/fixtures/test.coffee	/^Wat =$/;"	o	line:4	language:coffee	object:window
 _loop	../spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
 beam_magnum	../spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
 bound_func	../spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
-bump	../spec/fixtures/campfire.coffee	/^  bump : ->$/;"	f	line:46	language:coffee	object:Test
-bump	../spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	language:coffee	object:Wat.ho.@lolWat
+bump	../spec/fixtures/campfire.coffee	/^  bump : ->$/;"	p	line:46	language:coffee	object:Test
 bump	../spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
 bump_up	../spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
-constructor	../spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	language:coffee	object:Campfire
-do	../spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
-do	../spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
-handlers	../spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	line:14	language:coffee	object:Campfire
+constructor	../spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	p	line:8	language:coffee	object:Campfire
+do 	../spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	../spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+f	../spec/fixtures/test.coffee	/^for f in dir$/;"	o	line:35	language:coffee	object:window
+for 	../spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	../spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
+handlers	../spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	p	line:14	language:coffee	object:Campfire
 ho	../spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
-if	../spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
-if	../spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+if 	../spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	../spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
 loop	../spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
-obj	../spec/fixtures/test.coffee	/^obj =$/;"	v	line:49	language:coffee
+obj	../spec/fixtures/test.coffee	/^obj =$/;"	o	line:49	language:coffee	object:window
 onFailure	../spec/fixtures/campfire.coffee	/^      onFailure: (response) ->$/;"	f	line:24	language:coffee	object:Campfire.handlers.resp
 onSuccess	../spec/fixtures/campfire.coffee	/^      onSuccess : (response) ->$/;"	f	line:16	language:coffee	object:Campfire.handlers.resp
-recent	../spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	f	line:40	language:coffee	object:Campfire
-resp	../spec/fixtures/campfire.coffee	/^    resp =$/;"	v	line:15	language:coffee
-roomInfo	../spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	f	line:34	language:coffee	object:Campfire
-rooms	../spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	f	line:29	language:coffee	object:Campfire
+recent	../spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	p	line:40	language:coffee	object:Campfire
+roomInfo	../spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	p	line:34	language:coffee	object:Campfire
+rooms	../spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	p	line:29	language:coffee	object:Campfire

data/spec/fixtures/out.test-two.ctags

@@ -3,31 +3,31 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
+!_TAG_PROGRAM_VERSION	0.6.0	//
 @filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
-@lolWat	spec/fixtures/test.coffee	/^    @lolWat =$/;"	v	line:9	language:coffee
 Campfire	spec/fixtures/campfire.coffee	/^class Campfire$/;"	c	line:3	language:coffee
 Test	spec/fixtures/campfire.coffee	/^class Test$/;"	c	line:45	language:coffee
-Wat	spec/fixtures/test.coffee	/^Wat =$/;"	v	line:4	language:coffee
+Wat	spec/fixtures/test.coffee	/^Wat =$/;"	o	line:4	language:coffee	object:window
 _loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
 beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
 bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
-bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	f	line:46	language:coffee	object:Test
-bump	spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	language:coffee	object:Wat.ho.@lolWat
+bump	spec/fixtures/campfire.coffee	/^  bump : ->$/;"	p	line:46	language:coffee	object:Test
 bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
 bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
-constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	f	line:8	language:coffee	object:Campfire
-do	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
-do	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
-handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	f	line:14	language:coffee	object:Campfire
+constructor	spec/fixtures/campfire.coffee	/^  constructor: (api_key, host) ->$/;"	p	line:8	language:coffee	object:Campfire
+do 	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+f	spec/fixtures/test.coffee	/^for f in dir$/;"	o	line:35	language:coffee	object:window
+for 	spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
+handlers	spec/fixtures/campfire.coffee	/^  handlers: (callbacks) ->$/;"	p	line:14	language:coffee	object:Campfire
 ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
-if	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
-if	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+if 	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
 loop	spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
-obj	spec/fixtures/test.coffee	/^obj =$/;"	v	line:49	language:coffee
+obj	spec/fixtures/test.coffee	/^obj =$/;"	o	line:49	language:coffee	object:window
 onFailure	spec/fixtures/campfire.coffee	/^      onFailure: (response) ->$/;"	f	line:24	language:coffee	object:Campfire.handlers.resp
 onSuccess	spec/fixtures/campfire.coffee	/^      onSuccess : (response) ->$/;"	f	line:16	language:coffee	object:Campfire.handlers.resp
-recent	spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	f	line:40	language:coffee	object:Campfire
-resp	spec/fixtures/campfire.coffee	/^    resp =$/;"	v	line:15	language:coffee
-roomInfo	spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	f	line:34	language:coffee	object:Campfire
-rooms	spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	f	line:29	language:coffee	object:Campfire
+recent	spec/fixtures/campfire.coffee	/^  recent: (id, since, callbacks) ->$/;"	p	line:40	language:coffee	object:Campfire
+roomInfo	spec/fixtures/campfire.coffee	/^  roomInfo: (id, callbacks) ->$/;"	p	line:34	language:coffee	object:Campfire
+rooms	spec/fixtures/campfire.coffee	/^  rooms: (callbacks) ->$/;"	p	line:29	language:coffee	object:Campfire

data/spec/fixtures/out.test.ctags

@@ -3,20 +3,21 @@
 !_TAG_PROGRAM_AUTHOR	Łukasz Korecki	/lukasz@korecki.me/
 !_TAG_PROGRAM_NAME	CoffeeTags	//
 !_TAG_PROGRAM_URL	https://github.com/lukaszkorecki/CoffeeTags	/GitHub repository/
-!_TAG_PROGRAM_VERSION	0.5.0	//
+!_TAG_PROGRAM_VERSION	0.6.0	//
 @filter	spec/fixtures/test.coffee	/^    @filter = ->$/;"	f	line:14	language:coffee	object:Wat.ho
-@lolWat	spec/fixtures/test.coffee	/^    @lolWat =$/;"	v	line:9	language:coffee
-Wat	spec/fixtures/test.coffee	/^Wat =$/;"	v	line:4	language:coffee
+Wat	spec/fixtures/test.coffee	/^Wat =$/;"	o	line:4	language:coffee	object:window
 _loop	spec/fixtures/test.coffee	/^_loop = (x) ->$/;"	f	line:19	language:coffee	object:window
 beam_magnum	spec/fixtures/test.coffee	/^beam_magnum : -> deployed(true)$/;"	f	line:44	language:coffee	object:window
 bound_func	spec/fixtures/test.coffee	/^bound_func = (ok) => wat(ok)$/;"	f	line:41	language:coffee	object:window
-bump	spec/fixtures/test.coffee	/^      bump : ->$/;"	f	line:10	language:coffee	object:Wat.ho.@lolWat
 bump	spec/fixtures/test.coffee	/^bump = (wat) ->$/;"	f	line:1	language:coffee	object:window
 bump_up	spec/fixtures/test.coffee	/^      bump_up : ->$/;"	f	line:12	language:coffee	object:Wat.ho.@lolWat
-do	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
-do	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+do 	spec/fixtures/test.coffee	/^    do (element) ->$/;"	b	line:29	language:coffee
+do 	spec/fixtures/test.coffee	/^  do (f) ->$/;"	b	line:36	language:coffee
+f	spec/fixtures/test.coffee	/^for f in dir$/;"	o	line:35	language:coffee	object:window
+for 	spec/fixtures/test.coffee	/^  for element in lol$/;"	b	line:28	language:coffee
+for 	spec/fixtures/test.coffee	/^for f in dir$/;"	b	line:35	language:coffee
 ho	spec/fixtures/test.coffee	/^  ho : (x) ->$/;"	f	line:5	language:coffee	object:Wat
-if	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
-if	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
+if 	spec/fixtures/test.coffee	/^    if wat$/;"	b	line:24	language:coffee
+if 	spec/fixtures/test.coffee	/^  if z.isSomethingRidic$/;"	b	line:21	language:coffee
 loop	spec/fixtures/test.coffee	/^Array::loop = (x) ->$/;"	p	line:46	language:coffee	object:Array
-obj	spec/fixtures/test.coffee	/^obj =$/;"	v	line:49	language:coffee
+obj	spec/fixtures/test.coffee	/^obj =$/;"	o	line:49	language:coffee	object:window

data/spec/fixtures/test_tree.yaml

@@ -7,14 +7,14 @@
   :level: 0
 - :source: "  v = 'test'"
   :parent: 'bump'
-  :kind: o
+  :kind: v
   :name: v
   :line: 2
   :level: 2
 - :name: Wat
   :source: 'Wat ='
   :parent: window
-  :kind: o
+  :kind: v
   :level: 0
   :line: 4
 - :source: "  ho : (x) ->"
@@ -25,14 +25,14 @@
   :level: 2
 - :source: "    x = 'o'"
   :level: 4
-  :kind: o
+  :kind: v
   :line: 6
   :name: x
 - :name: '@lolWat'
   :level: 4
   :line: 8
   :source: '    @lolWat ='
-  :kind: o
+  :kind: v
 - :source: "      bump : ->"
   :parent: 'Wat.ho.@lolWat'
   :kind: f
@@ -72,12 +72,12 @@
 - :source: '      forVariable = 2 * element'
   :parent: '_loop.element'
   :line: 30
-  :kind: o
+  :kind: v
   :name: forVariable
   :level: 6
 - :source: "  className: 'notAClass'"
   :parent: obj
-  :kind: o
+  :kind: v
   :name: 'className'
   :line: 50
   :level: 2

data/spec/fixtures/tree.yaml

@@ -11,7 +11,7 @@
 - :source: '    @url = "https://#{host}.campfirenow.com/"'
   :name: '@url'
   :parent: 'Campfire.constructor'
-  :kind: o
+  :kind: v
   :level: 4
   :line: 9
 - :source: "  handlers: (callbacks) ->"
@@ -23,6 +23,7 @@
 - :name: resp
   :level: 4
   :source: "    resp ="
+  :parent: "Campfire.handlers"
   :line: 15
   :kind: v
 - :source: "      onSuccess : (response) ->"
@@ -57,7 +58,7 @@
   :level: 2
 - :source: '    url = "room/#{id}/recent.json"'
   :parent: Campfire.recent
-  :kind: o
+  :kind: v
   :name: url
   :line: 41
   :level: 4

data/spec/parser_spec.rb

@@ -217,12 +217,6 @@ describe 'CoffeeTags::Parser' do
           :line=>15,
           :kind=>"f",
           :name=>"baz"},
-          {:level=>2,
-           :parent=>"baz",
-           :source=>"  console.log 'baz \#{x} : \#{y}'",
-           :line=>16,
-           :kind=>"o",
-           :name=>""},
           {:level=>0,
           :parent=>"window",
           :source=>"echo3 :-> console.log 'echo'",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: CoffeeTags
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - "Łukasz Korecki"
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies: []
 description: CoffeeTags generates ctags compatibile tags for CoffeeScript.
 email:
@@ -36,6 +36,7 @@ files:
 - lib/CoffeeTags/parser.rb
 - lib/CoffeeTags/version.rb
 - plugin/coffee-autotag.vim
+- script/bump_version
 - spec/coffeetags_spec.rb
 - spec/coveralls-setup.rb
 - spec/fixtures/append-expected.ctags
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: CoffeeTags
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: tags generator for CoffeeScript