starscope 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dc4d4ed48ed8e03902cab715035cec7226085dd
-  data.tar.gz: d65334b73069abcfdb1e411dc898e672e556d52c
+  metadata.gz: 65718aa5d56aa5e07b3f4316ca5efe49f5b744ac
+  data.tar.gz: 323f5f0878dac6386bc5681584f9744f03f51b1c
 SHA512:
-  metadata.gz: 084546bf7ecfff1a1bf673d8a302d7fdbd7c0f302dd45830e9a5c8aaae4ec7d28e044a3744ef3eefbf3e1a76ec40d66d9fe2e1a7f601fed94bcf2023649d19df
-  data.tar.gz: de3833eb0f5ee2033760008fac08a0c1726c2fd148f28a81dc5501924e925fce6d06d8ff657e9ba1e6ebc6c29264456918ff60744b652954787539f36b2a561d
+  metadata.gz: 69b497639a09ceb44a3d34dd7743290f5c96b93a8e5eca40364df4d01b3b733336a71a7d008163efeb2841d0c00b2f1f027e24d8f5ab0ee1b521a56ce7a7d43f
+  data.tar.gz: 04967c93a1031595852ca2c6d4bb95f5b7e2ade6f5ca6de35e466461364c0a7653bf8a5e0949ec89e873be8859a4486f4f99a718f54c88fa42a668d89ca6b4a9

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 Changelog
 =========
 
-v1.3.0 (trunk)
+v1.3.1 (trunk)
+--------------------
+
+Bug Fixes:
+ * Fix parsing of certain queries containing `:`.
+ * Fix alignment of summaries on large DBs.
+
+v1.3.0 (2015-01-04)
 --------------------
 
 New Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    starscope (1.3.0)
+    starscope (1.3.1)
       backports (~> 3.6)
       oj (~> 2.9)
       parser (~> 2.1)

data/bin/starscope

@@ -102,7 +102,7 @@ def print_summary(db)
   tables = db.tables
   puts "No tables" if tables.empty?
   tables.sort {|a,b| a.to_s <=> b.to_s}.each do |table|
-    printf("%-8s %5d records\n", table, db.records(table).length)
+    printf("%-9s %6d records\n", table, db.records(table).length)
   end
 end
 
@@ -129,7 +129,7 @@ def run_query(db, query, separator)
   end
   match = match.join(separator)
 
-  if !match
+  if match.empty?
     $stderr.puts "Invalid input - no query found."
     return false
   end

data/lib/starscope/exportable.rb

@@ -35,14 +35,6 @@ module Starscope::Exportable
 
   private
 
-  # cscope has this funky issue where it refuses to recognize function calls that
-  # happen outside of a function definition - this isn't an issue in C, where all
-  # calls must occur in a function, but in ruby et al. it is perfectly legal to
-  # write normal code outside the "scope" of a function definition - we insert a
-  # fake shim "global" function everywhere we can to work around this
-  CSCOPE_GLOBAL_HACK_START = " \n\t$-\n"
-  CSCOPE_GLOBAL_HACK_STOP = " \n\t}\n"
-
   def export_ctags(file)
     file.puts <<END
 !_TAG_FILE_FORMAT	2	/extended format/
@@ -58,6 +50,44 @@ END
     end
   end
 
+  def ctag_line(rec, file)
+    ret = "#{rec[:name][-1]}\t#{rec[:file]}\t/^#{line_for_record(rec)}$/"
+
+    ext = ctag_ext_tags(rec, file)
+    if not ext.empty?
+      ret << ";\""
+      ext.sort.each do |k, v|
+        ret << "\t#{k}:#{v}"
+      end
+    end
+
+    ret
+  end
+
+  def ctag_ext_tags(rec, file)
+    tag = {}
+
+    # these extensions are documented at http://ctags.sourceforge.net/FORMAT
+    case rec[:type]
+    when :func
+      tag["kind"] = "f"
+    when :module, :class
+      tag["kind"] = "c"
+    end
+
+    tag["language"] = file[:lang]
+
+    tag
+  end
+
+  # cscope has this funky issue where it refuses to recognize function calls that
+  # happen outside of a function definition - this isn't an issue in C, where all
+  # calls must occur in a function, but in ruby et al. it is perfectly legal to
+  # write normal code outside the "scope" of a function definition - we insert a
+  # fake shim "global" function everywhere we can to work around this
+  CSCOPE_GLOBAL_HACK_START = " \n\t$-\n"
+  CSCOPE_GLOBAL_HACK_STOP = " \n\t}\n"
+
   # ftp://ftp.eeng.dcu.ie/pub/ee454/cygwin/usr/share/doc/mlcscope-14.1.8/html/cscope.html
   def export_cscope(file)
     buf = ""
@@ -132,7 +162,7 @@ END
         db[record[:file]][record[:line_no]] << record
       end
     end
-    return db
+    db
   end
 
   def tokenize_line(line, records)
@@ -160,10 +190,9 @@ END
 
       record[:key] = key
       toks[index] = record
-
     end
 
-    return toks.sort
+    toks.sort
   end
 
   def cscope_output(line, prev, offset, record)
@@ -249,37 +278,6 @@ END
       return ""
     end
 
-    return "\t" + ret
+    "\t" + ret
   end
-
-  def ctag_line(rec, file)
-    ret = "#{rec[:name][-1]}\t#{rec[:file]}\t/^#{line_for_record(rec)}$/"
-
-    ext = ctag_ext_tags(rec, file)
-    if not ext.empty?
-      ret << ";\""
-      ext.sort.each do |k, v|
-        ret << "\t#{k}:#{v}"
-      end
-    end
-
-    ret
-  end
-
-  def ctag_ext_tags(rec, file)
-    tag = {}
-
-    # these extensions are documented at http://ctags.sourceforge.net/FORMAT
-    case rec[:type]
-    when :func
-      tag["kind"] = "f"
-    when :module, :class
-      tag["kind"] = "c"
-    end
-
-    tag["language"] = file[:lang]
-
-    tag
-  end
-
 end

data/lib/starscope/version.rb

@@ -1,3 +1,3 @@
 module Starscope
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: starscope
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Evan Huus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: backports
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !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: pry
   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: minitest
   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: mocha
   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'
 description: A tool like the venerable cscope, but for ruby, golang and other languages
@@ -143,8 +143,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -193,17 +193,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A code indexer and analyzer