starscope 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,10 +1,25 @@
 Changelog
 =========
 
-v1.0.1 (trunk)
+v1.0.2 (trunk)
 --------------------
 
-No changes yet.
+Bug Fixes:
+ * Fix an exception when updating the db from line mode.
+ * Make sure to mark the db as changed when a source file has been deleted
+
+Misc:
+ * A few trivial tweaks and optimizations.
+ * Store the application version in the db metadata for more fine-grained
+   forwards-compatibility.
+ * Permit exporting from line mode.
+
+v1.0.1 (2014-04-16)
+--------------------
+
+Bug Fixes:
+ * Stupid forgot-to-change-the-gemspec to actually permit installing on Ruby
+   1.8.7!
 
 v1.0.0 (2014-04-16)
 --------------------

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (1.0.1)
+    starscope (1.0.2)
       oj (~> 2.7)
       parser (~> 2.1)
       ruby-progressbar (~> 1.4)
@@ -14,7 +14,7 @@ GEM
     method_source (0.8.2)
     minitest (5.3.3)
     oj (2.7.3)
-    parser (2.1.7)
+    parser (2.1.8)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     pry (0.9.12.6)

data/bin/starscope

@@ -83,7 +83,7 @@ END
   opts.separator <<END
 \nEXPORTING
     At the moment two export formats are supported: 'ctags' and 'cscope'. If
-    you don't specify a path, the output is written to the files '#{DEFAULT_CTAGS}' (for
+    you don't specify a path, the output is written to the file '#{DEFAULT_CTAGS}' (for
     ctags) or '#{DEFAULT_CSCOPE}' (for cscope) in the current directory.
 END
 
@@ -128,6 +128,22 @@ rescue StarScope::DB::NoTableError
   return false
 end
 
+def export(db, param)
+  format, path = param.split(',', 2)
+  case format
+  when 'ctags'
+    File.open(path || DEFAULT_CTAGS, 'w') do |file|
+      db.export_ctags(file)
+    end
+  when 'cscope'
+    File.open(path || DEFAULT_CSCOPE, 'w') do |file|
+      db.export_cscope(file)
+    end
+  else
+    puts "Unrecognized export format"
+  end
+end
+
 db = StarScope::DB.new(options[:show_progress], options[:verbose])
 
 db_exists = File.exists?(options[:db])
@@ -160,21 +176,7 @@ new_data ||= updated
 
 db.save(options[:db]) if options[:write] and (new_data or not db_exists)
 
-if options[:export]
-  format, path = options[:export].split(',', 2)
-  case format
-  when 'ctags'
-    File.open(path || DEFAULT_CTAGS, 'w') do |file|
-      db.export_ctags(file)
-    end
-  when 'cscope'
-    File.open(path || DEFAULT_CSCOPE, 'w') do |file|
-      db.export_cscope(file)
-    end
-  else
-    puts "Unrecognized export format"
-  end
-end
+export(db, options[:export]) if options[:export]
 
 if options[:query]
   table, query = options[:query].split(',', 2)
@@ -196,6 +198,7 @@ def linemode_help
 Input can be a query of the form 'TABLE QUERY' or a special command starting
 with a '!'. Recognized special commands are:
   !dump [TABLE]
+  !export FORMAT[,PATH]
   !summary
   !update
 
@@ -214,11 +217,17 @@ if options[:linemode]
         case cmd[1..-1]
         when "dump"
           dump(db, param)
+        when "export"
+          if param
+            export(db, param)
+          else
+            puts "!export requires an argument"
+          end
         when "summary"
           print_summary(db)
         when "update"
           changed = db.update
-          db.save(options[:write]) if options[:write] and changed
+          db.save(options[:db]) if options[:write] and changed
         when "help"
           puts linemode_help
         when "version"

data/lib/starscope/db.rb

@@ -8,13 +8,11 @@ require 'starscope/record'
 
 require 'starscope/langs/coffeescript'
 require 'starscope/langs/go'
-require 'starscope/langs/lua'
 require 'starscope/langs/ruby'
 
 LANGS = [
   StarScope::Lang::CoffeeScript,
   StarScope::Lang::Go,
-  StarScope::Lang::Lua,
   StarScope::Lang::Ruby
 ]
 
@@ -27,7 +25,8 @@ class StarScope::DB
 
   def initialize(progress, verbose)
     @output = StarScope::Output.new(progress, verbose)
-    @meta = {:paths => [], :files => {}, :excludes => []}
+    @meta = {:paths => [], :files => {}, :excludes => [],
+             :version => StarScope::VERSION}
     @tables = {}
   end
 
@@ -59,6 +58,10 @@ class StarScope::DB
 
   def save(file)
     @output.log("Writing database to `#{file}`...")
+
+    # regardless of what the old version was, the new version is written by us
+    @meta[:version] = StarScope::VERSION
+
     File.open(file, 'w') do |file|
       Zlib::GzipWriter.wrap(file) do |file|
         file.puts DB_FORMAT
@@ -105,7 +108,7 @@ class StarScope::DB
       @output.log("Updating `#{name}`")
       ret = update_file(name)
       @output.inc_pbar
-      changed = true if ret == :update
+      changed = true if ret
       ret == :delete
     end
     add_new_files(new_files)
@@ -127,7 +130,12 @@ class StarScope::DB
     if key == :meta
       puts "== Metadata Summary =="
       @meta.each do |k, v|
-        puts "#{k}: #{v.count}"
+        print "#{k}: "
+        if [Array, Hash].include? v.class
+          puts v.count
+        else
+          puts v
+        end
       end
       return
     end
@@ -135,8 +143,10 @@ class StarScope::DB
     puts "== Metadata: #{key} =="
     if @meta[key].is_a? Array
       @meta[key].sort.each {|x| puts x}
-    else
+    elsif @meta[key].is_a? Hash
       @meta[key].sort.each {|k,v| puts "#{k}: #{v}"}
+    else
+      puts @meta[key]
     end
   end
 
@@ -218,7 +228,7 @@ END
     buf << "\t@\n"
 
     header = "cscope 15 #{Dir.pwd} -c "
-    offset = "%010d\n" % (header.length + 11 + buf.bytes.to_a.length)
+    offset = "%010d\n" % (header.length + 11 + buf.bytes.count)
 
     file.print(header)
     file.print(offset)

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module StarScope
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -143,7 +143,6 @@ files:
 - lib/starscope/db.rb
 - lib/starscope/langs/coffeescript.rb
 - lib/starscope/langs/go.rb
-- lib/starscope/langs/lua.rb
 - lib/starscope/langs/ruby.rb
 - lib/starscope/matcher.rb
 - lib/starscope/output.rb
@@ -182,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 297600048847537323
+      hash: 2115433325249412524
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/starscope/langs/lua.rb

@@ -1,12 +0,0 @@
-module StarScope::Lang
-  module Lua
-
-    def self.match_file(name)
-      name.end_with?(".lua")
-    end
-
-    def self.extract(file)
-      # TODO
-    end
-  end
-end