rouge 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6d9cbc5bd266812506988d40b94a9de6436f72
-  data.tar.gz: 7fb0fe3816ed4d0adcc35d780640efbbfe72d6c2
+  metadata.gz: 726f116a1b78032be65f6abef810b5b1db42a093
+  data.tar.gz: acb0e9e2ad10c72f5e455517f17b71382693016b
 SHA512:
-  metadata.gz: 69735105b5246d5d1a230af6c3501ab45b275d9f988a4948034205202e9c2355e1b804566d1458e17940a4dc201332ab8f5d408d236a1f92ed76134651be5d46
-  data.tar.gz: 5b04ba1b449cc48ae61394bc44a83c43cffd5cf333a9af73a47b476d69fe4676096b4f6a8445ed4a1f9798d2157d9bfdcb5c2676fb615d984fab650b59a957b3
+  metadata.gz: cb8b9f3139cc5d9539aa4b539a6c03f1b36630bc2483bac383cce749cff0f8b87565eeaa30ec74a0312098b77ae5e89824b063a89e36d1e53a986ad330a97e6f
+  data.tar.gz: 61a48f640f1594d76ff48efe7501a3c5c151d9703d130a6d25db3c318a882b494a0409b9df8103c32fed6fad6768e617d158b84dedfb0b64dbd07dceaf4456e8

data/Gemfile

@@ -5,17 +5,21 @@ gemspec
 gem 'minitest', '~> 4.0'
 gem 'wrong'
 
+gem 'rubocop', '~> 0.49.1' if RUBY_VERSION >= '2.0.0'
+
 gem 'rake'
 
 # don't try to install redcarpet under jruby
 gem 'redcarpet', :platforms => :ruby
 
-gem 'pry'
+group :development do
+  gem 'pry'
 
-# docs
-gem 'yard'
-gem 'github-markup'
+  # docs
+  gem 'yard'
+  gem 'github-markup'
 
-# for visual tests
-gem 'sinatra'
-gem 'shotgun'
+  # for visual tests
+  gem 'sinatra'
+  gem 'shotgun'
+end

data/lib/rouge/cli.rb

@@ -66,7 +66,7 @@ module Rouge
       return klass.parse(argv) if klass
 
       case mode
-      when '-h', '--help', 'help', '-help'
+      when '-h', '--help', 'help', '-help', nil
         Help.parse(argv)
       else
         argv.unshift(mode) if mode
@@ -282,7 +282,7 @@ module Rouge
         formatter.format(lexer.lex(input), &method(:print))
       end
 
-    private
+    private_class_method
       def self.parse_cgi(str)
         pairs = CGI.parse(str).map { |k, v| [k.to_sym, v.first] }
         Hash[pairs]
@@ -374,7 +374,7 @@ module Rouge
       end
     end
 
-  private
+  private_class_method
     def self.normalize_syntax(argv)
       out = []
       argv.each do |arg|

data/lib/rouge/formatters/html.rb

@@ -26,7 +26,7 @@ module Rouge
         end
       end
 
