ctags.rb 1.0.15 → 1.0.18

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2VjNmI5ZDExNzUyYTRkMTcxN2Q1ZjE5ODA2M2EyMTg3MjI1Yzg3OA==
+    MzE3YmY5MGM4ZWFmYWY3OTk3ZTdkODc5OGQ4OGM3YTc1YjE0NzI1Zg==
   data.tar.gz: !binary |-
-    NjgwZTkwNWY5NmM2MmYzOTk5YmRlYjNmYTVlNDQzMTFjYzNmYmU0NA==
+    YzBiZjNmZjgxZjgxZmY2ZWU4Y2QwZjYzOGI1NzNhOTJhNWEwZTg1OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWZhOTYwNGQyNGQ0OGRjZGRkYzZkMWIwNmU2ODUwNDU3MTY4ODk5NTVlNmYx
-    YTM0N2VlZWFmMDYyYzRlYTM4ZmIwNDgyZmVlZWNkZWI3NTAxOGFlYTYxMGQ5
-    YTJkMjVjMDdjY2E5YjYxODVjZmZhNzYzMDcxYmYzZmQ0NTgwZjM=
+    YmRmNGQ3Mzk3MmZmNTg3NmE1MDlmY2FhMzQxNzJlYzQ0MTZiZTRmNTJmNmEz
+    YzRiOWIzZmI1MzI5YjUzZmYxY2UwMmMyNjMwN2FiMWYwNWIxMmY1ZTFmZTMz
+    Yzc3NDMwY2FiMTRhZWY4MzNhNWQzNjU2ODFjYWI4NmNhY2ZmOGE=
   data.tar.gz: !binary |-
-    YWEzYjNkYjZhMjE4ZGI5NjNlZTk1Nzk1MTc5Y2FiZWY4YzA5MDczYWM3ODg5
-    YThkNWI4YjE4OTI3NDI5YzFiYWRmOThmMmNiMGRkY2U5MmRlNDhkNDE0ZTVh
-    MDE2MzMyNDVhMjQ4MGZkNzljYWMyYTcyYmExYmI4MzEwMjY1ZmI=
+    ZDkyOGZmZWRkOGQ1NjY4NjRjNjg4N2ZhNmNiNGM0OTE4YmUwODU5ZGI1MmRi
+    YTgwMDkyZGYwOTYzZGI0YzhhYWIzMWZjMzNkOGQzNGQ5ZjA5N2Q1OGRkYTU1
+    OGE3NmQzNjZjNjJhMjY1NTczNDNmMDllZTRkMDMzYjFhMGY0N2I=

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 gemspec
+
 gem 'rake'
+gem 'ripper', :platforms => :mri_18

