coderay_bash 0.2.1 → 1.0

data/coderay_bash.gemspec

@@ -13,17 +13,17 @@ spec = Gem::Specification.new do |s|
   s.email = "pejuko@gmail.com"
   s.authors = ["Petr Kovar"]
   s.name = 'coderay_bash'
-  s.version = '0.2.1'
+  s.version = '1.0'
   s.date = Time.now.strftime("%Y-%m-%d")
-  s.add_dependency('coderay', '< 1.0')
+  s.add_dependency('coderay', '>= 1.0')
   s.require_path = 'lib'
   s.files = ["README.md", "coderay_bash.gemspec", "Rakefile"]
   s.files += Dir["lib/**/*.rb"]
   s.post_install_message = <<EOF
-This gem was tested with coderay 0.9.3 and won't work with coderay from svn.
+This gem was tested with coderay 1.0 and won't work with coderay 0.9.
 EOF
   s.description = <<EOF
-Bash highlighting for coderay. This gem was tested with coderay 0.9.3 and won't work with coderay >= 1.0.
+Bash highlighting for coderay. This gem was tested with coderay 1.0 and won't work with coderay < 1.0.
 EOF
 end
 

data/lib/coderay/scanners/bash.rb

@@ -1,7 +1,8 @@
 # Scanner for Bash
 # Author: Petr Kovar <pejuko@gmail.com>
-module CodeRay
-module Scanners
+
+module CodeRay module Scanners
+
   class Bash < Scanner
 
     register_for :bash
@@ -22,6 +23,14 @@ module Scanners
       local logout printf read set shopt source type typeset ulimit unalias
     )
 
+    PROGRAMS = %w(
+      awk bash bunzip2 bzcat bzip2 cat chgrp chmod chown cp cut date dd df dir dmesg du ed egrep
+      false fgrep findmnt fusermount gawk grep groups gunzip gzip hostname install keyctl kill less
+      ln loadkeys login ls lsblk lsinitcpio lsmod mbchk mkdir mkfifo mknod more mount mountpoint mv
+      netstat pidof ping ping6 ps pwd readlink red rm rmdir sed sh shred sleep stty su sudo sync tar
+      touch  tput tr traceroute traceroute6 true umount uname uncompress vdir zcat
+    )
+
     VARIABLES = %w(
       CDPATH HOME IFS MAIL MAILPATH OPTARG OPTIND PATH PS1 PS2
     )
@@ -46,8 +55,9 @@ module Scanners
       add(RESERVED_WORDS, :reserved).
       add(COMMANDS, :method).
       add(BASH_COMMANDS, :method).
-      add(VARIABLES, :pre_type).
-      add(BASH_VARIABLES, :pre_type)
+#      add(PROGRAMS, :method).
+      add(VARIABLES, :predefined).
+      add(BASH_VARIABLES, :predefined)
 
     attr_reader :state, :quote
 
@@ -55,35 +65,46 @@ module Scanners
       super(*args)
       @state = :initial
       @quote = nil
+      @shell = false
     end
 
-    def scan_tokens tokens, options
+    def scan_tokens encoder, options
 
       until eos?
         kind = match = nil
 
         if match = scan(/\n/)