-    private
+
       TABLE_FOR_ESCAPE_HTML = {
         '&' => '&',
         '<' => '&lt;',

data/lib/rouge/lexers/console.rb

@@ -48,9 +48,9 @@ module Rouge
 
       def prompt_prefix_regex
         if allow_comments?
-          /^[^<#]*?/
+          /[^<#]*?/m
         else
-          /^.*?/
+          /.*?/m
         end
       end
 

data/lib/rouge/lexers/elixir.rb

@@ -20,7 +20,7 @@ module Rouge
         rule /#.*$/, Comment::Single
         rule %r{\b(case|cond|end|bc|lc|if|unless|try|loop|receive|fn|defmodule|
              defp?|defprotocol|defimpl|defrecord|defmacrop?|defdelegate|
-             defexception|exit|raise|throw|unless|after|rescue|catch|else)\b(?![?!])|
+             defexception|exit|raise|throw|after|rescue|catch|else)\b(?![?!])|
              (?<!\.)\b(do|\-\>)\b}x, Keyword
         rule /\b(import|require|use|recur|quote|unquote|super|refer)\b(?![?!])/, Keyword::Namespace
         rule /(?<!\.)\b(and|not|or|when|xor|in)\b/, Operator::Word

data/lib/rouge/lexers/http.rb

@@ -56,7 +56,7 @@ module Rouge
         rule /([^\s:]+)( *)(:)( *)([^\r\n]+)(\r?\n|$)/ do |m|
           key = m[1]
           value = m[5]
-          if key.strip.downcase == 'content-type'
+          if key.strip.casecmp('content-type').zero?
             @content_type = value.split(';')[0].downcase
           end
 

data/lib/rouge/lexers/igorpro.rb

@@ -263,7 +263,7 @@ module Rouge
         rule %r(//), Comment, :comments
 
         rule /\b#{object}/ do |m|
-          if m[0].downcase.match /function/
+          if m[0].downcase =~ /function/
             token Keyword::Declaration
             push :parse_function
           elsif self.class.igorDeclarations.include? m[0].downcase
@@ -281,7 +281,7 @@ module Rouge
           elsif self.class.hdf5Operation.include? m[0].downcase
             token Keyword::Reserved
             push :operationFlags
-          elsif m[0].downcase.match /(v|s|w)_[a-z]+[a-z0-9]*/
+          elsif m[0].downcase =~ /(v|s|w)_[a-z]+[a-z0-9]*/
             token Name::Builtin
           else
             token Name

data/lib/rouge/lexers/liquid.rb

@@ -105,7 +105,7 @@ module Rouge
       state :filters do
         mixin :whitespace
 
-        rule (/\}\}/) { token Punctuation; reset_stack }
+        rule(/\}\}/) { token Punctuation; reset_stack }
 
         rule /([^\s\|:]+)(:?)(\s*)/ do
           groups Name::Function, Punctuation, Text::Whitespace
@@ -156,11 +156,11 @@ module Rouge
       end
 
       state :end_of_tag do
-        rule (/\}\}/) { token Punctuation; reset_stack }
+        rule(/\}\}/) { token Punctuation; reset_stack }
       end
 
       state :end_of_block do
-        rule (/%\}/) { token Punctuation; reset_stack }
+        rule(/%\}/) { token Punctuation; reset_stack }
       end
 
       # states for unknown markup

data/lib/rouge/lexers/make.rb

@@ -96,7 +96,7 @@ module Rouge
         end
 
         rule(/\\./m) { delegate @shell }
