coderay 1.0.0.800pre → 1.0.0.815pre

data/{README.rdoc → README_INDEX.rdoc}

@@ -111,6 +111,8 @@ Where would we be without all those people?
   less useless
 * Term::ANSIColor[http://term-ansicolor.rubyforge.org/]
 * PLEAC[http://pleac.sourceforge.net/] code examples
+* Github
+* Travis CI (http://travis-ci.org/rubychan/github)
 
 === Free
 

data/Rakefile

@@ -14,7 +14,7 @@ if File.directory? 'rake_tasks'
   
 else
   
-  # fallback tasks when rake_tasks folder is not present
+  # fallback tasks when rake_tasks folder is not present (eg. in the distribution package)
   desc 'Run CodeRay tests (basic)'
   task :test do
     ruby './test/functional/suite.rb'
@@ -26,9 +26,9 @@ else
   desc 'Generate documentation for CodeRay'
   Rake::RDocTask.new :doc do |rd|
     rd.title = 'CodeRay Documentation'
-    rd.main = 'README.rdoc'
+    rd.main = 'README_INDEX.rdoc'
     rd.rdoc_files.add Dir['lib']
-    rd.rdoc_files.add 'README.rdoc'
+    rd.rdoc_files.add rd.main
     rd.rdoc_dir = 'doc'
   end
   

data/bin/coderay

@@ -105,23 +105,38 @@ when 'highlight', nil
     if output_file
       output_filetype ||= CodeRay::FileType[output_file]
     else
-      output_filetype ||= tty? ? :term : :page
+      output_filetype ||= :term
     end
     
+    output_filetype = :page if output_filetype.to_s == 'html'
+    
     if input_file
       input = File.read input_file
     else
       input = $stdin.read
     end
     
-    output = CodeRay.scan(input, input_filetype).encode(output_filetype)
-    
-    if output_file
-      File.open output_file, 'w' do |file|
-        file.puts output
+    begin
+      file =
+        if output_file
+          File.open output_file, 'w'
+        else
+          $stdout.sync = true
+          $stdout
+        end
+      CodeRay.encode(input, input_filetype, output_filetype, :out => file)
+      file.puts
+    rescue CodeRay::PluginHost::PluginNotFound => boom
+      if boom.message[/CodeRay::(\w+)s could not load plugin :?(.*?): /]
+        puts "I don't know the #$1 \"#$2\"."
+      else
+        puts boom.message
       end
-    else
-      puts output
+      # puts "I don't know this plugin: #{boom.message[/Could not load plugin (.*?): /, 1]}."
+    rescue CodeRay::Scanners::Scanner::ScanError  # FIXME: rescue Errno::EPIPE
+      # ignore
+    ensure
+      file.close
     end
   end
 when 'list'
@@ -151,6 +166,13 @@ when 'commands'
 when 'help'
   help
 else
-  puts "Unknown command: #{subcommand}"
+  $stdout = $stderr
   help
+  puts
+  if subcommand[/\A\w+\z/]
+    puts "Unknown command: #{subcommand}"
+  else
+    puts "File not found: #{subcommand}"
+  end
+  exit 1
 end

data/lib/coderay.rb

@@ -158,6 +158,7 @@ module CodeRay
     #
     # See also demo/demo_simple.
     def scan code, lang, options = {}, &block
+      # FIXME: return a proxy for direct-stream encoding
       scanner = Scanners[lang].new code, options, &block
       scanner.tokenize
     end
@@ -187,7 +188,7 @@ module CodeRay
     # encodes it with the Encoder for +format+.
     # +options+ will be passed to the Encoder.
     #
-    # See CodeRay::Encoder.encode
+    # See CodeRay::Encoder.encode.
     def encode code, lang, format, options = {}
       encoder(format, options).encode code, lang, options
     end

data/lib/coderay/encoder.rb

@@ -153,7 +153,17 @@ module CodeRay
       #
       # See the HTML Encoder for an example of option caching.
       def setup options
-        @out = ''
+        @out = get_output(options)
+      end
+      
+      def get_output options
+        options[:out] || ''
+      end
+      
+      # Append data.to_s to the output. Returns the argument.
+      def output data
+        @out << data.to_s
+        data
       end
       
       # Called with merged options after encoding starts.

data/lib/coderay/encoders/_map.rb

@@ -3,7 +3,6 @@ module Encoders
   
   map \
     :loc             => :lines_of_code,
-    :html            => :page,
     :plain           => :text,
     :plaintext       => :text,
     :remove_comments => :comment_filter,

data/lib/coderay/encoders/count.rb

@@ -11,17 +11,23 @@ module Encoders
   protected
     
     def setup options
-      @out = 0
+      super
+      
+      @count = 0
+    end
+    
+    def finish options
+      output @count
     end
     
   public
     
     def text_token text, kind
-      @out += 1
+      @count += 1
     end
     
     def begin_group kind
-      @out += 1
+      @count += 1
     end
     alias end_group begin_group
     alias begin_line begin_group

data/lib/coderay/encoders/debug.rb

@@ -27,7 +27,7 @@ module Encoders
       if kind == :space
         @out << text
       else
-        # FIXME: Escape (
+        # TODO: Escape (
         text = text.gsub(/[)\\]/, '\\\\\0')  # escape ) and \
         @out << kind.to_s << '(' << text << ')'
       end

data/lib/coderay/encoders/filter.rb

@@ -21,29 +21,35 @@ module Encoders
     
   protected
     def setup options
-      @out = options[:tokens] || Tokens.new
+      super
+      
+      @tokens = options[:tokens] || Tokens.new
+    end
+    
+    def finish options
+      output @tokens
     end
     
   public
     
     def text_token text, kind  # :nodoc:
-      @out.text_token text, kind
+      @tokens.text_token text, kind
     end
     
     def begin_group kind  # :nodoc:
-      @out.begin_group kind
+      @tokens.begin_group kind
     end
     
     def begin_line kind  # :nodoc:
-      @out.begin_line kind
+      @tokens.begin_line kind
     end
     
     def end_group kind  # :nodoc:
-      @out.end_group kind
+      @tokens.end_group kind
     end
     
     def end_line kind  # :nodoc:
-      @out.end_line kind
+      @tokens.end_line kind
     end
     
   end

data/lib/coderay/encoders/html.rb

@@ -164,6 +164,11 @@ module Encoders
     def setup options
       super
       
+      if options[:wrap] || options[:line_numbers]
+        @real_out = @out
+        @out = ''
+      end
+      
       @HTML_ESCAPE = HTML_ESCAPE.dup
       @HTML_ESCAPE["\t"] = ' ' * options[:tab_width]
       
@@ -214,7 +219,7 @@ module Encoders
     
     def finish options
       unless @opened.empty?
-        warn '%d tokens still open: %p' % [@opened.size, @opened]
+        warn '%d tokens still open: %p' % [@opened.size, @opened] if $CODERAY_DEBUG
         @out << '</span>' while @opened.pop
         @last_opened = nil
       end
@@ -227,6 +232,11 @@ module Encoders
       @out.wrap! options[:wrap]
       @out.apply_title! options[:title]
       
+      if defined?(@real_out) && @real_out
+        @real_out << @out
+        @out = @real_out
+      end
+      
       super
     end
     

data/lib/coderay/encoders/html/css.rb

@@ -44,7 +44,7 @@ module Encoders
         ( [^\}]+ )?          # $2 = style
         \s* \} \s*
       |
