coderay 0.9.3 → 0.9.4

data/bin/coderay

@@ -4,97 +4,83 @@
 # Version: 0.2
 # Author: murphy
 
-def err msg
-  $stderr.puts msg
-end
-
-def read
-  if file = ARGV[2]
-    File.read file
-  else
-    $stdin.read
-  end
-end
+require 'coderay'
 
-begin
-  require 'coderay'
-
-  if ARGV.empty?
-    puts <<-USAGE
+if ARGV.empty?
+  $stderr.puts <<-USAGE
 CodeRay #{CodeRay::VERSION} (http://coderay.rubychan.de)
 
 Usage:
-  coderay -<lang> [-<format>] < file > output
   coderay file [-<format>]
+  coderay -<lang> [-<format>] [< file] [> output]
+
+Defaults:
+  lang:   based on file extension
+  format: ANSI colorized output for terminal, HTML page for files
 
 Examples:
-  coderay -ruby -statistic < foo.rb
-  coderay -ruby < foo.rb  # colorized output to terminal
-  coderay -ruby -page foo.rb  # HTML page output to terminal
-  coderay -ruby -page foo.rb > foo.html  # HTML page output to file
-  coderay codegen.c  # generates codegen.c.html
-    USAGE
-  end
+  coderay foo.rb                         # colorized output to terminal, based on file extension
+  coderay foo.rb -loc                    # print LOC count, based on file extension and format
+  coderay foo.rb > foo.html              # HTML page output to file, based on extension
+  coderay -ruby < foo.rb                 # colorized output to terminal, based on lang
+  coderay -ruby -loc < foo.rb            # print LOC count, based on lang
+  coderay -ruby -page foo.rb             # HTML page output to terminal, based on lang and format
+  coderay -ruby -page foo.rb > foo.html  # HTML page output to file, based on lang and format
+  USAGE
+end
 
-  first, second = ARGV
+first, second = ARGV
 
-  if first
-    if first[/-(\w+)/] == first
-      lang = $1
-      input = read
-      tokens = :scan
-    elsif first == '-'
-      lang = $1
-      input = read
-      tokens = :scan
+def read
+  file = ARGV.grep(/^(?!-)/).last
+  if file
+    if File.exist?(file)
+      File.read file
     else
-      file = first
-      tokens = CodeRay.scan_file file
-      output_filename, output_ext = file, /#{Regexp.escape(File.extname(file))}$/
+      $stderr.puts "No such file: #{file}"
     end
   else
-    puts 'No lang/file given.'
-    exit 1
+    $stdin.read
   end
+end
 
-  if second
-    if second[/-(\w+)/] == second
-      format = $1
-    else
-      raise 'invalid format (must be -xxx)'
-    end
+if first
+  if first[/-(\w+)/] == first
+    lang = $1
+    input = read
+    tokens = :scan
   else
-    if $stdout.tty?
-      format = :term
-    else
-      $stderr.puts 'No format given; setting to default (HTML Page).'
-      format = :page
+    file = first
+    unless File.exist? file
+      $stderr.puts "No such file: #{file}"
+      exit 2
     end
+    tokens = CodeRay.scan_file file
   end
-  
-  # TODO: allow streaming
-  if tokens == :scan
-    output = CodeRay::Duo[lang => format].highlight input  #, :stream => true
+else
+  $stderr.puts 'No lang/file given.'
+  exit 1
+end
+
+if second
+  if second[/-(\w+)/] == second
+    format = $1.to_sym
   else
-    output = tokens.encode format
+    raise 'invalid format (must be -xxx)'
   end
-  out = $stdout
-  if output_filename
-    output_filename += '.' + CodeRay::Encoders[format]::FILE_EXTENSION
-    if File.exist? output_filename
-      err 'File %s already exists.' % output_filename
-      exit
-    else
-      out = File.open output_filename, 'w'
-      puts "Writing to #{output_filename}..."
-    end
+else
+  if $stdout.tty?
+    format = :term
+  else
+    $stderr.puts 'No format given; setting to default (HTML Page).'
+    format = :page
   end
-  out.puts output
+end
 
-rescue => boom
-  err "Error: #{boom.message}\n"
-  err boom.backtrace
-  err '-' * 50
-  err ARGV
-  exit 1
+if tokens == :scan
+  output = CodeRay::Duo[lang => format].highlight input
+else
+  output = tokens.encode format
 end
+out = $stdout
+out.puts output

data/lib/README

@@ -18,7 +18,7 @@ And with line numbers.
 * is what everybody should have on their website
 * solves all your problems and makes the girls run after you
 
-Version: 0.9.3
+Version: 0.9.4
 Author:: murphy (Kornelius Kalnbach)
 Contact:: murphy rubychan de
 Website:: coderay.rubychan.de[http://coderay.rubychan.de]

data/lib/coderay/scanners/diff.rb

@@ -47,11 +47,16 @@ module Scanners
             tokens << [match, :change]
             next unless match = scan(/.+/)
             kind = :plain
-          elsif scan(/(@@)((?>[^@\n]*))(@@)/)
-            tokens << [:begin_line, line_kind = :change]
-            tokens << [self[1], :change]
-            tokens << [self[2], :plain]
-            tokens << [self[3], :change]
+          elsif match = scan(/@@(?>[^@\n]*)@@/)
+            if check(/\n|$/)
+              tokens << [:begin_line, line_kind = :change]
+            else
+              tokens << [:open, :change]
+            end
+            tokens << [match[0,2], :change]
+            tokens << [match[2...-2], :plain]
+            tokens << [match[-2,2], :change]
+            tokens << [:close, :change] unless line_kind
             next unless match = scan(/.+/)
             kind = :plain
           elsif match = scan(/\+/)

data/lib/coderay/scanners/html.rb

@@ -91,7 +91,7 @@ module Scanners
             end
 
           when :attribute
-            if scan(/#{TAG_END}/)
+            if scan(/#{TAG_END}/o)
               kind = :tag
               state = :initial
             elsif scan(/#{ATTR_NAME}/o)

data/lib/coderay/scanners/rhtml.rb

@@ -49,12 +49,16 @@ module Scanners
           @html_scanner.tokenize match
 
         elsif match = scan(/#{ERB_RUBY_BLOCK}/o)
-          start_tag = match[/\A<%[-=]?/]
+          start_tag = match[/\A<%[-=#]?/]
           end_tag = match[/-?%?>?\z/]
           tokens << [:open, :inline]
           tokens << [start_tag, :inline_delimiter]
           code = match[start_tag.size .. -1 - end_tag.size]
-          @ruby_scanner.tokenize code
+          if start_tag == '<%#'
+            tokens << [code, :comment]
+          else
+            @ruby_scanner.tokenize code
+          end
           tokens << [end_tag, :inline_delimiter] unless end_tag.empty?
           tokens << [:close, :inline]
 

data/lib/coderay.rb

@@ -134,7 +134,7 @@ module CodeRay
   # Minor: feature milestone
   # Teeny: development state, 0 for pre-release
   # Revision: Subversion Revision number (generated on rake gem:make)
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 
   require 'coderay/tokens'
   require 'coderay/token_classes'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: coderay
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - murphy
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +02:00
+date: 2010-09-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -103,6 +104,8 @@ files:
 - ./LICENSE
 - lib/README
 - FOLDERS
+- bin/coderay
+- bin/coderay_stylesheet
 has_rdoc: true
 homepage: http://coderay.rubychan.de
 licenses: []
@@ -115,25 +118,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
       segments: 
       - 1
       - 8
       - 2
       version: 1.8.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: coderay
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fast syntax highlighting for selected languages.