data/Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    ctags.rb (1.0.16)
+      posix-spawn (~> 0.3.6)
+      ripper-tags (~> 0.1.3)
+      yajl-ruby
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    posix-spawn (0.3.8)
+    rake (10.1.1)
+    ripper (1.0.5)
+    ripper-tags (0.1.3)
+      yajl-ruby
+    yajl-ruby (1.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ctags.rb!
+  rake
+  ripper

data/ctags.rb.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.email = ['aman@tmm1.net']
 
   s.add_dependency 'posix-spawn', '~> 0.3.6'
+  s.add_dependency 'ripper-tags', '~> 0.1.3'
   s.add_dependency 'yajl-ruby'
 
   s.extensions = ['ext/extconf.rb']

data/ext/extconf.rb

@@ -17,6 +17,7 @@ xsystem('pwd') # to create mkmf.log before the chdir
 
 Dir.chdir("#{CWD}/vendor/jansson-2.5") do
   sys "./configure --prefix=#{CWD}/dst --disable-shared" unless File.exists?('config.h')
+  sys "touch *"
   sys "make install"
 end
 

data/lib/ctags.rb

@@ -1,6 +1,18 @@
 require 'ctags/version'
 require 'ctags/exuberant'
+require 'ctags/ruby'
 
 module Ctags
-  extend Ctags::Exuberant
+  extend self
+
+  class Error < StandardError
+  end
+
+  def tags_for_file(file, code=nil)
+    if file =~ /\.rb$/
+      Ruby.tags_for_file(file, code)
+    else
+      Exuberant.tags_for_file(file, code)
+    end
+  end
 end

data/lib/ctags/exuberant.rb

@@ -3,11 +3,9 @@ require 'yajl'
 require 'tempfile'
 
 module Ctags
-  class Error < StandardError
-  end
-
   module Exuberant
     include POSIX::Spawn
+    extend self
 
     BIN    = File.expand_path("../../../ext/dst/bin/ctags", __FILE__)
     CONFIG = File.expand_path("../../ctags.cnf", __FILE__)
@@ -80,78 +78,10 @@ module Ctags
       tags
     end
 
-    def tags_for_code(filename, code)
-      tags_for_file(filename, code)
-    end
-
     def tags_for_file(filename, code=nil)
       cmd = {'command'=>'generate-tags','filename'=>filename}
       cmd['size'] = code.bytesize if code
       execute(cmd, code)
     end
-
-    def tags_for_file_old(filename, code=nil)
-      args = [
-        '--options=NONE',
-        '--fields=+KlnzsStimfa',
-        '--sort=no',
-        '--excmd=pattern',
-        '-o', '-'
-      ]
-
-      child =
-        if code
-          # XXX stdin is not seekable
-          # args << "--stdin-filename=#{filename}"
-          # args << {:input => code}
-
-          tempfile = Tempfile.new(['ctags-input', File.extname(filename)])
-          tempfile.write(code)
-          tempfile.close
-          args << tempfile.path
-
-          begin
-            Child.new(BIN, *args)
-          ensure
-            tempfile.unlink
-          end
-        else
-          args << filename
-          Child.new(BIN, *args)
-        end
-
-      if !child.status.success?
-        raise Error, child.err
-      end
-
-      tags = []
-
-      child.out.each_line.map do |line|
-        name, path, rest = line.strip.split("\t", 3)
-        pattern, fields = rest.split("/;\"\t", 2)
-
-        tag = {
-          :name => name,
-          :path => code ? filename : path,
-          :pattern => pattern.sub('/^','').chomp('$').gsub('\\\\','\\')
-        }
-
-        fields.split("\t").each do |field|
-          if field == 'file:'
-            key, value = :scope, 'file'
-          else
-            key, value = field.split(":", 2)
-          end
-
-          tag[key.to_sym] = value
-        end
-
-        tag[:line] = tag[:line].to_i
-
-        tags << tag
-      end
-
-      tags
-    end
   end
 end

data/lib/ctags/ruby.rb

@@ -0,0 +1,19 @@
+require 'ripper-tags/parser'
+
+module Ctags
+  module Ruby
+    extend self
+
+    def tags_for_file(file, data=nil)
+      data ||= File.read(file)
+      RipperTags::Parser.extract(data, file)
+    rescue Errno::ENOENT
+      raise Error, $!.message
+    rescue Interrupt
+      raise
+    rescue Object => e
+      STDERR.puts [e, file].inspect
+      []
+    end
+  end
+end

data/lib/ctags/version.rb

@@ -1,3 +1,3 @@
 module Ctags
-  VERSION = '1.0.15'
+  VERSION = '1.0.18'
 end

data/test/test_ctags.rb

@@ -13,8 +13,8 @@ class CtagsTest < Test::Unit::TestCase
     assert_equal 'method',    tag[:kind]
   end
 
-  def test_tags_for_code
-    tags = Ctags.tags_for_code('file.rb', File.read(__FILE__))
+  def test_tags_for_file_with_code
+    tags = Ctags.tags_for_file('file.rb', File.read(__FILE__))
     tag = tags.find{ |t| t[:name] == __method__.to_s }
 
     assert_equal 'file.rb',   tag[:path]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctags.rb
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.18
 platform: ruby
 authors:
 - Aman Gupta
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.6
+- !ruby/object:Gem::Dependency
+  name: ripper-tags
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +61,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bench.rb
@@ -485,6 +500,7 @@ files:
 - lib/ctags.cnf
 - lib/ctags.rb
 - lib/ctags/exuberant.rb
+- lib/ctags/ruby.rb
 - lib/ctags/version.rb
 - test/test_ctags.rb
 homepage: http://github.com/tmm1/ctags.rb