-          tokens << [match, :end_line]
+          encoder.text_token(match, :end_line)
           next
         end
 
         if @state == :initial
           if  match = scan(/\A#!.*/)
             kind = :directive
-          elsif match = scan(/#.*/)
+          elsif match = scan(/\s*#.*/)
             kind = :comment
+          elsif match = scan(/.#/)
+            kind = :ident
           elsif match = scan(/(?:\. |source ).*/)
             kind = :reserved
           elsif match = scan(/(?:\\.|,)/)
             kind = :plain
           elsif match = scan(/;/)
             kind = :delimiter
-          elsif match = scan(/(?:"|`)/)
+          elsif match = scan(/"/)
             @state = :quote
             @quote = match
-            tokens << [:open, :string] if @quote == '"'
-            tokens << [:open, :shell] if @quote == '`'
-            tokens << [match, :delimiter]
+            encoder.begin_group :string
+            encoder.text_token(match, :delimiter)
+            next
+          elsif match = scan(/`/)
+            if @shell
+              encoder.end_group :shell
+            else
+              encoder.begin_group :shell
+            end
+            @shell = (not @shell)
+            encoder.text_token(match, :delimiter)
             next
           elsif match = scan(/'[^']*'/)
             kind = :string
@@ -100,12 +121,19 @@ module Scanners
             kind = :global_variable
           elsif match = scan(/ \$\{ [^\}]+ \} /ox)
             match =~ /\$\{(.*)\}/
-            kind = IDENT_KIND[$1]
+            var=$1
+            if var =~ /\[.*\]/
+              encoder.text_token("${", :instance_variable)
+              match_array(var, encoder)
+              encoder.text_token("}", :instance_variable)
+              next
+            end
+            kind = IDENT_KIND[var]
             kind = :instance_variable if kind == :ident
           elsif match = scan(/ \$\( [^\)]+ \) /ox)
             kind = :shell
           elsif match = scan(PRE_CONSTANTS)
-            kind = :pre_constant
+            kind = :predefined_constant
           elsif match = scan(/[^\s'"]*[A-Za-z_][A-Za-z_0-9]*\+?=/)
             match =~ /(.*?)([A-Za-z_][A-Za-z_0-9]*)(\+?=)/
             str = $1
@@ -115,23 +143,23 @@ module Scanners
             if str.to_s.strip.empty?
               kind = IDENT_KIND[pre]
               kind = :instance_variable if kind == :ident
-              tokens << [pre, kind]
-              tokens << [op, :operator]
+              encoder.text_token(pre, kind)
+              encoder.text_token(op, :operator)
               next
             end
-          elsif match = scan(/[A-Za-z_]+\[[A-Za-z_\d]+\]/)
+          elsif match = scan(/[A-Za-z_]+\[[A-Za-z_\@\*\d]+\]/)
             # array
-            kind = IDENT_KIND(match)
-            kind = :instance_variable if kind == :ident
+            match_array(match, encoder)
+            next
           elsif match = scan(/ \$[A-Za-z_][A-Za-z_0-9]* /ox)
             match =~ /\$(.*)/
             kind = IDENT_KIND[$1]
             kind = :instance_variable if kind == :ident
           elsif match = scan(/read \S+/)
             match =~ /read(\s+)(\S+)/
-            tokens << ['read', :method]
-            tokens << [$1, :space]
-            tokens << [$2, :instance_variable]
+            encoder.text_token('read', :method)
+            encoder.text_token($1, :space)
+            encoder.text_token($2, :instance_variable)
             next
           elsif match = scan(/[\!\:\[\]\{\}]/)
             kind = :reserved
@@ -139,8 +167,8 @@ module Scanners
             match =~ /([^;]+);?/
             kind = IDENT_KIND[$1]
             if match[/([^;]+);$/]
-              tokens << [$1, kind]
-              tokens << [';', :delimiter]
+              encoder.text_token($1, kind)
+              encoder.text_token(';', :delimiter)
               next
             end
           elsif match = scan(/(?: = | - | \+ | \{ | \} | \( | \) | && | \|\| | ;; | ! )/ox)
@@ -157,23 +185,30 @@ module Scanners
           if (match = scan(/\\.?/))
             kind = :content
           elsif match = scan(/#{@quote}/)
-            tokens << [match, :delimiter]
-            tokens << [:close, :string] if @quote == '"'
-            tokens << [:close, :shell] if @quote == "`"
+            encoder.text_token(match, :delimiter)
+            encoder.end_group :string
             @quote = nil
             @state = :initial
             next
             #kind = :symbol
           elsif match = scan(PRE_CONSTANTS)
-            kind = :pre_constant
-          elsif match = scan(/ \$\{?[A-Za-z_][A-Za-z_\d]*\}? /x)
+            kind = :predefined_constant
+          elsif match = scan(/ (?: \$\(\(.*?\)\) ) /x)
+            kind = :global_variable
+          elsif match = scan(/ \$ (?: (?: \{ [^\}]* \}) | (?: [A-Za-z_0-9]+ ) ) /x)
+            match =~ /(\$\{?)([^\}]*)(\}?)/
+            pre=$1
+            var=$2
+            post=$3
+            if var =~ /\[.*?\]/
+              encoder.text_token(pre,:instance_variable)
+              match_array(var, encoder)
+              encoder.text_token(post,:instance_variable)
+              next
+            end
             kind = IDENT_KIND[match]
             kind = :instance_variable if kind == :ident
-          elsif (@quote == '`') and (match = scan(/\$"/))
-            kind = :content
-          elsif (@quote == '"') and (match = scan(/\$`/))
-            kind = :content
-          elsif match = scan(/[^#{@quote}\$\\]+/)
+          elsif match = scan(/[^#{@quote}\\]+/)
             kind = :content
           else match = scan(/.+/)
             # this shouldn't be
@@ -184,12 +219,24 @@ module Scanners
         end
   
         match ||= matched
-        tokens << [match, kind]
+        encoder.text_token(match, kind)
       end
 
-      tokens
+      encoder
     end
   
+
+    def match_array(match, encoder)
+        match =~ /([A-Za-z_]+)\[(.*?)\]/
+        var = $1
+        key = $2
+        kind = IDENT_KIND[var]
+        kind = :instance_variable if kind == :ident
+        encoder.text_token(var, kind)
+        encoder.text_token("[", :operator)
+        encoder.text_token(key, :key)
+        encoder.text_token("]", :operator)
+    end
   
     def handle_error(match, options)
       o = {:ignore_errors => true}.merge(options)

data/lib/coderay/scanners/erb_bash.rb

@@ -1,10 +1,10 @@
 # Scanner for Bash
 # Author: spam+github@codez.ch
-require 'coderay/scanners/rhtml'
+require 'coderay/scanners/erb'
 
 module CodeRay
   module Scanners
-    class ErbBash < RHTML
+    class ErbBash < ERB
       register_for :erb_bash
 
       protected

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: coderay_bash
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
-  - 0
-  - 2
   - 1
-  version: 0.2.1
+  - 0
+  version: "1.0"
 platform: ruby
 authors: 
 - Petr Kovar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +02:00
+date: 2011-10-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,8 +23,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -32,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: |
-  Bash highlighting for coderay. This gem was tested with coderay 0.9.3 and won't work with coderay >= 1.0.
+  Bash highlighting for coderay. This gem was tested with coderay 1.0 and won't work with coderay < 1.0.
 
 email: pejuko@gmail.com
 executables: []
@@ -45,15 +46,15 @@ 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
 has_rdoc: true
 homepage: http://github.com/pejuko/coderay_bash
 licenses: []
 
 post_install_message: |
-  This gem was tested with coderay 0.9.3 and won't work with coderay from svn.
+  This gem was tested with coderay 1.0 and won't work with coderay 0.9.
 
 rdoc_options: []
 
@@ -64,6 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -72,13 +74,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Simple bash scanner for highlighting with coderay.