-        ( . )                # $3 = error
+        ( [^\n]+ )           # $3 = error
       /mx
       def parse stylesheet
         stylesheet.scan CSS_CLASS_PATTERN do |selectors, style, error|

data/lib/coderay/encoders/html/output.rb

@@ -55,7 +55,6 @@ module Encoders
       end
       
       def apply_title! title
-        # FIXME: This may change the output!
         self.sub!(/(<title>)(<\/title>)/) { $1 + title + $2 }
         self
       end

data/lib/coderay/encoders/json.rb

@@ -36,32 +36,45 @@ module Encoders
     
   protected
     def setup options
-      @out = []
+      super
+      
+      @first = true
+      @out << '['
     end
     
     def finish options
-      @out.to_json
+      @out << ']'
+    end
+    
+    def append data
+      if @first
+        @first = false
+      else
+        @out << ','
+      end
+      
+      @out << data.to_json
     end
     
   public
     def text_token text, kind
-      @out << { :type => 'text', :text => text, :kind => kind }
+      append :type => 'text', :text => text, :kind => kind
     end
     
     def begin_group kind
-      @out << { :type => 'block', :action => 'open', :kind => kind }
+      append :type => 'block', :action => 'open', :kind => kind
     end
     
     def end_group kind
-      @out << { :type => 'block', :action => 'close', :kind => kind }
+      append :type => 'block', :action => 'close', :kind => kind
     end
     
     def begin_line kind
