rouge 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93043d4d750807111180be1a7d6582d7d8338470
-  data.tar.gz: 9b99367f2a290e9c4c0a040142866a641bb06803
+  metadata.gz: 9e86ab14104619c2550743be376277431a1d348a
+  data.tar.gz: dd494f5310e3f05ea124ba5009c1ee93835591b9
 SHA512:
-  metadata.gz: 302965016c0054702b7a0e97c1d8fecb6a755ae4957e127870e2d6eecd4131d8589e4f20b6c44b751edcceb0d3030cdfa27004ac9388d6b44e72b0133451a6f9
-  data.tar.gz: 52de7875d8d80e34c93cec6c86afdf8292bebfeabcac389a746c18b95bd46bb070b9410020ca609bd4beec241fdf243a07792cc927a4b7832254005f007c40c1
+  metadata.gz: 199f707e796ee258424385a3e04347fee7f3ac56062d1bd1d0498eb0cef816a6d9944bd93cadb7cc390da3ca8191be3a8da407c0e2372e4cc209867a9a76ac6b
+  data.tar.gz: b48cc7207849973dc09b789c6d0379d3a0ab5d4f364c5d8ca0b7db2f53879f1865b8574b22d1dd9bdb32e39f09ff52aa261db44e29a062d1862b7f68aa687ff4

data/lib/rouge/demos/docker

@@ -0,0 +1,9 @@
+maintainer First O'Last
+
+run echo \
+  123 $bar
+# comment
+onbuild add . /app/src
+onbuild run echo \
+  123 $bar
+CMD /bin/bash

data/lib/rouge/demos/fsharp

@@ -0,0 +1,12 @@
+(* Binary tree with leaves car­rying an integer. *)
+type Tree = Leaf of int | Node of Tree * Tree
+
+let rec existsLeaf test tree =
+  match tree with
+  | Leaf v -> test v
+  | Node (left, right) ->
+      existsLeaf test left
+      || existsLeaf test right
+
+let hasEvenLeaf tree =
+  existsLeaf (fun n -> n % 2 = 0) tree

