Merge branch 'master' into multiline-inline-diff

korny · korny · commit 2afe23ab0a3d · 2011-12-27T04:08:29.000+01:00
Conflicts:
	coderay.gemspec
diff --git a/Changes.textile b/Changes.textile
@@ -4,6 +4,13 @@ p=. _This files lists all changes in the CodeRay library since the 0.9.8 release
  
 {{toc}}
  
+h2. Changes in 1.0.5
+ 
+Fixes:
+ 
+* @autoload@ calls do not depend on @coderay/lib@ being in the load path (GitHub issue #6; thanks to tvon, banister, envygeeks, and ConradIrwin)
+* avoid dark blue as terminal color (GitHub issue #9; thanks to shevegen)
+
 h2. Changes in 1.0.4
  
 Fixes in the CSS scanner:
diff --git a/FOLDERS b/FOLDERS
@@ -17,7 +17,6 @@ Run <code>rake bench</code> to perform an example benchmark.
 Executional files for CodeRay.
 
 coderay:: The CodeRay executable.
-coderay_stylesheet:: Prints the default stylesheet.
 
 == demo - Demos and functional tests
 
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ group :development do
   gem "rake", "~> 0.9.2"
   gem "RedCloth", RUBY_PLATFORM == 'java' ? "= 4.2.7" : ">= 4.0.3"
   gem "term-ansicolor"
-  gem "shoulda-context", "= 1.0.0.beta1" if RUBY_VERSION >= '1.8.7'
+  gem "shoulda-context", "~> 1.0.0" if RUBY_VERSION >= '1.8.7'
   gem "json" unless RUBY_VERSION >= '1.9.1'
   gem "rdoc" if RUBY_VERSION >= '1.8.7'
 end
diff --git a/IDEA b/IDEA
diff --git a/TODO b/TODO
diff --git a/coderay.gemspec b/coderay.gemspec
@@ -9,8 +9,10 @@ Gem::Specification.new do |s|
     s.version = CodeRay::VERSION
   else
     # thanks to @Argorak for this solution
-    revision = 134 + (`git log --oneline | wc -l`.to_i)
-    s.version = "#{CodeRay::VERSION}.#{revision}rc1"
+    # revision = 134 + (`git log --oneline | wc -l`.to_i)
+    # s.version = "#{CodeRay::VERSION}.#{revision}rc1"
+    s.version = "#{CodeRay::VERSION}.rc1"
+>>>>>>> master
   end
   
   s.authors     = ['Kornelius Kalnbach']
diff --git a/lib/coderay.rb b/lib/coderay.rb
@@ -127,27 +127,34 @@ module CodeRay
   
   $CODERAY_DEBUG ||= false
   
-  require 'coderay/version'
+  CODERAY_PATH = File.join File.dirname(__FILE__), 'coderay'
+  
+  # Assuming the path is a subpath of lib/coderay/
+  def self.coderay_path *path
+    File.join CODERAY_PATH, *path
+  end
+  
+  require coderay_path('version')
   
   # helpers
-  autoload :FileType, 'coderay/helpers/file_type'
+  autoload :FileType,    coderay_path('helpers', 'file_type')
   
   # Tokens
-  autoload :Tokens, 'coderay/tokens'
-  autoload :TokensProxy, 'coderay/tokens_proxy'
-  autoload :TokenKinds, 'coderay/token_kinds'
+  autoload :Tokens,      coderay_path('tokens')
+  autoload :TokensProxy, coderay_path('tokens_proxy')
+  autoload :TokenKinds,  coderay_path('token_kinds')
   
   # Plugin system
-  autoload :PluginHost, 'coderay/helpers/plugin'
-  autoload :Plugin, 'coderay/helpers/plugin'
+  autoload :PluginHost,  coderay_path('helpers', 'plugin')
+  autoload :Plugin,      coderay_path('helpers', 'plugin')
   
   # Plugins
-  autoload :Scanners, 'coderay/scanner'
-  autoload :Encoders, 'coderay/encoder'
-  autoload :Styles, 'coderay/style'
+  autoload :Scanners,    coderay_path('scanner')
+  autoload :Encoders,    coderay_path('encoder')
+  autoload :Styles,      coderay_path('style')
   
-  # Convenience access and reusable Encoder/Scanner pair
-  autoload :Duo, 'coderay/duo'
+  # convenience access and reusable Encoder/Scanner pair
+  autoload :Duo,         coderay_path('duo')
   
   class << self
     
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
@@ -109,9 +109,9 @@ class HTML < Encoder
       :hint => false,
     }
     
-    autoload :Output,    'coderay/encoders/html/output'
-    autoload :CSS,       'coderay/encoders/html/css'
-    autoload :Numbering, 'coderay/encoders/html/numbering'
+    autoload :Output,    CodeRay.coderay_path('encoders', 'html', 'output')
+    autoload :CSS,       CodeRay.coderay_path('encoders', 'html', 'css')
+    autoload :Numbering, CodeRay.coderay_path('encoders', 'html', 'numbering')
     
     attr_reader :css
     
diff --git a/lib/coderay/encoders/terminal.rb b/lib/coderay/encoders/terminal.rb
@@ -24,14 +24,14 @@ class Terminal < Encoder
         :attribute_value => '31',
         :binary => '1;35',
         :char => {
-          :self => '36', :delimiter => '34'
+          :self => '36', :delimiter => '1;34'
         },
         :class => '1;35',
         :class_variable => '36',
         :color => '32',
         :comment => '37',
-        :complex => '34',
-        :constant => ['34', '4'],
+        :complex => '1;34',
+        :constant => ['1;34', '4'],
         :decoration => '35',
         :definition => '1;32',
         :directive => ['32', '4'],
@@ -56,7 +56,7 @@ class Terminal < Encoder
         :predefined_type => '1;30',
         :predefined => ['4', '1;34'],
         :preprocessor => '36',
-        :pseudo_class => '34',
+        :pseudo_class => '1;34',
         :regexp => {
           :self => '31',
           :content => '31',
@@ -77,10 +77,10 @@ class Terminal < Encoder
           :delimiter => '1;32',
         },
         :symbol => '1;32',
-        :tag => '34',
+        :tag => '1;34',
         :type => '1;34',
         :value => '36',
-        :variable => '34',
+        :variable => '1;34',
         
         :insert => '42',
         :delete => '41',
diff --git a/lib/coderay/scanner.rb b/lib/coderay/scanner.rb
@@ -2,8 +2,8 @@
 require 'strscan'
 
 module CodeRay
-
-  autoload :WordList, 'coderay/helpers/word_list'
+  
+  autoload :WordList, coderay_path('helpers', 'word_list')
   
   # = Scanners
   #
@@ -320,4 +320,4 @@ def scan_rest
     end
     
   end
-end
+end
diff --git a/lib/coderay/scanners/diff.rb b/lib/coderay/scanners/diff.rb
@@ -16,8 +16,6 @@ class Diff < Scanner
     
   protected
     
-    require 'coderay/helpers/file_type'
-    
     def scan_tokens encoder, options
       
       line_kind = nil
@@ -50,7 +48,7 @@ def scan_tokens encoder, options
             if match = scan(/.*?(?=$|[\t\n\x00]|  \(revision)/)
               encoder.text_token match, :filename
               if options[:highlight_code] && match != '/dev/null'
-                file_type = FileType.fetch(match, :text)
+                file_type = CodeRay::FileType.fetch(match, :text)
                 file_type = :text if file_type == :diff
                 content_scanner = scanners[file_type]
                 content_scanner_entry_state = nil
diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb
@@ -6,7 +6,7 @@ class Java < Scanner
     
     register_for :java
     
-    autoload :BuiltinTypes, 'coderay/scanners/java/builtin_types'
+    autoload :BuiltinTypes, CodeRay.coderay_path('scanners', 'java', 'builtin_types')
     
     # http://java.sun.com/docs/books/tutorial/java/nutsandbolts/_keywords.html
     KEYWORDS = %w[
diff --git a/lib/coderay/scanners/ruby.rb b/lib/coderay/scanners/ruby.rb
@@ -13,8 +13,8 @@ class Ruby < Scanner
     register_for :ruby
     file_extension 'rb'
     
-    autoload :Patterns,    'coderay/scanners/ruby/patterns'
-    autoload :StringState, 'coderay/scanners/ruby/string_state'
+    autoload :Patterns,    CodeRay.coderay_path('scanners', 'ruby', 'patterns')
+    autoload :StringState, CodeRay.coderay_path('scanners', 'ruby', 'string_state')
     
     def interpreted_string_state
       StringState.new :string, true, '"'
diff --git a/lib/coderay/tokens.rb b/lib/coderay/tokens.rb
@@ -1,7 +1,7 @@
 module CodeRay
   
   # GZip library for writing and reading token dumps.
-  autoload :GZip, 'coderay/helpers/gzip'
+  autoload :GZip, coderay_path('helpers', 'gzip')
   
   # = Tokens  TODO: Rewrite!
   #
diff --git a/test/functional/basic.rb b/test/functional/basic.rb
@@ -13,6 +13,22 @@ def test_version
     end
   end
   
+  def with_empty_load_path
+    old_load_path = $:.dup
+    $:.clear
+    yield
+  ensure
+    $:.replace old_load_path
+  end
+  
+  def test_autoload
+    with_empty_load_path do
+      assert_nothing_raised do
+        CodeRay::Scanners::Java::BuiltinTypes
+      end
+    end
+  end
+  
   RUBY_TEST_CODE = 'puts "Hello, World!"'
   
   RUBY_TEST_TOKENS = [
diff --git a/test/functional/examples.rb b/test/functional/examples.rb
@@ -97,7 +97,6 @@ def test_examples
     DIV
     
     # highlight a file (HTML div); guess the file type base on the extension
-    require 'coderay/helpers/file_type'
     assert_equal :ruby, CodeRay::FileType[__FILE__]
     
     # get a new scanner for Python
