coderay_bash 1.0.1 → 1.0.2

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 = '1.0.1'
+  s.version = '1.0.2'
   s.date = Time.now.strftime("%Y-%m-%d")
   s.add_dependency('coderay', '>= 1.0')
   s.require_path = 'lib'

data/lib/coderay/scanners/bash.rb

@@ -66,6 +66,8 @@ module CodeRay module Scanners
       @state = :initial
       @quote = nil
       @shell = false
+      @brace_shell = 0
+      @quote_brace_shell = 0
     end
 
     def scan_tokens encoder, options
@@ -106,12 +108,13 @@ module CodeRay module Scanners
             next
           elsif match = scan(/`/)
             if @shell
+              encoder.text_token(match, :delimiter)
               encoder.end_group :shell
             else
               encoder.begin_group :shell
+              encoder.text_token(match, :delimiter)
             end
             @shell = (not @shell)
-            encoder.text_token(match, :delimiter)
             next
           elsif match = scan(/'[^']*'?/)
             kind = :string
@@ -137,8 +140,19 @@ module CodeRay module Scanners
             end
             kind = IDENT_KIND[var]
             kind = :instance_variable if kind == :ident
-          elsif match = scan(/ \$\( [^\)]+ \) /ox)
-            kind = :shell
+          #elsif match = scan(/ \$\( [^\)]+ \) /ox)
+          elsif match = scan(/ \$\( /ox)
+            @brace_shell += 1
+            encoder.begin_group :shell
+            encoder.text_token(match, :delimiter)
+            next
+          elsif match = scan(/ \) /ox)
+            if @brace_shell > 0
+              encoder.text_token(match, :delimiter)
+              encoder.end_group :shell
+              @brace_shell -= 1
+              next
+            end
           elsif match = scan(PRE_CONSTANTS)
             kind = :predefined_constant
           elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
@@ -202,6 +216,20 @@ module CodeRay module Scanners
             kind = :predefined_constant
           elsif match = scan(/ (?: \$\(\(.*?\)\) ) /x)
             kind = :global_variable
+          elsif match = scan(/ \$\( /ox)
+            encoder.begin_group :shell
+            encoder.text_token(match, :delimiter)
+            @quote_brace_shell += 1
+            next
+          elsif match = scan(/\)/)
+            if @quote_brace_shell > 0
+              encoder.text_token(match, :delimiter)
+              encoder.end_group :shell
+              @quote_brace_shell -= 1
+              next
+            else
+              kind = :content
+            end
           elsif match = scan(/ \$ (?: (?: \{ [^\}]* \}) | (?: [A-Za-z_0-9]+ ) ) /x)
             match =~ /(\$\{?)([^\}]*)(\}?)/
             pre=$1
@@ -215,7 +243,7 @@ module CodeRay module Scanners
             end
             kind = IDENT_KIND[match]
             kind = :instance_variable if kind == :ident
-          elsif match = scan(/[^#{@quote}\\]+/)
+          elsif match = scan(/[^\)\$#{@quote}\\]+/)
             kind = :content
           else match = scan(/.+/)
             # this shouldn't be

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: coderay_bash
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-11 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &14527500 !ruby/object:Gem::Requirement
+  requirement: &14542400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14527500
+  version_requirements: *14542400
 description: ! 'Bash highlighting for coderay. This gem was tested with coderay 1.0
   and won''t work with coderay < 1.0.
 
@@ -34,9 +34,9 @@ files:
 - README.md
 - coderay_bash.gemspec
 - Rakefile
-- lib/coderay/scanners/erb_bash.rb
-- lib/coderay/scanners/bash.rb
 - lib/coderay_bash.rb
+- lib/coderay/scanners/bash.rb
+- lib/coderay/scanners/erb_bash.rb
 homepage: http://github.com/pejuko/coderay_bash
 licenses: []
 post_install_message: ! 'This gem was tested with coderay 1.0 and won''t work with
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple bash scanner for highlighting with coderay.