data/lib/rouge/lexers/docker.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class Docker < RegexLexer
+      title "Docker"
+      desc "Dockerfile syntax"
+      tag 'docker'
+      aliases 'dockerfile'
+      filenames 'Dockerfile', '*.docker'
+      mimetypes 'text/x-dockerfile-config'
+
+      KEYWORDS = %w(
+        FROM MAINTAINER CMD EXPOSE ENV ADD ENTRYPOINT VOLUME WORKDIR
+      ).join('|')
+
+      start { @shell = Shell.new(@options) }
+
+      state :root do
+        rule /\s+/, Text
+
+        rule /^(ONBUILD)(\s+)(#{KEYWORDS})(.*)/io do |m|
+          groups Keyword, Text::Whitespace, Keyword, Str
+        end
+
+        rule /^(#{KEYWORDS})\b(.*)/io do |m|
+          groups Keyword, Str
+        end
+
+        rule /#.*?$/, Comment
+
+        rule /^(ONBUILD\s+)?RUN(\s+)/i do
+          token Keyword
+          push :run
+          @shell.reset!
+        end
+
+        rule /\w+/, Text
+        rule /[^\w]+/, Text
+        rule /./, Text
+      end
+
+      state :run do
+        rule /\n/, Text, :pop!
+        rule /\\./m, Str::Escape
+        rule(/(\\.|[^\n\\])+/) { delegate @shell }
+      end
+    end
+  end
+end

data/lib/rouge/lexers/fsharp.rb

@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*- #
+
+module Rouge
+  module Lexers
+    class FSharp < RegexLexer
+      title "FSharp"
+      desc 'F# (fsharp.net)'
+      tag 'fsharp'
+      filenames '*.fs', '*.fsx'
+      mimetypes 'application/fsharp-script', 'text/x-fsharp', 'text/x-fsi'
+
+      def self.keywords
+        @keywords ||= Set.new %w(
+          abstract and as assert base begin class default delegate do
+          done downcast downto elif else end exception extern false
+          finally for fun function global if in inherit inline interface
+          internal lazy let let! match member module mutable namespace
+          new not null of open or override private public rec return
+          return! select static struct then to true try type upcast
+          use use! val void when while with yield yield! sig atomic 
+          break checked component const constraint constructor 
+          continue eager event external fixed functor include method 
+          mixin object parallel process protected pure sealed tailcall 
+          trait virtual volatile
+        )
+      end
+
+      def self.keyopts
+        @keyopts ||= Set.new %w(
+          != # & && ( ) * \+ , - -. -> . .. : :: := :> ; ;; < <- =
+          > >] >} ? ?? [ [< [> [| ] _ ` { {< | |] } ~ |> <| <>
+        )
+      end
+
+      def self.word_operators
+        @word_operators ||= Set.new %w(and asr land lor lsl lxor mod or)
+      end
+
+      def self.primitives
+        @primitives ||= Set.new %w(unit int float bool string char list array)
+      end
+
+      operator = %r([\[\];,{}_()!$%&*+./:<=>?@^|~#-]+)
+      id = /[a-z][\w']*/i
+      upper_id = /[A-Z][\w']*/
+
+      state :root do
+        rule /\s+/m, Text
+        rule /false|true|[(][)]|\[\]/, Name::Builtin::Pseudo
+        rule /#{upper_id}(?=\s*[.])/, Name::Namespace, :dotted
+        rule upper_id, Name::Class
+        rule /[(][*](?![)])/, Comment, :comment
+        rule %r(//.*?\n), Comment::Single
+        rule id do |m|
+          match = m[0]
+          if self.class.keywords.include? match
+            token Keyword
+          elsif self.class.word_operators.include? match
+            token Operator::Word
+          elsif self.class.primitives.include? match
+            token Keyword::Type
+          else
+            token Name
+          end
+        end
+
+        rule operator do |m|
+          match = m[0]
+          if self.class.keyopts.include? match
+            token Punctuation
+          else
+            token Operator
+          end
+        end
+
+        rule /-?\d[\d_]*(.[\d_]*)?(e[+-]?\d[\d_]*)/i, Num::Float
+        rule /0x\h[\h_]*/i, Num::Hex
+        rule /0o[0-7][0-7_]*/i, Num::Oct
+        rule /0b[01][01_]*/i, Num::Bin
+        rule /\d[\d_]*/, Num::Integer
+
+        rule /'(?:(\\[\\"'ntbr ])|(\\[0-9]{3})|(\\x\h{2}))'/, Str::Char
+        rule /'[.]'/, Str::Char
+        rule /'/, Keyword
+        rule /"/, Str::Double, :string
+        rule /[~?]#{id}/, Name::Variable
+      end
+
+      state :comment do
+        rule /[^(*)]+/, Comment
+        rule(/[(][*]/) { token Comment; push }
+        rule /[*][)]/, Comment, :pop!
+        rule /[(*)]/, Comment
+      end
+
+      state :string do
+        rule /[^\\"]+/, Str::Double
+        mixin :escape_sequence
+        rule /\\\n/, Str::Double
+        rule /"/, Str::Double, :pop!
+      end
+
+      state :escape_sequence do
+        rule /\\[\\"'ntbr]/, Str::Escape
+        rule /\\\d{3}/, Str::Escape
+        rule /\\x\h{2}/, Str::Escape
+      end
+
+      state :dotted do
+        rule /\s+/m, Text
+        rule /[.]/, Punctuation
+        rule /#{upper_id}(?=\s*[.])/, Name::Namespace
+        rule upper_id, Name::Class, :pop!
+        rule id, Name, :pop!
+      end
+    end
+  end
+end

data/lib/rouge/lexers/glsl.rb

@@ -10,7 +10,7 @@ module Rouge
     # Author: Sri Harsha Chilakapati
     class Glsl < C
       tag 'glsl'
-      filenames '*.glsl', '*.frag', '*.vert', '*.geom', '*.fs', '*.vs', '*.gs', '*.shader'
+      filenames '*.glsl', '*.frag', '*.vert', '*.geom', '*.vs', '*.gs', '*.shader'
       mimetypes 'x-shader/x-vertex', 'x-shader/x-fragment', 'x-shader/x-geometry'
 
       title "GLSL"

data/lib/rouge/lexers/python.rb

@@ -107,14 +107,14 @@ module Rouge
 
         # TODO: not in python 3
         rule /`.*?`/, Str::Backtick
-        rule /(?:r|ur|ru)"""/i, Str, :tdqs
-        rule /(?:r|ur|ru)'''/i, Str, :tsqs
-        rule /(?:r|ur|ru)"/i,   Str, :dqs
-        rule /(?:r|ur|ru)'/i,   Str, :sqs
-        rule /u?"""/i,          Str, :escape_tdqs
-        rule /u?'''/i,          Str, :escape_tsqs
-        rule /u?"/i,            Str, :escape_dqs
-        rule /u?'/i,            Str, :escape_sqs
+        rule /(?:r|ur|ru)"""/i, Str, :raw_tdqs
+        rule /(?:r|ur|ru)'''/i, Str, :raw_tsqs
+        rule /(?:r|ur|ru)"/i,   Str, :raw_dqs
+        rule /(?:r|ur|ru)'/i,   Str, :raw_sqs
+        rule /u?"""/i,          Str, :tdqs
+        rule /u?'''/i,          Str, :tsqs
+        rule /u?"/i,            Str, :dqs
+        rule /u?'/i,            Str, :sqs
 
         rule /@#{dotted_identifier}/i, Name::Decorator
 
@@ -204,7 +204,7 @@ module Rouge
         rule %r(\\
           ( [\\abfnrtv"']
           | \n
-          | N{.*?}
+          | N{[a-zA-z][a-zA-Z ]+[a-zA-Z]}
           | u[a-fA-F0-9]{4}
           | U[a-fA-F0-9]{8}
           | x[a-fA-F0-9]{2}
@@ -213,21 +213,26 @@ module Rouge
         )x, Str::Escape
       end
 
+      state :raw_escape do
+        rule /\\./, Str
+      end
+
       state :dqs do
         rule /"/, Str, :pop!
-        rule /\\\\|\\"|\\\n/, Str::Escape
+        mixin :escape
         mixin :strings_double
       end
 
       state :sqs do
         rule /'/, Str, :pop!
-        rule /\\\\|\\'|\\\n/, Str::Escape
+        mixin :escape
         mixin :strings_single
       end
 
       state :tdqs do
         rule /"""/, Str, :pop!
         rule /"/, Str
+        mixin :escape
         mixin :strings_double
         mixin :nl
       end
@@ -235,13 +240,14 @@ module Rouge
       state :tsqs do
         rule /'''/, Str, :pop!
         rule /'/, Str
+        mixin :escape
         mixin :strings_single
         mixin :nl
       end
 
       %w(tdqs tsqs dqs sqs).each do |qtype|
-        state :"escape_#{qtype}" do
-          mixin :escape
+        state :"raw_#{qtype}" do
+          mixin :raw_escape
           mixin :"#{qtype}"
         end
       end

data/lib/rouge/lexers/yaml.rb

@@ -63,6 +63,7 @@ module Rouge
 
       def set_indent(match, opts={})
         if indent < @next_indent
+          puts "    yaml: indenting #{indent}/#{@next_indent}" if @debug
           @indent_stack << @next_indent
         end
 
@@ -122,7 +123,10 @@ module Rouge
         end
 
         # block collection indicators
-        rule(/[?:-](?=[ ]|$)/) { |m| token Punctuation::Indicator; set_indent m[0] }
+        rule(/[?:-](?=[ ]|$)/) do |m|
+          set_indent m[0]
+          token Punctuation::Indicator
+        end
 
         # the beginning of a block line
         rule(/[ ]*/) { |m| token Text; continue_indent(m[0]); pop! }
@@ -166,8 +170,8 @@ module Rouge
 
       state :block_nodes do
         # implicit key
-        rule /:(?=\s|$)/ do |m|
-          token Punctuation::Indicator
+        rule /((?:\w[\w -]*)?)(:)(?=\s|$)/ do |m|
+          groups Name::Attribute, Punctuation::Indicator
           set_indent m[0], :implicit => true
         end
 
@@ -233,7 +237,9 @@ module Rouge
           @block_scalar_indent ||= indent_size
 
           if indent_size < dedent_level
-            pop! 2
+            save_indent m[0]
+            pop!
+            push :indentation
           end
         end
 

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "2.0.3"
+    "2.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email:
@@ -43,12 +43,14 @@ files:
 - lib/rouge/demos/d
 - lib/rouge/demos/dart
 - lib/rouge/demos/diff
+- lib/rouge/demos/docker
 - lib/rouge/demos/eiffel
 - lib/rouge/demos/elixir
 - lib/rouge/demos/erb
 - lib/rouge/demos/erlang
 - lib/rouge/demos/factor
 - lib/rouge/demos/fortran
+- lib/rouge/demos/fsharp
 - lib/rouge/demos/gherkin
 - lib/rouge/demos/glsl
 - lib/rouge/demos/go
@@ -162,12 +164,14 @@ files:
 - lib/rouge/lexers/d.rb
 - lib/rouge/lexers/dart.rb
 - lib/rouge/lexers/diff.rb
+- lib/rouge/lexers/docker.rb
 - lib/rouge/lexers/eiffel.rb
 - lib/rouge/lexers/elixir.rb
 - lib/rouge/lexers/erb.rb
 - lib/rouge/lexers/erlang.rb
 - lib/rouge/lexers/factor.rb
 - lib/rouge/lexers/fortran.rb
+- lib/rouge/lexers/fsharp.rb
 - lib/rouge/lexers/gherkin.rb
 - lib/rouge/lexers/gherkin/keywords.rb
 - lib/rouge/lexers/glsl.rb