coderay_bash 0.2.0 → 0.2.1

data/Rakefile

@@ -2,7 +2,7 @@
 # vi: fenc=utf-8:expandtab:ts=2:sw=2:sts=2
 # 
 # @author: Petr Kovar <pejuko@gmail.com>
-$KCODE='UTF8'
+$KCODE='UTF8' if RUBY_VERSION < "1.9"
 
 require 'rake/gempackagetask'
 require 'rake/testtask'

data/coderay_bash.gemspec

@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'coderay_bash'
-  s.version = '0.2.0'
+  s.version = '0.2.1'
   s.date = Time.now.strftime("%Y-%m-%d")
   s.add_dependency('coderay', '< 1.0')
   s.require_path = 'lib'

data/lib/coderay/scanners/bash.rb

@@ -106,7 +106,7 @@ module Scanners
             kind = :shell
           elsif match = scan(PRE_CONSTANTS)
             kind = :pre_constant
-          elsif match = scan(/[^\s]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
+          elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
             match =~ /(.*?)([A-Za-z_][A-Za-z_0-9]*)(\+?=)/
             str = $1
             pre = $2
@@ -151,8 +151,7 @@ module Scanners
             kind = :plain
           elsif match = scan(/.+/)
             # this shouldn't be :reserved for highlighting bad matches
-            kind = :error
-            match = ">>>>>#{match}<<<<<"
+            match, kind = handle_error(match, options)
           end
         elsif @state == :quote
           if (match = scan(/\\.?/))
@@ -179,9 +178,8 @@ module Scanners
           else match = scan(/.+/)
             # this shouldn't be
             #kind = :reserved
-            #raise match
-            match = ">>>>>#{match}<<<<<"
-            kind = :error
+            #raise match 
+            match, kind = handle_error(match, options)
           end
         end
   
@@ -191,6 +189,16 @@ module Scanners
 
       tokens
     end
+  
+  
+    def handle_error(match, options)
+      o = {:ignore_errors => true}.merge(options)
+      if o[:ignore_errors]
+        [match, :plain]
+      else
+        [">>>>>#{match}<<<<<", :error]        
+      end
+    end
 
   end
 end

data/lib/coderay/scanners/erb_bash.rb

@@ -11,7 +11,7 @@ module CodeRay
       def setup
         super
         # Scan Bash instead of HTML template
-        @html_scanner = CodeRay.scanner :bash, :tokens => @tokens, :keep_tokens => true
+        @html_scanner = CodeRay.scanner :bash, @options.merge(:tokens => @tokens, :keep_tokens => true)
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Petr Kovar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +01:00
+date: 2011-03-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,9 +45,9 @@ files:
 - README.md
 - coderay_bash.gemspec
 - Rakefile
-- lib/coderay_bash.rb
-- lib/coderay/scanners/bash.rb
 - lib/coderay/scanners/erb_bash.rb
+- lib/coderay/scanners/bash.rb
+- lib/coderay_bash.rb
 has_rdoc: true
 homepage: http://github.com/pejuko/coderay_bash
 licenses: []