coderay_bash 0.1.3 → 0.2.0

data/README.md

@@ -17,4 +17,9 @@ Bash scanner for highlighting scripts with CodeRay
 
     <%= @body %>
 
+### Types
+
+* `:bash`
+* `:erb_bash` -- erb code in bash strings
+
 For more information see [CodeRay web pages](http://coderay.rubychan.de/)

data/Rakefile

@@ -5,10 +5,16 @@
 $KCODE='UTF8'
 
 require 'rake/gempackagetask'
+require 'rake/testtask'
 require 'rake/clean'
 
 CLEAN << "coverage" << "pkg" << "README.html" << "CHANGELOG.html"
 
-task :default => [:gem]
+task :default => [:test, :gem]
 Rake::GemPackageTask.new(eval(File.read("coderay_bash.gemspec"))) {|pkg|}
 
+Rake::TestTask.new(:test) do |t|
+  t.pattern = File.join(File.dirname(__FILE__), 'test/test.rb')
+  t.verbose = true
+end
+

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.1.3'
+  s.version = '0.2.0'
   s.date = Time.now.strftime("%Y-%m-%d")
   s.add_dependency('coderay', '< 1.0')
   s.require_path = 'lib'
@@ -23,7 +23,7 @@ spec = Gem::Specification.new do |s|
 This gem was tested with coderay 0.9.3 and won't work with coderay from svn.
 EOF
   s.description = <<EOF
-This gem was tested with coderay 0.9.3 and won't work with coderay from svn.
+Bash highlighting for coderay. This gem was tested with coderay 0.9.3 and won't work with coderay >= 1.0.
 EOF
 end
 

data/lib/coderay/scanners/bash.rb

@@ -49,10 +49,15 @@ module Scanners
       add(VARIABLES, :pre_type).
       add(BASH_VARIABLES, :pre_type)
 
-    def scan_tokens tokens, options
+    attr_reader :state, :quote
+
+    def initialize(*args)
+      super(*args)
+      @state = :initial
+      @quote = nil
+    end
 
-      state = :initial
-      quote = nil
+    def scan_tokens tokens, options
 
       until eos?
         kind = match = nil
@@ -62,7 +67,7 @@ module Scanners
           next
         end
 
-        if state == :initial
+        if @state == :initial
           if  match = scan(/\A#!.*/)
             kind = :directive
           elsif match = scan(/#.*/)
@@ -74,10 +79,10 @@ module Scanners
           elsif match = scan(/;/)
             kind = :delimiter
           elsif match = scan(/(?:"|`)/)
-            state = :quote
-            quote = match
-            tokens << [:open, :string] if quote == '"'
-            tokens << [:open, :shell] if quote == '`'
+            @state = :quote
+            @quote = match
+            tokens << [:open, :string] if @quote == '"'
+            tokens << [:open, :shell] if @quote == '`'
             tokens << [match, :delimiter]
             next
           elsif match = scan(/'[^']*'/)
@@ -149,15 +154,15 @@ module Scanners
             kind = :error
             match = ">>>>>#{match}<<<<<"
           end
-        elsif state == :quote
+        elsif @state == :quote
           if (match = scan(/\\.?/))
             kind = :content
-          elsif match = scan(/#{quote}/)
+          elsif match = scan(/#{@quote}/)
             tokens << [match, :delimiter]
-            tokens << [:close, :string] if quote == '"'
-            tokens << [:close, :shell] if quote == "`"
-            quote = nil
-            state = :initial
+            tokens << [:close, :string] if @quote == '"'
+            tokens << [:close, :shell] if @quote == "`"
+            @quote = nil
+            @state = :initial
             next
             #kind = :symbol
           elsif match = scan(PRE_CONSTANTS)
@@ -165,11 +170,11 @@ module Scanners
           elsif match = scan(/ \$\{?[A-Za-z_][A-Za-z_\d]*\}? /x)
             kind = IDENT_KIND[match]
             kind = :instance_variable if kind == :ident
-          elsif (quote == '`') and (match = scan(/\$"/))
+          elsif (@quote == '`') and (match = scan(/\$"/))
             kind = :content
-          elsif (quote == '"') and (match = scan(/\$`/))
+          elsif (@quote == '"') and (match = scan(/\$`/))
             kind = :content
-          elsif match = scan(/[^#{quote}\$\\]+/)
+          elsif match = scan(/[^#{@quote}\$\\]+/)
             kind = :content
           else match = scan(/.+/)
             # this shouldn't be

data/lib/coderay/scanners/erb_bash.rb

@@ -0,0 +1,18 @@
+# Scanner for Bash
+# Author: spam+github@codez.ch
+require 'coderay/scanners/rhtml'
+
+module CodeRay
+  module Scanners
+    class ErbBash < RHTML
+      register_for :erb_bash
+
+      protected
+      def setup
+        super
+        # Scan Bash instead of HTML template
+        @html_scanner = CodeRay.scanner :bash, :tokens => @tokens, :keep_tokens => true
+      end
+    end
+  end
+end

data/lib/coderay_bash.rb

@@ -1,3 +1,6 @@
 require 'coderay'
-path = File.join File.expand_path(File.dirname(__FILE__)), "coderay/scanners/bash.rb"
-require path
+
+path = File.join File.expand_path(File.dirname(__FILE__))
+
+require File.join(path, "coderay/scanners/bash.rb")
+require File.join(path, "coderay/scanners/erb_bash.rb")

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: coderay_bash
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Petr Kovar
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -34,7 +32,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: |
-  This gem was tested with coderay 0.9.3 and won't work with coderay from svn.
+  Bash highlighting for coderay. This gem was tested with coderay 0.9.3 and won't work with coderay >= 1.0.
 
 email: pejuko@gmail.com
 executables: []
@@ -49,6 +47,7 @@ files:
 - Rakefile
 - lib/coderay_bash.rb
 - lib/coderay/scanners/bash.rb
+- lib/coderay/scanners/erb_bash.rb
 has_rdoc: true
 homepage: http://github.com/pejuko/coderay_bash
 licenses: []
@@ -65,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -74,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"