-      @out << { :type => 'block', :action => 'begin_line', :kind => kind }
+      append :type => 'block', :action => 'begin_line', :kind => kind
     end
     
     def end_line kind
-      @out << { :type => 'block', :action => 'end_line', :kind => kind }
+      append :type => 'block', :action => 'end_line', :kind => kind
     end
     
   end

data/lib/coderay/encoders/lines_of_code.rb

@@ -31,11 +31,12 @@ module Encoders
       end
       
       options[:exclude] = kinds_not_loc
+      
       super options
     end
     
     def finish options
-      @out.to_s.scan(NON_EMPTY_LINE).size
+      output @tokens.text.scan(NON_EMPTY_LINE).size
     end
     
   end

data/lib/coderay/encoders/statistic.rb

@@ -15,15 +15,12 @@ module Encoders
   protected
     
     def setup options
+      super
+      
       @type_stats = Hash.new { |h, k| h[k] = TypeStats.new 0, 0 }
       @real_token_count = 0
     end
     
-    def generate tokens, options
-      @tokens = tokens
-      super
-    end
-    
     STATS = <<-STATS  # :nodoc:
 
 Code Statistics
@@ -51,11 +48,13 @@ Token Types (%d):
       types_stats = @type_stats.sort_by { |k, v| [-v.count, k.to_s] }.map do |k, v|
         TOKEN_TYPES_ROW % [k, v.count, 100.0 * v.count / all_count, v.size]
       end.join
-      STATS % [
+      @out << STATS % [
         all_count, @real_token_count, all_size,
         @type_stats.delete_if { |k, v| k.is_a? String }.size,
         types_stats
       ]
+      
+      super
     end
     
   public

data/lib/coderay/encoders/text.rb

@@ -24,19 +24,22 @@ module Encoders
     
     def text_token text, kind
       super
-      @out << @sep if @sep
+      
+      if @first
+        @first = false
+      else
+        @out << @sep
+      end if @sep
     end
     
   protected
     def setup options
       super
+      
+      @first = true
       @sep = options[:separator]
     end
     
-    def finish options
-      super.chomp @sep
-    end
-    
   end
   
 end

data/lib/coderay/encoders/token_kind_filter.rb

@@ -34,6 +34,7 @@ module Encoders
   protected
     def setup options
       super
+      
       @group_excluded = false
       @exclude = options[:exclude]
       @exclude = Array(@exclude) unless @exclude == :all

data/lib/coderay/encoders/xml.rb

@@ -10,7 +10,7 @@ module Encoders
     
     FILE_EXTENSION = 'xml'
     
-    require 'rexml/document'
+    autoload :REXML, 'rexml/document'
     
     DEFAULT_OPTIONS = {
       :tab_width => 8,
@@ -20,6 +20,8 @@ module Encoders
     
   protected
     def setup options
+      super
+      
       @doc = REXML::Document.new
       @doc << REXML::XMLDecl.new
       @tab_width = options[:tab_width]
@@ -27,9 +29,9 @@ module Encoders
     end
     
     def finish options
-      @out = ''
       @doc.write @out, options[:pretty], options[:transitive], true
-      @out
+      
+      super
     end
     
   public

data/lib/coderay/encoders/yaml.rb

@@ -6,39 +6,44 @@ module Encoders
   # Slow.
   class YAML < Encoder
     
+    autoload :YAML, 'yaml'
+    
     register_for :yaml
     
     FILE_EXTENSION = 'yaml'
     
   protected
     def setup options
-      require 'yaml'
-      @out = []
+      super
+      
+      @data = []
     end
     
     def finish options
-      @out.to_a.to_yaml
+      YAML.dump @data, @out
+      
+      super
     end
     
   public
     def text_token text, kind
-      @out << [text, kind]
+      @data << [text, kind]
     end
     
     def begin_group kind
-      @out << [:begin_group, kind]
+      @data << [:begin_group, kind]
     end
     
     def end_group kind
-      @out << [:end_group, kind]
+      @data << [:end_group, kind]
     end
     
     def begin_line kind
-      @out << [:begin_line, kind]
+      @data << [:begin_line, kind]
     end
     
     def end_line kind
-      @out << [:end_line, kind]
+      @data << [:end_line, kind]
     end
     
   end