-        stop = /\$\(|\(|\)|\n|\\/
+        stop = /\$\(|\(|\)|\\|$/
         rule(/.+?(?=#{stop})/m) { delegate @shell }
         rule(stop) { delegate @shell }
       end

data/lib/rouge/lexers/matlab.rb

@@ -11,7 +11,7 @@ module Rouge
       mimetypes 'text/x-matlab', 'application/x-matlab'
 
       def self.analyze_text(text)
-        return 0.4 if text.match(/^\s*% /) # % comments are a dead giveaway
+        return 0.4 if text =~ /^\s*% / # % comments are a dead giveaway
       end
 
       def self.keywords

data/lib/rouge/lexers/mosel.rb

@@ -73,7 +73,7 @@ module Rouge
         getbstat getdualray getiis getiissense getiistype getinfcause getinfeas getlb getloadedlinctrs getloadedmpvars getname getprimalray getprobstat getrange getsensrng getsize getsol getub getvars
         implies indicator isiisvalid isintegral loadbasis
         loadmipsol loadprob
-        maximize, minimize
+        maximize minimize
         postsolve
         readbasis readdirs readsol refinemipsol rejectintsol repairinfeas resetbasis resetiis resetsol
         savebasis savemipsol savesol savestate selectsol setbstat setcallback setcbcutoff setgndata setlb setmipdir setmodcut setsol setub setucbdata stopoptimize
@@ -100,15 +100,15 @@ module Rouge
         getasnumber getchar getcwd getdate getday getdaynum getdays getdirsep 
         getendparse setendparse
         getenv getfsize getfstat getftime gethour getminute getmonth getmsec getpathsep
-        getqtype, setqtype
+        getqtype setqtype
         getsecond
-        getsepchar, setsepchar
+        getsepchar setsepchar
         getsize
-        getstart, setstart
-        getsucc, setsucc
+        getstart setstart
+        getsucc setsucc
         getsysinfo getsysstat gettime
         gettmpdir 
-        gettrim, settrim
+        gettrim settrim
         getweekday getyear
         inserttext isvalid
         makedir makepath newtar

data/lib/rouge/lexers/nasm.rb

@@ -139,7 +139,7 @@ module Rouge
 
       state :root do
         mixin :expr_whitespace
-        rule (//) { push :statement }
+        rule(//) { push :statement }
         rule /^%[a-zA-Z0-9]+/, Comment::Preproc, :statement
 
         rule(

data/lib/rouge/lexers/praat.rb

@@ -166,7 +166,7 @@ module Rouge
           push :comma_list
         end
 
-        rule /[\s\n]/,    Text, :pop!
+        rule /[\s]/,    Text, :pop!
       end
 
       state :procedure_call do
@@ -175,7 +175,7 @@ module Rouge
         rule /(:|\s*\()/, Punctuation, :pop!
 
         rule /'/,            Name::Function
-        rule /[^:\('\n\s]+/, Name::Function
+        rule /[^:\('\s]+/, Name::Function
 
         rule /(?=\s+)/ do
           token Text
@@ -187,7 +187,7 @@ module Rouge
       state :procedure_definition do
         rule /(:|\s*\()/, Punctuation, :pop!
 
-        rule /[^:\(\n\s]+/, Name::Function
+        rule /[^:\(\s]+/, Name::Function
 
         rule /(\s+)/, Text, :pop!
       end

data/lib/rouge/lexers/protobuf.rb

@@ -53,17 +53,17 @@ module Rouge
 
       state :package do
         rule /[a-zA-Z_]\w*/, Name::Namespace, :pop!
-        rule (//) { pop! }
+        rule(//) { pop! }
       end
 
       state :message do
         rule /[a-zA-Z_]\w*/, Name::Class, :pop!
-        rule (//) { pop! }
+        rule(//) { pop! }
       end
 
       state :type do
         rule /[a-zA-Z_]\w*/, Name, :pop!
-        rule (//) { pop! }
+        rule(//) { pop! }
       end
     end
   end

data/lib/rouge/lexers/wollok.rb

@@ -71,7 +71,7 @@ module Rouge
       state :objects do
         rule variable_naming do |m|
           variable = m[0]
-          if entities.include?(variable) || ('A'..'Z').include?(variable[0])
+          if entities.include?(variable) || ('A'..'Z').cover?(variable[0])
             token Name::Class
           else
             token Keyword::Variable

data/lib/rouge/regex_lexer.rb

@@ -46,6 +46,7 @@ module Rouge
         @name = name
         @defn = defn
         @rules = []
+        @loaded = false
       end
 
       def to_state(lexer_class)
@@ -102,7 +103,7 @@ module Rouge
           proc do |stream|
             puts "    yielding #{tok.qualname}, #{stream[0].inspect}" if @debug
             @output_stream.call(tok, stream[0])
-            puts "    popping stack: #{1}" if @debug
+            puts "    popping stack: 1" if @debug
             @stack.pop or raise 'empty stack!'
           end
         when :push
@@ -300,7 +301,7 @@ module Rouge
           # the most common, for now...
           next if rule.beginning_of_line && !stream.beginning_of_line?
 
-          if size = stream.skip(rule.re)
+          if (size = stream.skip(rule.re))
             puts "    got #{stream[0].inspect}" if @debug
 
             instance_exec(stream, &rule.callback)

data/lib/rouge/util.rb

@@ -7,10 +7,10 @@ module Rouge
     end
 
     def [](k)
-      _sup = super
-      return _sup if own_keys.include?(k)
+      value = super
+      return value if own_keys.include?(k)
 
-      _sup || parent[k]
+      value || parent[k]
     end
 
     def parent

data/lib/rouge/version.rb

@@ -2,6 +2,6 @@
 
 module Rouge
   def self.version
-    "2.1.0"
+    "2.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rouge
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Jeanine Adkisson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Rouge aims to a be a simple, easy-to-extend drop-in replacement for pygments.
 email: