starscope 1.0.3 → 1.0.4

data/CHANGELOG.md

@@ -1,7 +1,13 @@
 Changelog
 =========
 
-v1.0.3 (trunk)
+v1.0.4 (trunk)
+--------------------
+
+Improvements:
+ * Optimized deleting stale records.
+
+v1.0.3 (2014-06-10)
 --------------------
 
 Improvements:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (1.0.3)
+    starscope (1.0.4)
       oj (~> 2.9)
       parser (~> 2.1)
       ruby-progressbar (~> 1.5)

data/lib/starscope/db.rb

@@ -76,14 +76,14 @@ class StarScope::DB
     paths = paths.map {|p| normalize_fnmatch(p)}
     @meta[:excludes] += paths
     @meta[:excludes].uniq!
+
+    deleted = []
     @meta[:files].delete_if do |name, record|
-      if matches_exclude(paths, name)
-        remove_file(name)
-        true
-      else
-        false
-      end
+      ret = matches_exclude(paths, name)
+      deleted << name if ret
+      ret
     end
+    remove_files(deleted)
   end
 
   def add_paths(paths)
@@ -102,15 +102,30 @@ class StarScope::DB
   def update
     new_files = (Dir.glob(@meta[:paths]).select {|f| File.file? f}) - @meta[:files].keys
     new_files.delete_if {|f| matches_exclude(@meta[:excludes], f)}
+
     @output.new_pbar("Updating", new_files.length + @meta[:files].length)
     changed = false
+    @tables, tmp_tbls = {}, @tables
+    to_prune = []
+
     @meta[:files].delete_if do |name, record|
       @output.log("Updating `#{name}`")
-      ret = update_file(name)
+
+      event = file_event(name, record)
+      if event != :unchanged
+        to_prune << name
+        changed = true
+        parse_file(name) if event == :modified
+      end
+
       @output.inc_pbar
-      changed = true if ret
-      ret == :delete
+      event == :deleted
     end
+
+    @tables, tmp_tbls = tmp_tbls, @tables
+    remove_files(to_prune)
+    merge_db(tmp_tbls)
+
     add_new_files(new_files)
     @output.finish_pbar
     changed || !new_files.empty?
@@ -309,20 +324,27 @@ END
     end
   end
 
-  def remove_file(file)
+  def merge_db(new_tbls)
+    new_tbls.each do |name, tbl|
+      @tables[name] ||= []
+      @tables[name].concat(tbl)
+    end
+  end
+
+  def remove_files(files)
+    check = Hash[files.map {|f| [f, true]}]
     @tables.each do |name, tbl|
-      tbl.delete_if {|val| val[:file] == file}
+      tbl.delete_if {|val| check[val[:file]]}
     end
   end
 
-  def update_file(file)
-    if not File.exists?(file) or not File.file?(file)
-      remove_file(file)
-      :delete
-    elsif @meta[:files][file][:last_updated] < File.mtime(file).to_i
-      remove_file(file)
-      parse_file(file)
-      :update
+  def file_event(name, record)
+    if not File.exists?(name) or not File.file?(name)
+      :deleted
+    elsif record[:last_updated] < File.mtime(name).to_i
+      :modified
+    else
+      :unchanged
     end
   end
 

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/lib/test_db.rb

@@ -17,6 +17,8 @@ describe StarScope::DB do
     assert defs.include? :load
     assert defs.include? :update
     assert defs.include? :files_from_path
+    assert defs.include? :single_var
+    assert defs.include? :single_const
   end
 
   before do
@@ -27,34 +29,53 @@ describe StarScope::DB do
     proc {@db.dump_table(:foo)}.must_raise StarScope::DB::NoTableError
   end
 
-  it "must correctly add paths" do
+  it "must add paths" do
     paths = [GOLANG_SAMPLE, 'test/files/**/*']
     @db.add_paths(paths)
     @db.instance_eval('@meta[:paths]').must_equal paths
     validate(@db)
   end
 
-  it "must correctly pick up new files in old paths" do
+  it "must add excludes" do
+    paths = [GOLANG_SAMPLE, 'test/files/**/*']
+    @db.add_paths(paths)
+    @db.add_excludes(['test/files/**'])
+    files = @db.instance_eval('@meta[:files]').keys
+    files.wont_include RUBY_SAMPLE
+    files.wont_include GOLANG_SAMPLE
+    tbls = @db.instance_eval('@tables')
+    tbls[:defs].must_be_empty
+    tbls[:end].must_be_empty
+  end
+
+  it "must pick up new files in old paths" do
     @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
     @db.update
     validate(@db)
   end
 
-  it "must correctly remove old files in existing paths" do
-    @db.instance_eval('@meta[:paths] = ["test/files"]')
-    @db.instance_eval('@meta[:files] = {"test/files/foo" => {:last_update=>1}}')
-    @db.instance_eval('@meta[:files]').keys.must_include 'test/files/foo'
+  it "must remove old files in existing paths" do
+    @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
+    @db.instance_eval('@meta[:files] = {"test/files/foo" => {:last_updated=>1}}')
     @db.update
     @db.instance_eval('@meta[:files]').keys.wont_include 'test/files/foo'
   end
 
-  it "must correctly load an old DB file" do
+  it "must update stale existing files" do
+    @db.instance_eval('@meta[:paths] = ["test/files/**/*"]')
+    @db.instance_eval("@meta[:files] = {\"#{GOLANG_SAMPLE}\" => {:last_updated=>1}}")
+    @db.instance_eval("@tables[:defs] = [{:file => \"#{GOLANG_SAMPLE}\"}]")
+    @db.update
+    validate(@db)
+  end
+
+  it "must load an old DB file" do
     @db.load('test/files/db_old.json.gz')
     @db.instance_eval('@meta[:paths]').must_equal ['test/files/**/*']
     validate(@db)
   end
 
-  it "must correctly round-trip a database" do
+  it "must round-trip a database" do
     file = Tempfile.new('starscope_test')
     begin
       @db.add_paths(['test/files'])
@@ -68,7 +89,7 @@ describe StarScope::DB do
     end
   end
 
-  it "must correctly export to ctags" do
+  it "must export to ctags" do
     file = Tempfile.new('starscope_test')
     begin
       @db.add_paths(['test/files'])
@@ -82,7 +103,7 @@ describe StarScope::DB do
     end
   end
 
-  it "must correctly export to cscope" do
+  it "must export to cscope" do
     file = Tempfile.new('starscope_test')
     begin
       @db.add_paths(['test/files'])
@@ -98,7 +119,7 @@ describe StarScope::DB do
     end
   end
 
-  it "must correctly run queries" do
+  it "must run queries" do
     @db.add_paths(['test/files'])
     @db.query(:calls, "abc").must_equal []
     @db.query(:defs, "xyz").must_equal []

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-10 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,43 +78,49 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A tool like the venerable cscope, but for ruby, golang and other languages
@@ -148,26 +163,30 @@ files:
 homepage: https://github.com/eapache/starscope
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1535830419513548498
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A code indexer and analyzer
 test_files:
 - test/files/db_old.json.gz

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 38376cc70ae8d935176b3b428d6b82acb2e9ed28
-  data.tar.gz: eb7761acf9adc1aef79eaf1e2e74b04d7be51ca2
-SHA512:
-  metadata.gz: b2df9c55e2e0ca2ab3c0aeb825f7a9e9f3dec274216256a9e712eb60ea3176c4851925799b5621220fa59eca32ff67ba5813699eec056aa285840397f91775db
-  data.tar.gz: c5159b4997e35cd23f29ffee1a17da99e298dcdb7a02789a5b64435cd645e1af56788c5666c1ef5ac3dccfd5fdc250e48c62e7c170a8aaf71009e62138590d19