debugger-linecache 1.0.1 → 1.1.0

data/.travis.yml

@@ -0,0 +1,5 @@
+before_install: bundle init --gemspec=debugger-linecache.gemspec
+before_script: rake compile
+rvm:
+- 1.9.2
+- 1.9.3

data/{NEWS → CHANGELOG.md}

@@ -1,3 +1,17 @@
+## 1.1.0
+* Point to new debugger-ruby_core_source API
+* rename trace_nums19 ext to trace_nums
+* Renable Rakefile and tests
+* General cleanup
+
+## 1.0.1
+* Point to debugger-ruby_core_source as dependency
+
+## 1.0.0
+* Initial release - fork and release latest linecache
+
+## From previous gem's NEWS file
+
 0.5 (7/23/09)
 - updated for Ruby 1.9
 
@@ -28,5 +42,3 @@
 0.1
 
 - Initial release of LineCache, a module for reading and caching lines.
-
-$Id$

data/LICENSE.txt

@@ -0,0 +1,22 @@
+The MIT LICENSE
+
+Copyright (c) 2012 Gabriel Horner
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,5 +1,16 @@
-Description
-===========
+## Description
 Fork of linecache for [debugger](http://github.com/cldwalker/debugger)
+For more info see OLD\_README.
 
-TODO
+[![Build Status](https://secure.travis-ci.org/cldwalker/debugger-linecache.png?branch=master)](http://travis-ci.org/cldwalker/debugger-linecache)
+
+## Credits
+
+* Original authors: R. Bernstein, Mark Moseley
+
+## TODO
+* Fix todo test
+
+## LICENSE
+
+Original library was under gnu. This fork is licensed under MIT.

data/Rakefile

@@ -1,8 +1,5 @@
-#!/usr/bin/env rake
 # -*- Ruby -*-
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
 require 'rake/testtask'
 require 'rake/extensiontask'
 
@@ -10,36 +7,11 @@ Rake::ExtensionTask.new('trace_nums')
 
 SO_NAME = "trace_nums.so"
 
-# ------- Default Package ----------
-PKG_VERSION = open(File.join(File.dirname(__FILE__), 'VERSION')) do 
-  |f| f.readlines[0].chomp
-end
-PKG_NAME           = 'linecache'
-PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
-RUBY_FORGE_PROJECT = 'rocky-hacks'
-RUBY_FORGE_USER    = 'rockyb'
-
-FILES = FileList[
-  'AUTHORS',
-  'COPYING',
-  'ChangeLog',
-  'NEWS',
-  'README',
-  'Rakefile',
-  'VERSION',
-  'ext/trace_nums.c',
-  'ext/trace_nums.h',
-  'ext/extconf.rb',
-  'lib/*.rb',
-  'test/*.rb',
-  'test/data/*.rb',
-  'test/short-file'
-]                        
-
 desc "Test everything."
-test_task = task :test => :lib do 
+test_task = task :test => :lib do
   Rake::TestTask.new(:test) do |t|
-    t.pattern = 'test/test-*.rb'
+    # TODO: fix test-lnum
+    t.test_files = Dir['test/test-*.rb'] - ['test/test-lnum.rb']
     t.verbose = true
   end
 end
@@ -51,55 +23,17 @@ task :lib do
   end
 end
 
-
 desc "Test everything - same as test."
 task :check => :test
 
-desc "Create a GNU-style ChangeLog via svn2cl"
-task :ChangeLog do
-  system("svn2cl --authors=svn2cl_usermap")
-end
-
-# Base GEM Specification
-default_spec = Gem::Specification.new do |spec|
-  spec.name = "linecache"
-  
-  spec.homepage = "http://rubyforge.org/projects/rocky-hacks/linecache"
-  spec.summary = "Read file with caching"
-  spec.description = <<-EOF
-LineCache is a module for reading and caching lines. This may be useful for
-example in a debugger where the same lines are shown many times.
-EOF
-
-  spec.version = PKG_VERSION
-
-  spec.author = "R. Bernstein"
-  spec.email = "rockyb@rubyforge.net"
-  spec.platform = Gem::Platform::RUBY
-  spec.require_path = "lib"
-  spec.files = FILES.to_a  
-  spec.extensions = ["ext/extconf.rb"]
-
-  spec.required_ruby_version = '>= 1.8.2'
-  spec.date = Time.now
-  spec.rubyforge_project = 'rocky-hacks'
-  
-  # rdoc
-  spec.has_rdoc = true
-  spec.extra_rdoc_files = ['README', 'lib/linecache.rb', 'lib/tracelines.rb']
-
-  spec.test_files = FileList['test/*.rb']
-end
+base_spec = eval(File.read('debugger-linecache.gemspec'), binding, 'debugger-linecache.gemspec')
 
-# Rake task to build the default package
-  Rake::GemPackageTask.new(default_spec) do |pkg|
+Gem::PackageTask.new(base_spec) do |pkg|
   pkg.need_tar = true
 end
 
-task :default => [:test]
-
 # Windows specification
-win_spec = default_spec.clone
+win_spec = base_spec.clone
 win_spec.extensions = []
 ## win_spec.platform = Gem::Platform::WIN32 # deprecated
 win_spec.platform = 'mswin32'
@@ -122,17 +56,6 @@ task :win32_gem do
   rm(target)
 end
 
-desc "Publish linecache to RubyForge."
-task :publish do 
-  require 'rake/contrib/sshpublisher'
-  
-  # Get ruby-debug path.
-  ruby_debug_path = File.expand_path(File.dirname(__FILE__))
-
-  publisher = Rake::SshDirPublisher.new("rockyb@rubyforge.org",
-        "/var/www/gforge-projects/rocky-hacks/linecache", ruby_debug_path)
-end
-
 desc "Remove built files"
 task :clean => [:clobber_package, :clobber_rdoc] do
   cd "ext" do
@@ -145,25 +68,4 @@ task :clean => [:clobber_package, :clobber_rdoc] do
   end
 end
 
-# ---------  RDoc Documentation ------
-desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "linecache"
-  # Show source inline with line numbers
-  rdoc.options << "--inline-source" << "--line-numbers"
-  # Make the readme file the start page for the generated html
-  rdoc.options << '--main' << 'README'
-  rdoc.rdoc_files.include('ext/**/*.c',
-                          'lib/*.rb', 
-                          'README', 
-                          'COPYING')
-end
-
-desc "Publish the release files to RubyForge."
-task :rubyforge_upload do
-  `rubyforge login`
-  release_command = "rubyforge add_release #{PKG_NAME} #{PKG_NAME} '#{PKG_NAME}-#{PKG_VERSION}' pkg/#{PKG_NAME}-#{PKG_VERSION}.gem"
-  puts release_command
-  system(release_command)
-end
+task :default => [:test]

data/debugger-linecache.gemspec

@@ -17,4 +17,6 @@ example in a debugger where the same lines are shown many times.
   s.files = `git ls-files`.split("\n")
   s.extensions << "ext/trace_nums/extconf.rb"
   s.add_dependency "debugger-ruby_core_source"
+  s.add_development_dependency 'rake', '~> 0.9.2.2'
+  s.add_development_dependency 'rake-compiler', '~> 0.8.0'
 end

data/ext/trace_nums/extconf.rb

@@ -1,14 +1,8 @@
 require "mkmf"
-require "ruby_core_source"
+require "debugger/ruby_core_source"
 
-if RUBY_VERSION >= "1.8"
-  if RUBY_RELEASE_DATE < "2005-03-22"
-    STDERR.print("Ruby version is too old\n")
-    exit(1)
-  end
-else
-  STDERR.print("Ruby version is too old\n")
-  exit(1)
+if RUBY_VERSION < '1.9'
+  abort("Ruby version is too old")
 end
 
 hdrs = proc {
@@ -16,11 +10,6 @@ hdrs = proc {
 }
 
 dir_config("ruby")
-if !Ruby_core_source::create_makefile_with_core(hdrs, "trace_nums19")
-  STDERR.print("Makefile creation failed\n")
-  STDERR.print("*************************************************************\n\n")
-  STDERR.print("  NOTE: For Ruby 1.9 installation instructions, please see:\n\n")
-  STDERR.print("     http://wiki.github.com/mark-moseley/ruby-debug\n\n")
-  STDERR.print("*************************************************************\n\n")
-  exit(1)
-end  
+if !Debugger::RubyCoreSource.create_makefile_with_core(hdrs, "trace_nums")
+  abort("Makefile creation failed.")
+end

data/ext/trace_nums/trace_nums.c

@@ -97,7 +97,7 @@ lnums_for_str(VALUE self, VALUE src)
   return result;
 }
 
-void Init_trace_nums19(void)
+void Init_trace_nums(void)
 {
     mTraceLineNumbers = rb_define_module("TraceLineNumbers");
     rb_define_module_function(mTraceLineNumbers, "lnums_for_str", 

data/lib/debugger/linecache.rb

@@ -1,5 +1,5 @@
 module Debugger
   module Linecache
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/lib/linecache19.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # $Id$
-# 
+#
 #   Copyright (C) 2007, 2008 Rocky Bernstein <rockyb@rubyforge.net>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -22,14 +22,14 @@
 # Author::    Rocky Bernstein  (mailto:rockyb@rubyforge.net)
 #
 # = linecache
-# A module to read and cache lines of a Ruby program. 
+# A module to read and cache lines of a Ruby program.
 # == Version
 # :include:VERSION
 
 # == SYNOPSIS
 #
 # The LineCache module allows one to get any line from any file,
-# caching lines of the file on first access to the file. Although the 
+# caching lines of the file on first access to the file. Although the
 # file may be any file, the common use is when the file is a Ruby
 # script since parsing of the file is done to figure out where the
 # statement boundaries are.
@@ -65,20 +65,18 @@ SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 require 'digest/sha1'
 require 'set'
 
-begin require 'rubygems' rescue LoadError end
 require 'tracelines19'
-# require 'ruby-debug' ; Debugger.start
 
 # = module LineCache
-# A module to read and cache lines of a Ruby program. 
+# A module to read and cache lines of a Ruby program.
 module LineCache
   LineCacheInfo = Struct.new(:stat, :line_numbers, :lines, :path, :sha1) unless
     defined?(LineCacheInfo)
- 
-  # The file cache. The key is a name as would be given by Ruby for 
-  # __FILE__. The value is a LineCacheInfo object. 
-  @@file_cache = {} 
-  
+
+  # The file cache. The key is a name as would be given by Ruby for
+  # __FILE__. The value is a LineCacheInfo object.
+  @@file_cache = {}
+
   # Maps a string filename (a String) to a key in @@file_cache (a
   # String).
   #
@@ -91,9 +89,9 @@ module LineCache
   # Another related use is when a template system is used.  Here we'll
   # probably want to remap not only the file name but also line
   # ranges. Will probably use this for that, but I'm not sure.
-  @@file2file_remap = {} 
+  @@file2file_remap = {}
   @@file2file_remap_lines = {}
-  
+
   # Clear the file cache entirely.
   def clear_file_cache()
     @@file_cache = {}
@@ -115,7 +113,7 @@ module LineCache
   # is found, it will be kept. Return a list of invalidated filenames.
   # nil is returned if a filename was given but not found cached.
   def checkcache(filename=nil, use_script_lines=false)
-    
+
     if !filename
       filenames = @@file_cache.keys()
     elsif @@file_cache.member?(filename)
@@ -131,7 +129,7 @@ module LineCache
       if File.exist?(path)
         cache_info = @@file_cache[filename].stat
         stat = File.stat(path)
-        if stat && 
+        if stat &&
             (cache_info.size != stat.size or cache_info.mtime != stat.mtime)
           result << filename
           update_cache(filename, use_script_lines)
@@ -158,7 +156,7 @@ module LineCache
     end
   end
   module_function :cache
-      
+
   # Return true if filename is cached
   def cached?(filename)
     @@file_cache.member?(unmap_file(filename))
@@ -175,7 +173,7 @@ module LineCache
     end
   end
   module_function :cached_script?
-      
+
   def empty?(filename)
     filename=unmap_file(filename)
     @@file_cache[filename].lines.empty?
@@ -185,9 +183,9 @@ module LineCache
   # Get line +line_number+ from file named +filename+. Return nil if
   # there was a problem. If a file named filename is not found, the
   # function will look for it in the $: array.
-  # 
+  #
   # Examples:
-  # 
+  #
   #  lines = LineCache::getline('/tmp/myfile.rb')
   #  # Same as above
   #  $: << '/tmp'
@@ -236,7 +234,7 @@ module LineCache
   def remap_file_lines(from_file, to_file, range, start)
     range = (range..range) if range.is_a?(Fixnum)
     to_file = from_file unless to_file
-    if @@file2file_remap_lines[to_file] 
+    if @@file2file_remap_lines[to_file]
       # FIXME: need to check for overwriting ranges: whether
       # they intersect or one encompasses another.
       @@file2file_remap_lines[to_file] << [from_file, range, start]
@@ -245,12 +243,12 @@ module LineCache
     end
   end
   module_function :remap_file_lines
-  
+
   # Return SHA1 of filename.
   def sha1(filename)
     filename = unmap_file(filename)
     return nil unless @@file_cache.member?(filename)
-    return @@file_cache[filename].sha1.hexdigest if 
+    return @@file_cache[filename].sha1.hexdigest if
       @@file_cache[filename].sha1
     sha1 = Digest::SHA1.new
     @@file_cache[filename].lines.each do |line|
@@ -260,7 +258,7 @@ module LineCache
     sha1.hexdigest
   end
   module_function :sha1
-      
+
   # Return the number of lines in filename
   def size(filename)
     filename = unmap_file(filename)
@@ -285,14 +283,14 @@ module LineCache
     return nil unless fullname
     e = @@file_cache[filename]
     unless e.line_numbers
-      e.line_numbers = 
+      e.line_numbers =
         TraceLineNumbers.lnums_for_str_array(e.lines)
       e.line_numbers = false unless e.line_numbers
     end
     e.line_numbers
   end
   module_function :trace_line_numbers
-    
+
   def unmap_file(file)
     @@file2file_remap[file] ? @@file2file_remap[file] : file
   end
@@ -302,8 +300,8 @@ module LineCache
     if @@file2file_remap_lines[file]
       @@file2file_remap_lines[file].each do |from_file, range, start|
         if range === line
-          from_file = from_file || file 
-          return [from_file, start+line-range.begin] 
+          from_file = from_file || file
+          return [from_file, start+line-range.begin]
         end
       end
     end
@@ -321,13 +319,13 @@ module LineCache
 
     @@file_cache.delete(filename)
     path = File.expand_path(filename)
-    
+
     if use_script_lines
       list = [filename]
       list << @@file2file_remap[path] if @@file2file_remap[path]
-      list.each do |name| 
+      list.each do |name|
         if !SCRIPT_LINES__[name].nil? && SCRIPT_LINES__[name] != true
-          begin 
+          begin
             stat = File.stat(name)
           rescue
             stat = nil
@@ -342,7 +340,7 @@ module LineCache
         end
       end
     end
-      
+
     if File.exist?(path)
       stat = File.stat(path)
     elsif File.basename(filename) == filename
@@ -361,7 +359,7 @@ module LineCache
       fp = File.open(path, 'r')
       lines = fp.readlines()
       fp.close()
-    rescue 
+    rescue
       ##  print '*** cannot open', path, ':', msg
       return nil
     end
@@ -376,15 +374,15 @@ module LineCache
 end
 
 # example usage
-if __FILE__ == $0 
-  def yes_no(var) 
+if __FILE__ == $0
+  def yes_no(var)
     return var ? "" : "not "
   end
 
   lines = LineCache::getlines(__FILE__)
   puts "#{__FILE__} has #{LineCache.size(__FILE__)} lines"
   line = LineCache::getline(__FILE__, 6)
-  puts "The 6th line is\n#{line}" 
+  puts "The 6th line is\n#{line}"
   line = LineCache::remap_file(__FILE__, 'another_name')
   puts LineCache::getline('another_name', 7)
 
@@ -392,21 +390,21 @@ if __FILE__ == $0
   LineCache::update_cache(__FILE__)
   LineCache::checkcache(__FILE__)
   puts "#{__FILE__} has #{LineCache::size(__FILE__)} lines"
-  puts "#{__FILE__} trace line numbers:\n" + 
+  puts "#{__FILE__} trace line numbers:\n" +
     "#{LineCache::trace_line_numbers(__FILE__).to_a.sort.inspect}"
-  puts("#{__FILE__} is %scached." % 
+  puts("#{__FILE__} is %scached." %
        yes_no(LineCache::cached?(__FILE__)))
   puts LineCache::stat(__FILE__).inspect
   puts "Full path: #{LineCache::path(__FILE__)}"
   LineCache::checkcache # Check all files in the cache
-  LineCache::clear_file_cache 
-  puts("#{__FILE__} is now %scached." % 
+  LineCache::clear_file_cache
+  puts("#{__FILE__} is now %scached." %
        yes_no(LineCache::cached?(__FILE__)))
   digest = SCRIPT_LINES__.select{|k,v| k =~ /digest.rb$/}
   puts digest.first[0] if digest
   line = LineCache::getline(__FILE__, 7)
-  puts "The 7th line is\n#{line}" 
+  puts "The 7th line is\n#{line}"
   LineCache::remap_file_lines(__FILE__, 'test2', (10..20), 6)
   puts LineCache::getline('test2', 10)
-  puts "Remapped 10th line of test2 is\n#{line}" 
+  puts "Remapped 10th line of test2 is\n#{line}"
 end

data/lib/tracelines19.rb

@@ -1,27 +1,18 @@
 #!/usr/bin/env ruby
 # $Id$
-begin require 'rubygems' rescue LoadError end
-# require 'ruby-debug' ; Debugger.start(:post-mortem => true)
+require 'trace_nums'
 
 module TraceLineNumbers
-  @@SRC_DIR = File.expand_path(File.dirname(__FILE__))
-  begin
-    require File.join(@@SRC_DIR, '..', 'ext\trace_nums', 'trace_nums19')
-  rescue LoadError
-    # MSWindows seems to put this in lib rather than ext.
-    require File.join(@@SRC_DIR, '..', 'lib', 'trace_nums19')
-  end
-
-  # Return an array of lines numbers that could be 
+  # Return an array of lines numbers that could be
   # stopped at given a file name of a Ruby program.
   def lnums_for_file(file)
     lnums_for_str(File.read(file))
   end
   module_function :lnums_for_file
 
-  # Return an array of lines numbers that could be 
+  # Return an array of lines numbers that could be
   # stopped at given a file name of a Ruby program.
-  # We assume the each line has \n at the end. If not 
+  # We assume the each line has \n at the end. If not
   # set the newline parameters to \n.
   def lnums_for_str_array(string_array, newline='')
     lnums_for_str(string_array.join(newline))
@@ -34,7 +25,7 @@ if __FILE__ == $0
   # test_file = '../test/rcov-bug.rb'
   test_file = '../test/lnum-data/begin1.rb'
   if  File.exists?(test_file)
-    puts TraceLineNumbers.lnums_for_file(test_file).inspect 
+    puts TraceLineNumbers.lnums_for_file(test_file).inspect
     load(test_file, 0) # for later
   end
   puts TraceLineNumbers.lnums_for_file(__FILE__).inspect

data/test/lnum-diag.rb

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
 
-# begin require 'rubygems' rescue LoadError end
-# require 'ruby-debug' ; Debugger.start
-
 TEST_DIR = File.expand_path(File.dirname(__FILE__))
 TOP_SRC_DIR = File.join(TEST_DIR, '..')
 require File.join(TOP_SRC_DIR, 'lib', 'tracelines19.rb')
@@ -51,7 +48,7 @@ def dump_file(file, opts)
   if expected_lnums
     puts "expecting: #{expected_lnums.inspect}"
     puts '-' * 80
-    if expected_lnums 
+    if expected_lnums
       if got_lnums != expected_lnums
         puts "mismatch: #{got_lnums.inspect}"
       else
@@ -68,8 +65,8 @@ end
 require 'getoptlong'
 program = File.basename($0)
 opts = {
-  :print_source => true,  # Print source file? 
-  :print_trace  => true,  # Run Tracer over file? 
+  :print_source => true,  # Print source file?
+  :print_trace  => true,  # Run Tracer over file?
   :expect_line  => true,  # Source file has expected (correct) list of lines?
   :print_parse  => true,  # Show ParseTree output?
 }
@@ -88,7 +85,7 @@ getopts = GetoptLong.new(
 getopts.each do |opt, arg|
   case opt
     when '--help'
-    puts "usage 
+    puts "usage
 Usage: #{$program} [options] file1 file2 ...
 
 Diagnostic program to make see what TraceLineNumbers does and compare
@@ -125,6 +122,6 @@ options:
   end
 end
 
-ARGV.each do |file| 
+ARGV.each do |file|
   dump_file(file, opts)
 end

data/test/parse-show.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'pp'
-begin require 'rubygems' rescue LoadError end
 require 'parse_tree'
 
 ARGV.push "-" if ARGV.empty?

data/test/test-linecache.rb

@@ -4,38 +4,35 @@ require 'fileutils'
 require 'tempfile'
 require 'set'
 
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.start
-
 # Test LineCache module
 class TestLineCache < Test::Unit::TestCase
   @@TEST_DIR = File.expand_path(File.dirname(__FILE__))
   @@TOP_SRC_DIR = File.join(@@TEST_DIR, '..', 'lib')
   require File.join(@@TOP_SRC_DIR, 'linecache19.rb')
-  
+
   def setup
     LineCache::clear_file_cache
   end
-  
+
   def test_basic
     fp = File.open(__FILE__, 'r')
     compare_lines = fp.readlines()
     fp.close
-    
+
     # Test getlines to read this file.
     lines = LineCache::getlines(__FILE__)
     assert_equal(compare_lines, lines,
                  'We should get exactly the same lines as reading this file.')
-    
+
     # Test getline to read this file. The file should now be cached,
     # so internally a different set of routines are used.
     test_line = 1
     line = LineCache::getline(__FILE__, test_line)
     assert_equal(compare_lines[test_line-1], line,
                  'We should get exactly the same line as reading this file.')
-    
+
     # Test getting the line via a relative file name
-    Dir.chdir(File.dirname(__FILE__)) do 
+    Dir.chdir(File.dirname(__FILE__)) do
       short_file = File.basename(__FILE__)
       test_line = 10
       line = LineCache::getline(short_file, test_line)
@@ -76,7 +73,7 @@ class TestLineCache < Test::Unit::TestCase
     assert_equal(false, LineCache::cached_script?('./short-file'),
                  "Should not find './short-file' in SCRIPT_LINES__")
     assert_equal(true, 78 < LineCache.size(__FILE__))
-    Dir.chdir(File.dirname(__FILE__)) do 
+    Dir.chdir(File.dirname(__FILE__)) do
       load('./short-file', 0)
       assert_equal(true, LineCache::cached_script?('./short-file'),
                    "Should be able to find './short-file' in SCRIPT_LINES__")
@@ -96,23 +93,23 @@ class TestLineCache < Test::Unit::TestCase
     line5 = LineCache::getline(__FILE__, 5)
     LineCache::remap_file_lines(__FILE__, 'test2', 9, 5)
     rline9  = LineCache::getline('test2', 9)
-    assert_equal(line5, rline9, 
+    assert_equal(line5, rline9,
                  'lines should be the same via remap_file_line - remap integer')
 
     line6 = LineCache::getline(__FILE__, 6)
     rline10 = LineCache::getline('test2', 10)
-    assert_equal(line6, rline10, 
+    assert_equal(line6, rline10,
                  'lines should be the same via remap_file_line - range')
 
     line7 = LineCache::getline(__FILE__, 7)
     rline11 = LineCache::getline('test2', 11)
-    assert_equal(line7, rline11, 
+    assert_equal(line7, rline11,
                  'lines should be the same via remap_file_line - range')
 
     line8 = LineCache::getline(__FILE__, 8)
     LineCache::remap_file_lines(__FILE__, nil, 20, 8)
     rline20 = LineCache::getline(__FILE__, 20)
-    assert_equal(line8, rline20, 
+    assert_equal(line8, rline20,
                  'lines should be the same via remap_file_line - nil file')
   end
 
@@ -142,7 +139,7 @@ class TestLineCache < Test::Unit::TestCase
   end
 
   def test_sha1
-    test_file = File.join(@@TEST_DIR, 'short-file') 
+    test_file = File.join(@@TEST_DIR, 'short-file')
     LineCache::cache(test_file)
     assert_equal('1134f95ea84a3dcc67d7d1bf41390ee1a03af6d2',
                  LineCache::sha1(test_file))

data/test/test-lnum.rb

@@ -2,18 +2,15 @@
 # $Id$
 require 'test/unit'
 
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.init
-
 # Test TraceLineNumbers module
 class TestLineNumbers2 < Test::Unit::TestCase
   @@TEST_DIR = File.expand_path(File.dirname(__FILE__))
   @@TOP_SRC_DIR = File.join(@@TEST_DIR, '..')
   require File.join(@@TOP_SRC_DIR, 'lib', 'tracelines19.rb')
-  
+
   def test_all_lnum_data
     test_dir = File.join(@@TEST_DIR, 'data')
-    Dir.chdir(test_dir) do 
+    Dir.chdir(test_dir) do
       Dir.glob('*.rb').sort.each do |f|
         puts f
         fp = File.open(f, 'r')

data/test/test-tracelines.rb

@@ -4,9 +4,6 @@ require 'test/unit'
 require 'fileutils'
 require 'tempfile'
 
-# require 'rubygems'
-# require 'ruby-debug'; Debugger.init
-
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 # Test TestLineNumbers module
 class TestLineNumbers1 < Test::Unit::TestCase
@@ -20,7 +17,7 @@ class TestLineNumbers1 < Test::Unit::TestCase
     first_line = fp.readline[1..-2]
     @@rcov_lnums = eval(first_line, binding, __FILE__, __LINE__)
   }
-  
+
   def test_for_file
     rcov_lines = TraceLineNumbers.lnums_for_file(@@rcov_file)
     assert_equal(@@rcov_lnums, rcov_lines)
@@ -33,8 +30,8 @@ class TestLineNumbers1 < Test::Unit::TestCase
   end
 
   def test_for_string_array
-    load(@@rcov_file, 0) 
-    rcov_lines = 
+    load(@@rcov_file, 0)
+    rcov_lines =
       TraceLineNumbers.lnums_for_str_array(SCRIPT_LINES__[@@rcov_file])
     assert_equal(@@rcov_lnums, rcov_lines)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: debugger-linecache
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -29,6 +29,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: ! 'Linecache is a module for reading and caching lines. This may be useful
   for
 
@@ -42,14 +74,13 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- AUTHORS
-- COPYING
-- ChangeLog
-- NEWS
+- .travis.yml
+- CHANGELOG.md
+- LICENSE.txt
+- OLD_CHANGELOG
 - OLD_README
 - README.md
 - Rakefile
-- VERSION
 - debugger-linecache.gemspec
 - ext/trace_nums/extconf.rb
 - ext/trace_nums/trace_nums.c
@@ -57,7 +88,6 @@ files:
 - lib/debugger/linecache.rb
 - lib/linecache19.rb
 - lib/tracelines19.rb
-- svn2cl_usermap
 - test/data/begin1.rb
 - test/data/begin2.rb
 - test/data/begin3.rb
@@ -112,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Read file with caching

data/AUTHORS

@@ -1,2 +0,0 @@
-R. Bernstein (rockyb@rubyforge.net)
-Mark Moseley (mark@fast-software.com)

data/COPYING

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year  name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

data/VERSION

@@ -1 +0,0 @@
-0.5.1

data/svn2cl_usermap

@@ -1 +0,0 @@
-rockyb:Rocky Bernstein